From 1638876f49f8ca065298aac934f28119dfa60bed Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@pm.me>
Date: Fri, 9 Feb 2024 12:26:25 +0100
Subject: [PATCH] [m] Fix colors

---
 app/src/main/java/net/helcel/beendroid/svg/PSVGWrapper.kt | 4 ++--
 app/src/main/res/drawable-v24/ic_launcher_foreground.xml  | 2 +-
 app/src/main/res/drawable/about.xml                       | 4 ++--
 app/src/main/res/drawable/chevron.xml                     | 2 +-
 app/src/main/res/drawable/ic_launcher_background.xml      | 2 +-
 app/src/main/res/values/themes.xml                        | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/helcel/beendroid/svg/PSVGWrapper.kt b/app/src/main/java/net/helcel/beendroid/svg/PSVGWrapper.kt
index 6ddb8b2..655fc02 100644
--- a/app/src/main/java/net/helcel/beendroid/svg/PSVGWrapper.kt
+++ b/app/src/main/java/net/helcel/beendroid/svg/PSVGWrapper.kt
@@ -15,8 +15,8 @@ class PSVGWrapper(ctx: Context) {
     private val cm = HashMap<GeoLoc, PSVGLoader>()
     private var fm = ""
 
-    private val colorForeground: String = colorWrapper(ctx, R.color.darkgray).color.toHexString().substring(2)
-    private val colorBackground: String = colorWrapper(ctx, R.color.black).color.toHexString().substring(2)
+    private val colorForeground: String = colorWrapper(ctx, android.R.attr.panelColorBackground).color.toHexString().substring(2)
+    private val colorBackground: String = colorWrapper(ctx, android.R.attr.colorBackground).color.toHexString().substring(2)
 
     init {
         Country.entries.forEach {
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 756360c..8949830 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="1600" >
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/colorPrimary"
         android:fillType="nonZero"
         android:pathData="m800,1200q-83,0 -156,-31.5Q571,1137 517,1083 463,1029 431.5,956 400,883 400,800 400,717 431.5,644 463,571 517,517 571,463 644,431.5 717,400 800,400q83,0 156,31.5 73,31.5 127,85.5 54,54 85.5,127 31.5,73 31.5,156 0,83 -31.5,156 -31.5,73 -85.5,127 -54,54 -127,85.5 -73,31.5 -156,31.5zM800,1120q134,0 227,-93 93,-93 93,-227 0,-7 -0.5,-14.5 -0.5,-7.5 -0.5,-12.5 -5,29 -27,48 -22,19 -52,19L960,840Q927,840 903.5,816.5 880,793 880,760L880,720L720,720v-80q0,-33 23.5,-56.5Q767,560 800,560h40v0q0,-23 12.5,-40.5Q865,502 883,491q-20,-5 -40.5,-8 -20.5,-3 -42.5,-3 -134,0 -227,93 -93,93 -93,227 0,0 0,0 0,0 0,0h200q66,0 113,47 47,47 47,113v40L720,1000v110q20,5 39.5,7.5 19.5,2.5 40.5,2.5z"
         android:strokeWidth="1"
diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml
index 3fc7f46..9cd6750 100644
--- a/app/src/main/res/drawable/about.xml
+++ b/app/src/main/res/drawable/about.xml
@@ -4,10 +4,10 @@ android:height="24dp"
 android:viewportWidth="960"
 android:viewportHeight="960">
 <path
-    android:fillColor="@color/white"
+    android:fillColor="?attr/colorOnBackground"
     android:pathData="M80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L240,720L80,880ZM206,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,685L206,640ZM160,640L160,640L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,640Q160,640 160,640Q160,640 160,640L160,640Z" />
 
 <path
-    android:fillColor="@color/blue"
+    android:fillColor="?attr/colorPrimary"
     android:pathData="M480,280Q497,280 508.5,268.5Q520,257 520,240Q520,223 508.5,211.5Q497,200 480,200Q463,200 451.5,211.5Q440,223 440,240Q440,257 451.5,268.5Q463,280 480,280ZM440,600L520,600L520,360L440,360L440,600ZM80,880L80,160" />
 </vector>
diff --git a/app/src/main/res/drawable/chevron.xml b/app/src/main/res/drawable/chevron.xml
index 488b005..6d21775 100644
--- a/app/src/main/res/drawable/chevron.xml
+++ b/app/src/main/res/drawable/chevron.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="320"
     android:viewportHeight="512">
   <path
-      android:fillColor="@color/white"
+      android:fillColor="?attr/colorOnBackground"
       android:pathData="M310.6,233.4c12.5,12.5 12.5,32.8 0,45.3l-192,192c-12.5,12.5 -32.8,12.5 -45.3,0s-12.5,-32.8 0,-45.3L242.7,256 73.4,86.6c-12.5,-12.5 -12.5,-32.8 0,-45.3s32.8,-12.5 45.3,0l192,192z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 7f86e93..b4d8b97 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@color/darkgray"
+        android:fillColor="?attr/background"
         android:pathData="M0,0h960v960h-960z" />
 </vector>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4f86374..5cf973c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.Beendroid" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/blue</item>
+        <item name="background">@color/darkgray</item>
         <item name="android:colorPrimary">?attr/colorPrimary</item>
         <item name="android:panelColorBackground">@color/lightgray</item>
         <item name="android:statusBarColor">?attr/colorPrimary</item>