ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-12 05:07:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(settings): remove 'layout' label in string resource and code

Browse Source
This commit is contained in:
inotia00
2023-04-02 14:49:32 +09:00
parent 359e6e4dae
commit f690160996
67 changed files with 264 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
View File

@ -90,15 +90,15 @@ class GeneralAdsPatch : ResourcePatch {
"PREFERENCE: ADS_SETTINGS",
"SETTINGS: HIDE_GENERAL_ADS",
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"SETTINGS: HIDE_GENERAL_LAYOUT_ADS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_GENERAL_ADS",
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"PREFERENCE_HEADER: PLAYER",
"SETTINGS: HIDE_VIEW_PRODUCT",
"SETTINGS: DOUBLE_BACK_TIMEOUT",
"PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: BOTTOM_PLAYER_SETTINGS",
"SETTINGS: COMMENT_COMPONENT_PARENT"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
View File

@ -15,7 +15,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.misc.litho.patch.LithoFilterPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.BOTTOM_LAYOUT
import app.revanced.util.integrations.Constants.BOTTOM_PLAYER
@Patch
@Name("hide-button-container")
@ -34,7 +34,7 @@ class ButtonContainerPatch : ResourcePatch {
val instructionList =
"""
move-object/from16 v3, p2
invoke-static {v3, v10}, $BOTTOM_LAYOUT->hideActionButtons(Ljava/lang/Object;Ljava/nio/ByteBuffer;)Z
invoke-static {v3, v10}, $BOTTOM_PLAYER->hideActionButtons(Ljava/lang/Object;Ljava/nio/ByteBuffer;)Z
move-result v10
if-eqz v10, :do_not_block
move-object/from16 v15, p1
@ -72,7 +72,7 @@ class ButtonContainerPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: BOTTOM_PLAYER_SETTINGS",
"SETTINGS: BUTTON_CONTAINER"
)
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/buttomplayer/comment/patch/CommentComponentPatch.kt
View File

@ -32,7 +32,7 @@ class CommentComponentPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: BOTTOM_PLAYER_SETTINGS",
"SETTINGS: COMMENT_COMPONENT_PARENT",
"SETTINGS: COMMENT_COMPONENTS"
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/flyoutpanel/patch/FlyoutPanelPatch.kt
View File

@ -32,7 +32,7 @@ class FlyoutPanelPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS",
"PREFERENCE: FLYOUT_PANEL_SETTINGS",
"SETTINGS: FLYOUT_PANEL_COMPONENT"
)
)

8
src/main/kotlin/app/revanced/patches/youtube/layout/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
View File

@ -18,7 +18,7 @@ import app.revanced.patches.youtube.layout.flyoutpanel.oldqualitylayout.fingerpr
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.patches.youtube.misc.videoid.legacy.patch.LegacyVideoIdPatch
import app.revanced.util.integrations.Constants.FLYOUT_PANEL_LAYOUT
import app.revanced.util.integrations.Constants.FLYOUT_PANEL
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -47,7 +47,7 @@ class OldQualityLayoutPatch : BytecodePatch(
val register = (instruction(endIndex) as OneRegisterInstruction).registerA
addInstruction(
endIndex + 1,
"invoke-static { v$register }, $FLYOUT_PANEL_LAYOUT->enableOldQualityMenu(Landroid/widget/ListView;)V"
"invoke-static { v$register }, $FLYOUT_PANEL->enableOldQualityMenu(Landroid/widget/ListView;)V"
)
}
} ?: return QualityMenuViewInflateFingerprint.toErrorResult()
@ -58,7 +58,7 @@ class OldQualityLayoutPatch : BytecodePatch(
val register = (this.implementation!!.instructions[insertIndex] as OneRegisterInstruction).registerA
addInstructions(
insertIndex, """
invoke-static { v$register }, $FLYOUT_PANEL_LAYOUT->enableOldQualityLayout(I)I
invoke-static { v$register }, $FLYOUT_PANEL->enableOldQualityLayout(I)I
move-result v$register
"""
)
@ -70,7 +70,7 @@ class OldQualityLayoutPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS",
"PREFERENCE: FLYOUT_PANEL_SETTINGS",
"SETTINGS: ENABLE_OLD_QUALITY_LAYOUT"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.FULLSCREEN_LAYOUT
import app.revanced.util.integrations.Constants.FULLSCREEN
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
import org.jf.dexlib2.iface.instruction.Instruction
@ -68,7 +68,7 @@ class HideAutoplayPreviewPatch : BytecodePatch(
method.addInstructions(
insertIndex, """
invoke-static {}, $FULLSCREEN_LAYOUT->hideAutoPlayPreview()Z
invoke-static {}, $FULLSCREEN->hideAutoPlayPreview()Z
move-result v$dummyRegister
if-nez v$dummyRegister, :hidden
""", listOf(ExternalLabel("hidden", jumpInstruction))
@ -81,7 +81,7 @@ class HideAutoplayPreviewPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
"PREFERENCE: FULLSCREEN_SETTINGS",
"SETTINGS: HIDE_AUTOPLAY_PREVIEW"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt
View File

@ -17,7 +17,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.FULLSCREEN_LAYOUT
import app.revanced.util.integrations.Constants.FULLSCREEN
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@ -59,7 +59,7 @@ class HideEndScreenOverlayPatch : BytecodePatch() {
val dummyRegister = (instructions.elementAt(index) as Instruction31i).registerA
mutableMethod.addInstructions(
insertIndex, """
invoke-static {}, $FULLSCREEN_LAYOUT->hideEndScreenOverlay()Z
invoke-static {}, $FULLSCREEN->hideEndScreenOverlay()Z
move-result v$dummyRegister
if-eqz v$dummyRegister, :on
return-void
@ -85,7 +85,7 @@ class HideEndScreenOverlayPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
"PREFERENCE: FULLSCREEN_SETTINGS",
"SETTINGS: HIDE_ENDSCREEN_OVERLAY"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/flimstripoverlay/patch/HideFilmstripOverlayPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.fullscreen.flimstripoverlay.fingerprints.ScrubbingLabelFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.FULLSCREEN_LAYOUT
import app.revanced.util.integrations.Constants.FULLSCREEN
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@ -45,7 +45,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
it.addInstructions(
index + 1, """
invoke-static {}, $FULLSCREEN_LAYOUT->hideFilmstripOverlay()Z
invoke-static {}, $FULLSCREEN->hideFilmstripOverlay()Z
move-result v$dummyRegister
if-eqz v$dummyRegister, :show
const/4 v$primaryRegister, 0x0
@ -61,7 +61,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
"PREFERENCE: FULLSCREEN_SETTINGS",
"SETTINGS: HIDE_FILMSTRIP_OVERLAY"
)
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/bytecode/patch/HideFullscreenButtonContainerBytecodePatch.kt
View File

@ -43,7 +43,7 @@ class HideFullscreenButtonContainerBytecodePatch : BytecodePatch() {
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (invokeInstruction as Instruction21c).registerA
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/FullscreenLayoutPatch", "hideFullscreenButtonContainer")
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/FullscreenPatch", "hideFullscreenButtonContainer")
patchSuccessArray[0] = true
}

2
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenbuttoncontainer/resource/patch/HideFullscreenButtonContainerPatch.kt
View File

@ -33,7 +33,7 @@ class HideFullscreenButtonContainerPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
"PREFERENCE: FULLSCREEN_SETTINGS",
"SETTINGS: HIDE_FULLSCREEN_BUTTON_CONTAINER"
)
)

8
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
View File

@ -19,7 +19,7 @@ import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
import app.revanced.patches.youtube.layout.fullscreen.fullscreenbuttoncontainer.bytecode.patch.HideFullscreenButtonContainerBytecodePatch
import app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.fingerprints.FullscreenViewAdderFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.FULLSCREEN_LAYOUT
import app.revanced.util.integrations.Constants.FULLSCREEN
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
@ -53,7 +53,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
addInstructions(
endIndex - 3, """
invoke-static {}, $FULLSCREEN_LAYOUT->hideFullscreenPanels()I
invoke-static {}, $FULLSCREEN->hideFullscreenPanels()I
move-result v$register
"""
)
@ -76,7 +76,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
method.addInstructions(
invokeIndex, """
invoke-static {}, $FULLSCREEN_LAYOUT->showFullscreenTitle()Z
invoke-static {}, $FULLSCREEN->showFullscreenTitle()Z
move-result v$dummyRegister
if-eqz v$dummyRegister, :hidden
""", listOf(ExternalLabel("hidden", method.instruction(invokeIndex + 1)))
@ -88,7 +88,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
"PREFERENCE: FULLSCREEN_SETTINGS",
"SETTINGS: HIDE_FULLSCREEN_PANELS"
)
)

10
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/hapticfeedback/patch/HapticFeedBackPatch.kt
View File

@ -18,7 +18,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.fullscreen.hapticfeedback.fingerprints.*
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.FULLSCREEN_LAYOUT
import app.revanced.util.integrations.Constants.FULLSCREEN
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -56,7 +56,7 @@ class HapticFeedBackPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS",
"PREFERENCE: FULLSCREEN_SETTINGS",
"SETTINGS: DISABLE_HAPTIC_FEEDBACK"
)
)
@ -79,7 +79,7 @@ class HapticFeedBackPatch : BytecodePatch(
addInstructions(
insertIndex, """
invoke-static {}, $FULLSCREEN_LAYOUT->$targetMethodName()Z
invoke-static {}, $FULLSCREEN->$targetMethodName()Z
move-result v$dummyRegister
if-eqz v$dummyRegister, :vibrate
const-wide/16 v$targetRegister, 0x0
@ -91,7 +91,7 @@ class HapticFeedBackPatch : BytecodePatch(
addInstructions(
startIndex, """
invoke-static {}, $FULLSCREEN_LAYOUT->$targetMethodName()Z
invoke-static {}, $FULLSCREEN->$targetMethodName()Z
move-result v$dummyRegister
if-eqz v$dummyRegister, :vibrate
return-void
@ -103,7 +103,7 @@ class HapticFeedBackPatch : BytecodePatch(
fun MethodFingerprintResult.voidHaptics(targetMethodName: String) {
mutableMethod.addInstructions(
0, """
invoke-static {}, $FULLSCREEN_LAYOUT->$targetMethodName()Z
invoke-static {}, $FULLSCREEN->$targetMethodName()Z
move-result v0
if-eqz v0, :vibrate
return-void

8
src/main/kotlin/app/revanced/patches/youtube/layout/general/accountmenu/patch/AccountMenuPatch.kt
View File

@ -18,7 +18,7 @@ import app.revanced.patches.youtube.layout.general.accountmenu.fingerprints.Acco
import app.revanced.patches.youtube.layout.general.accountmenu.fingerprints.AccountMenuParentFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -47,7 +47,7 @@ class AccountMenuPatch : BytecodePatch(
addInstruction(
targetIndex + 1,
"invoke-static {v$register}, $GENERAL_LAYOUT->hideAccountMenu(Landroid/text/Spanned;)V"
"invoke-static {v$register}, $GENERAL->hideAccountMenu(Landroid/text/Spanned;)V"
)
}
} ?: return AccountMenuFingerprint.toErrorResult()
@ -58,7 +58,7 @@ class AccountMenuPatch : BytecodePatch(
addInstruction(
endIndex + 1,
"sput-object v$register, $GENERAL_LAYOUT->compactLink:Landroid/view/View;"
"sput-object v$register, $GENERAL->compactLink:Landroid/view/View;"
)
}
} ?: return AccountMenuParentFingerprint.toErrorResult()
@ -68,7 +68,7 @@ class AccountMenuPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_ACCOUNT_MENU"
)
)

10
src/main/kotlin/app/revanced/patches/youtube/layout/general/autocaptions/patch/AutoCaptionsPatch.kt
View File

@ -20,7 +20,7 @@ import app.revanced.patches.shared.fingerprints.SubtitleTrackFingerprint
import app.revanced.patches.youtube.layout.general.autocaptions.fingerprints.StartVideoInformerFingerprint
import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
@Patch
@Name("hide-auto-captions")
@ -50,7 +50,7 @@ class AutoCaptionsPatch : BytecodePatch(
0,
"""
const/4 v0, ${status.value}
sput-boolean v0, $GENERAL_LAYOUT->captionsButtonStatus:Z
sput-boolean v0, $GENERAL->captionsButtonStatus:Z
"""
)
}
@ -59,10 +59,10 @@ class AutoCaptionsPatch : BytecodePatch(
SubtitleTrackFingerprint.result?.mutableMethod?.let {
it.addInstructions(
0, """
invoke-static {}, $GENERAL_LAYOUT->hideAutoCaptions()Z
invoke-static {}, $GENERAL->hideAutoCaptions()Z
move-result v0
if-eqz v0, :auto_captions_shown
sget-boolean v0, $GENERAL_LAYOUT->captionsButtonStatus:Z
sget-boolean v0, $GENERAL->captionsButtonStatus:Z
if-nez v0, :auto_captions_shown
const/4 v0, 0x1
return v0
@ -75,7 +75,7 @@ class AutoCaptionsPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_AUTO_CAPTIONS"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.autopopuppanels.fingerprints.EngagementPanelControllerFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
@Patch
@Name("hide-auto-player-popup-panels")
@ -34,7 +34,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
EngagementPanelControllerFingerprint.result?.mutableMethod?.let {
it.addInstructions(
0, """
invoke-static {}, $GENERAL_LAYOUT->hideAutoPlayerPopupPanels()Z
invoke-static {}, $GENERAL->hideAutoPlayerPopupPanels()Z
move-result v0
if-eqz v0, :player_popup_panels_shown
if-eqz p4, :player_popup_panels_shown
@ -49,7 +49,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS"
)
)

10
src/main/kotlin/app/revanced/patches/youtube/layout/general/categorybar/patch/CategoryBarPatch.kt
View File

@ -19,7 +19,7 @@ import app.revanced.patches.youtube.layout.general.categorybar.fingerprints.Rela
import app.revanced.patches.youtube.layout.general.categorybar.fingerprints.SearchResultsChipBarFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@ -54,7 +54,7 @@ class CategoryBarPatch : BytecodePatch(
addInstructions(
insertIndex, """
invoke-static {v$register}, $GENERAL_LAYOUT->hideCategoryBarInFeed(I)I
invoke-static {v$register}, $GENERAL->hideCategoryBarInFeed(I)I
move-result v$register
"""
)
@ -71,7 +71,7 @@ class CategoryBarPatch : BytecodePatch(
addInstruction(
insertIndex + 1,
"invoke-static {v$register}, $GENERAL_LAYOUT->hideCategoryBarInRelatedVideo(Landroid/view/View;)V"
"invoke-static {v$register}, $GENERAL->hideCategoryBarInRelatedVideo(Landroid/view/View;)V"
)
}
} ?: return RelatedChipCloudFingerprint.toErrorResult()
@ -86,7 +86,7 @@ class CategoryBarPatch : BytecodePatch(
addInstructions(
targetIndex + 1, """
invoke-static {v$register}, $GENERAL_LAYOUT->hideCategoryBarInSearchResults(I)I
invoke-static {v$register}, $GENERAL->hideCategoryBarInSearchResults(I)I
move-result v$register
"""
)
@ -98,7 +98,7 @@ class CategoryBarPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_CATEGORY_BAR"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/channellistsubmenu/patch/ChannelListSubMenuPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.channellistsubmenu.fingerprints.ChannelListSubMenuFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -44,7 +44,7 @@ class ChannelListSubMenuPatch : BytecodePatch(
addInstruction(
endIndex + 1,
"invoke-static {v$register}, $GENERAL_LAYOUT->hideChannelListSubMenu(Landroid/view/View;)V"
"invoke-static {v$register}, $GENERAL->hideChannelListSubMenu(Landroid/view/View;)V"
)
}
} ?: return ChannelListSubMenuFingerprint.toErrorResult()
@ -54,7 +54,7 @@ class ChannelListSubMenuPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_CHANNEL_LIST_SUBMENU"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.crowdfundingbox.fingerprints.CrowdfundingBoxFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@Patch
@ -44,7 +44,7 @@ class CrowdfundingBoxPatch : BytecodePatch(
addInstruction(
insertIndex,
"invoke-static {v$register}, $GENERAL_LAYOUT->hideCrowdfundingBox(Landroid/view/View;)V"
"invoke-static {v$register}, $GENERAL->hideCrowdfundingBox(Landroid/view/View;)V"
)
}
} ?: return CrowdfundingBoxFingerprint.toErrorResult()
@ -54,7 +54,7 @@ class CrowdfundingBoxPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_CROWDFUNDING_BOX"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/floatingmicrophone/patch/FloatingMicrophonePatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.floatingmicrophone.fingerprints.FloatingMicrophoneFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@Patch
@ -44,7 +44,7 @@ class FloatingMicrophonePatch : BytecodePatch(
addInstructions(
insertIndex + 1, """
invoke-static {v$register}, $GENERAL_LAYOUT->hideFloatingMicrophone(Z)Z
invoke-static {v$register}, $GENERAL->hideFloatingMicrophone(Z)Z
move-result v$register
"""
)
@ -56,7 +56,7 @@ class FloatingMicrophonePatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_FLOATING_MICROPHONE"
)
)

