Merge pull request #1112

v2.5.2
antoinepirlot · Dec 18, 2024 · 3ecd326 · 3ecd326
2 parents 771eb6f + 6c976e1
commit 3ecd326
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 20 deletions.
diff --git a/RELEASES_EN.md b/RELEASES_EN.md
@@ -3,6 +3,12 @@ Tu peux retrouver ce fichier en [français 🇫🇷](RELEASES_FR.md)
 
 ## 2.5 (Android 5.1.1 Lollipop and later)
 
+### 2.5.2
+
+Improvements, optimizations and troubleshooting:
+
+* Hide start timer if the timer is running
+
 ### 2.5.1
 
 Improvements, optimizations and troubleshooting:

diff --git a/RELEASES_FR.md b/RELEASES_FR.md
@@ -3,6 +3,12 @@ You can find this file in [english 🇬🇧](RELEASES_EN.md)
 
 ## 2.5 (Android 5.1.1 Lollipop et ultérieur)
 
+### 2.5.2
+
+Améliorations, optimisations et dépannage:
+
+* Le bouton démarrer le minuteur est masqué lorsque le minuteur fonctionne
+
 ### 2.5.1
 
 Améliorations, optimisations et dépannage:

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         applicationId = nameSpace
         minSdk = 22
         targetSdk = 34
-        versionCode = 66
-        versionName = "2.5.1"
+        versionCode = 67
+        versionName = "2.5.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/io/github/antoinepirlot/satunes/ui/components/forms/CreateTimerForm.kt b/app/src/main/java/io/github/antoinepirlot/satunes/ui/components/forms/CreateTimerForm.kt
@@ -160,25 +160,27 @@ internal fun CreateTimerForm(
                 }
 
                 Spacer(modifier = Modifier.size(5.dp))
-            }
-            Button(
-                onClick = {
-                    computeTime(
-                        secondsIntField = secondsIntField,
-                        minutesIntField = minutesIntField,
-                        hoursIntField = hoursIntField
-                    )
-                    playbackViewModel.setTimer(
-                        scope = scope,
-                        snackBarHostState = snackBarHostState,
-                        hours = hoursIntField.intValue,
-                        minutes = minutesIntField.intValue,
-                        seconds = secondsIntField.intValue
-                    )
-                    onFinished?.invoke()
+            } else {
+                Button(
+                    onClick = {
+                        computeTime(
+                            secondsIntField = secondsIntField,
+                            minutesIntField = minutesIntField,
+                            hoursIntField = hoursIntField
+                        )
+                        playbackViewModel.setTimer(
+                            scope = scope,
+                            snackBarHostState = snackBarHostState,
+                            hours = hoursIntField.intValue,
+                            minutes = minutesIntField.intValue,
+                            seconds = secondsIntField.intValue
+                        )
+                        onFinished?.invoke()
+                    }
+                ) {
+
+                    NormalText(text = stringResource(R.string.start_timer_button_content))
                 }
-            ) {
-                NormalText(text = stringResource(R.string.start_timer_button_content))
             }
         }
     }

diff --git a/fastlane/metadata/android/en-US/changelogs/67.txt b/fastlane/metadata/android/en-US/changelogs/67.txt
@@ -0,0 +1,3 @@
+Improvements, optimizations and troubleshooting:
+
+* Hide start timer if the timer is running
diff --git a/fastlane/metadata/android/fr-FR/changelogs/67.txt b/fastlane/metadata/android/fr-FR/changelogs/67.txt
@@ -0,0 +1,3 @@
+Améliorations, optimisations et dépannage:
+
+* Le bouton démarrer le minuteur est masqué lorsque le minuteur fonctionne
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Improvements, optimizations and troubleshooting:

		* Hide start timer if the timer is running
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Améliorations, optimisations et dépannage:

		* Le bouton démarrer le minuteur est masqué lorsque le minuteur fonctionne