test/revanced-patches
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

refactor(YouTube - Miniplayer): Change ReVanced settings that are now YouTube default on into "Disable" style settings (#6003)

Browse source
This commit is contained in:
LisoUseInAIKyrios 2025-09-26 12:14:20 +04:00 • committed by GitHub
parent 041f7e0140
commit 15a7e540de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
View file

@ -19,7 +19,7 @@ import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.Setting; import app.revanced.extension.shared.settings.Setting;
import app.revanced.extension.youtube.settings.Settings; import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("SpellCheckingInspection") @SuppressWarnings({"unused", "SpellCheckingInspection"})
public final class MiniplayerPatch { public final class MiniplayerPatch {
/** /**
@ -129,7 +129,7 @@ public final class MiniplayerPatch {
(CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get()); (CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get());
private static final boolean DRAG_AND_DROP_ENABLED = private static final boolean DRAG_AND_DROP_ENABLED =
CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get(); CURRENT_TYPE.isModern() && !Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get();
private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED = private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED =
Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get() Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get()
@ -145,10 +145,10 @@ public final class MiniplayerPatch {
&& (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get()); && (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());
private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED = private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED =
CURRENT_TYPE.isModern() && Settings.MINIPLAYER_ROUNDED_CORNERS.get(); CURRENT_TYPE.isModern() && !Settings.MINIPLAYER_DISABLE_ROUNDED_CORNERS.get();
private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED = private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED =
DRAG_AND_DROP_ENABLED && Settings.MINIPLAYER_HORIZONTAL_DRAG.get(); DRAG_AND_DROP_ENABLED && !Settings.MINIPLAYER_DISABLE_HORIZONTAL_DRAG.get();
/** /**
* Remove a broken and always present subtitle text that is only * Remove a broken and always present subtitle text that is only
@ -173,14 +173,14 @@ public final class MiniplayerPatch {
public static final class MiniplayerHorizontalDragAvailability implements Setting.Availability { public static final class MiniplayerHorizontalDragAvailability implements Setting.Availability {
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return Settings.MINIPLAYER_TYPE.get().isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get(); return Settings.MINIPLAYER_TYPE.get().isModern() && !Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get();
} }
@Override @Override
public List<Setting<?>> getParentSettings() { public List<Setting<?>> getParentSettings() {
return List.of( return List.of(
Settings.MINIPLAYER_TYPE, Settings.MINIPLAYER_TYPE,
Settings.MINIPLAYER_DRAG_AND_DROP Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP
); );
} }
} }
@ -192,7 +192,7 @@ public final class MiniplayerPatch {
return type == MODERN_4 return type == MODERN_4
|| (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3)) || (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
|| (!IS_19_26_OR_GREATER && type == MODERN_1 || (!IS_19_26_OR_GREATER && type == MODERN_1
&& !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get()) && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get())
|| (IS_19_29_OR_GREATER && type == MODERN_3); || (IS_19_29_OR_GREATER && type == MODERN_3);
} }
@ -201,7 +201,7 @@ public final class MiniplayerPatch {
return List.of( return List.of(
Settings.MINIPLAYER_TYPE, Settings.MINIPLAYER_TYPE,
Settings.MINIPLAYER_DOUBLE_TAP_ACTION, Settings.MINIPLAYER_DOUBLE_TAP_ACTION,
Settings.MINIPLAYER_DRAG_AND_DROP Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP
); );
} }
} }

20
extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
View file

@ -11,6 +11,10 @@ import static app.revanced.extension.youtube.patches.ChangeHeaderPatch.HeaderLog
import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.ChangeStartPageTypeAvailability; import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.ChangeStartPageTypeAvailability;
import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage; import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode; import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerAnyModernAvailability;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideSubtextsAvailability;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability; import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType; import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL; import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
@ -177,15 +181,15 @@ public class Settings extends BaseSettings {
// Miniplayer // Miniplayer
public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true); public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true);
public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability()); public static final BooleanSetting MINIPLAYER_DISABLE_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_disable_drag_and_drop", FALSE, true, new MiniplayerAnyModernAvailability());
public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability()); public static final BooleanSetting MINIPLAYER_DISABLE_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_disable_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
public static final BooleanSetting MINIPLAYER_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability()); public static final BooleanSetting MINIPLAYER_DISABLE_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_disable_rounded_corners", FALSE, true, new MiniplayerAnyModernAvailability());
public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability()); public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, new MiniplayerAnyModernAvailability());
public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, new MiniplayerPatch.MiniplayerHideSubtextsAvailability()); public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerHideOverlayButtonsAvailability());
public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, new MiniplayerHideSubtextsAvailability());
public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability()); public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability());
public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability()); public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, new MiniplayerAnyModernAvailability());
public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, new MiniplayerPatch.MiniplayerAnyModernAvailability()); public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, new MiniplayerHideRewindOrOverlayOpacityAvailability());
public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability());
// External downloader // External downloader
public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE); public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE);

6
patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
View file

@ -186,15 +186,15 @@ val miniplayerPatch = bytecodePatch(
if (!is_19_29_or_greater) { if (!is_19_29_or_greater) {
preferences += SwitchPreference("revanced_miniplayer_double_tap_action") preferences += SwitchPreference("revanced_miniplayer_double_tap_action")
} }
preferences += SwitchPreference("revanced_miniplayer_drag_and_drop") preferences += SwitchPreference("revanced_miniplayer_disable_drag_and_drop")
} }
if (is_19_43_or_greater) { if (is_19_43_or_greater) {
preferences += SwitchPreference("revanced_miniplayer_horizontal_drag") preferences += SwitchPreference("revanced_miniplayer_disable_horizontal_drag")
} }
if (is_19_36_or_greater) { if (is_19_36_or_greater) {
preferences += SwitchPreference("revanced_miniplayer_rounded_corners") preferences += SwitchPreference("revanced_miniplayer_disable_rounded_corners")
} }
preferences += SwitchPreference("revanced_miniplayer_hide_subtext") preferences += SwitchPreference("revanced_miniplayer_hide_subtext")

18
patches/src/main/resources/addresources/values/strings.xml
View file

@ -1421,25 +1421,25 @@ Limitation: Using the back button on the toolbar may not work"</string>
<string name="revanced_miniplayer_type_entry_5">Modern 2</string> <string name="revanced_miniplayer_type_entry_5">Modern 2</string>
<string name="revanced_miniplayer_type_entry_6">Modern 3</string> <string name="revanced_miniplayer_type_entry_6">Modern 3</string>
<string name="revanced_miniplayer_type_entry_7">Modern 4</string> <string name="revanced_miniplayer_type_entry_7">Modern 4</string>
<string name="revanced_miniplayer_rounded_corners_title">Enable rounded corners</string> <string name="revanced_miniplayer_disable_rounded_corners_title">Disable rounded corners</string>
<string name="revanced_miniplayer_rounded_corners_summary_on">Corners are rounded</string> <string name="revanced_miniplayer_disable_rounded_corners_summary_on">Corners are square</string>
<string name="revanced_miniplayer_rounded_corners_summary_off">Corners are square</string> <string name="revanced_miniplayer_disable_rounded_corners_summary_off">Corners are rounded</string>
<string name="revanced_miniplayer_double_tap_action_title">Enable double-tap and pinch to resize</string> <string name="revanced_miniplayer_double_tap_action_title">Enable double-tap and pinch to resize</string>
<string name="revanced_miniplayer_double_tap_action_summary_on">"Double-tap action and pinch to resize is enabled <string name="revanced_miniplayer_double_tap_action_summary_on">"Double-tap action and pinch to resize is enabled
• Double tap to increase miniplayer size • Double tap to increase miniplayer size
• Double tap again to restore original size"</string> • Double tap again to restore original size"</string>
<string name="revanced_miniplayer_double_tap_action_summary_off">Double-tap action and pinch to resize is disabled</string> <string name="revanced_miniplayer_double_tap_action_summary_off">Double-tap action and pinch to resize is disabled</string>
<string name="revanced_miniplayer_drag_and_drop_title">Enable drag and drop</string> <string name="revanced_miniplayer_disable_drag_and_drop_title">Disable drag and drop</string>
<string name="revanced_miniplayer_drag_and_drop_summary_on">"Drag and drop is enabled <string name="revanced_miniplayer_disable_drag_and_drop_summary_on">Drag and drop is disabled</string>
<string name="revanced_miniplayer_disable_drag_and_drop_summary_off">"Drag and drop is enabled
Miniplayer can be dragged to any corner of the screen"</string> Miniplayer can be dragged to any corner of the screen"</string>
<string name="revanced_miniplayer_drag_and_drop_summary_off">Drag and drop is disabled</string> <string name="revanced_miniplayer_disable_horizontal_drag_title">Disable horizontal drag gesture</string>
<string name="revanced_miniplayer_horizontal_drag_title">Enable horizontal drag gesture</string> <string name="revanced_miniplayer_disable_horizontal_drag_summary_on">Horizontal drag gesture disabled</string>
<string name="revanced_miniplayer_horizontal_drag_summary_on">"Horizontal drag gesture enabled <string name="revanced_miniplayer_disable_horizontal_drag_summary_off">"Horizontal drag gesture enabled
Miniplayer can be dragged off-screen to the left or right"</string> Miniplayer can be dragged off-screen to the left or right"</string>
<string name="revanced_miniplayer_horizontal_drag_summary_off">Horizontal drag gesture disabled</string>
<string name="revanced_miniplayer_hide_overlay_buttons_title">Hide overlay buttons</string> <string name="revanced_miniplayer_hide_overlay_buttons_title">Hide overlay buttons</string>
<string name="revanced_miniplayer_hide_overlay_buttons_summary_on">Overlay buttons are hidden</string> <string name="revanced_miniplayer_hide_overlay_buttons_summary_on">Overlay buttons are hidden</string>
<string name="revanced_miniplayer_hide_overlay_buttons_summary_off">Overlay buttons are shown</string> <string name="revanced_miniplayer_hide_overlay_buttons_summary_off">Overlay buttons are shown</string>