From d703a139f36f50e2db6fef898bb664eb9a49a3dd Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Sun, 3 Nov 2024 19:31:53 +0100
Subject: [PATCH] code cleanup

---
 .../main/res/drawable/baseline_close_24.xml   | 11 +++-
 .../res/drawable/baseline_favorite_24.xml     |  2 +-
 .../drawable/baseline_favorite_border_24.xml  |  2 +-
 .../main/res/drawable/baseline_lock_24px.xml  |  2 +-
 .../drawable/baseline_not_interested_24.xml   | 11 +++-
 .../drawable/baseline_notifications_24.xml    | 11 +++-
 .../main/res/drawable/baseline_search_24.xml  | 11 +++-
 .../res/drawable/baseline_settings_24.xml     | 11 +++-
 .../baseline_settings_applications_24.xml     | 11 +++-
 .../res/drawable/baseline_skip_next_24.xml    | 11 +++-
 .../drawable/baseline_skip_previous_24.xml    | 11 +++-
 .../res/drawable/baseline_volume_down_24.xml  | 12 ++++-
 .../res/drawable/baseline_volume_up_24.xml    | 12 ++++-
 .../drawable/fast_scroll_thumb_drawable.xml   |  9 ++--
 .../main/res/drawable/fast_scroll_track.xml   |  4 +-
 .../drawable/fast_scroll_track_drawable.xml   |  6 +--
 .../res/drawable/ic_launcher_foreground.xml   | 53 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 +
 18 files changed, 134 insertions(+), 57 deletions(-)

diff --git a/app/src/main/res/drawable/baseline_close_24.xml b/app/src/main/res/drawable/baseline_close_24.xml
index a6a4319..41350ac 100644
--- a/app/src/main/res/drawable/baseline_close_24.xml
+++ b/app/src/main/res/drawable/baseline_close_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_favorite_24.xml b/app/src/main/res/drawable/baseline_favorite_24.xml
index 87df0dc..4f9b020 100644
--- a/app/src/main/res/drawable/baseline_favorite_24.xml
+++ b/app/src/main/res/drawable/baseline_favorite_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/app/src/main/res/drawable/baseline_favorite_border_24.xml b/app/src/main/res/drawable/baseline_favorite_border_24.xml
index f514a45..cecc9b0 100644
--- a/app/src/main/res/drawable/baseline_favorite_border_24.xml
+++ b/app/src/main/res/drawable/baseline_favorite_border_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?android:textColor"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/app/src/main/res/drawable/baseline_lock_24px.xml b/app/src/main/res/drawable/baseline_lock_24px.xml
index 11d93f2..1e96180 100644
--- a/app/src/main/res/drawable/baseline_lock_24px.xml
+++ b/app/src/main/res/drawable/baseline_lock_24px.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="?android:textColor"
       android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/baseline_not_interested_24.xml b/app/src/main/res/drawable/baseline_not_interested_24.xml
index 8666b2e..48ab05d 100644
--- a/app/src/main/res/drawable/baseline_not_interested_24.xml
+++ b/app/src/main/res/drawable/baseline_not_interested_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_notifications_24.xml b/app/src/main/res/drawable/baseline_notifications_24.xml
index c80cfc4..b695693 100644
--- a/app/src/main/res/drawable/baseline_notifications_24.xml
+++ b/app/src/main/res/drawable/baseline_notifications_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_search_24.xml b/app/src/main/res/drawable/baseline_search_24.xml
index 2fd74fb..ca9cbc0 100644
--- a/app/src/main/res/drawable/baseline_search_24.xml
+++ b/app/src/main/res/drawable/baseline_search_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_settings_24.xml b/app/src/main/res/drawable/baseline_settings_24.xml
index 1a56e8f..7cb5b17 100644
--- a/app/src/main/res/drawable/baseline_settings_24.xml
+++ b/app/src/main/res/drawable/baseline_settings_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_settings_applications_24.xml b/app/src/main/res/drawable/baseline_settings_applications_24.xml
index 9fb4bf4..f2d03cc 100644
--- a/app/src/main/res/drawable/baseline_settings_applications_24.xml
+++ b/app/src/main/res/drawable/baseline_settings_applications_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_skip_next_24.xml b/app/src/main/res/drawable/baseline_skip_next_24.xml
index dd1ec32..0091e03 100644
--- a/app/src/main/res/drawable/baseline_skip_next_24.xml
+++ b/app/src/main/res/drawable/baseline_skip_next_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_skip_previous_24.xml b/app/src/main/res/drawable/baseline_skip_previous_24.xml
index 678e831..0029a3e 100644
--- a/app/src/main/res/drawable/baseline_skip_previous_24.xml
+++ b/app/src/main/res/drawable/baseline_skip_previous_24.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_volume_down_24.xml b/app/src/main/res/drawable/baseline_volume_down_24.xml
index fa9f447..78b51d3 100644
--- a/app/src/main/res/drawable/baseline_volume_down_24.xml
+++ b/app/src/main/res/drawable/baseline_volume_down_24.xml
@@ -1,5 +1,13 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M18.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM5,9v6h4l5,5V4L9,9H5z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M18.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM5,9v6h4l5,5V4L9,9H5z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/baseline_volume_up_24.xml b/app/src/main/res/drawable/baseline_volume_up_24.xml
index f9555f0..6737fa6 100644
--- a/app/src/main/res/drawable/baseline_volume_up_24.xml
+++ b/app/src/main/res/drawable/baseline_volume_up_24.xml
@@ -1,5 +1,13 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="?android:textColor" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/fast_scroll_thumb_drawable.xml b/app/src/main/res/drawable/fast_scroll_thumb_drawable.xml
index fab51e6..1bfa13d 100644
--- a/app/src/main/res/drawable/fast_scroll_thumb_drawable.xml
+++ b/app/src/main/res/drawable/fast_scroll_thumb_drawable.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/fast_scroll_thumb"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/fast_scroll_thumb" android:state_pressed="true" />
 
