From 0c6191d2eb131c55f13d042f51171d0a5f49f571 Mon Sep 17 00:00:00 2001
From: JunYoung Lee <47595801+Lee-Jun-Young@users.noreply.github.com>
Date: Tue, 23 Jan 2024 21:11:25 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20[#29]=20Resolve=20PR=20comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composepicker/picker/datepicker/ProgDatePickerState.kt  | 6 +++---
 .../com/composepicker/picker/timepicker/ProgTimePicker.kt   | 4 ++--
 .../composepicker/picker/timepicker/ProgTimePickerState.kt  | 3 ++-
 3 files changed, 7 insertions(+), 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
index 4eecc8e..9a3a200 100644
--- 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
index 63e9c64..575d5da 100644
--- 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 -> }
         )
     }
 }
\ No newline at end of file
diff --git a/picker/src/main/java/com/composepicker/picker/timepicker/ProgTimePickerState.kt b/picker/src/main/java/com/composepicker/picker/timepicker/ProgTimePickerState.kt
index 1617d7c..eb54ad0 100644
--- 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")