5
src/main/kotlin/app/revanced/patches/youtube/layout/general/headerswitch/patch/HeaderSwitchPatch.kt
View File

@ -15,6 +15,7 @@ import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@ -56,7 +57,7 @@ class HeaderSwitchPatch : BytecodePatch() {
mutableMethod.addInstructions(
insertIndex, """
invoke-static {v$viewRegister}, Lapp/revanced/integrations/patches/layout/GeneralLayoutPatch;->enablePremiumHeader(I)I
invoke-static {v$viewRegister}, $GENERAL->enablePremiumHeader(I)I
move-result v$viewRegister
"""
)
@ -80,7 +81,7 @@ class HeaderSwitchPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HEADER_SWITCH"
)
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/mixplaylists/patch/MixPlaylistsPatch.kt
View File

@ -32,7 +32,7 @@ class MixPlaylistsPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_MIX_PLAYLISTS"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/personalinformation/patch/HideEmailAddressPatch.kt
View File

@ -15,7 +15,7 @@ import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.personalinformation.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -38,7 +38,7 @@ class HideEmailAddressPatch : BytecodePatch(
addInstructions(
insertIndex, """
invoke-static {v$register}, $GENERAL_LAYOUT->hideEmailAddress(I)I
invoke-static {v$register}, $GENERAL->hideEmailAddress(I)I
move-result v$register
"""
)
@ -50,7 +50,7 @@ class HideEmailAddressPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_EMAIL_ADDRESS"
)
)

