From bf78cbb63e1faa2707d13b217dd0d2c2bf9ffcf8 Mon Sep 17 00:00:00 2001
From: polymorphicshade <polymorphicshade@gmail.com>
Date: Wed, 19 Aug 2020 09:36:23 -0600
Subject: [PATCH] SponsorBlock: Improved enable/disable icons

Re-did the enable/disable icons to be cleaner and their behavior more understandable (w/ toast). Made icons more consistent with others (black, white, actually 24dp).
---
 .../newpipe/player/VideoPlayerImpl.java       | 12 ++++++++++--
 .../ic_sponsor_block_disable_black_24dp.xml   | 18 ++++++++++++++++++
 .../ic_sponsor_block_disable_white_24dp.xml   | 19 +++++++++++++++++++
 .../ic_sponsor_block_enable_black_24dp.xml    | 12 ++++++++++++
 .../ic_sponsor_block_enable_white_24dp.xml    | 13 +++++++++++++
 .../ic_sponsorblock_disable_white_24dp.xml    |  6 ------
 .../ic_sponsorblock_enable_white_24dp.xml     |  6 ------
 app/src/main/res/layout/player.xml            |  2 +-
 app/src/main/res/values/attrs.xml             |  2 ++
 app/src/main/res/values/styles.xml            |  4 ++++
 10 files changed, 79 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_sponsor_block_disable_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_sponsor_block_disable_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_sponsor_block_enable_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_sponsor_block_enable_white_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_sponsorblock_disable_white_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_sponsorblock_enable_white_24dp.xml

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index baaba15fe..b833c7788 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -56,6 +56,8 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -646,6 +648,12 @@ public class VideoPlayerImpl extends VideoPlayer
     public void onBlockingSponsorsButtonClicked() {
         super.onBlockingSponsorsButtonClicked();
         setBlockSponsorsButton(blockSponsorsButton, isBlockingSponsors());
+
+        Toast.makeText(context,
+                isBlockingSponsors()
+                        ? "SponsorBlock enabled"
+                        : "SponsorBlock disabled",
+                Toast.LENGTH_SHORT).show();
     }
 
     @Override
