From 863929fb64d9308d378a35cd81822fbc52dbc1fc Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Fri, 15 Jul 2022 21:07:13 -0600
Subject: [PATCH] ui: do not enforce contrast after api 29

Set the enforce*BarContrast methods to false above API 29, so we can
use fully transparent navigation and status bars.

Previously, we used a mostly transparent color for such, but now, we
can use a completely transparent color without it being changed to
match contrast.
---
 .../auxio/music/dirs/MusicDirsDialog.kt       |  2 +-
 .../main/res/values-night-v27/styles_core.xml |  4 +--
 app/src/main/res/values-night/colors.xml      |  2 +-
 app/src/main/res/values-v27/styles_core.xml   |  5 ++-
 app/src/main/res/values-v29/styles_core.xml   | 13 ++++++++
 app/src/main/res/values/colors.xml            | 11 ++++---
 app/src/main/res/values/styles_core.xml       | 32 ++++++++-----------
 7 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/res/values-v29/styles_core.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt
index ac7aae92f..d6052e563 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt
@@ -56,6 +56,7 @@ class MusicDirsDialog :
         builder
             .setTitle(R.string.set_dirs)
             .setNeutralButton(R.string.lbl_add, null)
+            .setNegativeButton(R.string.lbl_cancel, null)
             .setPositiveButton(R.string.lbl_save) { _, _ ->
                 val dirs = settings.getMusicDirs(storageManager)
                 val newDirs =
@@ -67,7 +68,6 @@ class MusicDirsDialog :
                     settings.setMusicDirs(newDirs)
                 }
             }
-            .setNegativeButton(R.string.lbl_cancel, null)
     }
 
     override fun onBindingCreated(binding: DialogMusicDirsBinding, savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/values-night-v27/styles_core.xml b/app/src/main/res/values-night-v27/styles_core.xml
index c818dcbda..f1702badf 100644
--- a/app/src/main/res/values-night-v27/styles_core.xml
+++ b/app/src/main/res/values-night-v27/styles_core.xml
@@ -2,8 +2,8 @@
 <resources>
     <!-- Template theme that handles edge-to-edge on other styles variants -->
     <style name="Theme.Auxio.V27" parent="Theme.Auxio">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@color/chrome_transparent</item>
+        <item name="android:navigationBarColor">@color/chrome_transparent_ish</item>
+        <item name="android:statusBarColor">@color/chrome_transparent_ish</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c8cb5c856..76bb8f595 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Note: Not actually transparent, making it transparent would actually make it translucent -->
-    <color name="chrome_transparent">#01151515</color>
+    <color name="chrome_transparent_ish">#01151515</color>
 
     <color name="widget_surface">@color/material_dynamic_secondary20</color>
     <color name="widget_surface_inverse">@color/material_dynamic_neutral90</color>
diff --git a/app/src/main/res/values-v27/styles_core.xml b/app/src/main/res/values-v27/styles_core.xml
index b2af32ca1..337189255 100644
--- a/app/src/main/res/values-v27/styles_core.xml
+++ b/app/src/main/res/values-v27/styles_core.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Template theme that handles edge-to-edge on other styles variants -->
     <style name="Theme.Auxio.V27" parent="Theme.Auxio">
-        <item name="android:navigationBarColor">@color/chrome_transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/chrome_transparent_ish</item>
+        <item name="android:statusBarColor">@color/chrome_transparent_ish</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
diff --git a/app/src/main/res/values-v29/styles_core.xml b/app/src/main/res/values-v29/styles_core.xml
new file mode 100644
index 000000000..1ab3ab23c
--- /dev/null
+++ b/app/src/main/res/values-v29/styles_core.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Auxio.V29" parent="Theme.Auxio.V27">
+        <!--
+        Android 10 finally allows you to use fully transparent system bars without it automatically
+        forcing contrast.
+        -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 129434f93..426ad790b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Note: Not actually transparent, making it transparent would actually make it translucent
-     TODO: Can actually disable the contrast check on some newer versions -->
-    <color name="chrome_transparent">#01fafafa</color>
+    <!-- Used on devices when we cannot set dark/light mode on the system bars. -->
     <color name="chrome_translucent">#80000000</color>
-    <color name="remote_translucent">#80ffffff</color>
+
+    <!--
+    Used on devices when we can use "transparent" system bars, but fully transparent colors
+    would cause the status bar to become translucent.
+    -->
+    <color name="chrome_transparent_ish">#01fafafa</color>
 
     <color name="widget_surface">@color/material_dynamic_primary95</color>
     <color name="widget_surface_inverse">@color/material_dynamic_neutral20</color>
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index 67a0694be..a65b02856 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -1,34 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Master parent theme -->
-    <!-- TODO: Make the app theme blue before dynamic colors -->
     <style name="Theme.Auxio" parent="Theme.Material3.DynamicColors.DayNight" />
     <!-- Template theme that handles edge-to-edge on other styles variants -->
     <style name="Theme.Auxio.V27" parent="Theme.Auxio">
         <item name="android:statusBarColor">@color/chrome_translucent</item>
         <item name="android:navigationBarColor">@color/chrome_translucent</item>
     </style>
+    <style name="Theme.Auxio.V29" parent="Theme.Auxio.V27" />
 
     <!-- Base theme -->
-    <style name="Theme.Auxio.Base" parent="Theme.Auxio.V27">
-        <!-- Values -->
-        <item name="colorAccent">?attr/colorSecondary</item>
-        <item name="colorOutline">@color/overlay_stroke</item>
-        <item name="indicatorColor">?attr/colorPrimary</item>
-        <item name="colorControlActivated">?attr/colorPrimary</item>
-
-        <!-- Fix dumb default android behavior -->
-        <item name="android:colorBackground">?attr/colorSurface</item>
-        <item name="android:windowBackground">?attr/colorSurface</item>
-        <item name="android:scrollbars">none</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-
-        <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
-        <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
-        <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
-
+    <style name="Theme.Auxio.Base" parent="Theme.Auxio.V29">
         <!-- Material configuration -->
+        <item name="colorOutline">@color/overlay_stroke</item>
         <item name="toolbarStyle">@style/Widget.Auxio.Toolbar</item>
         <item name="materialAlertDialogTheme">@style/Theme.Auxio.Dialog</item>
         <item name="sliderStyle">@style/Widget.Auxio.Slider</item>
@@ -56,6 +40,16 @@
         <item name="textAppearanceBodyLarge">@style/TextAppearance.Auxio.BodyLarge</item>
         <item name="textAppearanceBodyMedium">@style/TextAppearance.Auxio.BodyMedium</item>
         <item name="textAppearanceBodySmall">@style/TextAppearance.Auxio.BodySmall</item>
+
+        <!-- Fix dumb default android behavior -->
+        <item name="android:scrollbars">none</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="colorControlActivated">?attr/colorPrimary</item>
+
+        <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
+        <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
+        <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
     </style>
 
     <style name="Theme.Auxio.App" parent="@style/Theme.Auxio.Blue" />