Fix bug where clock would reset if time ended during back gesture

ldeso · Jun 19, 2024 · 6134ab9 · 6134ab9
1 parent e717584
commit 6134ab9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 ## 2.0.1 – Unreleased
 
+### Bug Fix
+
+- Fix bug where clock would reset if time ended during back gesture
+
 ### Note
 
 - Switch links to HTTPS in README.md

diff --git a/metadata/en-US/changelogs/201.txt b/metadata/en-US/changelogs/201.txt
@@ -0,0 +1 @@
+• Fix bug where clock would reset if time ended during back gesture
diff --git a/src/main/kotlin/ui/ClockScreen.kt b/src/main/kotlin/ui/ClockScreen.kt
@@ -114,11 +114,13 @@ fun ClockScreen(
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
                 delay(100L)
             }
-            if (clockState == ClockState.TICKING) {
-                clockViewModel.pause()
-                clockViewModel.restore(isDecimalRestored = true)
-            } else {
-                clockViewModel.reset()
+            when (backEventAction) {
+                BackAction.PAUSE -> run {
+                    clockViewModel.pause()
+                    clockViewModel.restore(isDecimalRestored = true)
+                }
+
+                BackAction.RESET -> clockViewModel.reset()
             }
         },
         updateSwipeEdge = { backEventSwipeEdge = it },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		• Fix bug where clock would reset if time ended during back gesture