Merge pull request #11 from commandiron/1.1.4-development

1.1.4 development
commandiron · Nov 29, 2022 · 68fb55a · 68fb55a
2 parents c713cde + 4a75e8d
commit 68fb55a
Show file tree

Hide file tree

Showing 7 changed files with 459 additions and 131 deletions.
diff --git a/app/src/main/java/com/commandiron/wheelpickercompose/MainActivity.kt b/app/src/main/java/com/commandiron/wheelpickercompose/MainActivity.kt
@@ -20,8 +20,10 @@ import androidx.compose.ui.unit.dp
 import com.commandiron.wheel_picker_compose.WheelDatePicker
 import com.commandiron.wheel_picker_compose.WheelDateTimePicker
 import com.commandiron.wheel_picker_compose.WheelTimePicker
+import com.commandiron.wheel_picker_compose.core.TimeFormat
 import com.commandiron.wheel_picker_compose.core.WheelPickerDefaults
 import com.commandiron.wheelpickercompose.ui.theme.WheelPickerComposeTheme
+import java.sql.Time
 import java.time.LocalDateTime
 
 class MainActivity : ComponentActivity() {
@@ -51,9 +53,9 @@ class MainActivity : ComponentActivity() {
                             startDateTime = LocalDateTime.of(
                                 2025, 10, 30, 5, 0
                             ),
-                            yearsRange = IntRange(1950, 2050),
+                            yearsRange = null,
                             size = DpSize(200.dp, 100.dp),
-                            backwardsDisabled = false,
+                            backwardsDisabled = true,
                             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.3'
+                version = '1.1.4'
             }
         }
     }

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
@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.commandiron.wheel_picker_compose.core.DefaultWheelTimePicker
 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.LocalTime
 
@@ -20,6 +21,7 @@ import java.time.LocalTime
 fun WheelTimePicker(
     modifier: Modifier = Modifier,
     startTime: LocalTime = LocalTime.now(),
+    timeFormat: TimeFormat = TimeFormat.HOUR_24,
     backwardsDisabled: Boolean = false,
     size: DpSize = DpSize(128.dp, 128.dp),
     textStyle: TextStyle = MaterialTheme.typography.titleMedium,
@@ -30,6 +32,7 @@ fun WheelTimePicker(
     DefaultWheelTimePicker(
         modifier,
         startTime,
+        timeFormat,
         backwardsDisabled,
         size,
         textStyle,

diff --git a/...compose/src/main/java/com/commandiron/wheel_picker_compose/core/CalculateMonthDayTexts.kt b/...compose/src/main/java/com/commandiron/wheel_picker_compose/core/CalculateMonthDayTexts.kt