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

Update colors for edit state

Browse Source 
Bug: 268521231
Test: Verify that edit state colors match the figma attached in the bug
Flag: no flag
Change-Id: I72e5ffde48ca2e53b876b2c86ac5d92c8ddf79c0
This commit is contained in:
fbaron
2023-05-16 16:57:19 -07:00
parent 21339533b1
commit e8efdc4bd9
9 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/color/cell_layout_bg_color_inactive.xml → res/color/cell_layout_bg_color.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.25"
android:color="?android:attr/colorAccent"/>
<item android:alpha="0.35"
android:color="?attr/workspaceSurfaceColor"/>
</selector>

5
res/color/cell_layout_bg_color_active.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.3"
android:color="?android:attr/colorAccent"/>
</selector>

6
res/drawable-v28/bg_celllayout.xml
View File

@@ -23,15 +23,15 @@
<shape android:shape="rectangle" >
<stroke
android:width="@dimen/spring_loaded_panel_border"
android:color="?android:attr/colorAccent" />
<solid android:color="@color/cell_layout_bg_color_active"/>
android:color="?attr/workspaceAccentColor" />
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="?android:attr/dialogCornerRadius" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/cell_layout_bg_color_inactive"/>
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="?android:attr/dialogCornerRadius" />
</shape>
</item>

6
res/drawable/bg_celllayout.xml
View File

@@ -23,15 +23,15 @@
<shape android:shape="rectangle" >
<stroke
android:width="@dimen/spring_loaded_panel_border"
android:color="?android:attr/colorAccent" />
<solid android:color="@color/cell_layout_bg_color_active"/>
android:color="?attr/workspaceAccentColor" />
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="@dimen/bg_round_rect_radius" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/cell_layout_bg_color_inactive"/>
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="@dimen/bg_round_rect_radius" />
</shape>
</item>

2
res/drawable/drop_target_frame_hover.xml
View File

@@ -16,6 +16,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/workspaceAccentColor" />
<solid android:color="?attr/dropTargetHoverButtonColor" />
<corners android:radius="@dimen/drop_target_button_frame_radius" />
</shape>

7
res/values-v31/colors.xml
View File

@@ -57,7 +57,12 @@
<color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>
<color name="workspace_accent_color_light">@android:color/system_accent1_100</color>
<color name="workspace_accent_color_dark">@android:color/system_accent2_600</color>
<color name="workspace_accent_color_dark">@android:color/system_accent1_900</color>
<color name="workspace_surface_color">@android:color/system_accent1_100</color>
<color name="drop_target_hover_text_color_light">@android:color/system_accent1_900</color>
<color name="drop_target_hover_text_color_dark">@android:color/system_accent1_100</color>
<color name="drop_target_hover_button_color_light">@android:color/system_accent1_100</color>
<color name="drop_target_hover_button_color_dark">@android:color/system_accent1_700</color>
<color name="preload_icon_accent_color_light">@android:color/system_accent1_600</color>
<color name="preload_icon_background_color_light">@android:color/system_accent2_200</color>

2
res/values/attrs.xml
View File

@@ -51,7 +51,9 @@
<attr name="folderHintColor" format="color" />
<attr name="isFolderDarkText" format="boolean" />
<attr name="workspaceAccentColor" format="color" />
<attr name="workspaceSurfaceColor" format="color" />
<attr name="dropTargetHoverTextColor" format="color" />
<attr name="dropTargetHoverButtonColor" format="color" />
<attr name="preloadIconAccentColor" format="color" />
<attr name="preloadIconBackgroundColor" format="color" />
<attr name="widgetPickerTitleColor" format="color"/>

9
res/values/colors.xml
View File

@@ -78,8 +78,13 @@
<color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
<color name="workspace_accent_color_light">#ff8df5e3</color>
<color name="workspace_accent_color_dark">#ff3d665f</color>
<color name="workspace_accent_color_light">#D3E3FD</color>
<color name="workspace_accent_color_dark">#041E49</color>
<color name="workspace_surface_color">#D3E3FD</color>
<color name="drop_target_hover_text_color_light">#041E49</color>
<color name="drop_target_hover_text_color_dark">#D3E3FD</color>
<color name="drop_target_hover_button_color_light">#D3E3FD</color>
<color name="drop_target_hover_button_color_dark">#0842A0</color>
<color name="all_apps_button_color">#40484B</color>

10
res/values/styles.xml
View File

@@ -61,7 +61,9 @@
<item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
<item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
<item name="workspaceAccentColor">@color/workspace_accent_color_light</item>
<item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>
<item name="workspaceSurfaceColor">@color/workspace_surface_color</item>
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_light</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_light</item>
<item name="overviewScrimColor">@color/overview_scrim</item>
<item name="preloadIconAccentColor">@color/preload_icon_accent_color_light</item>
<item name="preloadIconBackgroundColor">@color/preload_icon_background_color_light</item>
@@ -90,7 +92,8 @@
<item name="isWorkspaceDarkText">true</item>
<item name="workspaceStatusBarScrim">@null</item>
<item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
<item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_dark</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_dark</item>
</style>
<style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -137,7 +140,8 @@
<item name="isWorkspaceDarkText">true</item>
<item name="workspaceStatusBarScrim">@null</item>
<item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
<item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_dark</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_dark</item>
</style>
<!-- A derivative project can extend these themes to customize the application theme without