From 98647a705f3c2b277190ae115b2ee236697f1f1f Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 19 Dec 2019 17:34:36 +0100
Subject: Fixed playback speed icon mismatch

---
 core/src/main/res/drawable/ic_playback_speed_dark.xml       | 8 --------
 core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml  | 8 ++++++++
 core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml  | 8 ++++++++
 core/src/main/res/drawable/ic_playback_speed_white.xml      | 8 --------
 core/src/main/res/drawable/ic_playback_speed_white_24dp.xml | 8 ++++++++
 core/src/main/res/drawable/ic_playback_speed_white_48dp.xml | 8 ++++++++
 core/src/main/res/values/attrs.xml                          | 1 +
 core/src/main/res/values/styles.xml                         | 6 ++++--
 8 files changed, 37 insertions(+), 18 deletions(-)
 delete mode 100644 core/src/main/res/drawable/ic_playback_speed_dark.xml
 create mode 100644 core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml
 create mode 100644 core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml
 delete mode 100644 core/src/main/res/drawable/ic_playback_speed_white.xml
 create mode 100644 core/src/main/res/drawable/ic_playback_speed_white_24dp.xml
 create mode 100644 core/src/main/res/drawable/ic_playback_speed_white_48dp.xml

(limited to 'core/src')

