From 2deaa60498e1db40bd64505532841ef5b9673f3d Mon Sep 17 00:00:00 2001
From: BlackyHawky <blackyhawky@protonmail.com>
Date: Mon, 16 Oct 2023 23:05:36 +0200
Subject: [PATCH] Fix color of settings icons (#193)

---
 app/src/main/res/drawable/ic_settings_about.xml                | 3 +--
 ...ttings_about_white.xml => ic_settings_about_foreground.xml} | 3 ++-
 app/src/main/res/drawable/ic_settings_advanced.xml             | 3 +--
 ..._advanced_white.xml => ic_settings_advanced_foreground.xml} | 2 +-
 app/src/main/res/drawable/ic_settings_appearance.xml           | 3 +--
 ...earance_white.xml => ic_settings_appearance_foreground.xml} | 2 +-
 app/src/main/res/drawable/ic_settings_correction.xml           | 3 +--
 ...rection_white.xml => ic_settings_correction_foreground.xml} | 2 +-
 app/src/main/res/drawable/ic_settings_gesture.xml              | 3 +--
 ...gs_gesture_white.xml => ic_settings_gesture_foreground.xml} | 2 +-
 app/src/main/res/drawable/ic_settings_languages.xml            | 3 +--
 ...anguages_white.xml => ic_settings_languages_foreground.xml} | 2 +-
 12 files changed, 13 insertions(+), 18 deletions(-)
 rename app/src/main/res/drawable/{ic_settings_about_white.xml => ic_settings_about_foreground.xml} (88%)
 rename app/src/main/res/drawable/{ic_settings_advanced_white.xml => ic_settings_advanced_foreground.xml} (93%)
 rename app/src/main/res/drawable/{ic_settings_appearance_white.xml => ic_settings_appearance_foreground.xml} (97%)
 rename app/src/main/res/drawable/{ic_settings_correction_white.xml => ic_settings_correction_foreground.xml} (90%)
 rename app/src/main/res/drawable/{ic_settings_gesture_white.xml => ic_settings_gesture_foreground.xml} (95%)
 rename app/src/main/res/drawable/{ic_settings_languages_white.xml => ic_settings_languages_foreground.xml} (96%)

diff --git a/app/src/main/res/drawable/ic_settings_about.xml b/app/src/main/res/drawable/ic_settings_about.xml
index 3b039fd68..7a84fa0fe 100644
--- a/app/src/main/res/drawable/ic_settings_about.xml
+++ b/app/src/main/res/drawable/ic_settings_about.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/foreground"
     android:inset="@dimen/settings_screen_icon_inset"
-    android:drawable="@drawable/ic_settings_about_white"/>
\ No newline at end of file
+    android:drawable="@drawable/ic_settings_about_foreground"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_about_white.xml b/app/src/main/res/drawable/ic_settings_about_foreground.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_settings_about_white.xml
rename to app/src/main/res/drawable/ic_settings_about_foreground.xml
index 57fc8df08..a0ee1583f 100644
--- a/app/src/main/res/drawable/ic_settings_about_white.xml
+++ b/app/src/main/res/drawable/ic_settings_about_foreground.xml
@@ -4,6 +4,7 @@
     android:width="32dp"
     android:viewportHeight="24"
     android:viewportWidth="24">
-    <path android:fillColor="#FFF"
+    <path
+        android:fillColor="@color/foreground"
         android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_advanced.xml b/app/src/main/res/drawable/ic_settings_advanced.xml
index 934072ac4..175fcf695 100644
--- a/app/src/main/res/drawable/ic_settings_advanced.xml
+++ b/app/src/main/res/drawable/ic_settings_advanced.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/foreground"
     android:inset="@dimen/settings_screen_icon_inset"
-    android:drawable="@drawable/ic_settings_advanced_white"/>
\ No newline at end of file
+    android:drawable="@drawable/ic_settings_advanced_foreground"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_advanced_white.xml b/app/src/main/res/drawable/ic_settings_advanced_foreground.xml
similarity index 93%
rename from app/src/main/res/drawable/ic_settings_advanced_white.xml
rename to app/src/main/res/drawable/ic_settings_advanced_foreground.xml
index 8f6db87dd..1e711be59 100644
--- a/app/src/main/res/drawable/ic_settings_advanced_white.xml
+++ b/app/src/main/res/drawable/ic_settings_advanced_foreground.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="#FFF"
+        android:fillColor="@color/foreground"
         android:pathData="M240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_appearance.xml b/app/src/main/res/drawable/ic_settings_appearance.xml