-    <item
-        android:drawable="@drawable/fast_scroll_thumb" />
+    <item android:drawable="@drawable/fast_scroll_thumb" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/fast_scroll_track.xml b/app/src/main/res/drawable/fast_scroll_track.xml
index 5c6bd0a..2e402f9 100644
--- a/app/src/main/res/drawable/fast_scroll_track.xml
+++ b/app/src/main/res/drawable/fast_scroll_track.xml
@@ -5,8 +5,8 @@
     <solid android:color="@android:color/transparent" />
 
     <padding
-        android:top="2dp"
         android:bottom="2dp"
         android:left="2dp"
-        android:right="2dp" />
+        android:right="2dp"
+        android:top="2dp" />
 </shape>
diff --git a/app/src/main/res/drawable/fast_scroll_track_drawable.xml b/app/src/main/res/drawable/fast_scroll_track_drawable.xml
index 09f3307..6ccdea8 100644
--- a/app/src/main/res/drawable/fast_scroll_track_drawable.xml
+++ b/app/src/main/res/drawable/fast_scroll_track_drawable.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/fast_scroll_track"/>
-    <item
-        android:drawable="@drawable/fast_scroll_track"/>
+    <item android:drawable="@drawable/fast_scroll_track" android:state_pressed="true" />
+    <item android:drawable="@drawable/fast_scroll_track" />
 </selector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 4b7a08f..ca9dc9e 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -4,27 +4,36 @@
     android:height="108dp"
     android:viewportWidth="696"
     android:viewportHeight="167.625">
