From 0e649378411d066afb103a57281f326597a89c9f Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 31 Jul 2022 21:50:07 +0800 Subject: [PATCH 1/3] Add a test case --- .../io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 8 +++----- biz/main/src/main/res/core/values/strings.xml | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 69451a7da..9e1a860e5 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -4,7 +4,9 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import io.goooler.demoapp.base.core.BaseViewModel import io.goooler.demoapp.base.util.defaultAsync +import io.goooler.demoapp.common.util.getString import io.goooler.demoapp.common.util.showToast +import io.goooler.demoapp.main.R import io.goooler.demoapp.main.bean.MainRepoListBean import io.goooler.demoapp.main.repository.MainCommonRepository import java.util.concurrent.CancellationException @@ -36,11 +38,7 @@ class MainHomeViewModel @Inject constructor(private val repository: MainCommonRe } fun countDown() { - if (countdownJob?.isActive != true) { - startCountDown() - } else { - countdownJob?.cancel(ManualCancellationException) - } + _title.value = R.string.main_star_count_tip.getString() } private fun startCountDown( diff --git a/biz/main/src/main/res/core/values/strings.xml b/biz/main/src/main/res/core/values/strings.xml index 45cb111fa..0c4747260 100644 --- a/biz/main/src/main/res/core/values/strings.xml +++ b/biz/main/src/main/res/core/values/strings.xml @@ -3,4 +3,6 @@ https://raw.githubusercontent.com/coil-kt/coil/main/logo.svg + All %d stars. + From 9914d0e583653300b623e496be3612e59e497349 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 31 Jul 2022 21:57:23 +0800 Subject: [PATCH 2/3] Remove Int.getString(Any) --- .../kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 2 +- .../kotlin/io/goooler/demoapp/common/util/CommonExtensions.kt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 9e1a860e5..7138a7856 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -38,7 +38,7 @@ class MainHomeViewModel @Inject constructor(private val repository: MainCommonRe } fun countDown() { - _title.value = R.string.main_star_count_tip.getString() + _title.value = R.string.main_star_count_tip.getString().format(1) } private fun startCountDown( diff --git a/common/src/main/kotlin/io/goooler/demoapp/common/util/CommonExtensions.kt b/common/src/main/kotlin/io/goooler/demoapp/common/util/CommonExtensions.kt index d4de0bb1c..20f337d30 100644 --- a/common/src/main/kotlin/io/goooler/demoapp/common/util/CommonExtensions.kt +++ b/common/src/main/kotlin/io/goooler/demoapp/common/util/CommonExtensions.kt @@ -112,9 +112,6 @@ fun @receiver:ColorRes Int.getColor(): Int = try { fun @receiver:StringRes Int.getString(): String = StringUtils.getString(this) -fun @receiver:StringRes Int.getString(vararg formatArgs: Any): String = - StringUtils.getString(this, formatArgs) - fun @receiver:PluralsRes Int.getQuantityString(num: Int): String? = try { CommonApplication.app.resources.getQuantityString(this, num, num) } catch (e: Exception) { From 242da22d2d40c3c64aca319f480b4d70f12c3347 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 31 Jul 2022 21:59:15 +0800 Subject: [PATCH 3/3] Revert "Add a test case" --- .../io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 8 +++++--- biz/main/src/main/res/core/values/strings.xml | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 7138a7856..69451a7da 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -4,9 +4,7 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import io.goooler.demoapp.base.core.BaseViewModel import io.goooler.demoapp.base.util.defaultAsync -import io.goooler.demoapp.common.util.getString import io.goooler.demoapp.common.util.showToast -import io.goooler.demoapp.main.R import io.goooler.demoapp.main.bean.MainRepoListBean import io.goooler.demoapp.main.repository.MainCommonRepository import java.util.concurrent.CancellationException @@ -38,7 +36,11 @@ class MainHomeViewModel @Inject constructor(private val repository: MainCommonRe } fun countDown() { - _title.value = R.string.main_star_count_tip.getString().format(1) + if (countdownJob?.isActive != true) { + startCountDown() + } else { + countdownJob?.cancel(ManualCancellationException) + } } private fun startCountDown( diff --git a/biz/main/src/main/res/core/values/strings.xml b/biz/main/src/main/res/core/values/strings.xml index 0c4747260..45cb111fa 100644 --- a/biz/main/src/main/res/core/values/strings.xml +++ b/biz/main/src/main/res/core/values/strings.xml @@ -3,6 +3,4 @@ https://raw.githubusercontent.com/coil-kt/coil/main/logo.svg - All %d stars. -