index 273839efe..837f360a4 100644
--- a/app/src/main/res/drawable/ic_settings_appearance.xml
+++ b/app/src/main/res/drawable/ic_settings_appearance.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/foreground"
     android:inset="@dimen/settings_screen_icon_inset"
-    android:drawable="@drawable/ic_settings_appearance_white"/>
\ No newline at end of file
+    android:drawable="@drawable/ic_settings_appearance_foreground"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_appearance_white.xml b/app/src/main/res/drawable/ic_settings_appearance_foreground.xml
similarity index 97%
rename from app/src/main/res/drawable/ic_settings_appearance_white.xml
rename to app/src/main/res/drawable/ic_settings_appearance_foreground.xml
index ecfd76b81..9f17f2efe 100644
--- a/app/src/main/res/drawable/ic_settings_appearance_white.xml
+++ b/app/src/main/res/drawable/ic_settings_appearance_foreground.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="#FFF"
+        android:fillColor="@color/foreground"
         android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 112.5,324Q145,251 200.5,197Q256,143 330,111.5Q404,80 488,80Q568,80 639,107.5Q710,135 763.5,183.5Q817,232 848.5,298.5Q880,365 880,442Q880,557 810,618.5Q740,680 640,680L566,680Q557,680 553.5,685Q550,690 550,696Q550,708 565,730.5Q580,753 580,782Q580,832 552.5,856Q525,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM260,520Q286,520 303,503Q320,486 320,460Q320,434 303,417Q286,400 260,400Q234,400 217,417Q200,434 200,460Q200,486 217,503Q234,520 260,520ZM380,360Q406,360 423,343Q440,326 440,300Q440,274 423,257Q406,240 380,240Q354,240 337,257Q320,274 320,300Q320,326 337,343Q354,360 380,360ZM580,360Q606,360 623,343Q640,326 640,300Q640,274 623,257Q606,240 580,240Q554,240 537,257Q520,274 520,300Q520,326 537,343Q554,360 580,360ZM700,520Q726,520 743,503Q760,486 760,460Q760,434 743,417Q726,400 700,400Q674,400 657,417Q640,434 640,460Q640,486 657,503Q674,520 700,520ZM480,800Q489,800 494.5,795Q500,790 500,782Q500,768 485,749Q470,730 470,692Q470,650 499,625Q528,600 570,600L640,600Q706,600 753,561.5Q800,523 800,442Q800,321 707.5,240.5Q615,160 488,160Q352,160 256,253Q160,346 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_correction.xml b/app/src/main/res/drawable/ic_settings_correction.xml
index a5df76ed4..89885307f 100644
--- a/app/src/main/res/drawable/ic_settings_correction.xml
+++ b/app/src/main/res/drawable/ic_settings_correction.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/foreground"
     android:inset="@dimen/settings_screen_icon_inset"
-    android:drawable="@drawable/ic_settings_correction_white"/>
\ No newline at end of file
+    android:drawable="@drawable/ic_settings_correction_foreground"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_correction_white.xml b/app/src/main/res/drawable/ic_settings_correction_foreground.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_settings_correction_white.xml
rename to app/src/main/res/drawable/ic_settings_correction_foreground.xml
index 136a6d6aa..3c8db8bd9 100644
--- a/app/src/main/res/drawable/ic_settings_correction_white.xml
+++ b/app/src/main/res/drawable/ic_settings_correction_foreground.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="#FFF"
+        android:fillColor="@color/foreground"
         android:pathData="M564,880L394,710L450,654L564,768L790,542L846,598L564,880ZM120,640L314,120L408,120L602,640L510,640L464,508L254,508L208,640L120,640ZM282,432L438,432L362,216L358,216L282,432Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_gesture.xml b/app/src/main/res/drawable/ic_settings_gesture.xml
index d7a767336..18f231d44 100644
--- a/app/src/main/res/drawable/ic_settings_gesture.xml
+++ b/app/src/main/res/drawable/ic_settings_gesture.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/foreground"
     android:inset="@dimen/settings_screen_icon_inset"
