Fix AMOLED theme

This commit is contained in:
Zakhar Timoshenko
2021-09-12 15:37:41 +03:00
committed by Koitharu
parent f9cee7a8f5
commit 71f205ca8b
8 changed files with 67 additions and 24 deletions

View File

@@ -6,17 +6,25 @@
<color name="color_on_secondary">@android:color/white</color>
<color name="color_control_light">#39000000</color>
<color name="color_surface_secondary">#FFFFFF</color>
<color name="color_surface">#FFFFFF</color>
<color name="color_background">#FFFFFF</color>
<!-- Scrim colors -->
<color name="system_ui_scrim_light">#B3FFFFFF</color> <!-- 70% white -->
<color name="system_ui_scrim_black">#40000000</color> <!-- 25% black -->
<color name="nav_bar_scrim">@color/system_ui_scrim_black</color>
<color name="system_ui_scrim_dark">#40272727</color> <!-- 25% grey -->
<!-- We use a dark scrim by default since light status is API 23+ -->
<color name="status_bar_scrim">@color/system_ui_scrim_dark</color>
<!-- We use a dark scrim by default since light nav bar is API 27+ -->
<color name="nav_bar_scrim">@color/system_ui_scrim_dark</color>
<!-- Other colors with dark mode alternatives -->
<color name="list_divider">#1f000000</color>
<color name="error">#B00020</color>
<!-- AMOLED colors -->
<color name="system_ui_scrim_amoled">#B3000000</color>
<!-- Other Colors -->
<color name="blue_primary">#1976D2</color>
@@ -26,5 +34,6 @@
<color name="grey_dark">#212121</color>
<color name="dim">#99000000</color>
<color name="shadow">#99000000</color>
<color name="transparent">#00FFFFFF</color>
</resources>

View File

@@ -9,11 +9,10 @@
<item name="colorSecondary">?attr/colorPrimary</item>
<item name="colorOnSecondary">@color/color_on_secondary</item>
<item name="colorControlLight">@color/color_control_light</item>
<item name="colorSurfaceSecondary">@color/color_surface_secondary</item>
<!-- Window decor -->
<item name="android:windowLightStatusBar" tools:targetApi="m">@bool/use_light_status</item>
<item name="android:statusBarColor">@color/nav_bar_scrim</item>
<item name="android:statusBarColor">@color/status_bar_scrim</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/use_light_navigation</item>
<item name="android:navigationBarColor">@color/nav_bar_scrim</item>
<item name="popupTheme">@style/ThemeOverlay.Kotatsu</item>
@@ -29,9 +28,6 @@
<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
<item name="textAppearanceListItem">@style/TextAppearance.Kotatsu.ListPrimary</item>
<!-- Custom theme attrs -->
<item name="navigationBarDividerColor">?attr/colorControlLight</item>
<!-- ActionMode attrs -->
<item name="android:windowActionModeOverlay">true</item>
<item name="windowActionModeOverlay">true</item>