Skip to content

Commit 8a01a6c

Browse files
LisoUseInAIKyriosoSumAtrIX
LisoUseInAIKyrios
authored and
oSumAtrIX
committed
feat(YouTube - Hide player flyout menu items): Hide stable volume (#3827)
1 parent 18dde3e commit 8a01a6c

File tree

4 files changed

+42
-29
lines changed

4 files changed

+42
-29
lines changed

‎extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
2020
public PlayerFlyoutMenuItemsFilter() {
2121
exception = new ByteArrayFilterGroup(
2222
// Whitelist Quality menu item when "Hide Additional settings menu" is enabled
23-
Settings.HIDE_ADDITIONAL_SETTINGS_MENU,
23+
Settings.HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS,
2424
"quality_sheet"
2525
);
2626

2727
videoQualityMenuFooter = new StringFilterGroup(
28-
Settings.HIDE_VIDEO_QUALITY_MENU_FOOTER,
28+
Settings.HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER,
2929
"quality_sheet_footer"
3030
);
3131

@@ -36,47 +36,51 @@ public PlayerFlyoutMenuItemsFilter() {
3636

3737
flyoutFilterGroupList.addAll(
3838
new ByteArrayFilterGroup(
39-
Settings.HIDE_CAPTIONS_MENU,
39+
Settings.HIDE_PLAYER_FLYOUT_CAPTIONS,
4040
"closed_caption"
4141
),
4242
new ByteArrayFilterGroup(
43-
Settings.HIDE_ADDITIONAL_SETTINGS_MENU,
43+
Settings.HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS,
4444
"yt_outline_gear"
4545
),
4646
new ByteArrayFilterGroup(
47-
Settings.HIDE_LOOP_VIDEO_MENU,
47+
Settings.HIDE_PLAYER_FLYOUT_LOOP_VIDEO,
4848
"yt_outline_arrow_repeat_1_"
4949
),
5050
new ByteArrayFilterGroup(
51-
Settings.HIDE_AMBIENT_MODE_MENU,
51+
Settings.HIDE_PLAYER_FLYOUT_AMBIENT_MODE,
5252
"yt_outline_screen_light"
5353
),
5454
new ByteArrayFilterGroup(
55-
Settings.HIDE_HELP_MENU,
55+
Settings.HIDE_PLAYER_FLYOUT_STABLE_VOLUME,
56+
"volume_stable"
57+
),
58+
new ByteArrayFilterGroup(
59+
Settings.HIDE_PLAYER_FLYOUT_HELP,
5660
"yt_outline_question_circle"
5761
),
5862
new ByteArrayFilterGroup(
59-
Settings.HIDE_MORE_INFO_MENU,
63+
Settings.HIDE_PLAYER_FLYOUT_MORE_INFO,
6064
"yt_outline_info_circle"
6165
),
6266
new ByteArrayFilterGroup(
63-
Settings.HIDE_LOCK_SCREEN_MENU,
67+
Settings.HIDE_PLAYER_FLYOUT_LOCK_SCREEN,
6468
"yt_outline_lock"
6569
),
6670
new ByteArrayFilterGroup(
67-
Settings.HIDE_SPEED_MENU,
71+
Settings.HIDE_PLAYER_FLYOUT_SPEED,
6872
"yt_outline_play_arrow_half_circle"
6973
),
7074
new ByteArrayFilterGroup(
71-
Settings.HIDE_AUDIO_TRACK_MENU,
75+
Settings.HIDE_PLAYER_FLYOUT_AUDIO_TRACK,
7276
"yt_outline_person_radar"
7377
),
7478
new ByteArrayFilterGroup(
75-
Settings.HIDE_PLAYER_FLYOUT_MENU_SLEEP_TIMER,
79+
Settings.HIDE_PLAYER_FLYOUT_SLEEP_TIMER,
7680
"yt_outline_moon_z_"
7781
),
7882
new ByteArrayFilterGroup(
79-
Settings.HIDE_WATCH_IN_VR_MENU,
83+
Settings.HIDE_PLAYER_FLYOUT_WATCH_IN_VR,
8084
"yt_outline_vr"
8185
)
8286
);

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,21 @@ public class Settings extends BaseSettings {
178178
public static final BooleanSetting HIDE_PLAYLIST_BUTTON = new BooleanSetting("revanced_hide_playlist_button", FALSE);
179179

180180
// Player flyout menu items
181-
public static final BooleanSetting HIDE_CAPTIONS_MENU = new BooleanSetting("revanced_hide_player_flyout_captions", FALSE);
182-
public static final BooleanSetting HIDE_ADDITIONAL_SETTINGS_MENU = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE);
183-
public static final BooleanSetting HIDE_LOOP_VIDEO_MENU = new BooleanSetting("revanced_hide_player_flyout_loop_video", FALSE);
184-
public static final BooleanSetting HIDE_AMBIENT_MODE_MENU = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE);
185-
public static final BooleanSetting HIDE_HELP_MENU = new BooleanSetting("revanced_hide_player_flyout_help", TRUE);
186-
public static final BooleanSetting HIDE_SPEED_MENU = new BooleanSetting("revanced_hide_player_flyout_speed", FALSE);
187-
public static final BooleanSetting HIDE_MORE_INFO_MENU = new BooleanSetting("revanced_hide_player_flyout_more_info", TRUE);
188-
public static final BooleanSetting HIDE_LOCK_SCREEN_MENU = new BooleanSetting("revanced_hide_player_flyout_lock_screen", FALSE);
189-
public static final BooleanSetting HIDE_AUDIO_TRACK_MENU = new BooleanSetting("revanced_hide_player_flyout_audio_track", FALSE);
190-
public static final BooleanSetting HIDE_PLAYER_FLYOUT_MENU_SLEEP_TIMER = new BooleanSetting("revanced_hide_player_flyout_sleep_timer", FALSE);
191-
public static final BooleanSetting HIDE_WATCH_IN_VR_MENU = new BooleanSetting("revanced_hide_player_flyout_watch_in_vr", TRUE);
192-
public static final BooleanSetting HIDE_VIDEO_QUALITY_MENU_FOOTER = new BooleanSetting("revanced_hide_video_quality_menu_footer", FALSE);
181+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_CAPTIONS = new BooleanSetting("revanced_hide_player_flyout_captions", FALSE);
182+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE);
183+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_LOOP_VIDEO = new BooleanSetting("revanced_hide_player_flyout_loop_video", FALSE);
184+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_AMBIENT_MODE = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE);
185+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_HELP = new BooleanSetting("revanced_hide_player_flyout_help", TRUE);
186+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_SPEED = new BooleanSetting("revanced_hide_player_flyout_speed", FALSE);
187+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_MORE_INFO = new BooleanSetting("revanced_hide_player_flyout_more_info", TRUE);
188+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_LOCK_SCREEN = new BooleanSetting("revanced_hide_player_flyout_lock_screen", FALSE);
189+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_AUDIO_TRACK = new BooleanSetting("revanced_hide_player_flyout_audio_track", FALSE);
190+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_SLEEP_TIMER = new BooleanSetting("revanced_hide_player_flyout_sleep_timer", FALSE);
191+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_STABLE_VOLUME = new BooleanSetting("revanced_hide_player_flyout_stable_volume", FALSE);
192+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_WATCH_IN_VR = new BooleanSetting("revanced_hide_player_flyout_watch_in_vr", TRUE);
193+
@Deprecated
194+
private static final BooleanSetting DEPRECATED_HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER = new BooleanSetting("revanced_hide_video_quality_menu_footer", FALSE);
195+
public static final BooleanSetting HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER = new BooleanSetting("revanced_hide_player_flyout_video_quality_footer", FALSE);
193196