12
src/main/kotlin/app/revanced/patches/youtube/layout/general/shortscomponent/patch/ShortsComponentPatch.kt
View File

@ -24,7 +24,7 @@ import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.bytecode.BytecodeHelper.updatePatchStatus
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@ -79,7 +79,7 @@ class ShortsComponentPatch : BytecodePatch(
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (instructions.elementAt(index + 3) as OneRegisterInstruction).registerA
mutableMethod.implementation!!.injectHideCall(index + 4, viewRegister, "layout/GeneralLayoutPatch", "hideShortsPlayerCommentsButton")
mutableMethod.implementation!!.injectHideCall(index + 4, viewRegister, "layout/GeneralPatch", "hideShortsPlayerCommentsButton")
patchSuccessArray[0] = true
}
@ -92,7 +92,7 @@ class ShortsComponentPatch : BytecodePatch(
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (invokeInstruction as Instruction21c).registerA
mutableMethod.implementation!!.injectHideCall(index - 1, viewRegister, "layout/GeneralLayoutPatch", "hideShortsPlayerRemixButton")
mutableMethod.implementation!!.injectHideCall(index - 1, viewRegister, "layout/GeneralPatch", "hideShortsPlayerRemixButton")
patchSuccessArray[1] = true
}
@ -105,7 +105,7 @@ class ShortsComponentPatch : BytecodePatch(
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (invokeInstruction as Instruction21c).registerA
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/GeneralLayoutPatch", "hideShortsPlayerSubscriptionsButton")
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/GeneralPatch", "hideShortsPlayerSubscriptionsButton")
patchSuccessArray[2] = true
}
@ -137,7 +137,7 @@ class ShortsComponentPatch : BytecodePatch(
it.addInstructions(
insertIndex,"""
invoke-static {v$register}, $GENERAL_LAYOUT->hideShortsPlayerSubscriptionsButton(I)I
invoke-static {v$register}, $GENERAL->hideShortsPlayerSubscriptionsButton(I)I
move-result v$register
"""
)
@ -156,7 +156,7 @@ class ShortsComponentPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: SHORTS_COMPONENT.PARENT",
"SETTINGS: SHORTS_COMPONENT_PARENT.A",
"SETTINGS: SHORTS_COMPONENT_PARENT.B",

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/snackbar/patch/HideSnackbarPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.snackbar.fingerprints.HideSnackbarFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
@Patch
@Name("hide-snackbar")
@ -34,7 +34,7 @@ class HideSnackbarPatch : BytecodePatch(
HideSnackbarFingerprint.result?.mutableMethod?.let {
it.addInstructions(
0, """
invoke-static {}, $GENERAL_LAYOUT->hideSnackbar()Z
invoke-static {}, $GENERAL->hideSnackbar()Z
move-result v0
if-eqz v0, :default
return-void
@ -47,7 +47,7 @@ class HideSnackbarPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_SNACKBAR"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/patch/HideShortsOnStartupPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.startupshortsreset.fingerprints.UserWasInShortsFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -39,7 +39,7 @@ class HideShortsOnStartupPatch : BytecodePatch(
val register = (instruction(insertIndex - 1) as OneRegisterInstruction).registerA + 2
addInstructions(
insertIndex, """
invoke-static { }, $GENERAL_LAYOUT->hideStartupShortsPlayer()Z
invoke-static { }, $GENERAL->hideStartupShortsPlayer()Z
move-result v$register
if-eqz v$register, :show_startup_shorts_player
return-void
@ -53,7 +53,7 @@ class HideShortsOnStartupPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: SHORTS_COMPONENT.PARENT",
"SETTINGS: SHORTS_COMPONENT_PARENT.B",
"SETTINGS: HIDE_STARTUP_SHORTS_PLAYER"

4
src/main/kotlin/app/revanced/patches/youtube/layout/general/stories/patch/HideStoriesPatch.kt
View File

@ -57,7 +57,7 @@ class HideStoriesPatch : BytecodePatch() {
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (iPutInstruction as Instruction22c).registerA
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/GeneralLayoutPatch", "hideStoriesShelf")
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/GeneralPatch", "hideStoriesShelf")
patchSuccessArray[0] = true
patchSuccessArray[1] = true
@ -79,7 +79,7 @@ class HideStoriesPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_STORIES_SHELF"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
View File

@ -19,7 +19,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.tabletminiplayer.fingerprints.*
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@ -69,7 +69,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: ENABLE_TABLET_MINIPLAYER"
)
)
@ -92,7 +92,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
this.addInstructions(
index,
"""
invoke-static {v$overrideRegister}, $GENERAL_LAYOUT->enableTabletMiniPlayer(Z)Z
invoke-static {v$overrideRegister}, $GENERAL->enableTabletMiniPlayer(Z)Z
move-result v$overrideRegister
"""
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.widesearchbar.fingerprints
package app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneParentFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.widesearchbar.fingerprints
package app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.widesearchbar.fingerprints
package app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoParentFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.widesearchbar.fingerprints
package app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

16
src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/patch/WideSearchbarPatch.kt → src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/patch/WideSearchbarPatch.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.widesearchbar.patch
package app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.patch
import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description
@ -15,14 +15,18 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.widesearchbar.fingerprints.*
import app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints.*
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.GENERAL
@Patch
@Name("enable-wide-searchbar")
@Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
@DependsOn([SettingsPatch::class])
@DependsOn(
[
SettingsPatch::class
]
)
@YouTubeCompatibility
@Version("0.0.1")
class WideSearchbarPatch : BytecodePatch(
@ -58,7 +62,7 @@ class WideSearchbarPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: ENABLE_WIDE_SEARCHBAR"
)
)
@ -72,7 +76,7 @@ class WideSearchbarPatch : BytecodePatch(
val index = method.implementation!!.instructions.size - 1
method.addInstructions(
index, """
invoke-static {}, $GENERAL_LAYOUT->enableWideSearchbar()Z
invoke-static {}, $GENERAL->enableWideSearchbar()Z
move-result p0
"""
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/fingerprints/PivotBarFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/createbutton/fingerprints/PivotBarFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.createbutton.fingerprints
package app.revanced.patches.youtube.layout.navigation.createbutton.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

10
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/createbutton/patch/CreateButtonRemoverPatch.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.createbutton.patch
package app.revanced.patches.youtube.layout.navigation.createbutton.patch
import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description
@ -12,10 +12,10 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.PivotBarCreateButtonViewFingerprint
import app.revanced.patches.youtube.layout.general.pivotbar.createbutton.fingerprints.PivotBarFingerprint
import app.revanced.patches.youtube.layout.navigation.createbutton.fingerprints.PivotBarFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.NAVIGATION
import app.revanced.util.pivotbar.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
import app.revanced.util.pivotbar.InjectionUtils.injectHook
import org.jf.dexlib2.dexbacked.reference.DexBackedMethodReference
@ -73,7 +73,7 @@ class CreateButtonRemoverPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: NAVIGATION_SETTINGS",
"SETTINGS: HIDE_CREATE_BUTTON"
)
)
@ -89,7 +89,7 @@ class CreateButtonRemoverPatch : BytecodePatch(
private companion object {
const val hook =
"invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $GENERAL_LAYOUT" +
"invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $NAVIGATION" +
"->" +
"hideCreateButton(Landroid/view/View;)V"

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/fingerprints/PivotBarEnumFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsbutton/fingerprints/PivotBarEnumFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortsbutton.fingerprints
package app.revanced.patches.youtube.layout.navigation.shortsbutton.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/fingerprints/PivotBarShortsButtonViewFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsbutton/fingerprints/PivotBarShortsButtonViewFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortsbutton.fingerprints
package app.revanced.patches.youtube.layout.navigation.shortsbutton.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode

16
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsbutton/patch/ShortsButtonRemoverPatch.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortsbutton.patch
package app.revanced.patches.youtube.layout.navigation.shortsbutton.patch
import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description
@ -13,11 +13,11 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.PivotBarCreateButtonViewFingerprint
import app.revanced.patches.youtube.layout.general.pivotbar.shortsbutton.fingerprints.PivotBarEnumFingerprint
import app.revanced.patches.youtube.layout.general.pivotbar.shortsbutton.fingerprints.PivotBarShortsButtonViewFingerprint
import app.revanced.patches.youtube.layout.navigation.shortsbutton.fingerprints.PivotBarEnumFingerprint
import app.revanced.patches.youtube.layout.navigation.shortsbutton.fingerprints.PivotBarShortsButtonViewFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.NAVIGATION
import app.revanced.util.pivotbar.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
import app.revanced.util.pivotbar.InjectionUtils.injectHook
@ -77,9 +77,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"SETTINGS: SHORTS_COMPONENT.PARENT",
"SETTINGS: SHORTS_COMPONENT_PARENT.A",
"PREFERENCE: NAVIGATION_SETTINGS",
"SETTINGS: HIDE_SHORTS_BUTTON"
)
)
@ -90,12 +88,12 @@ class ShortsButtonRemoverPatch : BytecodePatch(
}
private companion object {
const val enumHook =
"sput-object v$REGISTER_TEMPLATE_REPLACEMENT, $GENERAL_LAYOUT" +
"sput-object v$REGISTER_TEMPLATE_REPLACEMENT, $NAVIGATION" +
"->" +
"lastPivotTab:Ljava/lang/Enum;"
const val buttonHook =
"invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $GENERAL_LAYOUT" +
"invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $NAVIGATION" +
"->" +
"hideShortsButton(Landroid/view/View;)V"
}

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortspivotbar/fingerprints/ReelWatchBundleFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsnavbar/fingerprints/ReelWatchBundleFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortspivotbar.fingerprints
package app.revanced.patches.youtube.layout.navigation.shortsnavbar.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortspivotbar/fingerprints/ReelWatchEndpointFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsnavbar/fingerprints/ReelWatchEndpointFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortspivotbar.fingerprints
package app.revanced.patches.youtube.layout.navigation.shortsnavbar.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortspivotbar/fingerprints/ReelWatchEndpointParentFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsnavbar/fingerprints/ReelWatchEndpointParentFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortspivotbar.fingerprints
package app.revanced.patches.youtube.layout.navigation.shortsnavbar.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortspivotbar/fingerprints/SetPivotBarFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsnavbar/fingerprints/SetPivotBarFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortspivotbar.fingerprints
package app.revanced.patches.youtube.layout.navigation.shortsnavbar.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

26
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/shortspivotbar/patch/ShortsPivotBarPatch.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/shortsnavbar/patch/ShortsNavBarPatch.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.shortspivotbar.patch
package app.revanced.patches.youtube.layout.navigation.shortsnavbar.patch
import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description
@ -16,20 +16,20 @@ import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.PivotBarCreateButtonViewFingerprint
import app.revanced.patches.youtube.layout.general.pivotbar.shortspivotbar.fingerprints.*
import app.revanced.patches.youtube.layout.navigation.shortsnavbar.fingerprints.*
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.NAVIGATION
import org.jf.dexlib2.dexbacked.reference.DexBackedTypeReference
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@Patch
@Name("hide-shorts-pivot-bar")
@Description("Hides the pivotbar when playing shorts.")
@Name("hide-shorts-navbar")
@Description("Hide navigation bar when playing shorts.")
@DependsOn([SettingsPatch::class])
@YouTubeCompatibility
@Version("0.0.1")
class ShortsPivotBarPatch : BytecodePatch(
class ShortsNavBarPatch : BytecodePatch(
listOf(
PivotBarCreateButtonViewFingerprint,
ReelWatchBundleFingerprint,
@ -50,7 +50,7 @@ class ShortsPivotBarPatch : BytecodePatch(
addInstruction(
startIndex + 1,
"sput-object v$register, $GENERAL_LAYOUT->pivotbar:$targetReference"
"sput-object v$register, $NAVIGATION->pivotbar:$targetReference"
)
}
} ?: return SetPivotBarFingerprint.toErrorResult()
@ -64,7 +64,7 @@ class ShortsPivotBarPatch : BytecodePatch(
) {
addInstruction(
0,
"invoke-static {}, $GENERAL_LAYOUT->hideShortsPlayerPivotBar()V"
"invoke-static {}, $NAVIGATION->hideShortsPlayerNavBar()V"
)
}
} ?: return ReelWatchBundleFingerprint.toErrorResult()
@ -72,7 +72,7 @@ class ShortsPivotBarPatch : BytecodePatch(
ReelWatchEndpointParentFingerprint.result?.let { parentResult ->
ReelWatchEndpointFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.mutableMethod?.addInstruction(
0,
"sput-object p1, $GENERAL_LAYOUT->shortsContext:Landroid/content/Context;"
"sput-object p1, $NAVIGATION->shortsContext:Landroid/content/Context;"
) ?: return ReelWatchEndpointFingerprint.toErrorResult()
} ?: return ReelWatchEndpointParentFingerprint.toErrorResult()
@ -81,14 +81,12 @@ class ShortsPivotBarPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"SETTINGS: SHORTS_COMPONENT.PARENT",
"SETTINGS: SHORTS_COMPONENT_PARENT.B",
"SETTINGS: HIDE_SHORTS_PLAYER_PIVOT_BAR"
"PREFERENCE: NAVIGATION_SETTINGS",
"SETTINGS: HIDE_SHORTS_NAVIGATION_BAR"
)
)
SettingsPatch.updatePatchStatus("hide-shorts-pivot-bar")
SettingsPatch.updatePatchStatus("hide-shorts-navbar")
return PatchResultSuccess()
}

2
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/switchbutton/fingerprints/AutoMotiveFingerprint.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/switchbutton/fingerprints/AutoMotiveFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.switchbutton.fingerprints
package app.revanced.patches.youtube.layout.navigation.switchbutton.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode

10
src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/switchbutton/patch/SwitchCreateButtonPatch.kt → src/main/kotlin/app/revanced/patches/youtube/layout/navigation/switchbutton/patch/SwitchCreateButtonPatch.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.general.pivotbar.switchbutton.patch
package app.revanced.patches.youtube.layout.navigation.switchbutton.patch
import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description
@ -13,9 +13,9 @@ import app.revanced.patcher.patch.PatchResultSuccess
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.general.pivotbar.switchbutton.fingerprints.AutoMotiveFingerprint
import app.revanced.patches.youtube.layout.navigation.switchbutton.fingerprints.AutoMotiveFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.GENERAL_LAYOUT
import app.revanced.util.integrations.Constants.NAVIGATION
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@Patch
@ -36,7 +36,7 @@ class SwitchCreateButtonPatch : BytecodePatch(
addInstructions(
insertIndex, """
invoke-static {v$register}, $GENERAL_LAYOUT->switchCreateNotification(Z)Z
invoke-static {v$register}, $NAVIGATION->switchCreateNotification(Z)Z
move-result v$register
"""
)
@ -48,7 +48,7 @@ class SwitchCreateButtonPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: GENERAL_LAYOUT_SETTINGS",
"PREFERENCE: NAVIGATION_SETTINGS",
"SETTINGS: SWITCH_CREATE_NOTIFICATION"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
import org.jf.dexlib2.iface.instruction.Instruction
@ -68,7 +68,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
method.addInstructions(
insertIndex, """
invoke-static {}, $PLAYER_LAYOUT->hideAutoPlayButton()Z
invoke-static {}, $PLAYER->hideAutoPlayButton()Z
move-result v$dummyRegister
if-nez v$dummyRegister, :hidden
""", listOf(ExternalLabel("hidden", jumpInstruction))
@ -81,7 +81,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_AUTOPLAY_BUTTON"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
View File

@ -14,7 +14,7 @@ import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.SubtitleButtonControllerFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
import org.jf.dexlib2.Opcode
@Patch
@ -37,7 +37,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
it.addInstruction(
index + 1,
"invoke-static {v0}, $PLAYER_LAYOUT->hideCaptionsButton(Landroid/widget/ImageView;)V"
"invoke-static {v0}, $PLAYER->hideCaptionsButton(Landroid/widget/ImageView;)V"
)
break
@ -50,7 +50,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_CAPTIONS_BUTTON"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/player/castbutton/patch/HideCastButtonPatch.kt
View File

@ -12,7 +12,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
@Patch
@Name("hide-cast-button")
@ -30,7 +30,7 @@ class HideCastButtonPatch : BytecodePatch() {
setVisibilityMethod.addInstructions(
0, """
invoke-static {p1}, $PLAYER_LAYOUT->hideCastButton(I)I
invoke-static {p1}, $PLAYER->hideCastButton(I)I
move-result p1
"""
)
@ -43,7 +43,7 @@ class HideCastButtonPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_CAST_BUTTON"
)
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/collapsebutton/patch/HideCollapseButtonPatch.kt
View File

@ -32,7 +32,7 @@ class HideCollapseButtonPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_COLLAPSE_BUTTON"
)
)

4
src/main/kotlin/app/revanced/patches/youtube/layout/player/endscreencards/patch/HideEndscreenCardsPatch.kt
View File

@ -43,7 +43,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
val index = this.scanResult.patternScanResult!!.endIndex
with (this.mutableMethod) {
val register = (this.instruction(index) as Instruction21c).registerA
this.implementation!!.injectHideCall(index + 1, register, "layout/PlayerLayoutPatch", "hideEndscreen")
this.implementation!!.injectHideCall(index + 1, register, "layout/PlayerPatch", "hideEndscreen")
}
}
@ -60,7 +60,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_ENDSCREEN_CARDS"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/player/infocards/patch/HideInfocardsPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.player.infocards.fingerprints.InfocardsIncognitoFingerprint
import app.revanced.patches.youtube.layout.player.infocards.fingerprints.InfocardsIncognitoParentFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
@Patch
@Name("hide-info-cards")
@ -34,7 +34,7 @@ class HideInfocardsPatch : BytecodePatch(
}.result?.mutableMethod?.
addInstructions(
1, """
invoke-static {v0}, $PLAYER_LAYOUT->hideInfoCard(Z)Z
invoke-static {v0}, $PLAYER->hideInfoCard(Z)Z
move-result v0
"""
) ?: return InfocardsIncognitoFingerprint.toErrorResult()
@ -45,7 +45,7 @@ class HideInfocardsPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_INFO_CARDS"
)
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/livechatbutton/patch/HideLiveChatButtonPatch.kt
View File

