Merge pull request #12 from commandiron/1.1.5-development

1.1.5 development
commandiron · Nov 30, 2022 · b141492 · b141492
2 parents 8a54abb + 89d5375
commit b141492
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/app/src/main/java/com/commandiron/wheelpickercompose/MainActivity.kt b/app/src/main/java/com/commandiron/wheelpickercompose/MainActivity.kt
@@ -54,8 +54,8 @@ class MainActivity : ComponentActivity() {
                                 2025, 10, 30, 5, 0
                             ),
                             yearsRange = null,
-                            size = DpSize(200.dp, 100.dp),
                             backwardsDisabled = true,
+                            size = DpSize(200.dp, 100.dp),
                             textStyle = MaterialTheme.typography.titleSmall,
                             textColor = Color(0xFFffc300),
                             selectorProperties = WheelPickerDefaults.selectorProperties(

diff --git a/wheel-picker-compose/build.gradle b/wheel-picker-compose/build.gradle
@@ -55,7 +55,7 @@ afterEvaluate {
 
                 groupId = 'com.git.luolix.topmandiron'
                 artifactId = 'wheel-picker-compose'
-                version = '1.1.4'
+                version = '1.1.5'
             }
         }
     }

diff --git a/...-picker-compose/src/main/java/com/commandiron/wheel_picker_compose/WheelDateTimePicker.kt b/...-picker-compose/src/main/java/com/commandiron/wheel_picker_compose/WheelDateTimePicker.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.commandiron.wheel_picker_compose.core.DefaultWheelDateTimePicker
 import com.commandiron.wheel_picker_compose.core.SelectorProperties
+import com.commandiron.wheel_picker_compose.core.TimeFormat
 import com.commandiron.wheel_picker_compose.core.WheelPickerDefaults
 import java.time.LocalDateTime
 
