diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButton.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButton.java index 99dbf7e18..c7469c44d 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButton.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButton.java @@ -1,16 +1,27 @@ package app.revanced.extension.youtube.sponsorblock.ui; import android.view.View; +import android.widget.ImageView; import androidx.annotation.Nullable; import app.revanced.extension.shared.Logger; +import app.revanced.extension.shared.ResourceType; +import app.revanced.extension.shared.Utils; +import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.youtube.settings.Settings; import app.revanced.extension.youtube.sponsorblock.SegmentPlaybackController; import app.revanced.extension.youtube.videoplayer.PlayerControlButton; @SuppressWarnings("unused") public class CreateSegmentButton { + + private static final int DRAWABLE_SB_LOGO = Utils.getResourceIdentifierOrThrow( + ResourceType.DRAWABLE, BaseSettings.SETTINGS_DISABLE_BOLD_ICONS.get() + ? "revanced_sb_logo" + : "revanced_sb_logo_bold" + ); + @Nullable private static PlayerControlButton instance; @@ -31,6 +42,14 @@ public class CreateSegmentButton { v -> SponsorBlockViewController.toggleNewSegmentLayoutVisibility(), null ); + + // FIXME: Bold YT player icons are currently forced off. + // Enable this logic when the new player icons are not forced off. + ImageView icon = Utils.getChildViewByResourceName(controlsView, + "revanced_sb_create_segment_button"); + if (false) { + icon.setImageResource(DRAWABLE_SB_LOGO); + } } catch (Exception ex) { Logger.printException(() -> "initialize failure", ex); } diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt index addd09811..933d0cc25 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt @@ -92,6 +92,7 @@ private val sponsorBlockResourcePatch = resourcePatch { "revanced_sb_edit.xml", "revanced_sb_forward.xml", "revanced_sb_logo.xml", + "revanced_sb_logo_bold.xml", "revanced_sb_publish.xml", "revanced_sb_voting.xml", ) diff --git a/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml b/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml index 6b55b0da9..ab680d2a5 100644 --- a/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml +++ b/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo.xml @@ -1,16 +1,16 @@ - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + android:fillColor="@android:color/white" + android:pathData="M 12.000145,2.0000008 C 8.8230689,1.9990926 5.6959192,2.7864027 2.9017488,4.2906678 2.3373945,4.5948398 1.9899198,5.1860103 2.000223,5.8244635 2.0930396,12.358829 5.4926743,18.31271 11.094442,21.749998 c 0.557183,0.333336 1.253849,0.333336 1.811031,0 5.601767,-3.438045 9.001096,-9.391169 9.094295,-15.9255345 0.01052,-0.6386247 -0.337035,-1.2300179 -0.9016,-1.5341683 -2.794107,-1.5040456 -5.92111,-2.2912233 -9.098023,-2.2902944 z m 0.08082,0.8705548 c 3.003625,0.013255 5.957553,0.7636027 8.599879,2.1845129 0.277414,0.151228 0.448533,0.4421907 0.44513,0.7568723 C 21.034684,12.23921 17.58825,17.8544 12.446767,21.009378 c -0.274165,0.167124 -0.619386,0.167124 -0.893551,0 C 6.4117365,17.854399 2.9652339,12.239209 2.8739372,5.8119397 2.8705209,5.4972741 3.0416092,5.2063196 3.3189962,5.0550685 6.0095892,3.608201 9.0224769,2.8570356 12.080969,2.8705556 Z M 9.6351953,6.7701615 v 8.3406435 l 7.2606727,-4.170358 z" /> diff --git a/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo_bold.xml b/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo_bold.xml new file mode 100644 index 000000000..058128b13 --- /dev/null +++ b/patches/src/main/resources/sponsorblock/drawable/revanced_sb_logo_bold.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file