Skip to content

Commit 15a7e54

Browse files
LisoUseInAIKyriosLisoUseInAIKyrios
authored
refactor(YouTube - Miniplayer): Change ReVanced settings that are now YouTube default on into "Disable" style settings (#6003)
1 parent 041f7e0 commit 15a7e54

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

‎extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import app.revanced.extension.shared.settings.Setting;
2020
import app.revanced.extension.youtube.settings.Settings;
2121

22-
@SuppressWarnings("SpellCheckingInspection")
22+
@SuppressWarnings({"unused", "SpellCheckingInspection"})
2323
public final class MiniplayerPatch {
2424

2525
/**
@@ -129,7 +129,7 @@ public boolean isModern() {
129129
(CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get());
130130

131131
private static final boolean DRAG_AND_DROP_ENABLED =
132-
CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
132+
CURRENT_TYPE.isModern() && !Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get();
133133

134134
private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED =
135135
Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get()
@@ -145,10 +145,10 @@ public boolean isModern() {
145145
&& (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());
146146

147147
private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED =
148-
CURRENT_TYPE.isModern() && Settings.MINIPLAYER_ROUNDED_CORNERS.get();
148+
CURRENT_TYPE.isModern() && !Settings.MINIPLAYER_DISABLE_ROUNDED_CORNERS.get();
149149

150150
private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED =
151-
DRAG_AND_DROP_ENABLED && Settings.MINIPLAYER_HORIZONTAL_DRAG.get();
151+
DRAG_AND_DROP_ENABLED && !Settings.MINIPLAYER_DISABLE_HORIZONTAL_DRAG.get();
152152

153153
/**
154154
* Remove a broken and always present subtitle text that is only
@@ -173,14 +173,14 @@ public boolean isModern() {
173173
public static final class MiniplayerHorizontalDragAvailability implements Setting.Availability {
174174
@Override
175175
public boolean isAvailable() {
176-
return Settings.MINIPLAYER_TYPE.get().isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
176+
return Settings.MINIPLAYER_TYPE.get().isModern() && !Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get();
177177
}
178178

179179
@Override
180180
public List<Setting<?>> getParentSettings() {
181181
return List.of(
182182
Settings.MINIPLAYER_TYPE,
183-
Settings.MINIPLAYER_DRAG_AND_DROP
183+
Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP
184184
);
185185
}
186186
}
@@ -192,7 +192,7 @@ public boolean isAvailable() {
192192
return type == MODERN_4
193193
|| (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
194194
|| (!IS_19_26_OR_GREATER && type == MODERN_1
195-
&& !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get())
195+
&& !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get())
196196
|| (IS_19_29_OR_GREATER && type == MODERN_3);
197197
}
198198

@@ -201,7 +201,7 @@ public List<Setting<?>> getParentSettings() {
201201
return List.of(
202202
Settings.MINIPLAYER_TYPE,
203203
Settings.MINIPLAYER_DOUBLE_TAP_ACTION,
204-
Settings.MINIPLAYER_DRAG_AND_DROP
204+
Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP
205205
);
206206
}
207207
}

‎extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.ChangeStartPageTypeAvailability;
1212
import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
1313
import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
14+
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerAnyModernAvailability;
15+
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability;
16+
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability;
17+
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideSubtextsAvailability;
1418
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
1519
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
1620
import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
@@ -177,15 +181,15 @@ public class Settings extends BaseSettings {
177181

178182
// Miniplayer
179183
public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true);
180-
public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
181-
public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
182-
public static final BooleanSetting MINIPLAYER_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
183-
public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability());
184-
public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, new MiniplayerPatch.MiniplayerHideSubtextsAvailability());
184+
public static final BooleanSetting MINIPLAYER_DISABLE_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_disable_drag_and_drop", FALSE, true, new MiniplayerAnyModernAvailability());
185+
public static final BooleanSetting MINIPLAYER_DISABLE_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_disable_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
186+
public static final BooleanSetting MINIPLAYER_DISABLE_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_disable_rounded_corners", FALSE, true, new MiniplayerAnyModernAvailability());
187+
public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, new MiniplayerAnyModernAvailability());
188+
public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerHideOverlayButtonsAvailability());
189+
public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, new MiniplayerHideSubtextsAvailability());
185190
public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability());
186-
public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
187-
public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, new MiniplayerPatch.MiniplayerAnyModernAvailability());
188-
public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, new MiniplayerPatch.MiniplayerHideRewindOrOverlayOpacityAvailability());
191+
public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, new MiniplayerAnyModernAvailability());
192+
public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, new MiniplayerHideRewindOrOverlayOpacityAvailability());
189193

190194
// External downloader
191195
public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE);

‎patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,15 @@ val miniplayerPatch = bytecodePatch(
186186
if (!is_19_29_or_greater) {
187187
preferences += SwitchPreference("revanced_miniplayer_double_tap_action")
188188
}
189-
preferences += SwitchPreference("revanced_miniplayer_drag_and_drop")
189+
preferences += SwitchPreference("revanced_miniplayer_disable_drag_and_drop")
190190
}
191191

192192
if (is_19_43_or_greater) {
193-
preferences += SwitchPreference("revanced_miniplayer_horizontal_drag")
193+
preferences += SwitchPreference("revanced_miniplayer_disable_horizontal_drag")
194194
}
195195

196196
if (is_19_36_or_greater) {
197-
preferences += SwitchPreference("revanced_miniplayer_rounded_corners")
197+
preferences += SwitchPreference("revanced_miniplayer_disable_rounded_corners")
198198
}
199199

200200
preferences += SwitchPreference("revanced_miniplayer_hide_subtext")

‎patches/src/main/resources/addresources/values/strings.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,25 +1421,25 @@ Limitation: Using the back button on the toolbar may not work"</string>
14211421
<string name="revanced_miniplayer_type_entry_5">Modern 2</string>
14221422
<string name="revanced_miniplayer_type_entry_6">Modern 3</string>
14231423
<string name="revanced_miniplayer_type_entry_7">Modern 4</string>
1424-
<string name="revanced_miniplayer_rounded_corners_title">Enable rounded corners</string>
1425-
<string name="revanced_miniplayer_rounded_corners_summary_on">Corners are rounded</string>
1426-
<string name="revanced_miniplayer_rounded_corners_summary_off">Corners are square</string>
1424+
<string name="revanced_miniplayer_disable_rounded_corners_title">Disable rounded corners</string>
1425+
<string name="revanced_miniplayer_disable_rounded_corners_summary_on">Corners are square</string>
1426+
<string name="revanced_miniplayer_disable_rounded_corners_summary_off">Corners are rounded</string>
14271427
<string name="revanced_miniplayer_double_tap_action_title">Enable double-tap and pinch to resize</string>
14281428
<string name="revanced_miniplayer_double_tap_action_summary_on">"Double-tap action and pinch to resize is enabled
14291429

14301430
• Double tap to increase miniplayer size
14311431
• Double tap again to restore original size"</string>
14321432
<string name="revanced_miniplayer_double_tap_action_summary_off">Double-tap action and pinch to resize is disabled</string>
1433-
<string name="revanced_miniplayer_drag_and_drop_title">Enable drag and drop</string>
1434-
<string name="revanced_miniplayer_drag_and_drop_summary_on">"Drag and drop is enabled
1433+
<string name="revanced_miniplayer_disable_drag_and_drop_title">Disable drag and drop</string>
1434+
<string name="revanced_miniplayer_disable_drag_and_drop_summary_on">Drag and drop is disabled</string>
1435+
<string name="revanced_miniplayer_disable_drag_and_drop_summary_off">"Drag and drop is enabled
14351436

14361437
Miniplayer can be dragged to any corner of the screen"</string>
1437-
<string name="revanced_miniplayer_drag_and_drop_summary_off">Drag and drop is disabled</string>
1438-
<string name="revanced_miniplayer_horizontal_drag_title">Enable horizontal drag gesture</string>
1439-
<string name="revanced_miniplayer_horizontal_drag_summary_on">"Horizontal drag gesture enabled
1438+
<string name="revanced_miniplayer_disable_horizontal_drag_title">Disable horizontal drag gesture</string>
1439+
<string name="revanced_miniplayer_disable_horizontal_drag_summary_on">Horizontal drag gesture disabled</string>
1440+
<string name="revanced_miniplayer_disable_horizontal_drag_summary_off">"Horizontal drag gesture enabled
14401441

14411442
Miniplayer can be dragged off-screen to the left or right"</string>
1442-
<string name="revanced_miniplayer_horizontal_drag_summary_off">Horizontal drag gesture disabled</string>
14431443
<string name="revanced_miniplayer_hide_overlay_buttons_title">Hide overlay buttons</string>
14441444
<string name="revanced_miniplayer_hide_overlay_buttons_summary_on">Overlay buttons are hidden</string>
14451445
<string name="revanced_miniplayer_hide_overlay_buttons_summary_off">Overlay buttons are shown</string>

0 commit comments

Comments
 (0)