From 46806ee31ff501866e714feac2c783d5eeb652ff Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Tue, 4 Mar 2025 11:21:03 -0700
Subject: [PATCH] ui: fix dynamic black theme dimming

---
 .../res/color/sel_dynamic_surface_bright.xml     |  5 +++++
 .../sel_dynamic_surface_container_black.xml      |  5 +++++
 .../sel_dynamic_surface_container_high_black.xml |  5 +++++
 ...l_dynamic_surface_container_highest_black.xml |  5 +++++
 .../sel_dynamic_surface_container_low_black.xml  |  5 +++++
 ...el_dynamic_surface_container_lowest_black.xml |  5 +++++
 .../res/color/sel_dynamic_surface_dim_black.xml  |  5 +++++
 app/src/main/res/values/themes_black.xml         | 16 ++++++++--------
 8 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_bright.xml
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_container_black.xml
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_container_high_black.xml
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_container_low_black.xml
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml
 create mode 100644 app/src/main/res/color/sel_dynamic_surface_dim_black.xml

diff --git a/app/src/main/res/color/sel_dynamic_surface_bright.xml b/app/src/main/res/color/sel_dynamic_surface_bright.xml
new file mode 100644
index 000000000..84e104f7b
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_bright.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_bright" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_black.xml
new file mode 100644
index 000000000..3a94afd3e
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_container_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_high_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_high_black.xml
new file mode 100644
index 000000000..3f32bfab9
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_container_high_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_high" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml
new file mode 100644
index 000000000..50b4d3397
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_container_highest_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_highest" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_low_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_low_black.xml
new file mode 100644
index 000000000..39b093200
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_container_low_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_low" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml b/app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml
new file mode 100644
index 000000000..e3794b4d2
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_container_lowest_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_container_lowest" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_dynamic_surface_dim_black.xml b/app/src/main/res/color/sel_dynamic_surface_dim_black.xml
new file mode 100644
index 000000000..3287accc1
--- /dev/null
+++ b/app/src/main/res/color/sel_dynamic_surface_dim_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/black" />
+    <item android:color="@color/m3_sys_color_dynamic_dark_surface_dim" android:alpha="0.5" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_black.xml b/app/src/main/res/values/themes_black.xml
index 714155c44..e2df0617d 100644
--- a/app/src/main/res/values/themes_black.xml
+++ b/app/src/main/res/values/themes_black.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <style name="Theme.Auxio.Black" parent="Theme.Auxio.Base">
-        <item name="colorSurface">@color/material_dynamic_neutral0</item>
-        <item name="colorSurfaceDim">@color/material_dynamic_neutral10</item>
-        <item name="colorSurfaceBright">@color/material_dynamic_neutral30</item>
-        <item name="colorSurfaceContainerLowest">@color/material_dynamic_neutral10</item>
-        <item name="colorSurfaceContainerLow">@color/material_dynamic_neutral20</item>
-        <item name="colorSurfaceContainer">@color/material_dynamic_neutral30</item>
-        <item name="colorSurfaceContainerHigh">@color/material_dynamic_neutral40</item>
-        <item name="colorSurfaceContainerHighest">@color/material_dynamic_neutral50</item>
+        <item name="colorSurface">@android:color/black</item>
+        <item name="colorSurfaceDim">@color/sel_dynamic_surface_dim_black</item>
+        <item name="colorSurfaceBright">@color/sel_dynamic_surface_bright</item>
+        <item name="colorSurfaceContainerLowest">@color/sel_dynamic_surface_container_lowest_black</item>
+        <item name="colorSurfaceContainerLow">@color/sel_dynamic_surface_container_low_black</item>
+        <item name="colorSurfaceContainer">@color/sel_dynamic_surface_container_black</item>
+        <item name="colorSurfaceContainerHigh">@color/sel_dynamic_surface_container_high_black</item>
+        <item name="colorSurfaceContainerHighest">@color/sel_dynamic_surface_container_highest_black</item>
     </style>
     <style name="Theme.Auxio.Red.Black" parent="Theme.Auxio.Red">
         <item name="colorSurface">@color/red_surface_black</item>