@@ -1591,8 +1599,8 @@ public class VideoPlayerImpl extends VideoPlayer
     protected void setBlockSponsorsButton(final ImageButton button,
                                           final boolean isBlockingSponsors) {
         button.setImageDrawable(AppCompatResources.getDrawable(service, isBlockingSponsors
-                ? R.drawable.ic_sponsorblock_disable_white_24dp
-                : R.drawable.ic_sponsorblock_enable_white_24dp));
+                ? R.drawable.ic_sponsor_block_enable_white_24dp
+                : R.drawable.ic_sponsor_block_disable_white_24dp));
     }
 
     /**
diff --git a/app/src/main/res/drawable/ic_sponsor_block_disable_black_24dp.xml b/app/src/main/res/drawable/ic_sponsor_block_disable_black_24dp.xml
new file mode 100644
index 000000000..dcadfeb66
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sponsor_block_disable_black_24dp.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,24c-0.5,0 -1,-0.1 -1.4,-0.4C4.1,19.6 0.1,12.7 0,5.1c0,-1 0.5,-2 1.4,-2.5C8,-0.9 16,-0.9 22.6,2.7C23.5,3.1 24,4.1 24,5.1c-0.1,7.6 -4.1,14.5 -10.5,18.5C13,23.9 12.5,24 12,24zM12,0.8c-3.5,0 -7,0.9 -10.2,2.6c-0.6,0.3 -1,1 -1,1.7C0.9,12.4 4.7,19 11,22.9c0.6,0.4 1.4,0.4 2,0c6.3,-3.8 10,-10.5 10.2,-17.8c0,-0.7 -0.4,-1.4 -1,-1.7C19,1.7 15.5,0.8 12,0.8z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M21.7,4.2C15.6,1 8.4,1 2.3,4.2C2,4.4 1.8,4.7 1.8,5.1c0.1,7.2 3.9,13.4 9.7,17c0.3,0.2 0.7,0.2 1,0c5.7,-3.5 9.6,-9.8 9.7,-17C22.2,4.7 22,4.4 21.7,4.2zM12,16.3c-3.1,0 -5.5,-2.5 -5.5,-5.5c0,-3 2.5,-5.5 5.5,-5.5s5.5,2.5 5.5,5.5C17.5,13.9 15.1,16.3 12,16.3z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.5,13.6c0.6,-0.8 1,-1.7 1,-2.8c0,-2.5 -2,-4.5 -4.5,-4.5c-1,0 -2,0.4 -2.8,1L15.5,13.6z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M8.5,8.1c-0.6,0.8 -1,1.7 -1,2.8c0,2.5 2,4.5 4.5,4.5c1,0 2,-0.4 2.8,-1L8.5,8.1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sponsor_block_disable_white_24dp.xml b/app/src/main/res/drawable/ic_sponsor_block_disable_white_24dp.xml
new file mode 100644
index 000000000..6cc8cd3b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sponsor_block_disable_white_24dp.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,24c-0.5,0 -1,-0.1 -1.4,-0.4C4.1,19.6 0.1,12.7 0,5.1c0,-1 0.5,-2 1.4,-2.5C8,-0.9 16,-0.9 22.6,2.7C23.5,3.1 24,4.1 24,5.1c-0.1,7.6 -4.1,14.5 -10.5,18.5C13,23.9 12.5,24 12,24zM12,0.8c-3.5,0 -7,0.9 -10.2,2.6c-0.6,0.3 -1,1 -1,1.7C0.9,12.4 4.7,19 11,22.9c0.6,0.4 1.4,0.4 2,0c6.3,-3.8 10,-10.5 10.2,-17.8c0,-0.7 -0.4,-1.4 -1,-1.7C19,1.7 15.5,0.8 12,0.8z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M21.7,4.2C15.6,1 8.4,1 2.3,4.2C2,4.4 1.8,4.7 1.8,5.1c0.1,7.2 3.9,13.4 9.7,17c0.3,0.2 0.7,0.2 1,0c5.7,-3.5 9.6,-9.8 9.7,-17C22.2,4.7 22,4.4 21.7,4.2zM12,16.3c-3.1,0 -5.5,-2.5 -5.5,-5.5c0,-3 2.5,-5.5 5.5,-5.5s5.5,2.5 5.5,5.5C17.5,13.9 15.1,16.3 12,16.3z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.5,13.6c0.6,-0.8 1,-1.7 1,-2.8c0,-2.5 -2,-4.5 -4.5,-4.5c-1,0 -2,0.4 -2.8,1L15.5,13.6z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M8.5,8.1c-0.6,0.8 -1,1.7 -1,2.8c0,2.5 2,4.5 4.5,4.5c1,0 2,-0.4 2.8,-1L8.5,8.1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sponsor_block_enable_black_24dp.xml b/app/src/main/res/drawable/ic_sponsor_block_enable_black_24dp.xml
new file mode 100644
index 000000000..f5abd06ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sponsor_block_enable_black_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,24c-0.5,0 -1,-0.1 -1.4,-0.4C4.1,19.6 0.1,12.7 0,5.1c0,-1 0.5,-2 1.4,-2.5C8,-0.9 16,-0.9 22.6,2.7C23.5,3.1 24,4.1 24,5.1c-0.1,7.6 -4.1,14.5 -10.5,18.5C13,23.9 12.5,24 12,24zM12,0.8c-3.5,0 -7,0.9 -10.2,2.6c-0.6,0.3 -1,1 -1,1.7C0.9,12.4 4.7,19 11,22.9c0.6,0.4 1.4,0.4 2,0c6.3,-3.8 10,-10.5 10.2,-17.8c0,-0.7 -0.4,-1.4 -1,-1.7C19,1.7 15.5,0.8 12,0.8z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M21.7,4.2C15.6,1 8.4,1 2.3,4.2C2,4.4 1.8,4.7 1.8,5.1c0.1,7.2 3.9,13.4 9.7,17c0.3,0.2 0.7,0.2 1,0c5.7,-3.5 9.6,-9.8 9.7,-17C22.2,4.7 22,4.4 21.7,4.2zM9.4,15.5V6.2l8.1,4.7L9.4,15.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sponsor_block_enable_white_24dp.xml b/app/src/main/res/drawable/ic_sponsor_block_enable_white_24dp.xml
new file mode 100644
index 000000000..2bda0ba7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sponsor_block_enable_white_24dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,24c-0.5,0 -1,-0.1 -1.4,-0.4C4.1,19.6 0.1,12.7 0,5.1c0,-1 0.5,-2 1.4,-2.5C8,-0.9 16,-0.9 22.6,2.7C23.5,3.1 24,4.1 24,5.1c-0.1,7.6 -4.1,14.5 -10.5,18.5C13,23.9 12.5,24 12,24zM12,0.8c-3.5,0 -7,0.9 -10.2,2.6c-0.6,0.3 -1,1 -1,1.7C0.9,12.4 4.7,19 11,22.9c0.6,0.4 1.4,0.4 2,0c6.3,-3.8 10,-10.5 10.2,-17.8c0,-0.7 -0.4,-1.4 -1,-1.7C19,1.7 15.5,0.8 12,0.8z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M21.7,4.2C15.6,1 8.4,1 2.3,4.2C2,4.4 1.8,4.7 1.8,5.1c0.1,7.2 3.9,13.4 9.7,17c0.3,0.2 0.7,0.2 1,0c5.7,-3.5 9.6,-9.8 9.7,-17C22.2,4.7 22,4.4 21.7,4.2zM9.4,15.5V6.2l8.1,4.7L9.4,15.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sponsorblock_disable_white_24dp.xml b/app/src/main/res/drawable/ic_sponsorblock_disable_white_24dp.xml
deleted file mode 100644
index 2d7730aaa..000000000
--- a/app/src/main/res/drawable/ic_sponsorblock_disable_white_24dp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24.000002dp" android:viewportHeight="25.4"
-    android:viewportWidth="25.399998" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="#FFFFFF">
-    <path android:fillColor="#FF000000"
-        android:pathData="m12.6741,25.3999c-0.3464,-0.003 -0.8168,-0.0818 -1.0681,-0.1797 -0.247,-0.0963 -0.8051,-0.4122 -1.2402,-0.702 -0.4351,-0.2898 -1.2154,-0.8642 -1.7338,-1.2765 -0.5184,-0.4123 -1.347,-1.1507 -1.8413,-1.641 -0.4943,-0.4903 -1.2355,-1.3141 -1.6471,-1.8306 -0.4116,-0.5165 -0.9718,-1.2727 -1.2449,-1.6805 -0.273,-0.4078 -0.738,-1.1862 -1.0332,-1.7299 -0.2952,-0.5437 -0.7071,-1.3615 -0.9153,-1.8174 -0.2082,-0.4559 -0.5534,-1.35 -0.7672,-1.987 -0.2138,-0.637 -0.4984,-1.6429 -0.6326,-2.2355 -0.1341,-0.5925 -0.3129,-1.6023 -0.3972,-2.2439 -0.0843,-0.6416 -0.1533,-1.6457 -0.1533,-2.2312 0,-0.7096 0.0521,-1.2171 0.1563,-1.5216 0.086,-0.2513 0.3384,-0.6631 0.561,-0.915 0.3208,-0.3631 0.6742,-0.5885 1.7041,-1.087 0.7146,-0.3459 1.8879,-0.8288 2.6073,-1.0731 0.7194,-0.2443 1.8133,-0.5566 2.4309,-0.6941 0.6176,-0.1374 1.6498,-0.3183 2.2938,-0.4019 0.6749,-0.0876 1.9231,-0.1519 2.9467,-0.1519 1.0236,0 2.2718,0.0644 2.9467,0.1519 0.644,0.0836 1.6762,0.2644 2.2938,0.4019 0.6176,0.1374 1.7115,0.4498 2.4309,0.6941 0.7194,0.2443 1.8927,0.7272 2.6073,1.0731 1.0299,0.4985 1.3833,0.724 1.7041,1.087 0.2226,0.2519 0.475,0.6637 0.561,0.915 0.1007,0.2943 0.1563,0.8039 0.1563,1.4317 0,0.5361 -0.047,1.4067 -0.1045,1.9347 -0.0575,0.5279 -0.2179,1.5159 -0.3564,2.1955 -0.1385,0.6796 -0.4495,1.8362 -0.6912,2.5701 -0.2416,0.734 -0.7906,2.0462 -1.2199,2.9161 -0.4293,0.8699 -1.0589,2.0042 -1.399,2.5207 -0.3401,0.5165 -0.8674,1.2505 -1.1718,1.631 -0.3044,0.3806 -0.8683,1.0428 -1.2532,1.4715 -0.3849,0.4288 -1.1834,1.1943 -1.7746,1.7012 -0.5911,0.5069 -1.5467,1.2416 -2.1235,1.6328 -0.5768,0.3911 -1.2656,0.7933 -1.5307,0.8937 -0.2899,0.1097 -0.7289,0.1806 -1.1011,0.1779zM12.8984,24.4482c0.1364,-0.0267 0.3679,-0.086 0.5143,-0.1318 0.1465,-0.0458 0.6053,-0.3112 1.0197,-0.5898 0.4144,-0.2786 1.1875,-0.8544 1.7181,-1.2797 0.5306,-0.4252 1.4176,-1.2418 1.9712,-1.8145 0.5536,-0.5727 1.3238,-1.4503 1.7116,-1.9502 0.3878,-0.4999 0.9471,-1.2988 1.243,-1.7754 0.2959,-0.4766 0.7586,-1.3062 1.0282,-1.8436 0.2696,-0.5374 0.6527,-1.3887 0.8513,-1.8917 0.1987,-0.5031 0.4963,-1.3927 0.6614,-1.977 0.1651,-0.5843 0.388,-1.5517 0.4952,-2.1497 0.1073,-0.598 0.236,-1.6697 0.2861,-2.3814 0.0593,-0.8428 0.0563,-1.4566 -0.009,-1.7601 -0.0679,-0.3174 -0.2183,-0.5901 -0.4714,-0.8552 -0.2505,-0.2624 -0.7495,-0.5681 -1.5313,-0.9384 -0.6378,-0.302 -1.7501,-0.7457 -2.4717,-0.9858 -0.7216,-0.2401 -1.8255,-0.5456 -2.4531,-0.6788 -0.6276,-0.1332 -1.5652,-0.2982 -2.0836,-0.3665 -0.5184,-0.0684 -1.7463,-0.123 -2.7285,-0.1214 -1.1164,0.002 -2.2159,0.0641 -2.9327,0.1662 -0.6308,0.0898 -1.68,0.2935 -2.3316,0.4527 -0.6517,0.1591 -1.6536,0.452 -2.2266,0.6509 -0.573,0.1989 -1.5382,0.5962 -2.1449,0.883 -0.6998,0.3308 -1.2472,0.665 -1.4973,0.9142 -0.2603,0.2594 -0.4328,0.5453 -0.5077,0.8418 -0.0824,0.326 -0.0863,0.8108 -0.0144,1.7703 0.0545,0.7267 0.1865,1.8106 0.2933,2.4087 0.1068,0.598 0.3293,1.5654 0.4944,2.1497 0.1651,0.5843 0.4621,1.474 0.6601,1.977 0.1979,0.5031 0.627,1.4396 0.9534,2.0812 0.3264,0.6416 0.8487,1.5535 1.1606,2.0264 0.3119,0.4729 0.927,1.3047 1.3669,1.8484 0.4399,0.5437 1.2404,1.4133 1.7789,1.9324 0.5385,0.5191 1.3331,1.2238 1.7659,1.5659 0.4327,0.3421 1.1248,0.8497 1.5379,1.128 0.4131,0.2783 0.952,0.5593 1.1976,0.6245 0.2456,0.0652 0.5581,0.0966 0.6945,0.0699zM12.6727,23.5264c-0.2467,0 -0.5642,-0.15 -1.1636,-0.5497 -0.4534,-0.3024 -1.0965,-0.7573 -1.429,-1.011 -0.3326,-0.2537 -1.0244,-0.8626 -1.5373,-1.3531 -0.513,-0.4906 -1.2693,-1.2923 -1.6807,-1.7816 -0.4114,-0.4893 -1.0537,-1.3567 -1.4273,-1.9276 -0.3736,-0.5709 -0.9009,-1.4678 -1.1718,-1.9932 -0.2709,-0.5254 -0.6898,-1.4595 -0.9307,-2.0759 -0.241,-0.6163 -0.5527,-1.5432 -0.6927,-2.0597 -0.14,-0.5165 -0.3456,-1.4714 -0.4568,-2.122 -0.1113,-0.6506 -0.23,-1.6971 -0.264,-2.3255 -0.0517,-0.9582 -0.0349,-1.1942 0.1044,-1.4625 0.1341,-0.2583 0.3803,-0.4224 1.2791,-0.8526 0.6122,-0.293 1.5784,-0.694 2.1471,-0.8911 0.5687,-0.1971 1.4636,-0.4668 1.9886,-0.5994 0.525,-0.1326 1.3992,-0.3181 1.9425,-0.4123 0.7478,-0.1296 1.5546,-0.1712 3.3196,-0.1712 1.765,0 2.5717,0.0416 3.3196,0.1712 0.5434,0.0942 1.4175,0.2797 1.9425,0.4123 0.525,0.1326 1.4199,0.4023 1.9886,0.5994 0.5687,0.1971 1.5349,0.598 2.1471,0.8911 0.8988,0.4302 1.145,0.5943 1.2791,0.8526 0.1392,0.2681 0.1561,0.5042 0.1045,1.4592 -0.0338,0.6266 -0.1563,1.6954 -0.2721,2.375 -0.1158,0.6796 -0.3604,1.7496 -0.5436,2.3777 -0.1831,0.6281 -0.5375,1.6284 -0.7875,2.2228 -0.25,0.5944 -0.6584,1.4595 -0.9076,1.9223 -0.2492,0.4628 -0.7451,1.2813 -1.102,1.8187 -0.3569,0.5374 -0.9706,1.3604 -1.3639,1.8287 -0.3932,0.4684 -1.138,1.2575 -1.6552,1.7536 -0.5171,0.4961 -1.3833,1.2305 -1.9248,1.632 -0.5415,0.4015 -1.1935,0.8518 -1.4488,1.0008 -0.2609,0.1523 -0.6127,0.2709 -0.8034,0.2709zM8.8778,18.485c0.0547,0 0.9366,-0.8331 1.9596,-1.8512l1.8601,-1.8513 1.8675,1.8513c1.0271,1.0182 1.9101,1.8512 1.9621,1.8512 0.052,0 0.7409,-0.6451 1.5308,-1.4335l1.4363,-1.4335 -1.9085,-1.9033 -1.9085,-1.9033 1.9089,-1.9018 1.9088,-1.9018 -1.4366,-1.4338c-0.7901,-0.7886 -1.4642,-1.4338 -1.4981,-1.4338 -0.0338,0 -0.9195,0.8303 -1.9682,1.8452l-1.9067,1.8451 -1.854,-1.8451c-1.0197,-1.0148 -1.8987,-1.8452 -1.9535,-1.8452 -0.0547,0 -0.746,0.6452 -1.5361,1.4338l-1.4366,1.4338 1.9089,1.9018 1.9088,1.9018 -1.9085,1.9033 -1.9085,1.9033 1.4363,1.4335c0.7899,0.7884 1.4811,1.4335 1.5358,1.4335z" android:strokeWidth="0.0990344"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_sponsorblock_enable_white_24dp.xml b/app/src/main/res/drawable/ic_sponsorblock_enable_white_24dp.xml
deleted file mode 100644
index 58448ed0c..000000000
--- a/app/src/main/res/drawable/ic_sponsorblock_enable_white_24dp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="25.400005"
-    android:viewportWidth="25.399996" android:width="23.999992dp" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="#FFFFFF">
-    <path android:fillColor="#FF000000"
-        android:pathData="m12.638,25.3999c-0.2786,-0.002 -0.6752,-0.0642 -0.8813,-0.1374 -0.2061,-0.0733 -0.6241,-0.283 -0.929,-0.4662 -0.3048,-0.1832 -1.0124,-0.675 -1.5724,-1.0929 -0.56,-0.4179 -1.4781,-1.1951 -2.0401,-1.727 -0.562,-0.532 -1.3809,-1.3936 -1.8197,-1.9146 -0.4388,-0.5211 -1.1538,-1.481 -1.5889,-2.1332 -0.4351,-0.6522 -1.0762,-1.7665 -1.4246,-2.4763 -0.3484,-0.7098 -0.7962,-1.7298 -0.9951,-2.2668 -0.1989,-0.537 -0.5112,-1.5622 -0.6941,-2.2782 -0.1829,-0.716 -0.411,-1.8368 -0.5071,-2.4905 -0.096,-0.6538 -0.179,-1.7904 -0.1843,-2.5258 -0.0085,-1.1718 0.0167,-1.3942 0.2041,-1.7977 0.1176,-0.2533 0.3864,-0.6322 0.5973,-0.8419 0.23,-0.2288 0.8413,-0.6047 1.5275,-0.9394 0.6292,-0.3068 1.5882,-0.7227 2.131,-0.9241 0.5428,-0.2014 1.4831,-0.4958 2.0896,-0.6542 0.6065,-0.1584 1.6624,-0.3876 2.3465,-0.5093 1.0646,-0.1895 1.6024,-0.2218 3.7315,-0.2242 1.9471,-0.002 2.7255,0.0363 3.5822,0.1772 0.602,0.0991 1.5611,0.2926 2.1314,0.4302 0.5702,0.1376 1.4798,0.4036 2.0213,0.5912 0.5415,0.1876 1.4533,0.5455 2.0264,0.7953 0.573,0.2498 1.3096,0.6265 1.6369,0.8371 0.3766,0.2423 0.7051,0.5555 0.8947,0.8531 0.1648,0.2586 0.3489,0.6492 0.4091,0.868 0.0701,0.2546 0.0877,0.879 0.0488,1.7349 -0.0334,0.7355 -0.1492,1.8721 -0.2574,2.5259 -0.1081,0.6537 -0.3076,1.6121 -0.4432,2.1296 -0.1356,0.5175 -0.409,1.409 -0.6075,1.9811 -0.1985,0.572 -0.666,1.6641 -1.039,2.4268 -0.373,0.7627 -1.0337,1.9218 -1.4683,2.5757 -0.4346,0.654 -1.1287,1.59 -1.5425,2.0801 -0.4138,0.4901 -1.1942,1.3167 -1.7342,1.8369 -0.54,0.5202 -1.3253,1.217 -1.7449,1.5485 -0.4197,0.3315 -1.1552,0.8598 -1.6346,1.174 -0.4793,0.3142 -1.0722,0.6314 -1.3175,0.7049 -0.2453,0.0735 -0.6739,0.1317 -0.9526,0.1293zM12.8415,24.3793c0.3751,-0.0216 0.6532,-0.1186 1.0448,-0.3643 0.2935,-0.1842 0.9367,-0.6314 1.4293,-0.9938 0.4926,-0.3624 1.2872,-1.0029 1.7659,-1.4233 0.4787,-0.4204 1.3008,-1.2626 1.8269,-1.8715 0.5261,-0.6089 1.3111,-1.6347 1.7444,-2.2796 0.4333,-0.6449 1.0927,-1.7857 1.4651,-2.5352 0.3725,-0.7495 0.884,-1.9826 1.1368,-2.7401 0.2527,-0.7575 0.5712,-1.9345 0.7076,-2.6155 0.1365,-0.681 0.2953,-1.671 0.353,-2.2 0.0577,-0.529 0.1039,-1.2868 0.1027,-1.6839 -0.001,-0.4851 -0.0621,-0.8534 -0.1849,-1.1223 -0.1005,-0.2202 -0.33,-0.5238 -0.5102,-0.6746 -0.1801,-0.1509 -0.5918,-0.4071 -0.9149,-0.5695 -0.3231,-0.1623 -1.0664,-0.4904 -1.6519,-0.7289 -0.5855,-0.2385 -1.5347,-0.5727 -2.1093,-0.7426 -0.5746,-0.1699 -1.6493,-0.4231 -2.3881,-0.5626 -1.0355,-0.1955 -1.7886,-0.2657 -3.2863,-0.3064 -1.2105,-0.0328 -2.3359,-0.008 -2.9852,0.0649 -0.5732,0.0647 -1.5894,0.2265 -2.2581,0.3597 -0.6687,0.1331 -1.7434,0.4145 -2.3882,0.6253 -0.6447,0.2108 -1.7388,0.6374 -2.4313,0.948 -0.6925,0.3106 -1.439,0.7181 -1.6589,0.9055 -0.2344,0.1998 -0.471,0.5261 -0.5717,0.7886 -0.1441,0.3756 -0.1611,0.6372 -0.1052,1.6212 0.0366,0.6453 0.1538,1.7025 0.2603,2.3493 0.1065,0.6468 0.3509,1.7453 0.5431,2.4412 0.1921,0.6959 0.5769,1.816 0.855,2.4893 0.2781,0.6733 0.776,1.7086 1.1065,2.3007 0.3305,0.5921 0.8504,1.4332 1.1553,1.869 0.3049,0.4358 0.815,1.1115 1.1334,1.5014 0.3184,0.39 0.9937,1.1218 1.5005,1.6264 0.5068,0.5045 1.3245,1.2375 1.8171,1.6288 0.4925,0.3913 1.2314,0.934 1.6418,1.2061 0.4105,0.2721 0.8806,0.5451 1.0448,0.6066 0.1642,0.0615 0.5285,0.0985 0.8096,0.0823zM12.7958,23.4902c-0.2922,0.0369 -0.4808,-0.0234 -0.9362,-0.2992 -0.3137,-0.19 -1.0072,-0.6723 -1.5411,-1.0718 -0.5339,-0.3995 -1.4454,-1.1944 -2.0255,-1.7665 -0.58,-0.5721 -1.3384,-1.3967 -1.6853,-1.8326 -0.3469,-0.4358 -0.932,-1.2515 -1.3002,-1.8125 -0.3682,-0.561 -0.9155,-1.5194 -1.2162,-2.1296 -0.3007,-0.6102 -0.7107,-1.5492 -0.9111,-2.0866 -0.2004,-0.5374 -0.494,-1.4957 -0.6524,-2.1296 -0.1584,-0.6339 -0.3563,-1.6206 -0.4397,-2.1927 -0.0834,-0.572 -0.1638,-1.5374 -0.1787,-2.1452 -0.0257,-1.0484 -0.0149,-1.1182 0.2116,-1.3593 0.1313,-0.1398 0.6463,-0.4507 1.1443,-0.6909 0.4981,-0.2402 1.3434,-0.5991 1.8785,-0.7977 0.5351,-0.1986 1.3823,-0.4701 1.8825,-0.6033 0.5003,-0.1333 1.473,-0.3417 2.1615,-0.4631 1.037,-0.1829 1.6277,-0.2213 3.441,-0.224 1.6543,-0.002 2.4565,0.0406 3.2837,0.1759 0.602,0.0985 1.5235,0.2861 2.0477,0.4168 0.5242,0.1308 1.4197,0.3989 1.9901,0.5958 0.5704,0.197 1.5334,0.5987 2.1401,0.8928 0.8994,0.4359 1.1369,0.5972 1.2865,0.8736 0.171,0.3162 0.1754,0.438 0.064,1.809 -0.0657,0.8085 -0.2324,2.0272 -0.3706,2.7082 -0.1382,0.681 -0.4471,1.8232 -0.6864,2.5383 -0.2393,0.7151 -0.6546,1.7625 -0.9229,2.3277 -0.2683,0.5652 -0.7472,1.4509 -1.0642,1.9681 -0.3171,0.5173 -0.88,1.3419 -1.2509,1.8325 -0.371,0.4906 -1.0432,1.2838 -1.4939,1.7626 -0.4507,0.4788 -1.2475,1.2263 -1.7706,1.6609 -0.5232,0.4347 -1.3491,1.0617 -1.8355,1.3932 -0.561,0.3825 -1.018,0.6198 -1.2502,0.6491zM9.9443,16.2914c0.0285,0 1.9203,-1.0732 4.2041,-2.385 2.2838,-1.3117 4.1841,-2.4154 4.2229,-2.4525 0.0388,-0.0371 -1.6365,-1.0477 -3.7231,-2.2457 -2.0865,-1.198 -4.0101,-2.3017 -4.2747,-2.4526l-0.4811,-0.2744v4.9051c0,2.6978 0.0233,4.9051 0.0518,4.9051z" android:strokeWidth="0.0992791"/>
-</vector>
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 4858161dc..571a2fca9 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -315,7 +315,7 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:scaleType="fitXY"
-                    app:srcCompat="@drawable/ic_sponsorblock_disable_white_24dp"
+                    app:srcCompat="@drawable/ic_sponsor_block_disable_white_24dp"
                     android:background="?attr/selectableItemBackground"
                     android:contentDescription="@string/sponsorblock_toggle_skipping"
                     tools:ignore="RtlHardcoded" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index cbf538fb5..a22ee1814 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -82,6 +82,8 @@
     <attr name="ic_sort" format="reference"/>
     <attr name="ic_help" format="reference"/>
     <attr name="ic_arrow_back" format="reference"/>
+    <attr name="ic_sponsor_block_enable" format="reference"/>
+    <attr name="ic_sponsor_block_disable" format="reference"/>
 
     <attr name="progress_horizontal_drawable" format="reference"/>
     <!-- Can't refer to colors directly in drawable's xml-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9a81d01e1..b8b6864fb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -97,6 +97,8 @@
         <item name="ic_sort">@drawable/ic_sort_black_24dp</item>
         <item name="ic_help">@drawable/ic_help_black_24dp</item>
         <item name="ic_arrow_back">@drawable/ic_arrow_back_black_24dp</item>
+        <item name="ic_sponsor_block_enable">@drawable/ic_sponsor_block_enable_black_24dp</item>
+        <item name="ic_sponsor_block_disable">@drawable/ic_sponsor_block_disable_black_24dp</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -204,6 +206,8 @@
         <item name="ic_sort">@drawable/ic_sort_white_24dp</item>
         <item name="ic_help">@drawable/ic_help_white_24dp</item>
         <item name="ic_arrow_back">@drawable/ic_arrow_back_white_24dp</item>
+        <item name="ic_sponsor_block_enable">@drawable/ic_sponsor_block_enable_white_24dp</item>
+        <item name="ic_sponsor_block_disable">@drawable/ic_sponsor_block_disable_white_24dp</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>