Change some design and default values (#27)

src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt

@@ -62,6 +62,9 @@ object SponsorBlockPatch : ResourcePatch() {
                 "ic_sb_edit.xml",
                 "ic_sb_logo.xml",
                 "ic_sb_publish.xml",
+                "ns_bg.xml",
+                "ic_sb_forward.xml",
+                "ic_sb_backward.xml",
                 "ic_sb_voting.xml"
             )
         ).forEach { resourceGroup ->

src/main/resources/youtube/settings/xml/revanced_prefs.xml

@@ -79,7 +79,7 @@
         <!-- SETTINGS: HIDE_FEED_FLYOUT_PANEL
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_feed_flyout_panel_title" />
         <SwitchPreference android:title="@string/revanced_hide_feed_flyout_panel_title" android:key="revanced_hide_feed_flyout_panel" android:defaultValue="false" android:summaryOn="@string/revanced_hide_feed_flyout_panel_summary_on" android:summaryOff="@string/revanced_hide_feed_flyout_panel_summary_off" />
-        <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_hide_feed_flyout_panel_filter_strings_title" android:key="revanced_hide_feed_flyout_panel_filter_strings" android:summary="@string/revanced_hide_feed_flyout_panel_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />SETTINGS: HIDE_FEED_FLYOUT_PANEL -->
+        <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_hide_feed_flyout_panel_filter_strings_title" android:key="revanced_hide_feed_flyout_panel_filter_strings" android:summary="@string/revanced_hide_feed_flyout_panel_filter_strings_summary" android:defaultValue="Play next in queue\nDownload video" android:inputType="textMultiLine" />SETTINGS: HIDE_FEED_FLYOUT_PANEL -->
 
         <!-- SETTINGS: PLAYER_FLYOUT_PANEL_HEADER
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_flyout_panel_title" />SETTINGS: PLAYER_FLYOUT_PANEL_HEADER -->
@@ -647,7 +647,7 @@
         <SwitchPreference android:title="@string/revanced_enable_swipe_volume_title" android:key="revanced_enable_swipe_volume" android:defaultValue="true" android:summaryOn="@string/revanced_enable_swipe_volume_summary_on" android:summaryOff="@string/revanced_enable_swipe_volume_summary_off" />
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_background_alpha_title" android:key="revanced_swipe_overlay_background_alpha" android:summary="@string/revanced_swipe_overlay_background_alpha_summary" android:defaultValue="127" android:inputType="number" />
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_magnitude_threshold_title" android:key="revanced_swipe_magnitude_threshold" android:summary="@string/revanced_swipe_magnitude_threshold_summary" android:defaultValue="0" android:inputType="number" />
-        <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_text_size_title" android:key="revanced_swipe_overlay_text_size" android:summary="@string/revanced_swipe_overlay_text_size_summary" android:defaultValue="27" android:inputType="number" />
+        <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_text_size_title" android:key="revanced_swipe_overlay_text_size" android:summary="@string/revanced_swipe_overlay_text_size_summary" android:defaultValue="20" android:inputType="number" />
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_timeout_title" android:key="revanced_swipe_overlay_timeout" android:summary="@string/revanced_swipe_overlay_timeout_summary" android:defaultValue="500" android:inputType="number" />
         <Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />
         <SwitchPreference android:title="@string/revanced_disable_hdr_auto_brightness_title" android:key="revanced_disable_hdr_auto_brightness" android:defaultValue="true" android:summaryOn="@string/revanced_disable_hdr_auto_brightness_summary_on" android:summaryOff="@string/revanced_disable_hdr_auto_brightness_summary_off" />SETTINGS: SWIPE_CONTROLS -->

src/main/resources/youtube/sponsorblock/drawable/ic_sb_adjust.xml

@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,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,8zM15,12c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3z" />
+        android:pathData="m 12 3 c -6 0 -9 5 -9 9 s 3 9 9 9 s 9 -5 9 -9 s -3 -9 -9 -9 z m 0 17 c -4.41 0 -8 -3.59 -8 -8 s 3.59 -8 8 -8 s 8 3.59 8 8 s -3.59 8 -8 8 z m 1.936 -8 c 0.064 2 -1.936 2 -1.936 2 s -2 0 -2 -2 s 2 -2 2 -2 s 2 0 2 2 z" />
 </vector>

src/main/resources/youtube/sponsorblock/drawable/ic_sb_backward.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 7.5 3.5 L 16.5 3.5 C 19.5 3.5 20.5 3.5 20.5 7.5 L 20.5 16.5 C 20.5 20.5 19.5 20.5 16.5 20.5 L 7.5 20.5 C 4.5 20.5 3.5 20.5 3.5 16.5 L 3.5 7.5 C 3.5 3.5 5.5 3.5 7.5 3.5 Z M 16.5 4.3 L 7.5 4.3 C 5.5 4.3 4.3 4.3 4.3 7.5 L 4.3 16.5 C 4.3 19.7 5.5 19.7 7.5 19.7 L 16.5 19.7 C 18.5 19.7 19.7 19.7 19.7 16.5 L 19.7 7.5 C 19.7 4.3 18.5 4.3 16.5 4.3 Z M 13.2 8 L 9.2 12 L 13.2 16 L 13.2 14.7 L 10.5 12 L 13.2 9.3 Z" />
+</vector>

src/main/resources/youtube/sponsorblock/drawable/ic_sb_compare.xml

@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M10,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h5v2h2L12,1h-2v2zM10,18L5,18l5,-6v6zM19,3h-5v2h5v13l-5,-6v9h5c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2z" />
+        android:pathData="m 9.5 5 l -3 0 c -2 0 -2 0 -2 3 v 9 c 0 2.5 0 2 2 2 h 4 v 2 h 1 l 0 -18 h -1 v 2 z m 0 13 l -4 0 l 5 -7 v 7 z m 9 -13 h -6 v 1 h 6 v 12 l -6 -8 v 9 h 5 c 2 0 2 0 2 -2 l 0 -9 c 0 -3 0 -3 -1 -3 z" />
 </vector>

src/main/resources/youtube/sponsorblock/drawable/ic_sb_edit.xml

@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+        android:pathData="m 4.8 16.2 v 3 h 3 l 8.848 -8.848 l -3 -3 l -8.848 8.848 m 14.168 -8.168 c 0.312 -0.312 0.312 -0.816 0 -1.128 l -1.872 -1.872 c -0.312 -0.312 -0.816 -0.312 -1.128 0 l -1.464 1.464 l 3 3 l 1.464 -1.464 m -5.368 0.368 l 2 2 l -8 8 l -2 0 l 0 -2 m 10.9072 -10.9008 l 2.0184 1.9944 l -1.056 1.0792 l -2.0888 -1.9944 z" />
 </vector>

src/main/resources/youtube/sponsorblock/drawable/ic_sb_forward.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 7.5 3.5 L 16.5 3.5 C 19.5 3.5 20.5 3.5 20.5 7.5 L 20.5 16.5 C 20.5 20.5 19.5 20.5 16.5 20.5 L 7.5 20.5 C 4.5 20.5 3.5 20.5 3.5 16.5 L 3.5 7.5 C 3.5 3.5 5.5 3.5 7.5 3.5 Z M 16.5 4.3 L 7.5 4.3 C 5.5 4.3 4.3 4.3 4.3 7.5 L 4.3 16.5 C 4.3 19.7 5.5 19.7 7.5 19.7 L 16.5 19.7 C 18.5 19.7 19.7 19.7 19.7 16.5 L 19.7 7.5 C 19.7 4.3 18.5 4.3 16.5 4.3 Z M 10.5 16 L 14.5 12 L 10.5 8 L 10.5 9.3 L 13.3 12 L 10.5 14.7 Z" />
+</vector>

src/main/resources/youtube/sponsorblock/drawable/ic_sb_logo.xml

@@ -6,8 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M20.73,4.9794C15.24,2.0994 8.76,2.0994 3.27,4.9794 3,5.1594 2.82,5.4294 2.82,5.7894c0.09,6.48 3.51,12.06 8.73,15.3 0.27,0.18 0.63,0.18 0.9,0 5.13,-3.15 8.64,-8.82 8.73,-15.3C21.18,5.4294 21,5.1594 20.73,4.9794ZM9.66,15.1494L9.66,6.7794l7.29,4.23z" />
+        android:pathData="m 15 2 l -7.92 3.52 v 4.4 c 0 5.72 3.52 10.56 7.92 11.44 c 4.4 -0.88 7.92 -5.72 7.92 -11.44 l 0 -4.4 z m 7.04 7.92 c 0 6.16 -3.52 9.24 -7.04 10.56 c -3.52 -1.32 -7.04 -4.4 -7.04 -10.56 l 0 -3.784 l 7.04 -2.992 l 7.04 2.992 l 0 3.784 z" />
 </vector>

src/main/resources/youtube/sponsorblock/drawable/ic_sb_publish.xml

@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M5,5c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,4c-0.55,0 -1,0.45 -1,1zM7.41,14L9,14v5c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-5h1.59c0.89,0 1.34,-1.08 0.71,-1.71L12.71,7.7c-0.39,-0.39 -1.02,-0.39 -1.41,0l-4.59,4.59c-0.63,0.63 -0.19,1.71 0.7,1.71z" />
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="#ffffffff" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="m 6 6 h 12 l 0 -1 l -12 0 z m 5.5 3.3 v 9.7 h 1 l 0 -9.7 l 4 2.5 l 0.5 -0.8 l -4.166 -2.666 c -0.5 -0.4 -1 -0.4 -1.6 0 l -4.234 2.666 l 0.5 0.8 z" />
 </vector>

src/main/resources/youtube/sponsorblock/drawable/ns_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#1c1b1b"/>
+    <corners android:radius="10dp"/>
+</shape>

src/main/resources/youtube/sponsorblock/layout/inline_sponsor_overlay.xml

@@ -6,7 +6,7 @@
         android:contentDescription="@string/sb_skip_button_compact_highlight"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true" android:layout_marginRight="20dp"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
         android:focusable="true"
@@ -27,7 +27,7 @@
         android:id="@+id/sb_new_segment_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true" android:layout_marginRight="20dp"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin"
         android:focusable="true"

src/main/resources/youtube/sponsorblock/layout/new_segment.xml

@@ -6,7 +6,7 @@
         android:id="@+id/sb_new_segment_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#66000000"
+        android:background="@drawable/ns_bg"
         android:gravity="start|center"
         android:orientation="vertical">
 
@@ -26,7 +26,7 @@
                 android:paddingTop="3.0dip"
                 android:paddingEnd="5.0dip"
                 android:paddingBottom="3.0dip"
-                android:src="@drawable/player_fast_rewind" />
+                android:src="@drawable/ic_sb_backward" />
 
             <ImageButton
                 android:id="@+id/sb_new_segment_forward"
@@ -40,7 +40,7 @@
                 android:paddingTop="3.0dip"
                 android:paddingEnd="5.0dip"
                 android:paddingBottom="3.0dip"
-                android:src="@drawable/player_fast_forward" />
+                android:src="@drawable/ic_sb_forward" />
 
             <ImageButton
                 android:id="@+id/sb_new_segment_adjust"