From 72e4ea4aad29045c5fc730f1b243e9a0247e186c Mon Sep 17 00:00:00 2001 From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> Date: Fri, 31 May 2024 15:05:13 +0800 Subject: [PATCH] Initial migration --- .../app/lawnchair/theme/tokens2/ColorToken.kt | 89 ++++++++++--------- .../launcher3/AppWidgetResizeFrame.java | 4 +- .../android/launcher3/ButtonDropTarget.java | 6 +- .../allapps/ActivityAllAppsContainerView.java | 8 +- 4 files changed, 56 insertions(+), 51 deletions(-) diff --git a/lawnchair/src/app/lawnchair/theme/tokens2/ColorToken.kt b/lawnchair/src/app/lawnchair/theme/tokens2/ColorToken.kt index f898b3f076..40e86be923 100644 --- a/lawnchair/src/app/lawnchair/theme/tokens2/ColorToken.kt +++ b/lawnchair/src/app/lawnchair/theme/tokens2/ColorToken.kt @@ -8,19 +8,19 @@ import com.android.launcher3.R import com.android.launcher3.util.Themes interface ColorToken { - fun resolve(context: Context): T = resolve(context, UiColorMode(Themes.getAttrInteger(context, R.attr.uiColorMode))) - fun resolve(context: Context, uiColorMode: UiColorMode): T { + fun resolveColor(context: Context): T = resolveColor(context, UiColorMode(Themes.getAttrInteger(context, R.attr.uiColorMode))) + fun resolveColor(context: Context, uiColorMode: UiColorMode): T { val themeProvider = ThemeProvider.INSTANCE.get(context) - return resolve(context, themeProvider.colorScheme, uiColorMode) + return resolveColor(context, themeProvider.colorScheme, uiColorMode) } - fun resolve(context: Context, scheme: LightDarkScheme, uiColorMode: UiColorMode): T + fun resolveColor(context: Context, scheme: LightDarkScheme, uiColorMode: UiColorMode): T } class MaterialColor( val color: String ) : ColorToken { - override fun resolve(context: Context, scheme: LightDarkScheme, uiColorMode: UiColorMode): Int { + override fun resolveColor(context: Context, scheme: LightDarkScheme, uiColorMode: UiColorMode): Int { return if (uiColorMode.isDarkTheme) { scheme.darkScheme.get(color) } else { @@ -29,43 +29,46 @@ class MaterialColor( } } -object ColorTokens2 { - val primary = MaterialColor("primary") - val onPrimary = MaterialColor("onPrimary") - val primaryContainer = MaterialColor("primaryContainer") - val onPrimaryContainer = MaterialColor("onPrimaryContainer") - val inversePrimary = MaterialColor("inversePrimary") - val secondary = MaterialColor("secondary") - val onSecondary = MaterialColor("onSecondary") - val secondaryContainer = MaterialColor("secondaryContainer") - val onSecondaryContainer = MaterialColor("onSecondaryContainer") - val tertiary = MaterialColor("tertiary") - val onTertiary = MaterialColor("onTertiary") - val tertiaryContainer = MaterialColor("tertiaryContainer") - val onTertiaryContainer = MaterialColor("onTertiaryContainer") - val background = MaterialColor("background") - val onBackground = MaterialColor("onBackground") - val surface = MaterialColor("surface") - val onSurface = MaterialColor("onSurface") - val surfaceVariant = MaterialColor("surfaceVariant") - val onSurfaceVariant = MaterialColor("onSurfaceVariant") - val surfaceTint = MaterialColor("surfaceTint") - val inverseSurface = MaterialColor("inverseSurface") - val inverseOnSurface = MaterialColor("inverseOnSurface") - val error = MaterialColor("error") - val onError = MaterialColor("onError") - val errorContainer = MaterialColor("errorContainer") - val onErrorContainer = MaterialColor("onErrorContainer") - val outline = MaterialColor("outline") - val outlineVariant = MaterialColor("outlineVariant") - val scrim = MaterialColor("scrim") - val surfaceBright = MaterialColor("surfaceBright") - val surfaceDim = MaterialColor("surfaceDim") - val surfaceContainer = MaterialColor("surfaceContainer") - val surfaceContainerHigh = MaterialColor("surfaceContainerHigh") - val surfaceContainerHighest = MaterialColor("surfaceContainerHighest") - val surfaceContainerLow = MaterialColor("surfaceContainerLow") - val surfaceContainerLowest = MaterialColor("surfaceContainerLowest") - +object Material3Colors { + @JvmField val primary = MaterialColor("primary") + @JvmField val onPrimary = MaterialColor("onPrimary") + @JvmField val primaryContainer = MaterialColor("primaryContainer") + @JvmField val onPrimaryContainer = MaterialColor("onPrimaryContainer") + @JvmField val inversePrimary = MaterialColor("inversePrimary") + @JvmField val secondary = MaterialColor("secondary") + @JvmField val onSecondary = MaterialColor("onSecondary") + @JvmField val secondaryContainer = MaterialColor("secondaryContainer") + @JvmField val onSecondaryContainer = MaterialColor("onSecondaryContainer") + @JvmField val tertiary = MaterialColor("tertiary") + @JvmField val onTertiary = MaterialColor("onTertiary") + @JvmField val tertiaryContainer = MaterialColor("tertiaryContainer") + @JvmField val onTertiaryContainer = MaterialColor("onTertiaryContainer") + @JvmField val background = MaterialColor("background") + @JvmField val onBackground = MaterialColor("onBackground") + @JvmField val surface = MaterialColor("surface") + @JvmField val onSurface = MaterialColor("onSurface") + @JvmField val surfaceVariant = MaterialColor("surfaceVariant") + @JvmField val onSurfaceVariant = MaterialColor("onSurfaceVariant") + @JvmField val surfaceTint = MaterialColor("surfaceTint") + @JvmField val inverseSurface = MaterialColor("inverseSurface") + @JvmField val inverseOnSurface = MaterialColor("inverseOnSurface") + @JvmField val error = MaterialColor("error") + @JvmField val onError = MaterialColor("onError") + @JvmField val errorContainer = MaterialColor("errorContainer") + @JvmField val onErrorContainer = MaterialColor("onErrorContainer") + @JvmField val outline = MaterialColor("outline") + @JvmField val outlineVariant = MaterialColor("outlineVariant") + @JvmField val scrim = MaterialColor("scrim") + @JvmField val surfaceBright = MaterialColor("surfaceBright") + @JvmField val surfaceDim = MaterialColor("surfaceDim") + @JvmField val surfaceContainer = MaterialColor("surfaceContainer") + @JvmField val surfaceContainerHigh = MaterialColor("surfaceContainerHigh") + @JvmField val surfaceContainerHighest = MaterialColor("surfaceContainerHighest") + @JvmField val surfaceContainerLow = MaterialColor("surfaceContainerLow") + @JvmField val surfaceContainerLowest = MaterialColor("surfaceContainerLowest") + @JvmField val WorkspaceAccentColor = primaryContainer + @JvmField val AllAppsBackground = surface + @JvmField val AllAppsHeaderProtection = surfaceContainerHigh + @JvmField val AllAppsBottomSheetBackground = surfaceDim } diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 2df74ee3d7..a8d7a802fe 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -48,7 +48,7 @@ import java.util.ArrayList; import java.util.List; import app.lawnchair.preferences2.PreferenceManager2; -import app.lawnchair.theme.tokens.ColorTokens; +import app.lawnchair.theme.tokens2.Material3Colors; import app.lawnchair.theme.drawable.DrawableTokens; public class AppWidgetResizeFrame extends AbstractFloatingView implements View.OnKeyListener { @@ -168,7 +168,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O mDragHandles[INDEX_RIGHT] = findViewById(R.id.widget_resize_right_handle); mDragHandles[INDEX_BOTTOM] = findViewById(R.id.widget_resize_bottom_handle); - int workspaceAccentColor = ColorTokens.WorkspaceAccentColor.resolveColor(getContext()); + int workspaceAccentColor = Material3Colors.WorkspaceAccentColor.resolveColor(getContext()); for (int i = 0; i < HANDLE_COUNT; i++) { ((ImageView) mDragHandles[i]).setColorFilter(workspaceAccentColor); } diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 823d16ddd4..d287e20a05 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -45,6 +45,8 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.Themes; import app.lawnchair.theme.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; +import app.lawnchair.theme.tokens2.Material3Colors; + import com.android.launcher3.views.ActivityContext; /** @@ -120,8 +122,8 @@ public abstract class ButtonDropTarget extends TextView } private void setTextColor() { - int normalColor = ColorTokens.WorkspaceAccentColor.resolveColor(getContext()); - int selectedColor = Themes.getAttrColor(getContext(), R.attr.dropTargetHoverTextColor); + int normalColor = Material3Colors.primaryContainer.resolveColor(getContext()); + int selectedColor = Material3Colors.onPrimaryContainer.resolveColor(getContext()); setTextColor(new ColorStateList( new int[][] { new int[] { -android.R.attr.state_selected }, new int[] { android.R.attr.state_selected } }, diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index be430360be..084f01ec5f 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -98,7 +98,7 @@ import java.util.stream.Stream; import app.lawnchair.allapps.LawnchairAlphabeticalAppsList; import app.lawnchair.font.FontManager; import app.lawnchair.preferences2.PreferenceManager2; -import app.lawnchair.theme.tokens.ColorTokens; +import app.lawnchair.theme.tokens2.Material3Colors; import app.lawnchair.ui.StretchRecyclerViewContainer; /** @@ -209,10 +209,10 @@ public class ActivityAllAppsContainerView mActivityContext = ActivityContext.lookupContext(context); mAllAppsStore = new AllAppsStore<>(mActivityContext); pref2 = PreferenceManager2.getInstance(mActivityContext); - mScrimColor = ColorTokens.AllAppsScrimColor.resolveColor(context); + mScrimColor = Material3Colors.AllAppsBackground.resolveColor(context); mHeaderThreshold = getResources().getDimensionPixelSize( R.dimen.dynamic_grid_cell_border_spacing); - mHeaderProtectionColor = ColorTokens.AllAppsHeaderProtectionColor.resolveColor(context); + mHeaderProtectionColor = Material3Colors.AllAppsHeaderProtection.resolveColor(context); mWorkManager = new WorkProfileManager( mActivityContext.getSystemService(UserManager.class), @@ -306,7 +306,7 @@ public class ActivityAllAppsContainerView 0 // Bottom left }; mBottomSheetBackgroundColor = - Themes.getAttrColor(getContext(), R.attr.materialColorSurfaceDim); + Material3Colors.AllAppsBottomSheetBackground.resolveColor(getContext());; updateBackgroundVisibility(mActivityContext.getDeviceProfile()); mSearchUiManager.initializeSearch(this); }