diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java index f6b9ba806f..bada1e1c79 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java @@ -3,6 +3,7 @@ import androidx.annotation.Nullable; import app.revanced.integrations.youtube.patches.playback.speed.CustomPlaybackSpeedPatch; +import app.revanced.integrations.youtube.settings.Settings; /** * Abuse LithoFilter for {@link CustomPlaybackSpeedPatch}. @@ -13,32 +14,33 @@ public final class PlaybackSpeedMenuFilterPatch extends Filter { * Old litho based speed selection menu. */ public static volatile boolean isOldPlaybackSpeedMenuVisible; + /** * 0.05x speed selection menu. */ public static volatile boolean isPlaybackRateSelectorMenuVisible; - private final StringFilterGroup playbackRateSelector; + private final StringFilterGroup playbackRateSelectorGroup; public PlaybackSpeedMenuFilterPatch() { - // 0.05x speed menu. - playbackRateSelector = new StringFilterGroup( - null, + // 0.05x litho speed menu. + playbackRateSelectorGroup = new StringFilterGroup( + Settings.CUSTOM_SPEED_MENU, "playback_rate_selector_menu_sheet.eml-js" ); // Old litho based speed menu. var oldPlaybackMenu = new StringFilterGroup( - null, + Settings.CUSTOM_SPEED_MENU, "playback_speed_sheet_content.eml-js"); - addPathCallbacks(playbackRateSelector, oldPlaybackMenu); + addPathCallbacks(playbackRateSelectorGroup, oldPlaybackMenu); } @Override boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray, StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) { - if (matchedGroup == playbackRateSelector) { + if (matchedGroup == playbackRateSelectorGroup) { isPlaybackRateSelectorMenuVisible = true; } else { isOldPlaybackSpeedMenuVisible = true; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java index 9550df3073..bd8ed537c6 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java @@ -124,7 +124,7 @@ public static void onFlyoutMenuCreate(RecyclerView recyclerView) { return; } } catch (Exception ex) { - Logger.printException(() -> "isPlaybackRateSelectorMenuVisible failure failure: ", ex); + Logger.printException(() -> "isPlaybackRateSelectorMenuVisible failure", ex); } try { @@ -134,7 +134,7 @@ public static void onFlyoutMenuCreate(RecyclerView recyclerView) { } } } catch (Exception ex) { - Logger.printException(() -> "isOldPlaybackSpeedMenuVisible failure: ", ex); + Logger.printException(() -> "isOldPlaybackSpeedMenuVisible failure", ex); } }); } diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java index b9a2148f38..240c48b510 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java @@ -32,10 +32,13 @@ public class Settings extends BaseSettings { public static final BooleanSetting REMEMBER_VIDEO_QUALITY_LAST_SELECTED = new BooleanSetting("revanced_remember_video_quality_last_selected", FALSE); public static final IntegerSetting VIDEO_QUALITY_DEFAULT_WIFI = new IntegerSetting("revanced_video_quality_default_wifi", -2); public static final IntegerSetting VIDEO_QUALITY_DEFAULT_MOBILE = new IntegerSetting("revanced_video_quality_default_mobile", -2); + // Speed public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED = new BooleanSetting("revanced_remember_playback_speed_last_selected", FALSE); + public static final BooleanSetting CUSTOM_SPEED_MENU = new BooleanSetting("revanced_custom_speed_menu", TRUE); public static final FloatSetting PLAYBACK_SPEED_DEFAULT = new FloatSetting("revanced_playback_speed_default", 1.0f); public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds", "0.25\n0.5\n0.75\n0.9\n0.95\n1.0\n1.05\n1.1\n1.25\n1.5\n1.75\n2.0\n3.0\n4.0\n5.0", true); + @Deprecated // Patch is obsolete and no longer works with 19.09+ public static final BooleanSetting HDR_AUTO_BRIGHTNESS = new BooleanSetting("revanced_hdr_auto_brightness", TRUE);