aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use provided text and colour for widget add button (#5089)

Browse Source 
* 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 <pun.butrach@gmail.com>

* Remove slotPlateColor from ColorTokens.kt

---------

Signed-off-by: validcube <pun.butrach@gmail.com>
This commit is contained in:
Pun Butrach
2024-12-15 18:49:27 +07:00
committed by GitHub
parent 6b5e912e10
commit a35070d8ad
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt
View File

@@ -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)

5
lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt
View File

@@ -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<GradientDrawable>(R.drawable.work_card)
.setColor(ColorTokens.Surface)
@JvmField
val WidgetAddButtonBackground = ResourceDrawableToken<InsetDrawable>(R.drawable.widget_cell_add_button_background)
.setTint(ColorTokens.WidgetAddButtonBackgroundColor)
}

5
src/com/android/launcher3/widget/WidgetCell.java
View File

@@ -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) {