diff --git a/src/main/kotlin/app/revanced/patches/microg/layout/branding/name/patch/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/microg/layout/branding/name/patch/CustomBrandingNamePatch.kt index 0e34b981f..8b5133abc 100644 --- a/src/main/kotlin/app/revanced/patches/microg/layout/branding/name/patch/CustomBrandingNamePatch.kt +++ b/src/main/kotlin/app/revanced/patches/microg/layout/branding/name/patch/CustomBrandingNamePatch.kt @@ -17,7 +17,7 @@ import org.w3c.dom.Element @Patch @Name("custom-branding-microg-name") -@Description("Changes the MicroG launcher name to your choice (defaults to MicroG).") +@Description("Rename the MicroG app to the name specified in options.json.") @MicroGCompatibility @Version("0.0.1") class CustomBrandingNamePatch : ResourcePatch { diff --git a/src/main/kotlin/app/revanced/patches/music/ads/video/patch/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/music/ads/video/patch/VideoAdsPatch.kt index 598454bbe..aa1367d8b 100644 --- a/src/main/kotlin/app/revanced/patches/music/ads/video/patch/VideoAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/ads/video/patch/VideoAdsPatch.kt @@ -16,8 +16,8 @@ import app.revanced.util.enum.CategoryType import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH @Patch -@Name("hide-music-ads") -@Description("Removes ads in the music player.") +@Name("hide-video-ads") +@Description("Removes ads in the music video.") @DependsOn( [ LithoFilterPatch::class, diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt index 0d99cb65b..1d60375b5 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt @@ -16,7 +16,7 @@ import org.w3c.dom.Element @Patch(false) @Name("custom-branding-music-name") -@Description("Changes the Music launcher name to your choice (defaults to YTM Extended, ReVanced Music Extended).") +@Description("Rename the YouTube Music app to the name specified in options.json.") @MusicCompatibility @Version("0.0.1") class CustomBrandingNamePatch : ResourcePatch { diff --git a/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt index 2e74f51d3..045b755ec 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt @@ -12,7 +12,7 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility @Patch @Name("bitrate-default-value") -@Description("Set the audio quality to 'Always High' when you first install the app.") +@Description("Set the audio quality to \"Always High\" when you first install the app.") @MusicCompatibility @Version("0.0.1") class BitrateDefaultValuePatch : ResourcePatch { diff --git a/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt index c65f8fe99..542b78bf6 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt @@ -14,7 +14,7 @@ import app.revanced.patches.music.misc.minimizedplayback.fingerprints.MinimizedP import app.revanced.patches.music.utils.annotations.MusicCompatibility @Patch -@Name("minimized-playback-music") +@Name("enable-minimized-playback") @Description("Enables minimized playback on Kids music.") @MusicCompatibility @Version("0.0.1") diff --git a/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt index 827cd2163..25464a08e 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt @@ -13,7 +13,7 @@ import java.nio.file.Files import java.nio.file.StandardCopyOption @Patch -@Name("optimize-resource-music") +@Name("optimize-resource") @Description("Remove unnecessary resources.") @MusicCompatibility @Version("0.0.1") diff --git a/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/RemoveTasteBuilderPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/RemoveTasteBuilderPatch.kt rename to src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt index 41e0cc449..383e8cc75 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/RemoveTasteBuilderPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt @@ -17,10 +17,10 @@ import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction @Patch @Name("hide-taste-builder") -@Description("Removes the \"Tell us which artists you like\" card from the home screen.") +@Description("Hides the \"Tell us which artists you like\" card from homepage.") @MusicCompatibility @Version("0.0.1") -class RemoveTasteBuilderPatch : BytecodePatch( +class TasteBuilderPatch : BytecodePatch( listOf(TasteBuilderConstructorFingerprint) ) { override fun execute(context: BytecodeContext): PatchResult { diff --git a/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/MusicTranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt similarity index 95% rename from src/main/kotlin/app/revanced/patches/music/misc/translations/patch/MusicTranslationsPatch.kt rename to src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt index 835ef5eac..01fbbcd16 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/MusicTranslationsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt @@ -14,12 +14,12 @@ import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.resources.ResourceHelper.addTranslations @Patch -@Name("translations-music") +@Name("translations") @Description("Add Crowdin translations for YouTube Music.") @DependsOn([SettingsPatch::class]) @MusicCompatibility @Version("0.0.1") -class MusicTranslationsPatch : ResourcePatch { +class TranslationsPatch : ResourcePatch { override fun execute(context: ResourceContext): PatchResult { context.addTranslations("music", LANGUAGE_LIST) diff --git a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/RemoveUpgradeButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt similarity index 96% rename from src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/RemoveUpgradeButtonPatch.kt rename to src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt index 0e2fce8c0..16153f5fe 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/RemoveUpgradeButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt @@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction @Patch @Name("hide-upgrade-button") -@Description("Remove upgrade tab from pivot bar, hide upgrade banner from homepage.") +@Description("Hides upgrade button from navigation bar and hide upgrade banner from homepage.") @DependsOn( [ IntegrationsPatch::class, @@ -34,7 +34,7 @@ import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction ) @MusicCompatibility @Version("0.0.1") -class RemoveUpgradeButtonPatch : BytecodePatch( +class UpgradeButtonPatch : BytecodePatch( listOf( PivotBarConstructorFingerprint, NotifierShelfFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt index 54cb337db..d03d26aa7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt @@ -17,7 +17,7 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH @Patch @Name("hide-comment-component") -@Description("Adds options to hide comment component under a video.") +@Description("Hides components related to comments.") @DependsOn( [ GeneralAdsBytecodePatch::class, diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt index 33a2e65fe..f6d10769e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt @@ -20,7 +20,7 @@ import app.revanced.patches.youtube.fullscreen.fullscreenpanels.fingerprints.Ful import app.revanced.patches.youtube.fullscreen.fullscreenpanels.fingerprints.FullscreenViewAdderFingerprint import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.fingerprints.LayoutConstructorFingerprint -import app.revanced.patches.youtube.utils.quickactionscontainer.patch.HideQuickActionsContainerPatch +import app.revanced.patches.youtube.utils.quickactions.patch.QuickActionsHookPatch import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.FullScreenEngagementPanel import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @@ -37,7 +37,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c @Description("Hides video description and comments panel in fullscreen view.") @DependsOn( [ - HideQuickActionsContainerPatch::class, + QuickActionsHookPatch::class, SettingsPatch::class, SharedResourceIdPatch::class ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt index 873b0fc60..c834f1be3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt @@ -11,7 +11,7 @@ import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch -import app.revanced.patches.youtube.utils.quickactionscontainer.patch.HideQuickActionsContainerPatch +import app.revanced.patches.youtube.utils.quickactions.patch.QuickActionsHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.PATCHES_PATH @@ -21,7 +21,7 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH @DependsOn( [ LithoFilterPatch::class, - HideQuickActionsContainerPatch::class, + QuickActionsHookPatch::class, SettingsPatch::class ] ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt index fcfbb2910..23bf34b32 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt @@ -25,8 +25,8 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.GENERAL @Patch -@Name("hide-auto-captions") -@Description("Hide captions from being automatically enabled.") +@Name("disable-auto-captions") +@Description("Disables forced auto captions.") @DependsOn( [ PlayerTypeHookPatch::class, @@ -60,7 +60,7 @@ class AutoCaptionsPatch : BytecodePatch( it.mutableMethod.apply { addInstructionsWithLabels( 0, """ - invoke-static {}, $GENERAL->hideAutoCaptions()Z + invoke-static {}, $GENERAL->disableAutoCaptions()Z move-result v0 if-eqz v0, :auto_captions_shown sget-boolean v0, $GENERAL->captionsButtonStatus:Z @@ -78,11 +78,11 @@ class AutoCaptionsPatch : BytecodePatch( SettingsPatch.addPreference( arrayOf( "PREFERENCE: GENERAL_SETTINGS", - "SETTINGS: HIDE_AUTO_CAPTIONS" + "SETTINGS: DISABLE_AUTO_CAPTIONS" ) ) - SettingsPatch.updatePatchStatus("hide-auto-captions") + SettingsPatch.updatePatchStatus("disable-auto-captions") return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt index ef16db674..35a5b026d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt @@ -15,7 +15,7 @@ import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.general.suggestions.fingerprints.BreakingNewsFingerprint import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch -import app.revanced.patches.youtube.utils.navbarindex.patch.NavBarIndexPatch +import app.revanced.patches.youtube.utils.navbarindex.patch.NavBarIndexHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.GENERAL import org.jf.dexlib2.iface.instruction.OneRegisterInstruction @@ -26,7 +26,7 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction @DependsOn( [ LithoFilterPatch::class, - NavBarIndexPatch::class, + NavBarIndexHookPatch::class, SettingsPatch::class ] ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt index 6662ecdcb..38047b7fb 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt @@ -19,8 +19,8 @@ import org.w3c.dom.Element @Patch @Name("custom-branding-youtube-name") +@Description("Rename the YouTube app to the name specified in options.json.") @DependsOn([SettingsPatch::class]) -@Description("Changes the YouTube launcher name to your choice (defaults to ReVanced Extended).") @YouTubeCompatibility @Version("0.0.1") class CustomBrandingNamePatch : ResourcePatch { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt index 8909f9898..728656a80 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt @@ -19,7 +19,7 @@ import org.w3c.dom.Element @Patch @Name("theme") -@Description("Applies a custom theme (default: amoled).") +@Description("Change the app's theme to the values specified in options.json.") @DependsOn( [ GeneralThemePatch::class, diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/autorepeat/patch/AutoRepeatPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/autorepeat/patch/AutoRepeatPatch.kt index 067799393..923412126 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/autorepeat/patch/AutoRepeatPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/autorepeat/patch/AutoRepeatPatch.kt @@ -26,7 +26,7 @@ import org.jf.dexlib2.builder.instruction.BuilderInstruction35c import org.jf.dexlib2.iface.instruction.OneRegisterInstruction import org.jf.dexlib2.iface.instruction.ReferenceInstruction -@Name("always-auto-repeat") +@Name("always-repeat") @YouTubeCompatibility @Version("0.0.1") class AutoRepeatPatch : BytecodePatch( diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt index fc51afafa..42e2d5d32 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt @@ -10,7 +10,7 @@ import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility -import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch +import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @Patch @@ -18,7 +18,7 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @Description("Hides the collapse button in the video player.") @DependsOn( [ - PlayerButtonPatch::class, + PlayerButtonHookPatch::class, SettingsPatch::class ] ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/livechatbutton/patch/HideLiveChatButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/livechatbutton/patch/HideLiveChatButtonPatch.kt index f13bae395..cbaae5f9a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/livechatbutton/patch/HideLiveChatButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/livechatbutton/patch/HideLiveChatButtonPatch.kt @@ -10,7 +10,7 @@ import app.revanced.patcher.patch.ResourcePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility -import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch +import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @Patch @@ -18,7 +18,7 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @Description("Hides the live chat button in the video player (for old layout).") @DependsOn( [ - PlayerButtonPatch::class, + PlayerButtonHookPatch::class, SettingsPatch::class ] ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt index 0709e7661..8d1f0dd4a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt @@ -13,7 +13,7 @@ import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.player.playerbuttonbg.fingerprints.HidePlayerButtonFingerprint import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility -import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch +import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH @@ -22,7 +22,7 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH @Description("Hide player button background.") @DependsOn( [ - PlayerButtonPatch::class, + PlayerButtonHookPatch::class, SettingsPatch::class ] ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt index 4639254e3..750c1140f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt @@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility -import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonPatch +import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @Patch @@ -18,7 +18,7 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch @Description("Hides the previous and next button in the player controller.") @DependsOn( [ - PlayerButtonPatch::class, + PlayerButtonHookPatch::class, SettingsPatch::class ] ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt similarity index 98% rename from src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexPatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt index 0221e4830..6d91b0ffb 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt @@ -23,11 +23,11 @@ import org.jf.dexlib2.iface.instruction.ReferenceInstruction import org.jf.dexlib2.iface.instruction.formats.Instruction35c import org.jf.dexlib2.iface.reference.MethodReference -@Name("hook-navbar-index-patch") +@Name("navbar-index-hook") @DependsOn([SharedResourceIdPatch::class]) @YouTubeCompatibility @Version("0.0.1") -class NavBarIndexPatch : BytecodePatch( +class NavBarIndexHookPatch : BytecodePatch( listOf( NavBarBuilderFingerprint, OnBackPressedFingerprint, diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt similarity index 97% rename from src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonPatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt index bdd190727..56f7fb2e5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt @@ -19,11 +19,11 @@ import org.jf.dexlib2.Opcode import org.jf.dexlib2.builder.instruction.BuilderInstruction21c import org.jf.dexlib2.builder.instruction.BuilderInstruction35c -@Name("hook-player-button-patch") +@Name("player-button-hook") @DependsOn([SharedResourceIdPatch::class]) @YouTubeCompatibility @Version("0.0.1") -class PlayerButtonPatch : BytecodePatch( +class PlayerButtonHookPatch : BytecodePatch( listOf(LiveChatFingerprint) ) { override fun execute(context: BytecodeContext): PatchResult { diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt index 22a0c37b6..d12c9a100 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt @@ -34,7 +34,7 @@ import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction import org.jf.dexlib2.iface.instruction.formats.Instruction35c import org.jf.dexlib2.iface.reference.Reference -@Name("player-controls-patch") +@Name("player-controls") @DependsOn([SharedResourceIdPatch::class]) @Description("Manages the code for the player controls of the YouTube player.") @YouTubeCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/quickactionscontainer/fingerprints/QuickActionsElementFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/fingerprints/QuickActionsElementFingerprint.kt similarity index 90% rename from src/main/kotlin/app/revanced/patches/youtube/utils/quickactionscontainer/fingerprints/QuickActionsElementFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/fingerprints/QuickActionsElementFingerprint.kt index 52bb921ed..1aeaf9d93 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/quickactionscontainer/fingerprints/QuickActionsElementFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/fingerprints/QuickActionsElementFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.utils.quickactionscontainer.fingerprints +package app.revanced.patches.youtube.utils.quickactions.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.QuickActionsElementContainer diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/quickactionscontainer/patch/HideQuickActionsContainerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/youtube/utils/quickactionscontainer/patch/HideQuickActionsContainerPatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt index f83ee39df..82829ed6f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/quickactionscontainer/patch/HideQuickActionsContainerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.utils.quickactionscontainer.patch +package app.revanced.patches.youtube.utils.quickactions.patch import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Name @@ -11,16 +11,16 @@ import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility -import app.revanced.patches.youtube.utils.quickactionscontainer.fingerprints.QuickActionsElementFingerprint +import app.revanced.patches.youtube.utils.quickactions.fingerprints.QuickActionsElementFingerprint import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.util.integrations.Constants.FULLSCREEN import org.jf.dexlib2.iface.instruction.OneRegisterInstruction -@Name("hide-quick-actions-hook") +@Name("quick-actions-hook") @DependsOn([SharedResourceIdPatch::class]) @YouTubeCompatibility @Version("0.0.1") -class HideQuickActionsContainerPatch : BytecodePatch( +class QuickActionsHookPatch : BytecodePatch( listOf(QuickActionsElementFingerprint) ) { override fun execute(context: BytecodeContext): PatchResult { diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml index 9daa8ceb4..03d4c614d 100644 --- a/src/main/resources/youtube/settings/host/values/strings.xml +++ b/src/main/resources/youtube/settings/host/values/strings.xml @@ -46,6 +46,9 @@ Default video quality on Mobile network Default video quality on Wi-Fi network Default video speed + Forced auto captions are enabled + Forced auto captions are disabled + Disable forced auto captions Default video speed is enabled in live stream Default video speed is disabled in live stream Disable video speed in live stream @@ -195,9 +198,6 @@ Please do not report any issues you encounter while using this feature."Autoplay preview container is shown Autoplay preview container is hidden Hide autoplay preview container - Captions are enabled when playing a video with captioning is enforced - "Captions aren't enabled when playing a video with captioning is enforced" - Hide auto captions Auto player popup panels are shown Auto player popup panels are hidden Hide auto player popup panels diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index 740354040..c7642b4fe 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -132,6 +132,9 @@ + + @@ -145,9 +148,6 @@ - - @@ -314,11 +314,11 @@ + -