From fb4e081e331dfa991fc9b30c04e5c51ce55cb765 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 8 Apr 2022 23:26:22 +0500 Subject: [PATCH 1/2] Fix restarting count down --- .../kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt index 7e8e000..d91796f 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt @@ -5,7 +5,10 @@ import androidx.lifecycle.* import dagger.hilt.android.lifecycle.HiltViewModel import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.take import kotlinx.coroutines.launch import timber.log.Timber import java.util.concurrent.TimeUnit @@ -34,7 +37,6 @@ class DisclaimerViewModel @Inject constructor( tickerFlow(COUNT_DOWN_TICK_PERIOD_SEC.toLong(), TimeUnit.SECONDS) .take(FULL_COUNT_DOWN_SEC - COUNT_DOWN_TICK_PERIOD_SEC + 1) .onEach { _okayCountDown.value = FULL_COUNT_DOWN_SEC - it } - .onCompletion { isCountDownStarted = false } .launchIn(viewModelScope) } From 1b643e872c1439e4ff3f00a7845a22dd64f75ed1 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 8 Apr 2022 23:28:06 +0500 Subject: [PATCH 2/2] Bump version to 0.2.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7df8a63..e2b0af1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "gq.kirmanak.mealient" minSdk 23 targetSdk 31 - versionCode 8 - versionName "0.1.7" + versionCode 9 + versionName "0.2.0" javaCompileOptions { annotationProcessorOptions {