diff --git a/core/src/main/res/drawable/ic_playback_speed_dark.xml b/core/src/main/res/drawable/ic_playback_speed_dark.xml
deleted file mode 100644
index 7c7d1cf8c..000000000
--- a/core/src/main/res/drawable/ic_playback_speed_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FF757575" android:pathData="M 12,14.888154 A 2.2284437,2.2284437 0 0 1 9.7715563,12.659711 c 0,-0.831952 0.4531167,-1.559911 1.1142217,-1.938746 L 18.098507,6.5463469 13.990743,13.66251 C 13.619336,14.390469 12.869093,14.888154 12,14.888154 m 0,-9.6565888 c 1.344494,0 2.599851,0.3714073 3.691789,0.9805151 L 14.131878,7.110886 C 13.485629,6.858329 12.742815,6.7171943 12,6.7171943 A 5.9425165,5.9425165 0 0 0 6.0574835,12.659711 c 0,1.64162 0.661105,3.127249 1.7381861,4.196902 h 0.00743 c 0.2896977,0.289697 0.2896977,0.757671 0,1.047369 -0.2896977,0.289697 -0.7650991,0.289697 -1.0547967,0.0075 v 0 C 5.4038067,16.566915 4.5718544,14.709879 4.5718544,12.659711 A 7.4281456,7.4281456 0 0 1 12,5.2315652 m 7.428145,7.4281458 c 0,2.050168 -0.831952,3.907204 -2.176446,5.251699 v 0 c -0.289698,0.282269 -0.757671,0.282269 -1.047369,-0.0075 -0.289697,-0.289698 -0.289697,-0.757671 0,-1.047368 v 0 c 1.077082,-1.077082 1.738186,-2.555282 1.738186,-4.196902 0,-0.742815 -0.141134,-1.48563 -0.401119,-2.154163 l 0.898805,-1.5599106 c 0.616537,1.1142216 0.987943,2.3621496 0.987943,3.7140736 z" />
-</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml b/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml
new file mode 100644
index 000000000..456aeba71
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FF757575" android:pathData="M 12,15.976673 A 2.9838134,2.9838134 0 0 1 9.0161867,12.992861 c 0,-1.113957 0.6067085,-2.08867 1.4919063,-2.595918 L 20.165701,4.8072659 14.66554,14.335576 C 14.168238,15.310289 13.163688,15.976673 12,15.976673 M 12,3.0468162 c 1.800234,0 3.481116,0.4973021 4.943185,1.3128776 l -2.08867,1.2034715 C 13.989209,5.2249998 12.994606,5.036025 12,5.036025 a 7.9568354,7.9568354 0 0 0 -7.9568354,7.956836 c 0,2.198075 0.885198,4.187283 2.3273743,5.619514 h 0.00995 c 0.3878957,0.387896 0.3878957,1.014497 0,1.402393 -0.3878958,0.387895 -1.0244427,0.387895 -1.4123384,0.01 v 0 C 3.1679127,18.224479 2.0539558,15.737969 2.0539558,12.992861 A 9.9460442,9.9460442 0 0 1 12,3.0468162 m 9.946045,9.9460448 c 0,2.745108 -1.113958,5.231618 -2.914192,7.031853 v 0 c -0.387896,0.377949 -1.014497,0.377949 -1.402392,-0.01 -0.387896,-0.387897 -0.387896,-1.014497 0,-1.402392 v 0 c 1.442176,-1.442178 2.327374,-3.421439 2.327374,-5.619515 0,-0.994605 -0.188974,-1.989209 -0.537086,-2.884354 L 20.62322,8.0197843 c 0.825522,1.4919063 1.322825,3.1628417 1.322825,4.9730227 z" />
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml b/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml
new file mode 100644
index 000000000..de7ca9d78
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FF757575" android:pathData="M 12,14.888154 A 2.2284437,2.2284437 0 0 1 9.7715563,12.659711 c 0,-0.831952 0.4531167,-1.559911 1.1142217,-1.938746 L 18.098507,6.5463469 13.990743,13.66251 C 13.619336,14.390469 12.869093,14.888154 12,14.888154 m 0,-9.6565888 c 1.344494,0 2.599851,0.3714073 3.691789,0.9805151 L 14.131878,7.110886 C 13.485629,6.858329 12.742815,6.7171943 12,6.7171943 A 5.9425165,5.9425165 0 0 0 6.0574835,12.659711 c 0,1.64162 0.661105,3.127249 1.7381861,4.196902 h 0.00743 c 0.2896977,0.289697 0.2896977,0.757671 0,1.047369 -0.2896977,0.289697 -0.7650991,0.289697 -1.0547967,0.0075 v 0 C 5.4038067,16.566915 4.5718544,14.709879 4.5718544,12.659711 A 7.4281456,7.4281456 0 0 1 12,5.2315652 m 7.428145,7.4281458 c 0,2.050168 -0.831952,3.907204 -2.176446,5.251699 v 0 c -0.289698,0.282269 -0.757671,0.282269 -1.047369,-0.0075 -0.289697,-0.289698 -0.289697,-0.757671 0,-1.047368 v 0 c 1.077082,-1.077082 1.738186,-2.555282 1.738186,-4.196902 0,-0.742815 -0.141134,-1.48563 -0.401119,-2.154163 l 0.898805,-1.5599106 c 0.616537,1.1142216 0.987943,2.3621496 0.987943,3.7140736 z" />
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_white.xml b/core/src/main/res/drawable/ic_playback_speed_white.xml
deleted file mode 100644
index cc6af0d55..000000000
--- a/core/src/main/res/drawable/ic_playback_speed_white.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#ffffffff" android:pathData="M 12,14.888154 A 2.2284437,2.2284437 0 0 1 9.7715563,12.659711 c 0,-0.831952 0.4531167,-1.559911 1.1142217,-1.938746 L 18.098507,6.5463469 13.990743,13.66251 C 13.619336,14.390469 12.869093,14.888154 12,14.888154 m 0,-9.6565888 c 1.344494,0 2.599851,0.3714073 3.691789,0.9805151 L 14.131878,7.110886 C 13.485629,6.858329 12.742815,6.7171943 12,6.7171943 A 5.9425165,5.9425165 0 0 0 6.0574835,12.659711 c 0,1.64162 0.661105,3.127249 1.7381861,4.196902 h 0.00743 c 0.2896977,0.289697 0.2896977,0.757671 0,1.047369 -0.2896977,0.289697 -0.7650991,0.289697 -1.0547967,0.0075 v 0 C 5.4038067,16.566915 4.5718544,14.709879 4.5718544,12.659711 A 7.4281456,7.4281456 0 0 1 12,5.2315652 m 7.428145,7.4281458 c 0,2.050168 -0.831952,3.907204 -2.176446,5.251699 v 0 c -0.289698,0.282269 -0.757671,0.282269 -1.047369,-0.0075 -0.289697,-0.289698 -0.289697,-0.757671 0,-1.047368 v 0 c 1.077082,-1.077082 1.738186,-2.555282 1.738186,-4.196902 0,-0.742815 -0.141134,-1.48563 -0.401119,-2.154163 l 0.898805,-1.5599106 c 0.616537,1.1142216 0.987943,2.3621496 0.987943,3.7140736 z" />
-</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_white_24dp.xml b/core/src/main/res/drawable/ic_playback_speed_white_24dp.xml
new file mode 100644
index 000000000..183bb595a
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playback_speed_white_24dp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#ffffffff" android:pathData="M 12,15.976673 A 2.9838134,2.9838134 0 0 1 9.0161867,12.992861 c 0,-1.113957 0.6067085,-2.08867 1.4919063,-2.595918 L 20.165701,4.8072659 14.66554,14.335576 C 14.168238,15.310289 13.163688,15.976673 12,15.976673 M 12,3.0468162 c 1.800234,0 3.481116,0.4973021 4.943185,1.3128776 l -2.08867,1.2034715 C 13.989209,5.2249998 12.994606,5.036025 12,5.036025 a 7.9568354,7.9568354 0 0 0 -7.9568354,7.956836 c 0,2.198075 0.885198,4.187283 2.3273743,5.619514 h 0.00995 c 0.3878957,0.387896 0.3878957,1.014497 0,1.402393 -0.3878958,0.387895 -1.0244427,0.387895 -1.4123384,0.01 v 0 C 3.1679127,18.224479 2.0539558,15.737969 2.0539558,12.992861 A 9.9460442,9.9460442 0 0 1 12,3.0468162 m 9.946045,9.9460448 c 0,2.745108 -1.113958,5.231618 -2.914192,7.031853 v 0 c -0.387896,0.377949 -1.014497,0.377949 -1.402392,-0.01 -0.387896,-0.387897 -0.387896,-1.014497 0,-1.402392 v 0 c 1.442176,-1.442178 2.327374,-3.421439 2.327374,-5.619515 0,-0.994605 -0.188974,-1.989209 -0.537086,-2.884354 L 20.62322,8.0197843 c 0.825522,1.4919063 1.322825,3.1628417 1.322825,4.9730227 z" />
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml b/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml
new file mode 100644
index 000000000..cc6af0d55
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#ffffffff" android:pathData="M 12,14.888154 A 2.2284437,2.2284437 0 0 1 9.7715563,12.659711 c 0,-0.831952 0.4531167,-1.559911 1.1142217,-1.938746 L 18.098507,6.5463469 13.990743,13.66251 C 13.619336,14.390469 12.869093,14.888154 12,14.888154 m 0,-9.6565888 c 1.344494,0 2.599851,0.3714073 3.691789,0.9805151 L 14.131878,7.110886 C 13.485629,6.858329 12.742815,6.7171943 12,6.7171943 A 5.9425165,5.9425165 0 0 0 6.0574835,12.659711 c 0,1.64162 0.661105,3.127249 1.7381861,4.196902 h 0.00743 c 0.2896977,0.289697 0.2896977,0.757671 0,1.047369 -0.2896977,0.289697 -0.7650991,0.289697 -1.0547967,0.0075 v 0 C 5.4038067,16.566915 4.5718544,14.709879 4.5718544,12.659711 A 7.4281456,7.4281456 0 0 1 12,5.2315652 m 7.428145,7.4281458 c 0,2.050168 -0.831952,3.907204 -2.176446,5.251699 v 0 c -0.289698,0.282269 -0.757671,0.282269 -1.047369,-0.0075 -0.289697,-0.289698 -0.289697,-0.757671 0,-1.047368 v 0 c 1.077082,-1.077082 1.738186,-2.555282 1.738186,-4.196902 0,-0.742815 -0.141134,-1.48563 -0.401119,-2.154163 l 0.898805,-1.5599106 c 0.616537,1.1142216 0.987943,2.3621496 0.987943,3.7140736 z" />
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 7745c2bd3..fe571539a 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -64,6 +64,7 @@
     <attr name="master_switch_background" format="color"/>
     <attr name="currently_playing_background" format="color"/>
     <attr name="ic_bookmark" format="reference"/>
