From a35070d8ad153c5aa4c20615b0ca2fa75fd2c16d Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Sun, 15 Dec 2024 18:49:27 +0700 Subject: [PATCH] Use provided text and colour for widget add button (#5089) * Use provided colour for widget add button LC: Allow customisability to the Add Button LC-Test: Press on any Widget on the Widget sheet Tested: https://drive.google.com/drive/folders/19UkQPAbeLtg4sYUGXolCb8I7eYQfpU_Z?usp=sharing Signed-off-by: validcube * Remove slotPlateColor from ColorTokens.kt --------- Signed-off-by: validcube --- .../src/app/lawnchair/theme/color/tokens/ColorTokens.kt | 4 ++++ lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt | 5 +++++ src/com/android/launcher3/widget/WidgetCell.java | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt index c0ce897a8f..00d3e36b35 100644 --- a/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt @@ -144,6 +144,10 @@ object ColorTokens { @JvmField val SurfaceBrightColor = DayNightColorToken(Neutral2_600.setLStar(98.0), Neutral2_600.setLStar(24.0)) + @JvmField val PrimaryButton = Accent1_600 + + @JvmField val WidgetAddButtonBackgroundColor = PrimaryButton + val SwitchThumbOn = Accent1_100 val SwitchThumbOff = DayNightColorToken(Neutral2_300, Neutral1_400) val SwitchThumbDisabled = DayNightColorToken(Neutral2_100, Neutral1_700) diff --git a/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt b/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt index 473ce365d5..743214fa90 100644 --- a/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt @@ -3,6 +3,7 @@ package app.lawnchair.theme.drawable import android.content.res.ColorStateList import android.graphics.drawable.Drawable import android.graphics.drawable.GradientDrawable +import android.graphics.drawable.InsetDrawable import android.graphics.drawable.LayerDrawable import android.graphics.drawable.RippleDrawable import android.graphics.drawable.StateListDrawable @@ -186,4 +187,8 @@ object DrawableTokens { @JvmField val WorkCard = ResourceDrawableToken(R.drawable.work_card) .setColor(ColorTokens.Surface) + + @JvmField + val WidgetAddButtonBackground = ResourceDrawableToken(R.drawable.widget_cell_add_button_background) + .setTint(ColorTokens.WidgetAddButtonBackgroundColor) } diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index 9fca894574..b0d0761bff 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -71,6 +71,7 @@ import java.util.function.Consumer; import app.lawnchair.LawnchairAppWidgetHostView; import app.lawnchair.font.FontManager; +import app.lawnchair.theme.drawable.DrawableTokens; /** * Represents the individual cell of the widget inside the widget tray. The @@ -168,6 +169,10 @@ public class WidgetCell extends LinearLayout { FontManager fontManager = FontManager.INSTANCE.get(getContext()); fontManager.setCustomFont(mWidgetName, R.id.font_body_medium); fontManager.setCustomFont(mWidgetDescription, R.id.font_body); + + // LC: Allow customisability to the Add Button, Test: Press on any Widget on the Widget sheet. + mWidgetAddButton.setBackground(DrawableTokens.WidgetAddButtonBackground.resolve(getContext())); + fontManager.setCustomFont(mWidgetAddButton, R.id.font_body_medium); } public void setRemoteViewsPreview(RemoteViews view) {