prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AMOLED theme

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/tabs_background.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="?colorSurface" />
<solid android:color="?android:attr/colorBackground" />
</shape>
</item>
<item

8
app/src/main/res/values-night/colors.xml
View File

@@ -6,13 +6,13 @@
<color name="color_on_secondary">@android:color/black</color>
<color name="color_control_light">#2EFFFFFF</color> <!-- 18% white -->
<color name="color_surface_secondary">#2a2b2e</color>
<color name="color_surface">#272727</color>
<color name="color_background">#121212</color>
<!-- Scrim colors -->
<color name="system_ui_scrim_light">#2EFFFFFF</color> <!-- 18% white -->
<color name="system_ui_scrim_black">#B3000000</color> <!-- 70% black -->
<!-- In dark mode without light status bar we can use transparent -->
<color name="system_ui_scrim_dark">#B3121212</color> <!-- 70% grey -->
<color name="status_bar_scrim">@color/system_ui_scrim_dark</color>
<!-- Other colors with light mode alternatives -->
<color name="list_divider">#1fffffff</color>

4
app/src/main/res/values-night/themes.xml
View File

@@ -2,7 +2,9 @@
<resources>
<style name="AppTheme.AMOLED">
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorSurface">@android:color/black</item>
<item name="android:statusBarColor">@color/system_ui_scrim_amoled</item>
</style>
<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.MaterialComponents.Dark">

5
app/src/main/res/values-notnight-v23/colors.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- We use a light scrim on API 23+ since we use a light status bar -->
<color name="status_bar_scrim">@color/system_ui_scrim_light</color>
</resources>

15
app/src/main/res/values/colors.xml
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>

6
app/src/main/res/values/themes.xml
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>