+    <attr name="ic_settings_speed" format="reference" />
 
     <!-- Used in itemdescription -->
     <attr name="non_transparent_background" format="reference"/>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 7fd074a5e..a638917f4 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -23,7 +23,8 @@
         <item name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
         <item name="av_pause">@drawable/ic_pause_grey600_24dp</item>
         <item name="av_play">@drawable/ic_play_arrow_grey600_24dp</item>
-        <item name="av_speed">@drawable/ic_playback_speed_dark</item>
+        <item name="av_speed">@drawable/ic_playback_speed_dark_48dp</item>
+        <item name="ic_settings_speed">@drawable/ic_playback_speed_dark_24dp</item>
         <item name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
         <item name="content_discard">@drawable/ic_delete_grey600_24dp</item>
         <item name="content_new">@drawable/ic_add_grey600_24dp</item>
@@ -110,7 +111,8 @@
         <item name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
         <item name="av_pause">@drawable/ic_pause_white_24dp</item>
         <item name="av_play">@drawable/ic_play_arrow_white_24dp</item>
-        <item name="av_speed">@drawable/ic_playback_speed_white</item>
+        <item name="av_speed">@drawable/ic_playback_speed_white_48dp</item>
+        <item name="ic_settings_speed">@drawable/ic_playback_speed_white_24dp</item>
         <item name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
         <item name="content_discard">@drawable/ic_delete_white_24dp</item>
         <item name="content_new">@drawable/ic_add_white_24dp</item>
-- 
cgit v1.2.3