From 0dcc0946f07115c03712614cad3d9c2f06be488f Mon Sep 17 00:00:00 2001 From: Antoine Date: Sat, 14 Dec 2024 14:38:21 +0100 Subject: [PATCH 1/2] Fix: hide timer if timer is already running Signed-off-by: Antoine --- .../ui/components/forms/CreateTimerForm.kt | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) 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 index ebd588b6..1fb49fee 100644 --- 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)) } } } From b4b24c9701395e9bd2c243d56a7f734c7f8b13dd Mon Sep 17 00:00:00 2001 From: Antoine Date: Sat, 14 Dec 2024 14:41:10 +0100 Subject: [PATCH 2/2] Add: changelogs Signed-off-by: Antoine --- RELEASES_EN.md | 6 ++++++ RELEASES_FR.md | 6 ++++++ app/build.gradle.kts | 4 ++-- fastlane/metadata/android/en-US/changelogs/67.txt | 3 +++ fastlane/metadata/android/fr-FR/changelogs/67.txt | 3 +++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/67.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/67.txt diff --git a/RELEASES_EN.md b/RELEASES_EN.md index 95ad82c1..fbb68a76 100644 --- 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 index 39a29352..b03db60f 100644 --- 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 index 9f60332c..d89e785b 100644 --- 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/fastlane/metadata/android/en-US/changelogs/67.txt b/fastlane/metadata/android/en-US/changelogs/67.txt new file mode 100644 index 00000000..95f6295f --- /dev/null +++ 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 \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/67.txt b/fastlane/metadata/android/fr-FR/changelogs/67.txt new file mode 100644 index 00000000..68ef2859 --- /dev/null +++ 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 \ No newline at end of file