-  <group android:scaleX="0.575"
-      android:scaleY="0.1384833"
-      android:translateX="147.9"
-      android:translateY="72.20587">
-    <group android:translateY="133.66406">
-      <path android:pathData="M57.734375,0.5625Q46.125,0.5625,39.765625,-6.921875Q33.40625,-14.421875,33.40625,-27.984375L33.40625,-99.28125L12.65625,-99.28125L12.65625,-109.40625L46.34375,-109.40625L46.34375,-27.984375Q46.34375,-19.40625,49.578125,-14.90625Q52.8125,-10.40625,59,-10.40625L74.109375,-10.40625L74.109375,0.5625L57.734375,0.5625Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M122.796875,2.046875Q111.40625,2.046875,103.984375,-4.53125Q96.5625,-11.109375,96.5625,-23.421875Q96.5625,-33.609375,101.484375,-39.34375Q106.40625,-45.078125,114.34375,-47.390625Q122.296875,-49.71875,131.29688,-49.71875L148.67188,-49.71875L148.67188,-51.75Q148.67188,-61.8125,143.5625,-65.75Q138.46875,-69.6875,129.26562,-69.6875Q122.09375,-69.6875,115.203125,-67.71875Q108.3125,-65.75,102.328125,-62.234375L102.328125,-75.171875Q108.796875,-77.5625,115.40625,-79.109375Q122.015625,-80.65625,128.90625,-80.65625Q135.9375,-80.65625,142.57812,-78.71875Q149.23438,-76.78125,154.07812,-72.390625Q158.9375,-68,160.54688,-60.609375Q161.67188,-55.40625,161.67188,-44.9375L161.67188,-28.828125Q161.67188,-22.21875,162.40625,-14.203125Q163.15625,-6.1875,165.82812,0L152.8125,0Q151.625,-2.75,150.92188,-5.875Q150.21875,-9,149.79688,-11.953125Q145.64062,-4.859375,138.29688,-1.40625Q130.95312,2.046875,122.796875,2.046875ZM125.953125,-8.796875Q133.96875,-8.796875,139,-12.734375Q144.03125,-16.671875,146.34375,-23.03125Q148.67188,-29.390625,148.67188,-36.703125L148.67188,-39.59375L132.28125,-39.59375Q126.796875,-39.59375,121.5625,-38.359375Q116.328125,-37.125,112.90625,-33.671875Q109.5,-30.234375,109.5,-23.625Q109.5,-16.171875,114.0625,-12.484375Q118.640625,-8.796875,125.953125,-8.796875Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M211.6875,2.046875Q187.71875,2.046875,187.71875,-29.8125L187.71875,-78.609375L200.65625,-78.609375L200.65625,-29.8125Q200.65625,-9.21875,216.04688,-9.21875Q225.04688,-9.21875,229.96875,-15.71875Q234.89062,-22.21875,234.89062,-34.109375L234.89062,-78.609375L247.90625,-78.609375L247.90625,0L236.15625,0L234.89062,-11.8125Q227.85938,2.046875,211.6875,2.046875Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M274.71875,-78.75L286.39062,-78.75L287.65625,-66.9375Q294.75,-80.65625,310.78125,-80.65625Q334.90625,-80.65625,334.90625,-48.796875L334.90625,0L321.89062,0L321.89062,-48.796875Q321.89062,-59.421875,318.20312,-64.40625Q314.51562,-69.40625,306.78125,-69.40625Q297.5625,-69.40625,292.60938,-62.890625Q287.65625,-56.390625,287.65625,-44.515625L287.65625,0L274.71875,0L274.71875,-78.75Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M397.57812,2.046875Q385.125,2.046875,376.65625,-3.1875Q368.1875,-8.4375,363.85938,-17.78125Q359.53125,-27.140625,359.53125,-39.3125Q359.53125,-51.546875,363.89062,-60.859375Q368.25,-70.171875,376.75,-75.40625Q385.26562,-80.65625,397.85938,-80.65625Q404.39062,-80.65625,409.65625,-79.140625Q414.9375,-77.625,420.42188,-74.609375L420.42188,-61.03125Q415.4375,-65.46875,410.40625,-67.578125Q405.375,-69.6875,398.98438,-69.6875Q389.48438,-69.6875,383.82812,-65.609375Q378.17188,-61.53125,375.67188,-54.640625Q373.17188,-47.75,373.17188,-39.3125Q373.17188,-30.9375,375.70312,-24.015625Q378.23438,-17.09375,383.85938,-13.015625Q389.48438,-8.9375,398.90625,-8.9375Q405.09375,-8.9375,410.4375,-10.96875Q415.78125,-13.015625,420.42188,-17.4375L420.42188,-4.015625Q410.375,2.046875,397.57812,2.046875Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M448.71875,-109.40625L461.65625,-109.40625L461.65625,-66.9375Q468.75,-80.65625,484.92188,-80.65625Q494.625,-80.65625,499.79688,-76.15625Q504.96875,-71.65625,506.9375,-64.40625Q508.90625,-57.171875,508.90625,-48.796875L508.90625,0L495.89062,0L495.89062,-48.796875Q495.89062,-59.421875,492.15625,-64.40625Q488.4375,-69.40625,480.5625,-69.40625Q473.25,-69.40625,469.14062,-65.78125Q465.03125,-62.15625,463.34375,-56.453125Q461.65625,-50.765625,461.65625,-44.515625L461.65625,0L448.71875,0L448.71875,-109.40625Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M569.6719,2.046875Q551.46875,2.046875,541.09375,-8.890625Q530.71875,-19.828125,530.71875,-38.75Q530.71875,-50.484375,534.8281,-59.96875Q538.9531,-69.46875,547.0625,-75.0625Q555.1875,-80.65625,567.1406,-80.65625Q582.8906,-80.65625,591.5781,-70.5625Q600.2656,-60.46875,600.2656,-42.609375L600.2656,-36.28125L544.21875,-36.28125L544.21875,-35.859375Q544.21875,-23.5625,550.6875,-16.25Q557.15625,-8.9375,569.8125,-8.9375Q577.125,-8.9375,583.9844,-11.25Q590.84375,-13.578125,597.2344,-16.875L597.2344,-4.015625Q590.5625,-1.265625,583.7031,0.390625Q576.84375,2.046875,569.6719,2.046875ZM587.3281,-46.40625Q587.3281,-52.953125,585.3594,-58.21875Q583.3906,-63.5,579.0625,-66.59375Q574.7344,-69.6875,567.6406,-69.6875Q560.46875,-69.6875,555.6406,-66.546875Q550.8281,-63.421875,548.125,-58.140625Q545.4219,-52.875,544.71875,-46.40625L587.3281,-46.40625Z"
-          android:fillColor="#FFFFFF"/>
-      <path android:pathData="M630.2344,-78.75L641.9844,-78.75L643.25,-63.359375Q646.5469,-71.71875,653.1875,-76.1875Q659.84375,-80.65625,669.125,-80.65625Q678.8281,-80.65625,686,-75.734375L686,-62.515625Q678.40625,-68.703125,668,-68.703125Q656.0469,-68.703125,649.6406,-61.0625Q643.25,-53.4375,643.25,-39.171875L643.25,0L630.2344,0L630.2344,-78.75Z"
-          android:fillColor="#FFFFFF"/>
+    <group
+        android:scaleX="0.575"
+        android:scaleY="0.1384833"
+        android:translateX="147.9"
+        android:translateY="72.20587">
+        <group android:translateY="133.66406">
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M57.734375,0.5625Q46.125,0.5625,39.765625,-6.921875Q33.40625,-14.421875,33.40625,-27.984375L33.40625,-99.28125L12.65625,-99.28125L12.65625,-109.40625L46.34375,-109.40625L46.34375,-27.984375Q46.34375,-19.40625,49.578125,-14.90625Q52.8125,-10.40625,59,-10.40625L74.109375,-10.40625L74.109375,0.5625L57.734375,0.5625Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M122.796875,2.046875Q111.40625,2.046875,103.984375,-4.53125Q96.5625,-11.109375,96.5625,-23.421875Q96.5625,-33.609375,101.484375,-39.34375Q106.40625,-45.078125,114.34375,-47.390625Q122.296875,-49.71875,131.29688,-49.71875L148.67188,-49.71875L148.67188,-51.75Q148.67188,-61.8125,143.5625,-65.75Q138.46875,-69.6875,129.26562,-69.6875Q122.09375,-69.6875,115.203125,-67.71875Q108.3125,-65.75,102.328125,-62.234375L102.328125,-75.171875Q108.796875,-77.5625,115.40625,-79.109375Q122.015625,-80.65625,128.90625,-80.65625Q135.9375,-80.65625,142.57812,-78.71875Q149.23438,-76.78125,154.07812,-72.390625Q158.9375,-68,160.54688,-60.609375Q161.67188,-55.40625,161.67188,-44.9375L161.67188,-28.828125Q161.67188,-22.21875,162.40625,-14.203125Q163.15625,-6.1875,165.82812,0L152.8125,0Q151.625,-2.75,150.92188,-5.875Q150.21875,-9,149.79688,-11.953125Q145.64062,-4.859375,138.29688,-1.40625Q130.95312,2.046875,122.796875,2.046875ZM125.953125,-8.796875Q133.96875,-8.796875,139,-12.734375Q144.03125,-16.671875,146.34375,-23.03125Q148.67188,-29.390625,148.67188,-36.703125L148.67188,-39.59375L132.28125,-39.59375Q126.796875,-39.59375,121.5625,-38.359375Q116.328125,-37.125,112.90625,-33.671875Q109.5,-30.234375,109.5,-23.625Q109.5,-16.171875,114.0625,-12.484375Q118.640625,-8.796875,125.953125,-8.796875Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M211.6875,2.046875Q187.71875,2.046875,187.71875,-29.8125L187.71875,-78.609375L200.65625,-78.609375L200.65625,-29.8125Q200.65625,-9.21875,216.04688,-9.21875Q225.04688,-9.21875,229.96875,-15.71875Q234.89062,-22.21875,234.89062,-34.109375L234.89062,-78.609375L247.90625,-78.609375L247.90625,0L236.15625,0L234.89062,-11.8125Q227.85938,2.046875,211.6875,2.046875Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M274.71875,-78.75L286.39062,-78.75L287.65625,-66.9375Q294.75,-80.65625,310.78125,-80.65625Q334.90625,-80.65625,334.90625,-48.796875L334.90625,0L321.89062,0L321.89062,-48.796875Q321.89062,-59.421875,318.20312,-64.40625Q314.51562,-69.40625,306.78125,-69.40625Q297.5625,-69.40625,292.60938,-62.890625Q287.65625,-56.390625,287.65625,-44.515625L287.65625,0L274.71875,0L274.71875,-78.75Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M397.57812,2.046875Q385.125,2.046875,376.65625,-3.1875Q368.1875,-8.4375,363.85938,-17.78125Q359.53125,-27.140625,359.53125,-39.3125Q359.53125,-51.546875,363.89062,-60.859375Q368.25,-70.171875,376.75,-75.40625Q385.26562,-80.65625,397.85938,-80.65625Q404.39062,-80.65625,409.65625,-79.140625Q414.9375,-77.625,420.42188,-74.609375L420.42188,-61.03125Q415.4375,-65.46875,410.40625,-67.578125Q405.375,-69.6875,398.98438,-69.6875Q389.48438,-69.6875,383.82812,-65.609375Q378.17188,-61.53125,375.67188,-54.640625Q373.17188,-47.75,373.17188,-39.3125Q373.17188,-30.9375,375.70312,-24.015625Q378.23438,-17.09375,383.85938,-13.015625Q389.48438,-8.9375,398.90625,-8.9375Q405.09375,-8.9375,410.4375,-10.96875Q415.78125,-13.015625,420.42188,-17.4375L420.42188,-4.015625Q410.375,2.046875,397.57812,2.046875Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M448.71875,-109.40625L461.65625,-109.40625L461.65625,-66.9375Q468.75,-80.65625,484.92188,-80.65625Q494.625,-80.65625,499.79688,-76.15625Q504.96875,-71.65625,506.9375,-64.40625Q508.90625,-57.171875,508.90625,-48.796875L508.90625,0L495.89062,0L495.89062,-48.796875Q495.89062,-59.421875,492.15625,-64.40625Q488.4375,-69.40625,480.5625,-69.40625Q473.25,-69.40625,469.14062,-65.78125Q465.03125,-62.15625,463.34375,-56.453125Q461.65625,-50.765625,461.65625,-44.515625L461.65625,0L448.71875,0L448.71875,-109.40625Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M569.6719,2.046875Q551.46875,2.046875,541.09375,-8.890625Q530.71875,-19.828125,530.71875,-38.75Q530.71875,-50.484375,534.8281,-59.96875Q538.9531,-69.46875,547.0625,-75.0625Q555.1875,-80.65625,567.1406,-80.65625Q582.8906,-80.65625,591.5781,-70.5625Q600.2656,-60.46875,600.2656,-42.609375L600.2656,-36.28125L544.21875,-36.28125L544.21875,-35.859375Q544.21875,-23.5625,550.6875,-16.25Q557.15625,-8.9375,569.8125,-8.9375Q577.125,-8.9375,583.9844,-11.25Q590.84375,-13.578125,597.2344,-16.875L597.2344,-4.015625Q590.5625,-1.265625,583.7031,0.390625Q576.84375,2.046875,569.6719,2.046875ZM587.3281,-46.40625Q587.3281,-52.953125,585.3594,-58.21875Q583.3906,-63.5,579.0625,-66.59375Q574.7344,-69.6875,567.6406,-69.6875Q560.46875,-69.6875,555.6406,-66.546875Q550.8281,-63.421875,548.125,-58.140625Q545.4219,-52.875,544.71875,-46.40625L587.3281,-46.40625Z" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:pathData="M630.2344,-78.75L641.9844,-78.75L643.25,-63.359375Q646.5469,-71.71875,653.1875,-76.1875Q659.84375,-80.65625,669.125,-80.65625Q678.8281,-80.65625,686,-75.734375L686,-62.515625Q678.40625,-68.703125,668,-68.703125Q656.0469,-68.703125,649.6406,-61.0625Q643.25,-53.4375,643.25,-39.171875L643.25,0L630.2344,0L630.2344,-78.75Z" />
+        </group>
     </group>
-  </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e519aa..17bdff8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -204,6 +204,7 @@
     <string name="list_other_expand_notifications_panel">Expand notifications panel</string>
     <string name="list_other_nop">Do nothing</string>
     <string name="list_other_lock_screen">Lock Screen</string>
+    <string name="list_other_torch">Toggle Torch</string>
 
     <!--
       -