@ -32,7 +32,7 @@ class HideLiveChatButtonPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_LIVE_CHATS_BUTTON"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/player/musicbutton/patch/HideMusicButtonPatch.kt
View File

@ -15,7 +15,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.player.musicbutton.fingerprints.MusicAppDeeplinkButtonFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
import org.jf.dexlib2.iface.instruction.Instruction
@Patch
@ -34,7 +34,7 @@ class HideMusicButtonPatch : BytecodePatch(
val jumpInstruction = this[size - 1] as Instruction
it.addInstructions(
0, """
invoke-static {}, $PLAYER_LAYOUT->hideMusicButton()Z
invoke-static {}, $PLAYER->hideMusicButton()Z
move-result v0
if-nez v0, :hidden
""", listOf(ExternalLabel("hidden", jumpInstruction))
@ -47,7 +47,7 @@ class HideMusicButtonPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_YOUTUBE_MUSIC_BUTTON"
)
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/nextprevbutton/patch/HideNextPrevButtonPatch.kt
View File

@ -32,7 +32,7 @@ class HideNextPrevButtonPatch : ResourcePatch {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_NEXT_BUTTON",
"SETTINGS: HIDE_PREV_BUTTON"
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/fingerprints/HidePlayerButtonFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
object HidePlayerButtonFingerprint : MethodFingerprint (
customFingerprint = {
it.definingClass == "Lapp/revanced/integrations/patches/layout/PlayerLayoutPatch;"
it.definingClass == "Lapp/revanced/integrations/patches/layout/PlayerPatch;"
&& it.name == "hidePlayerButton"
}
)

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
View File

@ -44,7 +44,7 @@ class HidePlayerButtonBackgroundPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_PLAYER_BUTTON_BACKGROUND"
)
)

