Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5323395 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clock Carousel Card Color Fix" into udc-qpr-dev am: 6e0da182 am: 96d5dfcb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24526531



Change-Id: Ie6ecbfc8c9c35348b2cf48288745f139b66607b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb529cd4 96d5dfcb

src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.customization.picker.clock.ui.binder



import android.content.Context

import android.content.res.Configuration

import androidx.core.content.ContextCompat

import androidx.core.view.isVisible

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.LifecycleEventObserver
@@ -91,6 +93,15 @@ object ClockCarouselViewBinder { 
                launch {

                    viewModel.seedColor.collect { clockViewFactory.updateColorForAllClocks(it) }

                }



                launch {

                    val night =

                        (context.resources.configuration.uiMode and

                            Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES)

                    viewModel.getClockCardColorResId(night).collect {

                        carouselView.setCarouselCardColor(ContextCompat.getColor(context, it))

                    }

                }

            }

        }

src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.customization.picker.clock.ui.view



import android.content.Context

import android.content.res.ColorStateList

import android.content.res.Resources

import android.util.AttributeSet

import android.view.LayoutInflater
@@ -297,6 +298,16 @@ class ClockCarouselView( 
        }

    }



    fun setCarouselCardColor(color: Int) {

        itemViewIds.forEach { id ->

            val cardViewId = getClockCardViewId(id)

            cardViewId?.let {

                val cardView = motionLayout.requireViewById<View>(it)

                cardView.backgroundTintList = ColorStateList.valueOf(color)

            }

        }

    }



    private fun overrideScreenPreviewWidth() {

        val overrideWidth =

            context.resources.getDimensionPixelSize(

src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt

+36 −0
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
 */

package com.android.customization.picker.clock.ui.viewmodel



import android.graphics.Color

import androidx.lifecycle.ViewModel

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.viewModelScope

import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor

import com.android.customization.picker.clock.shared.ClockSize

import com.android.wallpaper.R

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.Job
@@ -56,6 +58,38 @@ class ClockCarouselViewModel( 


    val seedColor: Flow<Int?> = interactor.seedColor



    fun getClockCardColorResId(isDarkThemeEnabled: Boolean): Flow<Int> {

        return interactor.seedColor.map {

            it.let { seedColor ->

                // if seedColor is null, default clock color is selected

                if (seedColor == null) {

                    if (isDarkThemeEnabled) {

                        // In dark mode, use darkest surface container color

                        R.color.system_surface_container_high

                    } else {

                        // In light mode, use lightest surface container color

                        R.color.system_surface_bright

                    }

                } else {

                    val luminance = Color.luminance(seedColor)

                    if (isDarkThemeEnabled) {

                        if (luminance <= CARD_COLOR_CHANGE_LUMINANCE_THRESHOLD_DARK_THEME) {

                            R.color.system_surface_bright

                        } else {

                            R.color.system_surface_container_high

                        }

                    } else {

                        if (luminance <= CARD_COLOR_CHANGE_LUMINANCE_THRESHOLD_LIGHT_THEME) {

                            R.color.system_surface_bright

                        } else {

                            R.color.system_surface_container_highest

                        }

                    }

                }

            }

        }

    }



    @OptIn(ExperimentalCoroutinesApi::class)

    val selectedIndex: Flow<Int> =

        allClocks
@@ -96,5 +130,7 @@ class ClockCarouselViewModel( 


    companion object {

        const val CLOCKS_EVENT_UPDATE_DELAY_MILLIS: Long = 100

        const val CARD_COLOR_CHANGE_LUMINANCE_THRESHOLD_LIGHT_THEME: Float = 0.85f

        const val CARD_COLOR_CHANGE_LUMINANCE_THRESHOLD_DARK_THEME: Float = 0.03f

    }

}