fix(Hide settings menu): do not use strings for filtering

This commit is contained in:
inotia00 2024-10-06 22:16:21 +09:00
parent 542291414e
commit 98a1cb3ee4
18 changed files with 362 additions and 98 deletions

View File

@ -2,7 +2,6 @@ package app.revanced.patches.music.ads.general
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patches.music.ads.general.MusicAdsPatch.hookLithoFullscreenAds
import app.revanced.patches.music.ads.general.MusicAdsPatch.hookNonLithoFullscreenAds
@ -10,8 +9,6 @@ import app.revanced.patches.music.ads.general.fingerprints.AccountMenuFooterFing
import app.revanced.patches.music.ads.general.fingerprints.FloatingLayoutFingerprint
import app.revanced.patches.music.ads.general.fingerprints.GetPremiumTextViewFingerprint
import app.revanced.patches.music.ads.general.fingerprints.InterstitialsContainerFingerprint
import app.revanced.patches.music.ads.general.fingerprints.MembershipSettingsFingerprint
import app.revanced.patches.music.ads.general.fingerprints.MembershipSettingsParentFingerprint
import app.revanced.patches.music.ads.general.fingerprints.NotifierShelfFingerprint
import app.revanced.patches.music.ads.general.fingerprints.ShowDialogCommandFingerprint
import app.revanced.patches.music.navigation.components.NavigationBarComponentsPatch
@ -55,7 +52,6 @@ object AdsPatch : BaseBytecodePatch(
FloatingLayoutFingerprint,
GetPremiumTextViewFingerprint,
InterstitialsContainerFingerprint,
MembershipSettingsParentFingerprint,
NotifierShelfFingerprint,
ShowDialogCommandFingerprint
)
@ -163,20 +159,6 @@ object AdsPatch : BaseBytecodePatch(
}
}
// premium membership menu in settings
MembershipSettingsFingerprint.resolve(
context,
MembershipSettingsParentFingerprint.resultOrThrow().classDef
)
MembershipSettingsFingerprint.resultOrThrow().mutableMethod.addInstructions(
0, """
const/4 v0, 0x0
return-object v0
"""
)
// endregion
LithoFilterPatch.addFilter(ADS_FILTER_CLASS_DESCRIPTOR)
SettingsPatch.addSwitchPreference(

View File

@ -1,11 +0,0 @@
package app.revanced.patches.music.ads.general.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
internal object MembershipSettingsFingerprint : MethodFingerprint(
returnType = "Ljava/lang/CharSequence;",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList()
)

View File

@ -1,12 +0,0 @@
package app.revanced.patches.music.ads.general.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
internal object MembershipSettingsParentFingerprint : MethodFingerprint(
returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(),
strings = listOf("SPmanage_red")
)

View File

@ -15,7 +15,9 @@ import app.revanced.patches.music.general.components.fingerprints.FloatingButton
import app.revanced.patches.music.general.components.fingerprints.HistoryMenuItemFingerprint
import app.revanced.patches.music.general.components.fingerprints.HistoryMenuItemOfflineTabFingerprint
import app.revanced.patches.music.general.components.fingerprints.MediaRouteButtonFingerprint
import app.revanced.patches.music.general.components.fingerprints.ParentToolMenuFingerprint
import app.revanced.patches.music.general.components.fingerprints.PlayerOverlayChipFingerprint
import app.revanced.patches.music.general.components.fingerprints.PreferenceScreenFingerprint
import app.revanced.patches.music.general.components.fingerprints.SearchBarFingerprint
import app.revanced.patches.music.general.components.fingerprints.SearchBarParentFingerprint
import app.revanced.patches.music.general.components.fingerprints.SoundSearchFingerprint
@ -26,6 +28,7 @@ import app.revanced.patches.music.general.components.fingerprints.TopBarMenuItem
import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.music.utils.integrations.Constants.GENERAL_PATH
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MusicTasteBuilderShelf
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PlayerOverlayChip
@ -62,7 +65,9 @@ object LayoutComponentsPatch : BaseBytecodePatch(
HistoryMenuItemFingerprint,
HistoryMenuItemOfflineTabFingerprint,
MediaRouteButtonFingerprint,
ParentToolMenuFingerprint,
PlayerOverlayChipFingerprint,
PreferenceScreenFingerprint,
SearchBarParentFingerprint,
SoundSearchFingerprint,
TasteBuilderConstructorFingerprint,
@ -70,9 +75,10 @@ object LayoutComponentsPatch : BaseBytecodePatch(
TopBarMenuItemImageViewFingerprint
)
) {
private const val INTEGRATIONS_SETTINGS_MENU_DESCRIPTOR =
"$GENERAL_PATH/SettingsMenuPatch;"
private const val CUSTOM_FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/CustomFilter;"
private const val LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/LayoutComponentsFilter;"
@ -194,6 +200,35 @@ object LayoutComponentsPatch : BaseBytecodePatch(
// endregion
// region patch for hide setting menus
PreferenceScreenFingerprint.resultOrThrow().mutableMethod.apply {
addInstructions(
implementation!!.instructions.lastIndex, """
invoke-virtual/range {p0 .. p0}, Lcom/google/android/apps/youtube/music/settings/fragment/SettingsHeadersFragment;->getPreferenceScreen()Landroidx/preference/PreferenceScreen;
move-result-object v0
invoke-static {v0}, $INTEGRATIONS_SETTINGS_MENU_DESCRIPTOR->hideSettingsMenu(Landroidx/preference/PreferenceScreen;)V
"""
)
}
// The lowest version supported by the patch does not have parent tool settings
ParentToolMenuFingerprint.result?.let {
it.mutableMethod.apply {
val index = it.scanResult.patternScanResult!!.startIndex + 1
val register = getInstruction<FiveRegisterInstruction>(index).registerD
addInstructions(
index, """
invoke-static {v$register}, $INTEGRATIONS_SETTINGS_MENU_DESCRIPTOR->hideParentToolsMenu(Z)Z
move-result v$register
"""
)
}
}
// endregion
// region patch for hide sound search button
SoundSearchFingerprint.result?.let {
@ -299,16 +334,6 @@ object LayoutComponentsPatch : BaseBytecodePatch(
"revanced_custom_filter_strings",
"revanced_custom_filter"
)
SettingsPatch.addSwitchPreference(
CategoryType.GENERAL,
"revanced_hide_settings_menu",
"false"
)
SettingsPatch.addPreferenceWithIntent(
CategoryType.GENERAL,
"revanced_hide_settings_menu_filter_strings",
"revanced_hide_settings_menu"
)
SettingsPatch.addSwitchPreference(
CategoryType.GENERAL,
"revanced_hide_button_shelf",
@ -373,5 +398,66 @@ object LayoutComponentsPatch : BaseBytecodePatch(
"revanced_hide_voice_search_button",
"false"
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_parent_tools",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_general",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_playback",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_data_saving",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_downloads_and_storage",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_notification",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_privacy_and_location",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_recommendations",
"false",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_paid_memberships",
"true",
false
)
SettingsPatch.addSwitchPreference(
CategoryType.SETTINGS,
"revanced_hide_settings_menu_about",
"false",
false
)
}
}

View File

@ -0,0 +1,20 @@
package app.revanced.patches.music.general.components.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode
internal object ParentToolMenuFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
opcodes = listOf(
Opcode.CONST_4,
Opcode.INVOKE_VIRTUAL,
Opcode.IGET,
),
strings = listOf("pref_key_parent_tools"),
customFingerprint = { methodDef, _ ->
methodDef.name == "onSettingsLoaded"
}
)

View File

@ -0,0 +1,11 @@
package app.revanced.patches.music.general.components.fingerprints
import app.revanced.patcher.fingerprint.MethodFingerprint
internal object PreferenceScreenFingerprint : MethodFingerprint(
returnType = "V",
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lcom/google/android/apps/youtube/music/settings/fragment/SettingsHeadersFragment;" &&
methodDef.name == "onCreatePreferences"
}
)

View File

@ -136,6 +136,7 @@ object VisualPreferencesIconsPatch : BaseResourcePatch(
"revanced_preference_screen_general",
"revanced_preference_screen_navigation",
"revanced_preference_screen_player",
"revanced_preference_screen_settings",
"revanced_preference_screen_video",
"revanced_preference_screen_ryd",
"revanced_preference_screen_sb",

View File

@ -8,6 +8,7 @@ enum class CategoryType(val value: String, var added: Boolean) {
GENERAL("general", false),
NAVIGATION("navigation", false),
PLAYER("player", false),
SETTINGS("settings", false),
VIDEO("video", false),
RETURN_YOUTUBE_DISLIKE("ryd", false),
SPONSOR_BLOCK("sb", false),

View File

@ -1,42 +1,43 @@
package app.revanced.patches.shared.settingmenu
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.shared.integrations.Constants.PATCHES_PATH
import app.revanced.patches.shared.settingmenu.fingerprints.SettingsMenuFingerprint
import app.revanced.patches.shared.viewgroup.ViewGroupMarginLayoutParamsHookPatch
import app.revanced.util.getReference
import app.revanced.util.indexOfFirstInstructionOrThrow
import app.revanced.util.resultOrThrow
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
import com.android.tools.smali.dexlib2.iface.reference.FieldReference
import app.revanced.patches.shared.settingmenu.fingerprints.FindPreferenceFingerprint
import app.revanced.patches.shared.settingmenu.fingerprints.RemovePreferenceFingerprint
import app.revanced.util.findMethodOrThrow
import app.revanced.util.getMethodCall
@Patch(
description = "Hide the settings menu for YouTube or YouTube Music.",
dependencies = [ViewGroupMarginLayoutParamsHookPatch::class]
)
object SettingsMenuPatch : BytecodePatch(
setOf(SettingsMenuFingerprint)
setOf(
FindPreferenceFingerprint,
RemovePreferenceFingerprint
)
) {
private const val INTEGRATIONS_CLASS_DESCRIPTOR =
"$PATCHES_PATH/SettingsMenuPatch;"
"$PATCHES_PATH/BaseSettingsMenuPatch;"
override fun execute(context: BytecodeContext) {
SettingsMenuFingerprint.resultOrThrow().mutableMethod.apply {
val insertIndex = indexOfFirstInstructionOrThrow {
getReference<FieldReference>()?.type == "Landroid/support/v7/widget/RecyclerView;"
}
val insertRegister = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
val findPreferenceMethodCall = FindPreferenceFingerprint.getMethodCall()
val removePreferenceMethodCall = RemovePreferenceFingerprint.getMethodCall()
addInstruction(
insertIndex,
"invoke-static {v$insertRegister}, " +
"$INTEGRATIONS_CLASS_DESCRIPTOR->hideSettingsMenu(Landroid/support/v7/widget/RecyclerView;)V"
)
}
context.findMethodOrThrow(INTEGRATIONS_CLASS_DESCRIPTOR) {
name == "removePreference"
}.addInstructionsWithLabels(
0, """
invoke-virtual {p0, p1}, $findPreferenceMethodCall
move-result-object v0
if-eqz v0, :ignore
invoke-virtual {p0, v0}, $removePreferenceMethodCall
:ignore
return-void
"""
)
}
}

View File

@ -0,0 +1,15 @@
package app.revanced.patches.shared.settingmenu.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
internal object FindPreferenceFingerprint : MethodFingerprint(
returnType = "Landroidx/preference/Preference;",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Ljava/lang/CharSequence;"),
strings = listOf("Key cannot be null"),
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Landroidx/preference/PreferenceGroup;"
}
)

View File

@ -0,0 +1,19 @@
package app.revanced.patches.shared.settingmenu.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode
internal object RemovePreferenceFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Landroidx/preference/Preference;"),
opcodes = listOf(Opcode.INVOKE_VIRTUAL),
customFingerprint = custom@{ methodDef, _ ->
if (methodDef.definingClass != "Landroidx/preference/PreferenceGroup;") {
return@custom false
}
val instructions = methodDef.implementation?.instructions ?: return@custom false
instructions.elementAt(0).opcode == Opcode.INVOKE_DIRECT
}
)

View File

@ -1,8 +0,0 @@
package app.revanced.patches.shared.settingmenu.fingerprints
import app.revanced.util.fingerprint.LiteralValueFingerprint
internal object SettingsMenuFingerprint : LiteralValueFingerprint(
returnType = "Landroid/view/View;",
literalSupplier = { 16908351 },
)

View File

@ -5,6 +5,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.litho.LithoFilterPatch
@ -19,11 +20,13 @@ import app.revanced.patches.youtube.general.components.fingerprints.AppBlockingC
import app.revanced.patches.youtube.general.components.fingerprints.BottomUiContainerFingerprint
import app.revanced.patches.youtube.general.components.fingerprints.FloatingMicrophoneFingerprint
import app.revanced.patches.youtube.general.components.fingerprints.PiPNotificationFingerprint
import app.revanced.patches.youtube.general.components.fingerprints.PreferenceScreenFingerprint
import app.revanced.patches.youtube.general.components.fingerprints.TooltipContentFullscreenFingerprint
import app.revanced.patches.youtube.general.components.fingerprints.TooltipContentViewFingerprint
import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.youtube.utils.integrations.Constants.COMPONENTS_PATH
import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL_PATH
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.AccountSwitcherAccessibility
import app.revanced.patches.youtube.utils.settings.SettingsPatch
@ -60,10 +63,13 @@ object LayoutComponentsPatch : BaseBytecodePatch(
BottomUiContainerFingerprint,
FloatingMicrophoneFingerprint,
PiPNotificationFingerprint,
PreferenceScreenFingerprint,
TooltipContentFullscreenFingerprint,
TooltipContentViewFingerprint
)
) {
private const val INTEGRATIONS_SETTINGS_MENU_DESCRIPTOR =
"$GENERAL_PATH/SettingsMenuPatch;"
private const val CUSTOM_FILTER_CLASS_DESCRIPTOR =
"$COMPONENTS_PATH/CustomFilter;"
private const val LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR =
@ -193,6 +199,29 @@ object LayoutComponentsPatch : BaseBytecodePatch(
// endregion
// region patch for hide setting menus
PreferenceScreenFingerprint.resultOrThrow().mutableMethod.apply {
val targetIndex =
PreferenceScreenFingerprint.indexOfPreferenceScreenInstruction(this)
val targetRegister = getInstruction<FiveRegisterInstruction>(targetIndex).registerC
val targetReference = getInstruction<ReferenceInstruction>(targetIndex).reference
val insertIndex = implementation!!.instructions.lastIndex
addInstructions(
insertIndex + 1, """
invoke-virtual {v$targetRegister}, $targetReference
move-result-object v$targetRegister
invoke-static {v$targetRegister}, $INTEGRATIONS_SETTINGS_MENU_DESCRIPTOR->hideSettingsMenu(Landroidx/preference/PreferenceScreen;)V
return-void
"""
)
removeInstruction(insertIndex)
}
// endregion
// region patch for hide snack bar
BottomUiContainerFingerprint.resultOrThrow().let {

View File

@ -0,0 +1,30 @@
package app.revanced.patches.youtube.general.components.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import app.revanced.patches.youtube.general.components.fingerprints.PreferenceScreenFingerprint.indexOfPreferenceScreenInstruction
import app.revanced.util.getReference
import app.revanced.util.indexOfFirstInstructionReversed
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.Method
import com.android.tools.smali.dexlib2.iface.reference.MethodReference
internal object PreferenceScreenFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = emptyList(),
strings = listOf(":android:show_fragment_args"),
customFingerprint = { methodDef, classDef ->
AccessFlags.SYNTHETIC.isSet(classDef.accessFlags) &&
indexOfPreferenceScreenInstruction(methodDef) >= 0
}
) {
fun indexOfPreferenceScreenInstruction(methodDef: Method) =
methodDef.indexOfFirstInstructionReversed {
val reference = getReference<MethodReference>()
opcode == Opcode.INVOKE_VIRTUAL &&
reference?.returnType == "Landroidx/preference/PreferenceScreen;" &&
reference.parameterTypes.size == 0
}
}

View File

@ -128,7 +128,6 @@ Info:
<string name="revanced_replace_flyout_menu_report_only_player_summary">Keeps the Report menu in the comments section intact.</string>
<!-- PreferenceScreen: General -->
<string name="revanced_preference_screen_general_title">General</string>
@ -151,11 +150,6 @@ Info:
<!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
<string name="revanced_custom_filter_strings_summary">List of component path builder strings to filter, separated by new lines.</string>
<string name="revanced_custom_filter_toast_invalid_syntax">Invalid custom filter: %s.</string>
<string name="revanced_hide_settings_menu_title">Hide settings menu</string>
<string name="revanced_hide_settings_menu_summary">"Hide elements of the settings menu.
This hides not only the YT Music settings menu, but also the ReVanced Extended settings menu."</string>
<string name="revanced_hide_settings_menu_filter_strings_title">Settings menu filter</string>
<string name="revanced_hide_settings_menu_filter_strings_summary">List of settings menu names to filter, separated by new lines.</string>
<string name="revanced_hide_button_shelf_title">Hide button shelf</string>
<string name="revanced_hide_button_shelf_summary">Hides the button shelf in the feed.</string>
<string name="revanced_hide_carousel_shelf_title">Hide carousel shelf</string>
@ -263,6 +257,22 @@ This does not bypass the age restriction. It just accepts it automatically."</st
<string name="revanced_restore_old_player_layout_summary">"Returns the player layout to the old style.
Some features may not work properly in the old player layout."</string>
<!-- PreferenceScreen: Settings menu -->
<string name="revanced_preference_screen_settings_title">Settings menu</string>
<string name="revanced_hide_settings_menu_parent_tools_title">Hide Family Center menu</string>
<string name="revanced_hide_settings_menu_general_title">Hide General menu</string>
<string name="revanced_hide_settings_menu_playback_title">Hide Playback menu</string>
<string name="revanced_hide_settings_menu_data_saving_title">Hide Data saving menu</string>
<string name="revanced_hide_settings_menu_downloads_and_storage_title">Hide Downloads &amp; storage menu</string>
<string name="revanced_hide_settings_menu_notification_title">Hide Notifications menu</string>
<string name="revanced_hide_settings_menu_privacy_and_location_title">Hide Privacy &amp; data menu</string>
<string name="revanced_hide_settings_menu_recommendations_title">Hide Recommendations menu</string>
<string name="revanced_hide_settings_menu_paid_memberships_title">Hide Get Music premium menu</string>
<string name="revanced_hide_settings_menu_about_title">Hide About menu</string>
<!-- PreferenceScreen: Video -->
<string name="revanced_preference_screen_video_title">Video</string>
@ -283,6 +293,7 @@ Some features may not work properly in the old player layout."</string>
<string name="revanced_remember_video_quality_none">Failed to set quality.</string>
<string name="revanced_remember_video_quality_wifi">Changing default Wi-Fi quality to %s.</string>
<!-- PreferenceScreen: Return YouTube Dislike -->
<string name="revanced_preference_screen_ryd_title">Return YouTube Dislike</string>

View File

@ -0,0 +1,18 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<group
android:scaleX="0.5"
android:scaleY="0.5"
android:pivotX="300"
android:pivotY="480">
<path
android:name="path"
android:pathData="M 413.384 840 L 397.231 725.539 Q 375.154 718.539 348.769 703.846 Q 322.385 689.154 304.077 672.308 L 198.384 720.154 L 131.538 601.538 L 225.692 531.769 Q 223.692 519.692 222.423 506.269 Q 221.154 492.846 221.154 480.769 Q 221.154 469.462 222.423 456.038 Q 223.692 442.615 225.692 428.231 L 131.538 357.692 L 198.384 241.384 L 303.308 287.692 Q 323.923 270.846 348.769 256.538 Q 373.615 242.231 396.461 235.461 L 413.384 120 L 546.616 120 L 562.769 235.231 Q 587.923 244.538 610.577 257.192 Q 633.231 269.846 653.615 287.692 L 762.385 241.384 L 828.462 357.692 L 731.231 429.308 Q 734.769 443.154 735.654 455.808 Q 736.539 468.462 736.539 480 Q 736.539 490.769 735.269 503.308 Q 734 515.846 731.231 531.231 L 827.693 601.538 L 760.846 720.154 L 653.615 671.539 Q 632.231 689.923 609.423 703.962 Q 586.616 718 562.769 724.769 L 546.616 840 L 413.384 840 Z M 438.308 809.231 L 520.923 809.231 L 535.692 698 Q 566.385 690 592.039 675.308 Q 617.692 660.615 644 635.846 L 746.923 680.308 L 786.923 610.615 L 696 543.154 Q 700 524.615 702.115 509.654 Q 704.231 494.692 704.231 480 Q 704.231 463.769 702.231 449.577 Q 700.231 435.385 696 418.385 L 788.462 349.385 L 748.462 279.692 L 643.231 324.154 Q 624.077 302.769 593.539 284.115 Q 563 265.461 534.923 262 L 521.692 150.769 L 438.308 150.769 L 425.846 261.231 Q 393.385 267.461 366.961 282.538 Q 340.538 297.615 315.231 323.385 L 211.538 279.692 L 171.538 349.385 L 262.461 416.077 Q 257.692 430.769 255.577 446.885 Q 253.461 463 253.461 480.769 Q 253.461 497 255.577 512.346 Q 257.692 527.692 261.692 543.154 L 171.538 610.615 L 211.538 680.308 L 314.461 636.615 Q 338.461 661.385 365.269 676.077 Q 392.077 690.769 425.077 698.769 L 438.308 809.231 Z M 477.692 575.385 Q 517.846 575.385 545.462 547.769 Q 573.077 520.154 573.077 480 Q 573.077 439.846 545.462 412.231 Q 517.846 384.615 477.692 384.615 Q 438.308 384.615 410.308 412.231 Q 382.307 439.846 382.307 480 Q 382.307 520.154 410.308 547.769 Q 438.308 575.385 477.692 575.385 Z M 480 480 Z"
android:fillColor="@android:color/white" />
</group>
</vector>

View File

@ -526,13 +526,66 @@ If this setting do not take effect, try switching to Incognito mode."</string>
<string name="revanced_preference_screen_settings_menu_title">Settings menu</string>
<string name="revanced_preference_screen_settings_menu_summary">Hide elements of the YouTube settings menu.</string>
<string name="revanced_hide_settings_menu_title">Hide YouTube settings menu</string>
<string name="revanced_hide_settings_menu_summary">Hide elements of the YouTube settings menu.</string>
<string name="revanced_hide_settings_menu_filter_strings_title">YouTube settings menu filter</string>
<string name="revanced_hide_settings_menu_filter_strings_summary">List of YouTube settings menu names to filter, separated by new lines.</string>
<string name="revanced_hide_settings_menu_filter_strings_hint">"Account
Data saving
Captions"</string>
<string name="revanced_hide_settings_menu_parent_tools_title">Hide Family Center menu</string>
<string name="revanced_hide_settings_menu_parent_tools_summary_on">Family Center menu is hidden.</string>
<string name="revanced_hide_settings_menu_parent_tools_summary_off">Family Center menu is shown.</string>
<string name="revanced_hide_settings_menu_general_title">Hide General menu</string>
<string name="revanced_hide_settings_menu_general_summary_on">General menu is hidden.</string>
<string name="revanced_hide_settings_menu_general_summary_off">General menu is shown.</string>
<string name="revanced_hide_settings_menu_account_title">Hide Account menu</string>
<string name="revanced_hide_settings_menu_account_summary_on">Account menu is hidden.</string>
<string name="revanced_hide_settings_menu_account_summary_off">Account menu is shown.</string>
<string name="revanced_hide_settings_menu_data_saving_title">Hide Data saving menu</string>
<string name="revanced_hide_settings_menu_data_saving_summary_on">Data saving menu is hidden.</string>
<string name="revanced_hide_settings_menu_data_saving_summary_off">Data saving menu is shown.</string>
<string name="revanced_hide_settings_menu_auto_play_title">Hide Autoplay menu</string>
<string name="revanced_hide_settings_menu_auto_play_summary_on">Autoplay menu is hidden.</string>
<string name="revanced_hide_settings_menu_auto_play_summary_off">Autoplay menu is shown.</string>
<string name="revanced_hide_settings_menu_video_quality_title">Hide Video quality preferences menu</string>
<string name="revanced_hide_settings_menu_video_quality_summary_on">Video quality preferences menu is hidden.</string>
<string name="revanced_hide_settings_menu_video_quality_summary_off">Video quality preferences menu is shown.</string>
<string name="revanced_hide_settings_menu_offline_title">Hide Background menu</string>
<string name="revanced_hide_settings_menu_offline_summary_on">Background menu is hidden.</string>
<string name="revanced_hide_settings_menu_offline_summary_off">Background menu is shown.</string>
<string name="revanced_hide_settings_menu_pair_with_tv_title">Hide Watch on TV menu</string>
<string name="revanced_hide_settings_menu_pair_with_tv_summary_on">Watch on TV menu is hidden.</string>
<string name="revanced_hide_settings_menu_pair_with_tv_summary_off">Watch on TV menu is shown.</string>
<string name="revanced_hide_settings_menu_history_title">Hide Manage all history menu</string>
<string name="revanced_hide_settings_menu_history_summary_on">Manage all history menu is hidden.</string>
<string name="revanced_hide_settings_menu_history_summary_off">Manage all history menu is shown.</string>
<string name="revanced_hide_settings_menu_your_data_title">Hide Your data in YouTube menu</string>
<string name="revanced_hide_settings_menu_your_data_summary_on">Your data in YouTube menu is hidden.</string>
<string name="revanced_hide_settings_menu_your_data_summary_off">Your data in YouTube menu is shown.</string>
<string name="revanced_hide_settings_menu_privacy_title">Hide Privacy menu</string>
<string name="revanced_hide_settings_menu_privacy_summary_on">Privacy menu is hidden.</string>
<string name="revanced_hide_settings_menu_privacy_summary_off">Privacy menu is shown.</string>
<string name="revanced_hide_settings_menu_premium_early_access_title">Hide Try experimental new features menu</string>
<string name="revanced_hide_settings_menu_premium_early_access_summary_on">Try experimental new features menu is hidden.</string>
<string name="revanced_hide_settings_menu_premium_early_access_summary_off">Try experimental new features menu is shown.</string>
<string name="revanced_hide_settings_menu_subscription_product_title">Hide Purchases and memberships menu</string>
<string name="revanced_hide_settings_menu_subscription_product_summary_on">Purchases and memberships menu is hidden.</string>
<string name="revanced_hide_settings_menu_subscription_product_summary_off">Purchases and memberships menu is shown.</string>
<string name="revanced_hide_settings_menu_billing_and_payment_title">Hide Billing and payments menu</string>
<string name="revanced_hide_settings_menu_billing_and_payment_summary_on">Billing and payments menu is hidden.</string>
<string name="revanced_hide_settings_menu_billing_and_payment_summary_off">Billing and payments menu is shown.</string>
<string name="revanced_hide_settings_menu_notification_title">Hide Notifications menu</string>
<string name="revanced_hide_settings_menu_notification_summary_on">Notifications menu is hidden.</string>
<string name="revanced_hide_settings_menu_notification_summary_off">Notifications menu is shown.</string>
<string name="revanced_hide_settings_menu_connected_accounts_title">Hide Connected apps menu</string>
<string name="revanced_hide_settings_menu_connected_accounts_summary_on">Connected apps menu is hidden.</string>
<string name="revanced_hide_settings_menu_connected_accounts_summary_off">Connected apps menu is shown.</string>
<string name="revanced_hide_settings_menu_live_chat_title">Hide Live chat menu</string>
<string name="revanced_hide_settings_menu_live_chat_summary_on">Live chat menu is hidden.</string>
<string name="revanced_hide_settings_menu_live_chat_summary_off">Live chat menu is shown.</string>
<string name="revanced_hide_settings_menu_captions_title">Hide Captions menu</string>
<string name="revanced_hide_settings_menu_captions_summary_on">Captions menu is hidden.</string>
<string name="revanced_hide_settings_menu_captions_summary_off">Captions menu is shown.</string>
<string name="revanced_hide_settings_menu_accessibility_title">Hide Accessibility menu</string>
<string name="revanced_hide_settings_menu_accessibility_summary_on">Accessibility menu is hidden.</string>
<string name="revanced_hide_settings_menu_accessibility_summary_off">Accessibility menu is shown.</string>
<string name="revanced_hide_settings_menu_about_title">Hide About menu</string>
<string name="revanced_hide_settings_menu_about_summary_on">About menu is hidden.</string>
<string name="revanced_hide_settings_menu_about_summary_off">About menu is shown.</string>
<!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Toolbar -->
<string name="revanced_preference_screen_toolbar_title">Toolbar</string>

View File

@ -198,8 +198,26 @@
<!-- SETTINGS: HIDE_LAYOUT_COMPONENTS
<PreferenceScreen android:title="@string/revanced_preference_screen_settings_menu_title" android:key="revanced_preference_screen_settings_menu" android:summary="@string/revanced_preference_screen_settings_menu_summary">
<SwitchPreference android:title="@string/revanced_hide_settings_menu_title" android:key="revanced_hide_settings_menu" android:summary="@string/revanced_hide_settings_menu_summary" />
<app.revanced.integrations.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_hide_settings_menu_filter_strings_title" android:key="revanced_hide_settings_menu_filter_strings" android:summary="@string/revanced_hide_settings_menu_filter_strings_summary" android:hint="@string/revanced_hide_settings_menu_filter_strings_hint" android:inputType="textMultiLine" android:dependency="revanced_hide_settings_menu" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_parent_tools_title" android:key="revanced_hide_settings_menu_parent_tools" android:summaryOn="@string/revanced_hide_settings_menu_parent_tools_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_parent_tools_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_general_title" android:key="revanced_hide_settings_menu_general" android:summaryOn="@string/revanced_hide_settings_menu_general_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_general_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_account_title" android:key="revanced_hide_settings_menu_account" android:summaryOn="@string/revanced_hide_settings_menu_account_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_account_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_data_saving_title" android:key="revanced_hide_settings_menu_data_saving" android:summaryOn="@string/revanced_hide_settings_menu_data_saving_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_data_saving_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_auto_play_title" android:key="revanced_hide_settings_menu_auto_play" android:summaryOn="@string/revanced_hide_settings_menu_auto_play_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_auto_play_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_video_quality_title" android:key="revanced_hide_settings_menu_video_quality" android:summaryOn="@string/revanced_hide_settings_menu_video_quality_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_video_quality_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_offline_title" android:key="revanced_hide_settings_menu_offline" android:summaryOn="@string/revanced_hide_settings_menu_offline_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_offline_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_pair_with_tv_title" android:key="revanced_hide_settings_menu_pair_with_tv" android:summaryOn="@string/revanced_hide_settings_menu_pair_with_tv_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_pair_with_tv_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_history_title" android:key="revanced_hide_settings_menu_history" android:summaryOn="@string/revanced_hide_settings_menu_history_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_history_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_your_data_title" android:key="revanced_hide_settings_menu_your_data" android:summaryOn="@string/revanced_hide_settings_menu_your_data_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_your_data_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_privacy_title" android:key="revanced_hide_settings_menu_privacy" android:summaryOn="@string/revanced_hide_settings_menu_privacy_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_privacy_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_premium_early_access_title" android:key="revanced_hide_settings_menu_premium_early_access" android:summaryOn="@string/revanced_hide_settings_menu_premium_early_access_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_premium_early_access_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_subscription_product_title" android:key="revanced_hide_settings_menu_subscription_product" android:summaryOn="@string/revanced_hide_settings_menu_subscription_product_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_subscription_product_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_billing_and_payment_title" android:key="revanced_hide_settings_menu_billing_and_payment" android:summaryOn="@string/revanced_hide_settings_menu_billing_and_payment_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_billing_and_payment_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_notification_title" android:key="revanced_hide_settings_menu_notification" android:summaryOn="@string/revanced_hide_settings_menu_notification_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_notification_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_connected_accounts_title" android:key="revanced_hide_settings_menu_connected_accounts" android:summaryOn="@string/revanced_hide_settings_menu_connected_accounts_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_connected_accounts_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_live_chat_title" android:key="revanced_hide_settings_menu_live_chat" android:summaryOn="@string/revanced_hide_settings_menu_live_chat_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_live_chat_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_captions_title" android:key="revanced_hide_settings_menu_captions" android:summaryOn="@string/revanced_hide_settings_menu_captions_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_captions_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_accessibility_title" android:key="revanced_hide_settings_menu_accessibility" android:summaryOn="@string/revanced_hide_settings_menu_accessibility_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_accessibility_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_settings_menu_about_title" android:key="revanced_hide_settings_menu_about" android:summaryOn="@string/revanced_hide_settings_menu_about_summary_on" android:summaryOff="@string/revanced_hide_settings_menu_about_summary_off" />
</PreferenceScreen>SETTINGS: HIDE_LAYOUT_COMPONENTS -->
<!-- SETTINGS: TOOLBAR_COMPONENTS