Merge "Return list of one default option when shape not enabled (2/2)" into main
diff --git a/res/layout/floating_sheet_clock_color_content.xml b/res/layout/floating_sheet_clock_color_content.xml
index fd218c6..3711b92 100644
--- a/res/layout/floating_sheet_clock_color_content.xml
+++ b/res/layout/floating_sheet_clock_color_content.xml
@@ -40,15 +40,14 @@
It's critical for any TextViews inside the included layout to have text.
-->
<include
- layout="@layout/color_option"
- android:layout_width="@dimen/option_item_size"
- android:layout_height="@dimen/option_item_size"
+ layout="@layout/color_option2"
android:visibility="invisible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/clock_color_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"
android:clipChildren="false"
android:clipToPadding="false" />
</FrameLayout>
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder2.kt b/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder2.kt
index 2c197ad..4758619 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder2.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder2.kt
@@ -17,14 +17,36 @@
package com.android.customization.picker.color.ui.binder
+import androidx.lifecycle.LifecycleOwner
import com.android.customization.picker.color.ui.view.ColorOptionIconView2
import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
+import com.android.wallpaper.picker.customization.ui.binder.ColorUpdateBinder
+import com.android.wallpaper.picker.customization.ui.viewmodel.ColorUpdateViewModel
object ColorOptionIconBinder2 {
- fun bind(view: ColorOptionIconView2, viewModel: ColorOptionIconViewModel, darkTheme: Boolean) {
+
+ interface Binding {
+ /** Destroys the color update binding, in spite of lifecycle state. */
+ fun destroy()
+ }
+
+ fun bind(
+ view: ColorOptionIconView2,
+ viewModel: ColorOptionIconViewModel,
+ darkTheme: Boolean,
+ colorUpdateViewModel: ColorUpdateViewModel,
+ shouldAnimateColor: () -> Boolean,
+ lifecycleOwner: LifecycleOwner,
+ ): Binding {
+ val binding =
+ ColorUpdateBinder.bind(
+ setColor = { color -> view.bindStrokeColor(color) },
+ color = colorUpdateViewModel.colorPrimary,
+ shouldAnimate = shouldAnimateColor,
+ lifecycleOwner = lifecycleOwner,
+ )
if (darkTheme) {
view.bindColor(
- view.resources.getColor(android.R.color.system_primary_dark, view.context.theme),
viewModel.darkThemeColor0,
viewModel.darkThemeColor1,
viewModel.darkThemeColor2,
@@ -32,12 +54,16 @@
)
} else {
view.bindColor(
- view.resources.getColor(android.R.color.system_primary_light, view.context.theme),
viewModel.lightThemeColor0,
viewModel.lightThemeColor1,
viewModel.lightThemeColor2,
viewModel.lightThemeColor3,
)
}
+ return object : Binding {
+ override fun destroy() {
+ binding.destroy()
+ }
+ }
}
}
diff --git a/src/com/android/customization/picker/color/ui/view/ColorOptionIconView2.kt b/src/com/android/customization/picker/color/ui/view/ColorOptionIconView2.kt
index 3fc6324..ea20af3 100644
--- a/src/com/android/customization/picker/color/ui/view/ColorOptionIconView2.kt
+++ b/src/com/android/customization/picker/color/ui/view/ColorOptionIconView2.kt
@@ -55,13 +55,11 @@
* @param color3 the color in the bottom right quadrant
*/
fun bindColor(
- @ColorInt strokeColor: Int,
@ColorInt color0: Int,
@ColorInt color1: Int,
@ColorInt color2: Int,
@ColorInt color3: Int,
) {
- this.strokeColor = strokeColor
this.color0 = color0
this.color1 = color1
this.color2 = color2
@@ -69,6 +67,11 @@
invalidate()
}
+ fun bindStrokeColor(@ColorInt strokeColor: Int) {
+ this.strokeColor = strokeColor
+ invalidate()
+ }
+
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
this.w = w
this.h = h
diff --git a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
index 943729b..18a4c53 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
@@ -20,7 +20,8 @@
import android.animation.AnimatorListenerAdapter
import android.animation.ValueAnimator
import android.content.Context
-import android.content.res.Configuration
+import android.content.res.Configuration.UI_MODE_NIGHT_MASK
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
import android.view.View
import android.view.ViewGroup
import android.view.ViewTreeObserver.OnGlobalLayoutListener
@@ -36,8 +37,8 @@
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.android.customization.picker.clock.shared.ClockSize
-import com.android.customization.picker.color.ui.binder.ColorOptionIconBinder
-import com.android.customization.picker.color.ui.view.ColorOptionIconView
+import com.android.customization.picker.color.ui.binder.ColorOptionIconBinder2
+import com.android.customization.picker.color.ui.view.ColorOptionIconView2
import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
import com.android.customization.picker.common.ui.view.SingleRowListItemSpacing
import com.android.systemui.plugins.clocks.AxisType
@@ -54,7 +55,6 @@
import com.android.wallpaper.picker.customization.ui.view.FloatingToolbar
import com.android.wallpaper.picker.customization.ui.view.adapter.FloatingToolbarTabAdapter
import com.android.wallpaper.picker.customization.ui.viewmodel.ColorUpdateViewModel
-import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter
import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter2
import java.lang.ref.WeakReference
import kotlinx.coroutines.DisposableHandle
@@ -144,10 +144,17 @@
// Clock color
val clockColorContent = view.requireViewById<View>(R.id.clock_floating_sheet_color_content)
val clockColorAdapter =
- createClockColorOptionItemAdapter(view.resources.configuration.uiMode, lifecycleOwner)
+ createClockColorOptionItemAdapter(
+ uiMode = view.resources.configuration.uiMode,
+ colorUpdateViewModel = colorUpdateViewModel,
+ shouldAnimateColor = isFloatingSheetActive,
+ lifecycleOwner = lifecycleOwner,
+ )
val clockColorList =
view.requireViewById<RecyclerView>(R.id.clock_color_list).apply {
- initColorList(appContext, clockColorAdapter)
+ adapter = clockColorAdapter
+ layoutManager =
+ LinearLayoutManager(appContext, LinearLayoutManager.HORIZONTAL, false)
}
val clockColorSlider: SeekBar = view.requireViewById(R.id.clock_color_slider)
clockColorSlider.setOnSeekBarChangeListener(
@@ -468,39 +475,34 @@
private fun createClockColorOptionItemAdapter(
uiMode: Int,
+ colorUpdateViewModel: ColorUpdateViewModel,
+ shouldAnimateColor: () -> Boolean,
lifecycleOwner: LifecycleOwner,
- ): OptionItemAdapter<ColorOptionIconViewModel> =
- OptionItemAdapter(
- layoutResourceId = R.layout.color_option,
+ ): OptionItemAdapter2<ColorOptionIconViewModel> =
+ OptionItemAdapter2(
+ layoutResourceId = R.layout.color_option2,
lifecycleOwner = lifecycleOwner,
- bindIcon = { foregroundView: View, colorIcon: ColorOptionIconViewModel ->
- val colorOptionIconView = foregroundView as? ColorOptionIconView
- val night =
- uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
- colorOptionIconView?.let { ColorOptionIconBinder.bind(it, colorIcon, night) }
+ bindPayload = { itemView: View, colorIcon: ColorOptionIconViewModel ->
+ val colorOptionIconView =
+ itemView.requireViewById<ColorOptionIconView2>(
+ com.android.wallpaper.R.id.background
+ )
+ val night = uiMode and UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES
+ val binding =
+ ColorOptionIconBinder2.bind(
+ view = colorOptionIconView,
+ viewModel = colorIcon,
+ darkTheme = night,
+ colorUpdateViewModel = colorUpdateViewModel,
+ shouldAnimateColor = shouldAnimateColor,
+ lifecycleOwner = lifecycleOwner,
+ )
+ return@OptionItemAdapter2 DisposableHandle { binding.destroy() }
},
+ colorUpdateViewModel = WeakReference(colorUpdateViewModel),
+ shouldAnimateColor = shouldAnimateColor,
)
- private fun RecyclerView.initColorList(
- context: Context,
- adapter: OptionItemAdapter<ColorOptionIconViewModel>,
- ) {
- apply {
- this.adapter = adapter
- layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
- addItemDecoration(
- SingleRowListItemSpacing(
- context.resources.getDimensionPixelSize(
- R.dimen.floating_sheet_content_horizontal_padding
- ),
- context.resources.getDimensionPixelSize(
- R.dimen.floating_sheet_list_item_horizontal_space
- ),
- )
- )
- }
- }
-
// Alpha is 1 when current height is from height, and 0 when current height is to height.
private fun getAlpha(fromHeight: Int, toHeight: Int, currentHeight: Int): Float =
(1 - (currentHeight - fromHeight).toFloat() / (toHeight - fromHeight).toFloat())
diff --git a/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
index 4f5adab..a097828 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
@@ -41,6 +41,7 @@
import com.android.wallpaper.picker.customization.ui.viewmodel.ColorUpdateViewModel
import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter2
import java.lang.ref.WeakReference
+import kotlinx.coroutines.DisposableHandle
import kotlinx.coroutines.launch
object ColorsFloatingSheetBinder {
@@ -158,10 +159,16 @@
com.android.wallpaper.R.id.background
)
val night = uiMode and UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES
- ColorOptionIconBinder2.bind(colorOptionIconView, colorIcon, night)
- // Return null since it does not need the lifecycleOwner to launch any job for later
- // disposal when rebind.
- return@OptionItemAdapter2 null
+ val binding =
+ ColorOptionIconBinder2.bind(
+ view = colorOptionIconView,
+ viewModel = colorIcon,
+ darkTheme = night,
+ colorUpdateViewModel = colorUpdateViewModel,
+ shouldAnimateColor = shouldAnimateColor,
+ lifecycleOwner = lifecycleOwner,
+ )
+ return@OptionItemAdapter2 DisposableHandle { binding.destroy() }
},
colorUpdateViewModel = WeakReference(colorUpdateViewModel),
shouldAnimateColor = shouldAnimateColor,
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 1faf971..4bbb789 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -95,6 +95,11 @@
navigateToLockScreenNotificationsSettingsActivity,
)
+ val optionsViewModel =
+ viewModel.customizationOptionsViewModel as ThemePickerCustomizationOptionsViewModel
+
+ val isOnMainScreen = { optionsViewModel.selectedOption.value == null }
+
val optionClock: View =
lockScreenCustomizationOptionEntries
.first { it.first == ThemePickerLockCustomizationOption.CLOCK }
@@ -161,8 +166,6 @@
val optionThemedIconsSwitch =
optionThemedIcons?.findViewById<Switch>(R.id.option_entry_themed_icons_switch)
- val optionsViewModel =
- viewModel.customizationOptionsViewModel as ThemePickerCustomizationOptionsViewModel
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
launch {
@@ -252,14 +255,21 @@
}
launch {
+ var binding: ColorOptionIconBinder2.Binding? = null
optionsViewModel.colorPickerViewModel2.selectedColorOption.collect { colorOption
->
(colorOption as? ColorOptionImpl)?.let {
- ColorOptionIconBinder2.bind(
- view = optionColorsIcon,
- viewModel = ColorOptionIconViewModel.fromColorOption(colorOption),
- darkTheme = view.resources.configuration.isNightModeActive,
- )
+ binding?.destroy()
+ binding =
+ ColorOptionIconBinder2.bind(
+ view = optionColorsIcon,
+ viewModel =
+ ColorOptionIconViewModel.fromColorOption(colorOption),
+ darkTheme = view.resources.configuration.isNightModeActive,
+ colorUpdateViewModel = colorUpdateViewModel,
+ shouldAnimateColor = isOnMainScreen,
+ lifecycleOwner = lifecycleOwner,
+ )
}
}
}
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
index e055d48..a5f5d22 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
@@ -34,7 +34,6 @@
import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
import com.android.wallpaper.picker.customization.ui.viewmodel.FloatingToolbarTabViewModel
import com.android.wallpaper.picker.di.modules.BackgroundDispatcher
-import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel
import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel2
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
@@ -290,7 +289,7 @@
}
}
- val clockColorOptions: Flow<List<OptionItemViewModel<ColorOptionIconViewModel>>> =
+ val clockColorOptions: Flow<List<OptionItemViewModel2<ColorOptionIconViewModel>>> =
colorPickerInteractor.selectedColorOption.map { selectedColorOption ->
// Use mapLatest and delay(100) here to prevent too many selectedClockColor update
// events from ClockRegistry upstream, caused by sliding the saturation level bar.
@@ -304,7 +303,7 @@
.map { colorMap.keys.indexOf(it) == index }
.stateIn(viewModelScope)
add(
- OptionItemViewModel<ColorOptionIconViewModel>(
+ OptionItemViewModel2<ColorOptionIconViewModel>(
key = MutableStateFlow(colorModel.colorId) as StateFlow<String>,
payload =
ColorOptionIconViewModel(
@@ -346,7 +345,7 @@
private suspend fun ColorOption.toOptionItemViewModel(
context: Context
- ): OptionItemViewModel<ColorOptionIconViewModel> {
+ ): OptionItemViewModel2<ColorOptionIconViewModel> {
val lightThemeColors =
(this as ColorOptionImpl)
.previewInfo
@@ -362,7 +361,7 @@
val isSelectedFlow =
previewingClockColorId.map { it == DEFAULT_CLOCK_COLOR_ID }.stateIn(viewModelScope)
val key = "${this.type}::${this.style}::${this.serializedPackages}"
- return OptionItemViewModel<ColorOptionIconViewModel>(
+ return OptionItemViewModel2<ColorOptionIconViewModel>(
key = MutableStateFlow(key) as StateFlow<String>,
payload =
ColorOptionIconViewModel(