(Clock) Fix time conversion issue #64

Author: maxkeppeler

clock/src/androidTest/java/com/maxkeppeler/sheets/clock/functional/ClockViewTests.kt

@@ -385,4 +385,107 @@ class ClockViewTests {
         }
         rule.onPositiveButton().assertIsNotEnabled()
     }
+
+    @Test
+    fun clockView_12HourFormat_midnightSelection_returnsMidnight() {
+        var selectedTime: LocalTime? = null
+        rule.setContentAndWaitForIdle {
+            ClockView(
+                useCaseState = UseCaseState(visible = true),
+                selection = ClockSelection.HoursMinutes { hours, minutes ->
+                    selectedTime = LocalTime.of(hours, minutes)
+                },
+                config = ClockConfig(is24HourFormat = false)
+            )
+        }
+
+        listOf(1, 2, 0, 0).forEach {
+            runBlocking {
+                rule.onNodeWithTags(TestTags.KEYBOARD_KEY, it).performClick()
+                delay(Constants.DEBOUNCE_KEY_CLICK_DURATION)
+            }
+        }
+        runBlocking {
+            rule.onNodeWithTags(TestTags.CLOCK_12_HOUR_FORMAT, 0).performClick() // Select AM
+            delay(Constants.DEBOUNCE_KEY_CLICK_DURATION)
+        }
+        rule.onPositiveButton().performClick()
+
+        assert(selectedTime == LocalTime.MIDNIGHT)
+    }
+
+    @Test
+    fun clockView_12HourFormat_noonSelection_returnsNoon() {
+        var selectedTime: LocalTime? = null
+        rule.setContentAndWaitForIdle {
+            ClockView(
+                useCaseState = UseCaseState(visible = true),
+                selection = ClockSelection.HoursMinutes { hours, minutes ->
+                    selectedTime = LocalTime.of(hours, minutes)
+                },
+                config = ClockConfig(is24HourFormat = false)
+            )
+        }
+
+        listOf(1, 2, 0, 0).forEach {
+            runBlocking {
+                rule.onNodeWithTags(TestTags.KEYBOARD_KEY, it).performClick()
+                delay(Constants.DEBOUNCE_KEY_CLICK_DURATION)
+            }
+        }
+        runBlocking {
+            rule.onNodeWithTags(TestTags.CLOCK_12_HOUR_FORMAT, 1).performClick() // Select PM
+            delay(Constants.DEBOUNCE_KEY_CLICK_DURATION)
+        }
+        rule.onPositiveButton().performClick()
+        assert(selectedTime == LocalTime.NOON)
+    }
+
+    @Test
+    fun clockView_12HourFormat_amPmIndicatorMisalignment_returnsCorrectTime() {
+        var selectedTime: LocalTime? = null
+        val testTime = LocalTime.of(10, 30)
+
+        rule.setContentAndWaitForIdle {
+            ClockView(
+                useCaseState = UseCaseState(visible = true),
+                selection = ClockSelection.HoursMinutes { hours, minutes ->
+                    selectedTime = LocalTime.of(hours, minutes)
+                },
+                config = ClockConfig(is24HourFormat = false)
+            )
+        }
+        listOf(1, 0, 3, 0).forEach {
+            runBlocking {
+                rule.onNodeWithTags(TestTags.KEYBOARD_KEY, it).performClick()
+                delay(Constants.DEBOUNCE_KEY_CLICK_DURATION)
+            }
+        }
+        // Change AM/PM without adjusting time again
+        runBlocking {
+            rule.onNodeWithTags(TestTags.CLOCK_12_HOUR_FORMAT, 1).performClick() // Change to PM
+            delay(Constants.DEBOUNCE_KEY_CLICK_DURATION)
+        }
+        rule.onPositiveButton().performClick()
+        assert(selectedTime == testTime.plusHours(12))
+    }
+
+    @Test
+    fun clockView_12HourFormat_defaultTimeSelection_returnsDefaultTime() {
+        val defaultTime = LocalTime.of(10, 30, 0)
+        var selectedTime: LocalTime? = null
+        rule.setContentAndWaitForIdle {
+            ClockView(
+                useCaseState = UseCaseState(visible = true),
+                selection = ClockSelection.HoursMinutes { hours, minutes ->
+                    selectedTime = LocalTime.of(hours, minutes)
+                },
+                config = ClockConfig(is24HourFormat = false, defaultTime = defaultTime)
+            )
+        }
+
+        rule.onPositiveButton().performClick()
+        assert(selectedTime == defaultTime)
+    }
+
 }

clock/src/main/java/com/maxkeppeler/sheets/clock/ClockState.kt

@@ -27,8 +27,15 @@ import com.maxkeppeker.sheets.core.models.base.Debouncer
 import com.maxkeppeker.sheets.core.views.BaseTypeState
 import com.maxkeppeler.sheets.clock.models.ClockConfig
 import com.maxkeppeler.sheets.clock.models.ClockSelection
-import com.maxkeppeler.sheets.clock.utils.*
+import com.maxkeppeler.sheets.clock.utils.Constants
+import com.maxkeppeler.sheets.clock.utils.convertTimeIntoTimeTextValues
+import com.maxkeppeler.sheets.clock.utils.convertTimeTextValuesIntoTime
+import com.maxkeppeler.sheets.clock.utils.getDisabledInputKeys
+import com.maxkeppeler.sheets.clock.utils.getInputKeys
+import com.maxkeppeler.sheets.clock.utils.inputValue
 import com.maxkeppeler.sheets.clock.utils.isAm
+import com.maxkeppeler.sheets.clock.utils.moveToNextIndex
+import com.maxkeppeler.sheets.clock.utils.moveToPreviousIndex
 import java.io.Serializable
 import java.time.LocalTime
 

clock/src/main/java/com/maxkeppeler/sheets/clock/utils/Utils.kt

@@ -65,10 +65,13 @@ internal fun convertTimeTextValuesIntoTime(
     var actualHour = hour
 
     if (!is24HourFormat) {
-        if (isAm && actualHour >= 12 && min > 0) actualHour -= 12
-        else if (!isAm && ((actualHour < 12 && min >= 0) || (actualHour == 12 && min == 0))) actualHour += 12
+        actualHour = when {
+            isAm && hour == 12 -> 0 // 12 AM should be converted to 0
+            !isAm && hour != 12 -> hour + 12 // PM times (except for 12 PM) should be converted to 24-hour format by adding 12
+            !isAm && hour == 12 -> hour // 12 PM should stay as 12
+            else -> hour // AM times (except for 12 AM) should remain the same
+        }
     }
-    if (actualHour == 24) actualHour = 0
 
     return LocalTime.of(actualHour, min, sec)
 }