diff options
Diffstat (limited to 'src/com/android/customization/picker/clock/ui')
3 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt index e785ebd0..ecbb9018 100644 --- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt +++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt @@ -108,11 +108,11 @@ object ClockSettingsBinder { when (size) { ClockSize.DYNAMIC -> { sizeOptions.radioButtonDynamic.isChecked = true - sizeOptions.radioButtonLarge.isChecked = false + sizeOptions.radioButtonSmall.isChecked = false } - ClockSize.LARGE -> { + ClockSize.SMALL -> { sizeOptions.radioButtonDynamic.isChecked = false - sizeOptions.radioButtonLarge.isChecked = true + sizeOptions.radioButtonSmall.isChecked = true } } } diff --git a/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt b/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt index fcf89049..909491a3 100644 --- a/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt +++ b/src/com/android/customization/picker/clock/ui/view/ClockSizeRadioButtonGroup.kt @@ -35,7 +35,7 @@ class ClockSizeRadioButtonGroup( } val radioButtonDynamic: RadioButton - val radioButtonLarge: RadioButton + val radioButtonSmall: RadioButton var onRadioButtonClickListener: OnRadioButtonClickListener? = null init { @@ -43,8 +43,8 @@ class ClockSizeRadioButtonGroup( radioButtonDynamic = requireViewById(R.id.radio_button_dynamic) val buttonDynamic = requireViewById<View>(R.id.button_container_dynamic) buttonDynamic.setOnClickListener { onRadioButtonClickListener?.onClick(ClockSize.DYNAMIC) } - radioButtonLarge = requireViewById(R.id.radio_button_large) - val buttonLarge = requireViewById<View>(R.id.button_container_large) - buttonLarge.setOnClickListener { onRadioButtonClickListener?.onClick(ClockSize.LARGE) } + radioButtonSmall = requireViewById(R.id.radio_button_large) + val buttonLarge = requireViewById<View>(R.id.button_container_small) + buttonLarge.setOnClickListener { onRadioButtonClickListener?.onClick(ClockSize.SMALL) } } } diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt index 54aaec33..1ffb7b82 100644 --- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt +++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt @@ -38,6 +38,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch /** View model for the clock settings screen. */ class ClockSettingsViewModel @@ -189,7 +190,7 @@ private constructor(context: Context, private val interactor: ClockPickerInterac val selectedClockSize: Flow<ClockSize> = interactor.selectedClockSize fun setClockSize(size: ClockSize) { - interactor.setClockSize(size) + viewModelScope.launch { interactor.setClockSize(size) } } private val _selectedTabPosition = MutableStateFlow(Tab.COLOR) |