-    android:drawable="@drawable/ic_settings_gesture_white"/>
\ No newline at end of file
+    android:drawable="@drawable/ic_settings_gesture_foreground"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_gesture_white.xml b/app/src/main/res/drawable/ic_settings_gesture_foreground.xml
similarity index 95%
rename from app/src/main/res/drawable/ic_settings_gesture_white.xml
rename to app/src/main/res/drawable/ic_settings_gesture_foreground.xml
index 03b0af7ab..c8b4d2d1f 100644
--- a/app/src/main/res/drawable/ic_settings_gesture_white.xml
+++ b/app/src/main/res/drawable/ic_settings_gesture_foreground.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="#FFF"
+        android:fillColor="@color/foreground"
         android:pathData="M554,842Q501,842 463.5,805.5Q426,769 426,716Q426,686 439,652Q452,618 478.5,587.5Q505,557 545.5,533.5Q586,510 641,501Q638,461 622,444.5Q606,428 582,428Q552,428 517,453Q482,478 434,535Q356,628 319.5,656Q283,684 241,684Q190,684 155,646.5Q120,609 120,556Q120,503 143.5,447Q167,391 223,313Q241,287 250.5,269Q260,251 260,240Q260,233 257.5,229.5Q255,226 250,226Q240,226 225,238.5Q210,251 190,276L120,206Q152,167 185,146.5Q218,126 250,126Q297,126 328.5,158.5Q360,191 360,238Q360,267 345,301.5Q330,336 295,384Q257,438 238.5,479Q220,520 220,549Q220,566 225.5,575Q231,584 241,584Q253,584 274.5,563.5Q296,543 361,467Q424,392 475,360Q526,328 582,328Q659,328 697.5,379Q736,430 741,496L840,496L840,596L741,596Q735,684 692,763Q649,842 554,842ZM556,742Q595,742 614.5,697.5Q634,653 640,603Q584,617 555,651.5Q526,686 526,712Q526,726 534,734Q542,742 556,742Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_languages.xml b/app/src/main/res/drawable/ic_settings_languages.xml
index 76c3825ae..d921bfb8c 100644
--- a/app/src/main/res/drawable/ic_settings_languages.xml
+++ b/app/src/main/res/drawable/ic_settings_languages.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/foreground"
     android:inset="@dimen/settings_screen_icon_inset"
-    android:drawable="@drawable/ic_settings_languages_white"/>
\ No newline at end of file
+    android:drawable="@drawable/ic_settings_languages_foreground"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_languages_white.xml b/app/src/main/res/drawable/ic_settings_languages_foreground.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_settings_languages_white.xml
rename to app/src/main/res/drawable/ic_settings_languages_foreground.xml
index e70c0afe6..1bc3c2117 100644
--- a/app/src/main/res/drawable/ic_settings_languages_white.xml
+++ b/app/src/main/res/drawable/ic_settings_languages_foreground.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="#FFF"
+        android:fillColor="@color/foreground"
         android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 111.5,324.5Q143,252 197.5,197.5Q252,143 325,111.5Q398,80 480,80Q563,80 635.5,111.5Q708,143 762.5,197.5Q817,252 848.5,324.5Q880,397 880,480Q880,562 848.5,635Q817,708 762.5,762.5Q708,817 635.5,848.5Q563,880 480,880ZM480,798Q506,762 525,723Q544,684 556,640L404,640Q416,684 435,723Q454,762 480,798ZM376,782Q358,749 344.5,713.5Q331,678 322,640L204,640Q233,690 276.5,727Q320,764 376,782ZM584,782Q640,764 683.5,727Q727,690 756,640L638,640Q629,678 615.5,713.5Q602,749 584,782ZM170,560L306,560Q303,540 301.5,520.5Q300,501 300,480Q300,459 301.5,439.5Q303,420 306,400L170,400Q165,420 162.5,439.5Q160,459 160,480Q160,501 162.5,520.5Q165,540 170,560ZM386,560L574,560Q577,540 578.5,520.5Q580,501 580,480Q580,459 578.5,439.5Q577,420 574,400L386,400Q383,420 381.5,439.5Q380,459 380,480Q380,501 381.5,520.5Q383,540 386,560ZM654,560L790,560Q795,540 797.5,520.5Q800,501 800,480Q800,459 797.5,439.5Q795,420 790,400L654,400Q657,420 658.5,439.5Q660,459 660,480Q660,501 658.5,520.5Q657,540 654,560ZM638,320L756,320Q727,270 683.5,233Q640,196 584,178Q602,211 615.5,246.5Q629,282 638,320ZM404,320L556,320Q544,276 525,237Q506,198 480,162Q454,198 435,237Q416,276 404,320ZM204,320L322,320Q331,282 344.5,246.5Q358,211 376,178Q320,196 276.5,233Q233,270 204,320Z"/>
 </vector>
\ No newline at end of file