diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt index 87ed67f7b..81a165c33 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt +++ b/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 -> @@ -119,4 +122,4 @@ object SponsorBlockPatch : ResourcePatch() { SettingsPatch.updatePatchStatus("SponsorBlock") } -} \ No newline at end of file +} diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png index b23946dba..15df96114 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png index 114ff15e4..47c0612f4 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png index 114ff15e4..47c0612f4 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png index 93df73506..15df96114 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png index 93df73506..15df96114 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png index 9e10fbe3f..2996ba60d 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png index 021d4d5bc..37ba55dda 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png index 90f98db8a..5618e6909 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png index 2277524ee..68532d62f 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png index 94fceaabf..e296f6a68 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png index 114ff15e4..47c0612f4 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png differ diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png index 93df73506..15df96114 100644 Binary files a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png and b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png differ diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index 0c064e9c6..ad9b3cca4 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -79,7 +79,7 @@ + SETTINGS: HIDE_FEED_FLYOUT_PANEL --> @@ -647,7 +647,7 @@ - + SETTINGS: SWIPE_CONTROLS --> diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_adjust.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_adjust.xml index 76a4b8bc9..4863effca 100644 --- a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_adjust.xml +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_adjust.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + 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" /> diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_backward.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_backward.xml new file mode 100644 index 000000000..bb3118c26 --- /dev/null +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_backward.xml @@ -0,0 +1,10 @@ + + + diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_compare.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_compare.xml index 04cc65e40..fc19a09b9 100644 --- a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_compare.xml +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_compare.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + 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" /> diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_edit.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_edit.xml index e93574bd9..89aba0607 100644 --- a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_edit.xml +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_edit.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + 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" /> diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_forward.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_forward.xml new file mode 100644 index 000000000..ee21c525c --- /dev/null +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_forward.xml @@ -0,0 +1,10 @@ + + + diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_logo.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_logo.xml index b6f7d1443..3ef398d20 100644 --- a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_logo.xml +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_logo.xml @@ -6,8 +6,5 @@ android:viewportHeight="24"> - + 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" /> diff --git a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_publish.xml b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_publish.xml index de4e58d3a..ebeccbc8d 100644 --- a/src/main/resources/youtube/sponsorblock/drawable/ic_sb_publish.xml +++ b/src/main/resources/youtube/sponsorblock/drawable/ic_sb_publish.xml @@ -1,10 +1,5 @@ - - - + + + + \ No newline at end of file diff --git a/src/main/resources/youtube/sponsorblock/drawable/ns_bg.xml b/src/main/resources/youtube/sponsorblock/drawable/ns_bg.xml new file mode 100644 index 000000000..529f14143 --- /dev/null +++ b/src/main/resources/youtube/sponsorblock/drawable/ns_bg.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/resources/youtube/sponsorblock/layout/inline_sponsor_overlay.xml b/src/main/resources/youtube/sponsorblock/layout/inline_sponsor_overlay.xml index 2c0385549..05469bafb 100644 --- a/src/main/resources/youtube/sponsorblock/layout/inline_sponsor_overlay.xml +++ b/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" diff --git a/src/main/resources/youtube/sponsorblock/layout/new_segment.xml b/src/main/resources/youtube/sponsorblock/layout/new_segment.xml index be5020be2..0b0e15ffa 100644 --- a/src/main/resources/youtube/sponsorblock/layout/new_segment.xml +++ b/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" /> + android:src="@drawable/ic_sb_forward" />