5
src/main/kotlin/app/revanced/patches/youtube/layout/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
View File

@ -17,6 +17,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.formats.Instruction21c
import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@ -64,7 +65,7 @@ class PlayerOverlayFilterPatch : BytecodePatch() {
mutableMethod.addInstructions(
insertIndex + 1, """
invoke-static {}, Lapp/revanced/integrations/patches/layout/PlayerLayoutPatch;->hidePlayerOverlayFilter()Z
invoke-static {}, $PLAYER->hidePlayerOverlayFilter()Z
move-result v$dummyRegister
if-eqz v$dummyRegister, :currentcolor
const v$dummyRegister, $transparent
@ -92,7 +93,7 @@ class PlayerOverlayFilterPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_PLAYER_OVERLAY_FILTER"
)
)

4
src/main/kotlin/app/revanced/patches/youtube/layout/player/suggestactions/patch/SuggestedActionsPatch.kt
View File

@ -61,7 +61,7 @@ class SuggestedActionsPatch : BytecodePatch() {
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (iPutInstruction as Instruction22c).registerA
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/PlayerLayoutPatch", "hideSuggestedActions")
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/PlayerPatch", "hideSuggestedActions")
patchSuccessArray[0] = true
}
@ -84,7 +84,7 @@ class SuggestedActionsPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_SUGGESTED_ACTION"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/patch/HideChannelWatermarkPatch.kt
View File

@ -18,7 +18,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.player.watermark.fingerprints.HideWatermarkFingerprint
import app.revanced.patches.youtube.layout.player.watermark.fingerprints.HideWatermarkParentFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
@Patch
@ -43,7 +43,7 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
removeInstruction(insertIndex)
addInstructions(
insertIndex, """
invoke-static {}, $PLAYER_LAYOUT->hideChannelWatermark()Z
invoke-static {}, $PLAYER->hideChannelWatermark()Z
move-result v$register
"""
)
@ -56,7 +56,7 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: PLAYER_LAYOUT_SETTINGS",
"PREFERENCE: PLAYER_SETTINGS",
"SETTINGS: HIDE_CHANNEL_WATERMARK"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbar/patch/HideSeekbarPatch.kt
View File

@ -15,7 +15,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.patches.youtube.misc.timebar.patch.HookTimebarPatch
import app.revanced.util.integrations.Constants.SEEKBAR_LAYOUT
import app.revanced.util.integrations.Constants.SEEKBAR
@Patch
@Name("hide-seekbar")
@ -35,7 +35,7 @@ class HideSeekbarPatch : BytecodePatch() {
insertMethod.addInstructions(
0, """
invoke-static {}, $SEEKBAR_LAYOUT->hideSeekbar()Z
invoke-static {}, $SEEKBAR->hideSeekbar()Z
move-result v0
if-eqz v0, :show_seekbar
return-void
@ -47,7 +47,7 @@ class HideSeekbarPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
"PREFERENCE: SEEKBAR_SETTINGS",
"SETTINGS: HIDE_SEEKBAR"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
View File

@ -15,7 +15,7 @@ import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.SEEKBAR_LAYOUT
import app.revanced.util.integrations.Constants.SEEKBAR
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@ -58,7 +58,7 @@ class SeekbarColorPatch : BytecodePatch() {
mutableMethod.addInstructions(
registerIndex + 1, """
invoke-static {v$viewRegister}, $SEEKBAR_LAYOUT->enableCustomSeekbarColor(I)I
invoke-static {v$viewRegister}, $SEEKBAR->enableCustomSeekbarColor(I)I
move-result v$viewRegister
"""
)
@ -82,7 +82,7 @@ class SeekbarColorPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
"PREFERENCE: SEEKBAR_SETTINGS",
"SETTINGS: CUSTOM_SEEKBAR_COLOR"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/patch/SeekbarTappingPatch.kt
View File

@ -18,7 +18,7 @@ import app.revanced.patches.youtube.layout.seekbar.seekbartapping.fingerprints.S
import app.revanced.patches.youtube.layout.seekbar.seekbartapping.fingerprints.SeekbarTappingParentFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.SEEKBAR_LAYOUT
import app.revanced.util.integrations.Constants.SEEKBAR
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.Method
import org.jf.dexlib2.iface.instruction.formats.Instruction11n
@ -77,7 +77,7 @@ class SeekbarTappingPatch : BytecodePatch(
addInstructions(
insertIndex, """
invoke-static {}, $SEEKBAR_LAYOUT->enableSeekbarTapping()Z
invoke-static {}, $SEEKBAR->enableSeekbarTapping()Z
move-result v0
if-eqz v0, :off
invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
@ -92,7 +92,7 @@ class SeekbarTappingPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
"PREFERENCE: SEEKBAR_SETTINGS",
"SETTINGS: ENABLE_SEEKBAR_TAPPING"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/speed/patch/AppendSpeedPatch.kt
View File

@ -16,7 +16,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.misc.overridespeed.bytecode.patch.OverrideSpeedHookPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.SEEKBAR_LAYOUT
import app.revanced.util.integrations.Constants.SEEKBAR
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.dexbacked.instruction.DexBackedInstruction35c
import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@ -66,7 +66,7 @@ class AppendSpeedPatch : BytecodePatch() {
val insertRegister = (instructions.elementAt(insertIndex) as Instruction35c).registerC
mutableMethod.addInstructions(
insertIndex, """
invoke-static {v$insertRegister}, $SEEKBAR_LAYOUT->enableTimeStampSpeed(Ljava/lang/String;)Ljava/lang/String;
invoke-static {v$insertRegister}, $SEEKBAR->enableTimeStampSpeed(Ljava/lang/String;)Ljava/lang/String;
move-result-object v$insertRegister
"""
)
@ -91,7 +91,7 @@ class AppendSpeedPatch : BytecodePatch() {
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
"PREFERENCE: SEEKBAR_SETTINGS",
"SETTINGS: ENABLE_TIME_STAMP_SPEED"
)
)

6
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timestamps/patch/HideTimeStampPatch.kt
View File

@ -17,7 +17,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.layout.seekbar.timestamps.fingerprints.TimeStampsContainerFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.SEEKBAR_LAYOUT
import app.revanced.util.integrations.Constants.SEEKBAR
@Patch
@Name("hide-time-stamp")
@ -40,7 +40,7 @@ class HideTimeStampPatch : BytecodePatch(
TimeStampsContainerFingerprint.result?.mutableMethod?.let {
it.addInstructions(
0, """
invoke-static {}, $SEEKBAR_LAYOUT->hideTimeStamp()Z
invoke-static {}, $SEEKBAR->hideTimeStamp()Z
move-result v0
if-eqz v0, :show_time_stamp
return-void
@ -53,7 +53,7 @@ class HideTimeStampPatch : BytecodePatch(
*/
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE: SEEKBAR_LAYOUT_SETTINGS",
"PREFERENCE: SEEKBAR_SETTINGS",
"SETTINGS: HIDE_TIME_STAMP"
)
)

4
src/main/kotlin/app/revanced/patches/youtube/misc/playerbutton/patch/PlayerButtonPatch.kt
View File

@ -14,7 +14,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.youtube.misc.playerbutton.fingerprints.LiveChatFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.util.integrations.Constants.PLAYER_LAYOUT
import app.revanced.util.integrations.Constants.PLAYER
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
@ -58,7 +58,7 @@ class PlayerButtonPatch : BytecodePatch(
addInstructions(
index, """
invoke-static {v$firstRegister, v$secondRegister}, $PLAYER_LAYOUT->hidePlayerButton(Landroid/view/View;I)I
invoke-static {v$firstRegister, v$secondRegister}, $PLAYER->hidePlayerButton(Landroid/view/View;I)I
move-result v$secondRegister
"""
)

13
src/main/kotlin/app/revanced/util/integrations/Constants.kt
View File

@ -8,12 +8,13 @@ internal object Constants {
const val SWIPE_PATH = "$PATCHES_PATH/swipe"
const val GENERAL_LAYOUT = "$PATCHES_PATH/layout/GeneralLayoutPatch;"
const val PLAYER_LAYOUT = "$PATCHES_PATH/layout/PlayerLayoutPatch;"
const val FULLSCREEN_LAYOUT = "$PATCHES_PATH/layout/FullscreenLayoutPatch;"
const val BOTTOM_LAYOUT = "$PATCHES_PATH/layout/BottomLayoutPatch;"
const val FLYOUT_PANEL_LAYOUT = "$PATCHES_PATH/layout/FlyoutPanelLayoutPatch;"
const val SEEKBAR_LAYOUT = "$PATCHES_PATH/layout/SeekbarLayoutPatch;"
const val BOTTOM_PLAYER = "$PATCHES_PATH/layout/BottomPlayerPatch;"
const val FLYOUT_PANEL = "$PATCHES_PATH/layout/FlyoutPanelPatch;"
const val FULLSCREEN = "$PATCHES_PATH/layout/FullscreenPatch;"
const val GENERAL = "$PATCHES_PATH/layout/GeneralPatch;"
const val NAVIGATION = "$PATCHES_PATH/layout/NavigationPatch;"
const val PLAYER = "$PATCHES_PATH/layout/PlayerPatch;"
const val SEEKBAR = "$PATCHES_PATH/layout/SeekBarPatch;"
const val MISC_PATH = "$PATCHES_PATH/misc"

19
src/main/resources/youtube/settings/host/values/strings.xml
View File

@ -152,7 +152,7 @@ Is it ready to submit?"</string>
<string name="revanced_adremover_web_search_panel_title">Hide web search panels</string>
<string name="revanced_ads">Ads</string>
<string name="revanced_backup_summary">Import ReVanced settings from file or export ReVanced settings to file</string>
<string name="revanced_bottom_player_layout">Bottom player layout</string>
<string name="revanced_bottom_player">Bottom player</string>
<string name="revanced_button_container_title">Button container</string>
<string name="revanced_comments_title">Comments</string>
<string name="revanced_copytimestamp_success">Time Stamp copied to clipboard</string>
@ -258,9 +258,9 @@ Is it ready to submit?"</string>
<string name="revanced_export_settings_title">Export settings</string>
<string name="revanced_extended_support_center_summary">Report issues or leave suggestions here</string>
<string name="revanced_extended_support_center_title">Support Center</string>
<string name="revanced_flyout_menu_layout">Flyout menu layout</string>
<string name="revanced_fullscreen_layout">Fullscreen layout</string>
<string name="revanced_general_layout">General layout</string>
<string name="revanced_flyout_menu">Flyout menu</string>
<string name="revanced_fullscreen">Fullscreen</string>
<string name="revanced_general">General</string>
<string name="revanced_haptic_feedback_title">Haptic feedback</string>
<string name="revanced_hide_account_menu_summary_off">Account menus are shown</string>
<string name="revanced_hide_account_menu_summary_on">Account menus are hidden</string>
@ -439,6 +439,9 @@ Please do not report any issues you encounter while using this feature."</string
<string name="revanced_hide_shorts_button_title">Hide shorts button</string>
<string name="revanced_hide_shorts_component_summary">Hides Shorts section or the Shorts player component</string>
<string name="revanced_hide_shorts_component_title">Hide shorts component</string>
<string name="revanced_hide_shorts_navigation_bar_summary_off">Navigation bar is shown</string>
<string name="revanced_hide_shorts_navigation_bar_summary_on">Navigation bar is hidden</string>
<string name="revanced_hide_shorts_navigation_bar_title">Hide navigation bar in shorts</string>
<string name="revanced_hide_shorts_player_comments_button_summary_off">Shorts player comments button is shown</string>
<string name="revanced_hide_shorts_player_comments_button_summary_on">Shorts player comments button is hidden</string>
<string name="revanced_hide_shorts_player_comments_button_title">Hide shorts player comments button</string>
@ -446,9 +449,6 @@ Please do not report any issues you encounter while using this feature."</string
<string name="revanced_hide_shorts_player_join_button_summary_off">Shorts player join button is shown</string>
<string name="revanced_hide_shorts_player_join_button_summary_on">Shorts player join button is hidden</string>
<string name="revanced_hide_shorts_player_join_button_title">Hide shorts player join button</string>
<string name="revanced_hide_shorts_player_pivot_bar_summary_off">Shorts player pivotbar is shown</string>
<string name="revanced_hide_shorts_player_pivot_bar_summary_on">Shorts player pivotbar is hidden</string>
<string name="revanced_hide_shorts_player_pivot_bar_title">Hide shorts player pivotbar</string>
<string name="revanced_hide_shorts_player_remix_button_summary_off">Shorts player remix button is shown</string>
<string name="revanced_hide_shorts_player_remix_button_summary_on">Shorts player remix button is hidden</string>
<string name="revanced_hide_shorts_player_remix_button_title">Hide shorts player remix button</string>
@ -482,6 +482,7 @@ Please do not report any issues you encounter while using this feature."</string
<string name="revanced_import_settings_summary">Fetch ReVanced settings from saved file</string>
<string name="revanced_import_settings_title">Import settings</string>
<string name="revanced_misc">Miscellaneous</string>
<string name="revanced_navigation">Navigation</string>
<string name="revanced_others">Others</string>
<string name="revanced_overlay_button">Overlay button</string>
<string name="revanced_overlay_button_auto_repeat_summary_off">Auto repeat button is hidden</string>
@ -509,7 +510,7 @@ Please do not report any issues you encounter while using this feature."</string
<string name="revanced_patches_information">Patches Information</string>
<string name="revanced_patches_information_summary">Information about applied patches</string>
<string name="revanced_player_flyout_panel_title">Player flyout panel</string>
<string name="revanced_player_layout">Player layout</string>
<string name="revanced_player">Player</string>
<string name="revanced_reboot_warning_general">"As this is still an experimental feature, there may be other unknown issues.
Are you sure you want to continue though?"</string>
<string name="revanced_reboot_warning_phone">"Tricks the dpi to change some layouts to phone layouts.
@ -553,7 +554,7 @@ Since these setting is quite outdated, it may not be valid"</string>
<string name="revanced_save_video_quality_none">Failed to set quality</string>
<string name="revanced_save_video_quality_wifi">Changing default Wi-Fi quality to:</string>
<string name="revanced_save_video_speed">Changing default speed to:</string>
<string name="revanced_seekbar_layout">Seekbar layout</string>
<string name="revanced_seekbar">Seekbar</string>
<string name="revanced_show_fullscreen_title_summary">Known issue: Title disappears when clicked</string>
<string name="revanced_show_fullscreen_title_title">Show fullscreen title</string>
<string name="revanced_spoofing_type_general">Spoof to general video</string>

122
src/main/resources/youtube/settings/xml/revanced_prefs.xml
View File

@ -44,28 +44,19 @@
</PreferenceScreen>PREFERENCE: SWIPE_SETTINGS -->
<!-- PREFERENCE: GENERAL_LAYOUT_SETTINGS
<PreferenceScreen android:title="@string/revanced_general_layout" android:key="general_layout">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout" />PREFERENCE: GENERAL_LAYOUT_SETTINGS -->
<!-- PREFERENCE: GENERAL_SETTINGS
<PreferenceScreen android:title="@string/revanced_general" android:key="general">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general" />PREFERENCE: GENERAL_SETTINGS -->
<!-- SETTINGS: HIDE_STORIES_SHELF
<SwitchPreference android:title="@string/revanced_hide_stories_shelf_title" android:key="revanced_hide_stories_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_stories_shelf_summary_on" android:summaryOff="@string/revanced_hide_stories_shelf_summary_off" />SETTINGS: HIDE_STORIES_SHELF -->
<!-- SETTINGS: SWITCH_CREATE_NOTIFICATION
<SwitchPreference android:title="@string/revanced_switching_create_notification_title" android:key="revanced_switching_create_notification" android:defaultValue="false" android:summaryOn="@string/revanced_switching_create_notification_summary_on" android:summaryOff="@string/revanced_switching_create_notification_summary_off" />SETTINGS: SWITCH_CREATE_NOTIFICATION -->
<!-- SETTINGS: HIDE_CREATE_BUTTON
<SwitchPreference android:title="@string/revanced_hide_create_button_title" android:key="revanced_hide_create_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_create_button_summary_on" android:summaryOff="@string/revanced_hide_create_button_summary_off" />SETTINGS: HIDE_CREATE_BUTTON -->
<!-- SETTINGS: SHORTS_COMPONENT.PARENT
<PreferenceScreen android:title="@string/revanced_hide_shorts_component_title" android:key="revanced_hide_shorts_component" android:summary="@string/revanced_hide_shorts_component_summary">SETTINGS: SHORTS_COMPONENT.PARENT -->
<!-- SETTINGS: SHORTS_COMPONENT_PARENT.A
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_hide_shorts_component_title" />SETTINGS: SHORTS_COMPONENT_PARENT.A -->
<!-- SETTINGS: HIDE_SHORTS_BUTTON
<SwitchPreference android:title="@string/revanced_hide_shorts_button_title" android:key="revanced_hide_shorts_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_button_summary_off" />SETTINGS: HIDE_SHORTS_BUTTON -->
<!-- SETTINGS: HIDE_SHORTS_SHELF
<SwitchPreference android:title="@string/revanced_hide_shorts_shelf_title" android:key="revanced_hide_shorts_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_summary_off" />SETTINGS: HIDE_SHORTS_SHELF -->
@ -82,10 +73,6 @@
<SwitchPreference android:title="@string/revanced_hide_shorts_player_subscriptions_button_title" android:key="revanced_hide_shorts_player_subscriptions_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_subscriptions_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_subscriptions_button_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_shorts_player_join_button_title" android:key="revanced_hide_shorts_player_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_player_join_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_join_button_summary_off" />SETTINGS: HIDE_SHORTS_COMPONENTS -->
<!-- SETTINGS: HIDE_SHORTS_PLAYER_PIVOT_BAR
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_experimental_flag" />
<SwitchPreference android:title="@string/revanced_hide_shorts_player_pivot_bar_title" android:key="revanced_hide_shorts_player_pivot_bar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_player_pivot_bar_summary_on" android:summaryOff="@string/revanced_hide_shorts_player_pivot_bar_summary_off" />SETTINGS: HIDE_SHORTS_PLAYER_PIVOT_BAR -->
<!-- SETTINGS: SHORTS_COMPONENT.PARENT
</PreferenceScreen>SETTINGS: SHORTS_COMPONENT.PARENT -->
@ -124,7 +111,7 @@
<!-- SETTINGS: HIDE_CHANNEL_LIST_SUBMENU
<SwitchPreference android:title="@string/revanced_hide_channel_list_submenu_title" android:key="revanced_hide_channel_list_submenu" android:defaultValue="true" android:summaryOn="@string/revanced_hide_channel_list_submenu_summary_on" android:summaryOff="@string/revanced_hide_channel_list_submenu_summary_off" />SETTINGS: HIDE_CHANNEL_LIST_SUBMENU -->
<!-- SETTINGS: HIDE_GENERAL_LAYOUT_ADS
<!-- SETTINGS: HIDE_GENERAL_ADS
<SwitchPreference android:title="@string/revanced_adremover_merchandise_title" android:key="revanced_adremover_merchandise" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_merchandise_summary_on" android:summaryOff="@string/revanced_adremover_merchandise_summary_off" />
<SwitchPreference android:title="@string/revanced_adremover_browse_store_button_title" android:key="revanced_adremover_browse_store_button" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_browse_store_button_summary_on" android:summaryOff="@string/revanced_adremover_browse_store_button_summary_off" />
<SwitchPreference android:title="@string/revanced_adremover_community_posts_home_title" android:key="revanced_adremover_community_posts_home" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_community_posts_home_summary_on" android:summaryOff="@string/revanced_adremover_community_posts_home_summary_off" />
@ -144,7 +131,7 @@
<SwitchPreference android:title="@string/revanced_adremover_album_card_in_search_title" android:key="revanced_adremover_album_card_in_search" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_album_card_in_search_summary_on" android:summaryOff="@string/revanced_adremover_album_card_in_search_summary_off" />
<SwitchPreference android:title="@string/revanced_adremover_breaking_news_shelf_title" android:key="revanced_adremover_breaking_news_shelf" android:defaultValue="false" android:summaryOn="@string/revanced_adremover_breaking_news_shelf_summary_on" android:summaryOff="@string/revanced_adremover_breaking_news_shelf_summary_off" />
<SwitchPreference android:title="@string/revanced_adremover_web_search_panel_title" android:key="revanced_adremover_web_search_panel" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_web_search_panel_summary_on" android:summaryOff="@string/revanced_adremover_web_search_panel_summary_off" />
<SwitchPreference android:title="@string/revanced_adremover_timed_reactions_title" android:key="revanced_adremover_timed_reactions" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_timed_reactions_summary_on" android:summaryOff="@string/revanced_adremover_timed_reactions_summary_off" />SETTINGS: HIDE_GENERAL_LAYOUT_ADS -->
<SwitchPreference android:title="@string/revanced_adremover_timed_reactions_title" android:key="revanced_adremover_timed_reactions" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_timed_reactions_summary_on" android:summaryOff="@string/revanced_adremover_timed_reactions_summary_off" />SETTINGS: HIDE_GENERAL_ADS -->
<!-- SETTINGS: HIDE_ACCOUNT_MENU
<SwitchPreference android:title="@string/revanced_hide_account_menu_title" android:key="revanced_hide_account_menu" android:defaultValue="false" android:summaryOn="@string/revanced_hide_account_menu_summary_on" android:summaryOff="@string/revanced_hide_account_menu_summary_off" />
@ -153,13 +140,13 @@
<!-- SETTINGS: HEADER_SWITCH
<SwitchPreference android:title="@string/revanced_override_premium_header_title" android:key="revanced_override_premium_header" android:defaultValue="false" android:summaryOn="@string/revanced_override_premium_header_summary_on" android:summaryOff="@string/revanced_override_premium_header_summary_off" />SETTINGS: HEADER_SWITCH -->
<!-- PREFERENCE: GENERAL_LAYOUT_SETTINGS
</PreferenceScreen>PREFERENCE: GENERAL_LAYOUT_SETTINGS -->
<!-- PREFERENCE: GENERAL_SETTINGS
</PreferenceScreen>PREFERENCE: GENERAL_SETTINGS -->
<!-- PREFERENCE: PLAYER_LAYOUT_SETTINGS
<PreferenceScreen android:title="@string/revanced_player_layout" android:key="player_layout">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_layout" />PREFERENCE: PLAYER_LAYOUT_SETTINGS -->
<!-- PREFERENCE: PLAYER_SETTINGS
<PreferenceScreen android:title="@string/revanced_player" android:key="player">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player" />PREFERENCE: PLAYER_SETTINGS -->
<!-- SETTINGS: HIDE_COLLAPSE_BUTTON
<SwitchPreference android:title="@string/revanced_hide_collapse_button_title" android:key="revanced_hide_collapse_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_collapse_button_summary_on" android:summaryOff="@string/revanced_hide_collapse_button_summary_off" />SETTINGS: HIDE_COLLAPSE_BUTTON -->
@ -206,13 +193,13 @@
<!-- SETTINGS: HIDE_PLAYER_OVERLAY_FILTER
<SwitchPreference android:title="@string/revanced_hide_player_overlay_filter_title" android:key="revanced_hide_player_overlay_filter" android:defaultValue="false" android:summaryOn="@string/revanced_hide_player_overlay_filter_summary_on" android:summaryOff="@string/revanced_hide_player_overlay_filter_summary_off" />SETTINGS: HIDE_PLAYER_OVERLAY_FILTER -->
<!-- PREFERENCE: PLAYER_LAYOUT_SETTINGS
</PreferenceScreen>PREFERENCE: PLAYER_LAYOUT_SETTINGS -->
<!-- PREFERENCE: PLAYER_SETTINGS
</PreferenceScreen>PREFERENCE: PLAYER_SETTINGS -->
<!-- PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS
<PreferenceScreen android:title="@string/revanced_fullscreen_layout" android:key="fullscreen_layout">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen_layout" />PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS -->
<!-- PREFERENCE: FULLSCREEN_SETTINGS
<PreferenceScreen android:title="@string/revanced_fullscreen" android:key="fullscreen">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen" />PREFERENCE: FULLSCREEN_SETTINGS -->
<!-- SETTINGS: HIDE_FULLSCREEN_PANELS
<SwitchPreference android:title="@string/revanced_hide_fullscreen_panels_title" android:key="revanced_hide_fullscreen_panels" android:defaultValue="false" android:summaryOn="@string/revanced_hide_fullscreen_panels_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_panels_summary_off" />
@ -236,12 +223,12 @@
<SwitchPreference android:title="@string/revanced_disable_haptic_feedback_scrubbing_title" android:key="revanced_disable_haptic_feedback_scrubbing" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_scrubbing_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_scrubbing_summary_off" />
<SwitchPreference android:title="@string/revanced_disable_haptic_feedback_chapters_title" android:key="revanced_disable_haptic_feedback_chapters" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_chapters_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_chapters_summary_off" />
<SwitchPreference android:title="@string/revanced_disable_haptic_feedback_zoom_title" android:key="revanced_disable_haptic_feedback_zoom" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_zoom_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_zoom_summary_off" />SETTINGS: DISABLE_HAPTIC_FEEDBACK -->
<!-- PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS
</PreferenceScreen>PREFERENCE: FULLSCREEN_LAYOUT_SETTINGS -->
<!-- PREFERENCE: FULLSCREEN_SETTINGS
</PreferenceScreen>PREFERENCE: FULLSCREEN_SETTINGS -->
<!-- PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS
<PreferenceScreen android:title="@string/revanced_bottom_player_layout" android:key="bottom_player">PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS -->
<!-- PREFERENCE: BOTTOM_PLAYER_SETTINGS
<PreferenceScreen android:title="@string/revanced_bottom_player" android:key="bottom_player">PREFERENCE: BOTTOM_PLAYER_SETTINGS -->
<!-- SETTINGS: BUTTON_CONTAINER
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_button_container_title" />
@ -269,16 +256,16 @@
<SwitchPreference android:title="@string/revanced_hide_comments_thanks_button_title" android:key="revanced_hide_comments_thanks_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_comments_thanks_button_summary_on" android:summaryOff="@string/revanced_hide_comments_thanks_button_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_emoji_picker_title" android:key="revanced_hide_emoji_picker" android:defaultValue="false" android:summaryOn="@string/revanced_hide_emoji_picker_summary_on" android:summaryOff="@string/revanced_hide_emoji_picker_summary_off" />SETTINGS: COMMENT_COMPONENTS -->
<!-- SETTINGS: HIDE_GENERAL_LAYOUT_ADS
<SwitchPreference android:title="@string/revanced_adremover_channel_guidelines_title" android:key="revanced_adremover_channel_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_channel_guidelines_summary_off" />SETTINGS: HIDE_GENERAL_LAYOUT_ADS -->
<!-- SETTINGS: HIDE_GENERAL_ADS
<SwitchPreference android:title="@string/revanced_adremover_channel_guidelines_title" android:key="revanced_adremover_channel_guidelines" android:defaultValue="true" android:summaryOn="@string/revanced_adremover_channel_guidelines_summary_on" android:summaryOff="@string/revanced_adremover_channel_guidelines_summary_off" />SETTINGS: HIDE_GENERAL_ADS -->
<!-- PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS
</PreferenceScreen>PREFERENCE: BOTTOM_PLAYER_LAYOUT_SETTINGS -->
<!-- PREFERENCE: BOTTOM_PLAYER_SETTINGS
</PreferenceScreen>PREFERENCE: BOTTOM_PLAYER_SETTINGS -->
<!-- PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS
<PreferenceScreen android:title="@string/revanced_flyout_menu_layout" android:key="flyout_menu">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu_layout" />PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS -->
<!-- PREFERENCE: FLYOUT_PANEL_SETTINGS
<PreferenceScreen android:title="@string/revanced_flyout_menu" android:key="flyout_menu">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu" />PREFERENCE: FLYOUT_PANEL_SETTINGS -->
<!-- SETTINGS: ENABLE_OLD_QUALITY_LAYOUT
<SwitchPreference android:title="@string/revanced_enable_old_quality_layout_title" android:key="revanced_enable_old_quality_layout" android:defaultValue="true" android:summaryOn="@string/revanced_enable_old_quality_layout_summary_on" android:summaryOff="@string/revanced_enable_old_quality_layout_summary_off" />SETTINGS: ENABLE_OLD_QUALITY_LAYOUT -->
@ -298,13 +285,34 @@
<SwitchPreference android:title="@string/revanced_hide_menu_stats_for_nerds_title" android:key="revanced_hide_menu_stats_for_nerds" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_stats_for_nerds_summary_on" android:summaryOff="@string/revanced_hide_menu_stats_for_nerds_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_menu_listen_with_youtube_music_title" android:key="revanced_hide_menu_listen_with_youtube_music" android:defaultValue="false" android:summaryOn="@string/revanced_hide_menu_listen_with_youtube_music_summary_on" android:summaryOff="@string/revanced_hide_menu_listen_with_youtube_music_summary_off" />SETTINGS: FLYOUT_PANEL_COMPONENT -->
<!-- PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS
</PreferenceScreen>PREFERENCE: FLYOUT_PANEL_LAYOUT_SETTINGS -->
<!-- PREFERENCE: FLYOUT_PANEL_SETTINGS
</PreferenceScreen>PREFERENCE: FLYOUT_PANEL_SETTINGS -->
<!-- PREFERENCE: SEEKBAR_LAYOUT_SETTINGS
<PreferenceScreen android:title="@string/revanced_seekbar_layout" android:key="seekbar">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar_layout" />PREFERENCE: SEEKBAR_LAYOUT_SETTINGS -->
<!-- PREFERENCE: NAVIGATION_SETTINGS
<PreferenceScreen android:title="@string/revanced_navigation" android:key="navigation">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_navigation" />PREFERENCE: NAVIGATION_SETTINGS -->
<!-- SETTINGS: SWITCH_CREATE_NOTIFICATION
<SwitchPreference android:title="@string/revanced_switching_create_notification_title" android:key="revanced_switching_create_notification" android:defaultValue="false" android:summaryOn="@string/revanced_switching_create_notification_summary_on" android:summaryOff="@string/revanced_switching_create_notification_summary_off" />SETTINGS: SWITCH_CREATE_NOTIFICATION -->
<!-- SETTINGS: HIDE_CREATE_BUTTON
<SwitchPreference android:title="@string/revanced_hide_create_button_title" android:key="revanced_hide_create_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_create_button_summary_on" android:summaryOff="@string/revanced_hide_create_button_summary_off" />SETTINGS: HIDE_CREATE_BUTTON -->
<!-- SETTINGS: HIDE_SHORTS_BUTTON
<SwitchPreference android:title="@string/revanced_hide_shorts_button_title" android:key="revanced_hide_shorts_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_button_summary_on" android:summaryOff="@string/revanced_hide_shorts_button_summary_off" />SETTINGS: HIDE_SHORTS_BUTTON -->
<!-- SETTINGS: HIDE_SHORTS_NAVIGATION_BAR
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_experimental_flag" />
<SwitchPreference android:title="@string/revanced_hide_shorts_navigation_bar_title" android:key="revanced_hide_shorts_navigation_bar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_navigation_bar_summary_on" android:summaryOff="@string/revanced_hide_shorts_navigation_bar_summary_off" />SETTINGS: HIDE_SHORTS_NAVIGATION_BAR -->
<!-- PREFERENCE: NAVIGATION_SETTINGS
</PreferenceScreen>PREFERENCE: NAVIGATION_SETTINGS -->
<!-- PREFERENCE: SEEKBAR_SETTINGS
<PreferenceScreen android:title="@string/revanced_seekbar" android:key="seekbar">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar" />PREFERENCE: SEEKBAR_SETTINGS -->
<!-- SETTINGS: HIDE_SEEKBAR
<SwitchPreference android:title="@string/revanced_hide_seekbar_title" android:key="revanced_hide_seekbar" android:defaultValue="false" android:summaryOn="@string/revanced_hide_seekbar_summary_on" android:summaryOff="@string/revanced_hide_seekbar_summary_off" />SETTINGS: HIDE_SEEKBAR -->
@ -322,8 +330,8 @@
<!-- SETTINGS: ENABLE_TIME_STAMP_SPEED
<SwitchPreference android:title="@string/revanced_enable_time_stamp_speed_title" android:key="revanced_enable_time_stamp_speed" android:defaultValue="true" android:summaryOn="@string/revanced_enable_time_stamp_speed_summary_on" android:summaryOff="@string/revanced_enable_time_stamp_speed_summary_off" />SETTINGS: ENABLE_TIME_STAMP_SPEED -->
<!-- PREFERENCE: SEEKBAR_LAYOUT_SETTINGS
</PreferenceScreen>PREFERENCE: SEEKBAR_LAYOUT_SETTINGS -->
<!-- PREFERENCE: SEEKBAR_SETTINGS
</PreferenceScreen>PREFERENCE: SEEKBAR_SETTINGS -->
<!-- PREFERENCE: OVERLAY_BUTTONS
@ -424,14 +432,10 @@
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_swipe_controls" />
<Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general" />
<Preference android:title="hide-stories" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="switch-create-notification" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-create-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-shorts-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-shorts-component" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-startup-shorts-player" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-shorts-pivot-bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="enable-wide-searchbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="enable-tablet-miniplayer" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-auto-captions" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@ -446,7 +450,7 @@
<Preference android:title="hide-account-menu" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="header-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_layout" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player" />
<Preference android:title="hide-collapse-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-music-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-autoplay-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@ -461,7 +465,7 @@
<Preference android:title="hide-suggested-actions" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-player-overlay-filter" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen_layout" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_fullscreen" />
<Preference android:title="hide-fullscreen-panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-fullscreen-buttoncontainer" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-autoplay-preview" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@ -469,15 +473,21 @@
<Preference android:title="hide-filmstrip-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="disable-haptic-feedback" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_bottom_player_layout" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_bottom_player" />
<Preference android:title="hide-button-container" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-comment-component" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu_layout" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_flyout_menu" />
<Preference android:title="enable-old-quality-layout" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-flyout-panel" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar_layout" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_navigation" />
<Preference android:title="switch-create-notification" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-create-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-shorts-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-shorts-navbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_seekbar" />
<Preference android:title="hide-seekbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="enable-seekbar-tapping" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="custom-seekbar-color" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>