🎨 [#29] Resolve PR comments

Compose-Picker · Jan 23, 2024 · 0c6191d · 0c6191d
1 parent 30bf11f
commit 0c6191d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/picker/src/main/java/com/composepicker/picker/datepicker/ProgDatePickerState.kt b/picker/src/main/java/com/composepicker/picker/datepicker/ProgDatePickerState.kt
@@ -30,9 +30,9 @@ class ProgDatePickerState(
     var month by mutableStateOf(initialDate.toLocalDateTime(TimeZone.currentSystemDefault()).monthNumber.toString())
     var day by mutableStateOf(initialDate.toLocalDateTime(TimeZone.currentSystemDefault()).dayOfMonth.toString())
 
-    val yearList = (minDate.toLocalDateTime(TimeZone.currentSystemDefault()).year..maxDate.toLocalDateTime(TimeZone.currentSystemDefault()).year).toList().map { it.toString() }
-    val monthList = (1..12).toList().map{ it.toString()}
-    val dayList = (1..31).toList().map{ it.toString()} // TODO : Change DateList when month change.
+    val yearList = (minDate.toLocalDateTime(TimeZone.currentSystemDefault()).year..maxDate.toLocalDateTime(TimeZone.currentSystemDefault()).year).map { it.toString() }
+    val monthList = (1..12).map{ it.toString()}
+    val dayList = (1..31).map{ it.toString()} // TODO : Change DateList when month change.
 
     companion object {
         fun Saver(): Saver<ProgDatePickerState, *> = Saver(

diff --git a/picker/src/main/java/com/composepicker/picker/timepicker/ProgTimePicker.kt b/picker/src/main/java/com/composepicker/picker/timepicker/ProgTimePicker.kt
@@ -78,8 +78,8 @@ fun PreviewProgTimePicker() {
         shape = RoundedCornerShape(1)
     ) {
         ProgTimePicker(
-            timePickerState = ProgTimePickerState(1, 30, is24Hour = false, timeGap = TimeGap.ONE_THIRD),
-            onTimeChanged = { a, b, c -> }
+            timePickerState = ProgTimePickerState(1, 20, is24Hour = false, timeGap = TimeGap.FIVE),
+            onTimeChanged = { hour, minute, meridiem -> }
         )
     }
 }
diff --git a/picker/src/main/java/com/composepicker/picker/timepicker/ProgTimePickerState.kt b/picker/src/main/java/com/composepicker/picker/timepicker/ProgTimePickerState.kt
@@ -28,8 +28,9 @@ class ProgTimePickerState(
 
     val hourList: List<String> =
         if (is24Hour) (0..23).map { it.toString() } else (1..12).map { it.toString() }
+    @OptIn(ExperimentalStdlibApi::class)
     val minuteList: List<String>
-        get() = (0..59).filter { it.mod(timeGap.interval) == 0 }.map { it.toString() }
+        get() = (0..<60).filter { it.mod(timeGap.interval) == 0 }.map { it.toString() }
 
     val meridiemList: List<String> = listOf("AM", "PM")