@@ -21,6 +22,7 @@ fun WheelDateTimePicker(
     modifier: Modifier = Modifier,
     startDateTime: LocalDateTime = LocalDateTime.now(),
     yearsRange: IntRange? = IntRange(1922, 2122),
+    timeFormat: TimeFormat = TimeFormat.HOUR_24,
     backwardsDisabled: Boolean = false,
     size: DpSize = DpSize(256.dp, 128.dp),
     textStyle: TextStyle = MaterialTheme.typography.titleMedium,
@@ -32,6 +34,7 @@ fun WheelDateTimePicker(
         modifier,
         startDateTime,
         yearsRange,
+        timeFormat,
         backwardsDisabled,
         size,
         textStyle,

diff --git a/wheel-picker-compose/src/main/java/com/commandiron/wheel_picker_compose/WheelTimePicker.kt b/wheel-picker-compose/src/main/java/com/commandiron/wheel_picker_compose/WheelTimePicker.kt
@@ -38,7 +38,7 @@ fun WheelTimePicker(
         textStyle,
         textColor,
         selectorProperties,
-        onSnappedTime = { snappedTime ->
+        onSnappedTime = { snappedTime, _ ->
             onSnappedTime(snappedTime.snappedLocalTime)
             snappedTime.snappedIndex
         }

diff --git a/...ose/src/main/java/com/commandiron/wheel_picker_compose/core/DefaultWheelDateTimePicker.kt b/...ose/src/main/java/com/commandiron/wheel_picker_compose/core/DefaultWheelDateTimePicker.kt
@@ -25,6 +25,7 @@ internal fun DefaultWheelDateTimePicker(
     modifier: Modifier = Modifier,
     startDateTime: LocalDateTime = LocalDateTime.now(),
     yearsRange: IntRange? = IntRange(1922, 2122),
+    timeFormat: TimeFormat = TimeFormat.HOUR_24,
     backwardsDisabled: Boolean = false,
     size: DpSize = DpSize(256.dp, 128.dp),
     textStyle: TextStyle = MaterialTheme.typography.titleMedium,
@@ -105,6 +106,7 @@ internal fun DefaultWheelDateTimePicker(
             //Time
             DefaultWheelTimePicker(
                 startTime = startDateTime.toLocalTime(),
+                timeFormat = timeFormat,
                 backwardsDisabled = false,
                 size = DpSize(
                     width = if(yearsRange == null ) size.width * 3 / 6  else size.width * 2 / 5 ,
@@ -115,7 +117,7 @@ internal fun DefaultWheelDateTimePicker(
                 selectorProperties = WheelPickerDefaults.selectorProperties(
                     enabled = false
                 ),
-                onSnappedTime = { snappedTime ->
+                onSnappedTime = { snappedTime, timeFormat ->
 
                     val newDateTime = when(snappedTime) {
                         is SnappedTime.Hour -> {
@@ -139,7 +141,7 @@ internal fun DefaultWheelDateTimePicker(
                     return@DefaultWheelTimePicker when(snappedTime) {
                         is SnappedTime.Hour -> {
                             onSnappedDateTime(SnappedDateTime.Hour(snappedDateTime, snappedDateTime.hour))
-                            snappedDateTime.hour
+                            if(timeFormat == TimeFormat.HOUR_24) snappedDateTime.hour else snappedDateTime.hour - 1
                         }
                         is SnappedTime.Minute -> {
                             onSnappedDateTime(SnappedDateTime.Minute(snappedDateTime, snappedDateTime.minute))

diff --git a/...compose/src/main/java/com/commandiron/wheel_picker_compose/core/DefaultWheelTimePicker.kt b/...compose/src/main/java/com/commandiron/wheel_picker_compose/core/DefaultWheelTimePicker.kt
@@ -30,7 +30,7 @@ internal fun DefaultWheelTimePicker(
     textStyle: TextStyle = MaterialTheme.typography.titleMedium,
     textColor: Color = LocalContentColor.current,
     selectorProperties: SelectorProperties = WheelPickerDefaults.selectorProperties(),
-    onSnappedTime : (snappedTime: SnappedTime) -> Int? = { _ -> null },
+    onSnappedTime : (snappedTime: SnappedTime, timeFormat: TimeFormat) -> Int? = { _,_ -> null },
 ) {
 
     var snappedTime by remember { mutableStateOf(startTime.truncatedTo(ChronoUnit.MINUTES)) }
@@ -138,7 +138,8 @@ internal fun DefaultWheelTimePicker(
                                 SnappedTime.Hour(
                                     localTime = snappedTime,
                                     index = newIndex
-                                )
+                                ),
+                                timeFormat
                             )?.let { return@WheelTextPicker it }
                         }
                     }
@@ -197,7 +198,8 @@ internal fun DefaultWheelTimePicker(
                                     SnappedTime.Minute(
                                         localTime = snappedTime,
                                         index = newIndex
-                                    )
+                                    ),
+                                    timeFormat
                                 )?.let { return@WheelTextPicker it }
                             }
                         }
@@ -222,7 +224,13 @@ internal fun DefaultWheelTimePicker(
                     ),
                     onScrollFinished = { snappedIndex ->
 
-                        val newAmPm =  amPms.find { it.index == snappedIndex }
+                        val newAmPm =  amPms.find {
+                            if(snappedIndex == 2) {
+                                it.index == 1
+                            } else {
+                                it.index == snappedIndex
+                            }
+                        }
 
                         newAmPm?.let {
                             snappedAmPm = newAmPm
@@ -255,7 +263,8 @@ internal fun DefaultWheelTimePicker(
                                     SnappedTime.Hour(
                                         localTime = snappedTime,
                                         index = newIndex
-                                    )
+                                    ),
+                                    timeFormat
                                 )
                             }
                         }
@@ -310,6 +319,7 @@ private data class AmPmHour(
 )
 
 private fun hourToAmPmHour(hour: Int): Int {
+
     if(hour == 0) {
         return 12
     }
@@ -320,6 +330,7 @@ private fun hourToAmPmHour(hour: Int): Int {
 }
 
 private fun amPmHourToHour(amPmHour: Int, amPmValue: AmPmValue): Int {
+
     return when(amPmValue) {
         AmPmValue.AM -> {
             amPmHour