File tree Expand file tree Collapse file tree 2 files changed +16
-2
lines changed
features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ import android.view.ViewGroup
55import android.view.WindowManager
66import androidx.appcompat.app.AppCompatActivity
77import androidx.fragment.app.viewModels
8- import com.example.util.simpletimetracker.core.BuildConfig
98import com.example.util.simpletimetracker.core.base.BaseFragment
109import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
1110import com.example.util.simpletimetracker.core.dialog.CsvExportSettingsDialogListener
@@ -49,7 +48,6 @@ class SettingsFragment :
4948 )
5049
5150 override fun initUi () = with (binding) {
52- tvSettingsVersionName.text = BuildConfig .VERSION_NAME
5351 spinnerSettingsFirstDayOfWeek.setProcessSameItemSelection(false )
5452 spinnerSettingsRecordTypeSort.setProcessSameItemSelection(false )
5553 }
@@ -84,6 +82,7 @@ class SettingsFragment :
8482
8583 override fun initViewModel (): Unit = with (binding) {
8684 with (viewModel) {
85+ versionName.observe(tvSettingsVersionName::setText)
8786 cardOrderViewData.observe(::updateCardOrderViewData)
8887 firstDayOfWeekViewData.observe(::updateFirstDayOfWeekViewData)
8988 startOfDayViewData.observe(::updateStartOfDayViewData)
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
44import androidx.lifecycle.MutableLiveData
55import androidx.lifecycle.ViewModel
66import androidx.lifecycle.viewModelScope
7+ import com.example.util.simpletimetracker.core.BuildConfig
78import com.example.util.simpletimetracker.core.extension.set
89import com.example.util.simpletimetracker.core.interactor.NotificationInactivityInteractor
910import com.example.util.simpletimetracker.core.interactor.NotificationTypeInteractor
@@ -206,6 +207,10 @@ class SettingsViewModel @Inject constructor(
206207 }
207208 }
208209
210+ val versionName: LiveData <String > by lazy {
211+ MutableLiveData (loadVersionName())
212+ }
213+
209214 val themeChanged: LiveData <Boolean > = MutableLiveData (false )
210215
211216 fun onVisible () {
@@ -529,6 +534,16 @@ class SettingsViewModel @Inject constructor(
529534 .let (settingsMapper::toUseProportionalMinutesHint)
530535 }
531536
537+ private fun loadVersionName (): String {
538+ return BuildConfig .VERSION_NAME .let {
539+ if (BuildConfig .DEBUG ) {
540+ " $it ${BuildConfig .BUILD_TYPE } "
541+ } else {
542+ it
543+ }
544+ }
545+ }
546+
532547 companion object {
533548 private const val INACTIVITY_DURATION_DIALOG_TAG = " inactivity_duration_dialog_tag"
534549 private const val IGNORE_SHORT_RECORDS_DIALOG_TAG = " ignore_short_records_dialog_tag"
You can’t perform that action at this time.
0 commit comments