194197
// General layout
195198
public static final EnumSetting<StartPage> CHANGE_START_PAGE = new EnumSetting<>("revanced_change_start_page", StartPage.ORIGINAL, true);
@@ -379,6 +382,8 @@ public class Settings extends BaseSettings {
379382

380383
migrateOldSettingToNew(HIDE_PLAYER_BUTTONS, HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS);
381384

385+
migrateOldSettingToNew(DEPRECATED_HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER, HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER);
386+
382387
// endregion
383388
}
384389
}

‎patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,15 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch(
4646
SwitchPreference("revanced_hide_player_flyout_additional_settings"),
4747
SwitchPreference("revanced_hide_player_flyout_loop_video"),
4848
SwitchPreference("revanced_hide_player_flyout_ambient_mode"),
49+
SwitchPreference("revanced_hide_player_flyout_stable_volume"),
4950
SwitchPreference("revanced_hide_player_flyout_help"),
5051
SwitchPreference("revanced_hide_player_flyout_speed"),
5152
SwitchPreference("revanced_hide_player_flyout_lock_screen"),
5253
SwitchPreference("revanced_hide_player_flyout_more_info"),
5354
SwitchPreference("revanced_hide_player_flyout_audio_track"),
5455
SwitchPreference("revanced_hide_player_flyout_watch_in_vr"),
5556
SwitchPreference("revanced_hide_player_flyout_sleep_timer"),
56-
SwitchPreference("revanced_hide_video_quality_menu_footer"),
57+
SwitchPreference("revanced_hide_player_flyout_video_quality_footer"),
5758
),
5859
),
5960
)

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,9 @@ This is because Crowdin requires temporarily flattening this file and removing t
527527
<string name="revanced_hide_player_flyout_ambient_mode_title">Hide Ambient mode</string>
528528
<string name="revanced_hide_player_flyout_ambient_mode_summary_on">Ambient mode menu is hidden</string>
529529
<string name="revanced_hide_player_flyout_ambient_mode_summary_off">Ambient mode menu is shown</string>
530+
<string name="revanced_hide_player_flyout_stable_volume_title">Hide Stable volume</string>
531+
<string name="revanced_hide_player_flyout_stable_volume_summary_off">Stable volume menu is shown</string>
532+
<string name="revanced_hide_player_flyout_stable_volume_summary_on">Stable volume menu is hidden</string>
530533
<!-- 'Help & feedback' should be translated using the same localized wording YouTube displays for the menu item. -->
531534
<string name="revanced_hide_player_flyout_help_title">Hide Help &amp; feedback</string>
532535
<string name="revanced_hide_player_flyout_help_summary_on">Help &amp; feedback menu is hidden</string>
@@ -552,9 +555,9 @@ This is because Crowdin requires temporarily flattening this file and removing t
552555
<string name="revanced_hide_player_flyout_watch_in_vr_title">Hide Watch in VR</string>
553556
<string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Watch in VR menu is hidden</string>
554557
<string name="revanced_hide_player_flyout_watch_in_vr_summary_off">Watch in VR menu is shown</string>
555-
<string name="revanced_hide_video_quality_menu_footer_title">Hide video quality menu footer</string>
556-
<string name="revanced_hide_video_quality_menu_footer_summary_on">Video quality menu footer is hidden</string>
557-
<string name="revanced_hide_video_quality_menu_footer_summary_off">Video quality menu footer is shown</string>
558+
<string name="revanced_hide_player_flyout_video_quality_footer_title">Hide video quality menu footer</string>
559+
<string name="revanced_hide_player_flyout_video_quality_footer_summary_on">Video quality menu footer is hidden</string>
560+
<string name="revanced_hide_player_flyout_video_quality_footer_summary_off">Video quality menu footer is shown</string>
558561
</patch>
559562
<patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">
560563
<string name="revanced_hide_player_previous_next_buttons_title">Hide previous &amp; next video buttons</string>

0 commit comments

Comments
 (0)