diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt b/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt index 8d72db4145..5849eaa08d 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt +++ b/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt @@ -2,6 +2,7 @@ package app.lawnchair.theme.color import android.content.Context import android.util.Log +import androidx.core.graphics.ColorUtils import app.lawnchair.theme.ResourceToken import app.lawnchair.theme.ThemeProvider import app.lawnchair.theme.UiColorMode @@ -78,6 +79,17 @@ data class DarkTextColorToken( } } +data class SetAlphaColorToken( + private val token: ColorToken, + private val alpha: Float +) : ColorToken { + + override fun resolve(context: Context, scheme: ColorScheme, uiColorMode: UiColorMode): Color { + val color = token.resolveColor(context, scheme, uiColorMode) + return AndroidColor(ColorUtils.setAlphaComponent(color, (alpha * 255).toInt())) + } +} + data class SetLStarColorToken( private val token: ColorToken, private val lStar: Double diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt b/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt index 5a0b85a253..f77b29ceea 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt +++ b/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt @@ -1,3 +1,4 @@ package app.lawnchair.theme.color +fun ColorToken.setAlpha(alpha: Float) = SetAlphaColorToken(this, alpha) fun ColorToken.setLStar(lStar: Double) = SetLStarColorToken(this, lStar) diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt index 7ce3d44798..781bbb6270 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt @@ -5,6 +5,7 @@ object ColorTokens { val Neutral1_0 = SwatchColorToken(Swatch.Neutral1, Shade.S0) val Neutral1_50 = SwatchColorToken(Swatch.Neutral1, Shade.S50) val Neutral1_100 = SwatchColorToken(Swatch.Neutral1, Shade.S100) + val Neutral1_200 = SwatchColorToken(Swatch.Neutral1, Shade.S200) val Neutral1_500 = SwatchColorToken(Swatch.Neutral1, Shade.S500) val Neutral1_700 = SwatchColorToken(Swatch.Neutral1, Shade.S700) val Neutral1_800 = SwatchColorToken(Swatch.Neutral1, Shade.S800) @@ -54,5 +55,7 @@ object ColorTokens { @JvmField val PopupShadeThird = DayNightColorToken(PopupColorPrimary.setLStar(90.0), PopupColorPrimary.setLStar(10.0)) @JvmField val WallpaperPopupScrim = Neutral1_900 + @JvmField val WidgetsPickerScrim = DayNightColorToken(Neutral1_200, Neutral1_900).setAlpha(0.8f) + @JvmField val WorkspaceAccentColor = DarkTextColorToken(Accent1_100, Accent2_600) } diff --git a/lawnchair/src/app/lawnchair/views/ComposeFloatingView.kt b/lawnchair/src/app/lawnchair/views/ComposeFloatingView.kt index 5bf9fbbb07..d49f01f8ad 100644 --- a/lawnchair/src/app/lawnchair/views/ComposeFloatingView.kt +++ b/lawnchair/src/app/lawnchair/views/ComposeFloatingView.kt @@ -13,9 +13,9 @@ import androidx.compose.runtime.SideEffect import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext -import androidx.core.content.ContextCompat import app.lawnchair.LawnchairLauncher import app.lawnchair.launcher +import app.lawnchair.theme.color.ColorTokens import app.lawnchair.ui.preferences.components.BottomSheet import app.lawnchair.ui.preferences.components.BottomSheetState import app.lawnchair.ui.preferences.components.rememberBottomSheetState @@ -25,7 +25,6 @@ import app.lawnchair.ui.util.portal.PortalNodeView import app.lawnchair.util.ProvideLifecycleState import com.android.launcher3.AbstractFloatingView import com.android.launcher3.Insettable -import com.android.launcher3.R import com.android.launcher3.util.SystemUiController import com.google.accompanist.insets.ProvideWindowInsets import kotlinx.coroutines.launch @@ -101,7 +100,7 @@ class ComposeFloatingView(context: Context) : @Composable fun scrimColor(): Color { val context = LocalContext.current - val intColor = ContextCompat.getColor(context, R.color.widgets_picker_scrim) + val intColor = ColorTokens.WidgetsPickerScrim.resolveColor(context) return Color(intColor) } diff --git a/src/com/android/launcher3/views/WidgetsEduView.java b/src/com/android/launcher3/views/WidgetsEduView.java index c2947c7310..50d312dd12 100644 --- a/src/com/android/launcher3/views/WidgetsEduView.java +++ b/src/com/android/launcher3/views/WidgetsEduView.java @@ -28,6 +28,8 @@ import com.android.launcher3.Insettable; import com.android.launcher3.Launcher; import com.android.launcher3.R; +import app.lawnchair.theme.color.ColorTokens; + /** * Education view about widgets. */ @@ -78,7 +80,7 @@ public class WidgetsEduView extends AbstractSlideInView implements Ins @Override protected int getScrimColor(Context context) { - return context.getResources().getColor(R.color.widgets_picker_scrim); + return ColorTokens.WidgetsPickerScrim.resolveColor(context); } @Override diff --git a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java index 1cc7f53bf9..c43ee6dc1d 100644 --- a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java @@ -35,6 +35,8 @@ import com.android.launcher3.R; import com.android.launcher3.dragndrop.AddItemActivity; import com.android.launcher3.views.AbstractSlideInView; +import app.lawnchair.theme.color.ColorTokens; + /** * Bottom sheet for the pin widget. */ @@ -129,7 +131,7 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView } protected int getScrimColor(Context context) { - boolean isMainColorDark = Themes.getAttrBoolean(context, R.attr.isMainColorDark); - return context.getResources().getColor(isMainColorDark - ? R.color.widgets_picker_scrim_dark - : R.color.widgets_picker_scrim); + return ColorTokens.WidgetsPickerScrim.resolveColor(context); } @Override