From 981d2a03b30b97135b913372e2d770b280f8688a Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sun, 8 Dec 2024 22:25:42 +0400 Subject: [PATCH] rename to `Open videos fullscreen` --- ...eenPatch.java => OpenVideosFullscreen.java} | 6 +++--- .../extension/youtube/settings/Settings.java | 2 +- patches/api/patches.api | 4 ++-- .../layout/player/fullscreen/Fingerprints.kt | 6 +++--- ...eenModePatch.kt => OpenVideosFullscreen.kt} | 18 +++++++++--------- .../resources/addresources/values/strings.xml | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) rename extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/{PortraitFullscreenPatch.java => OpenVideosFullscreen.java} (53%) rename patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/{PortraitFullscreenModePatch.kt => OpenVideosFullscreen.kt} (76%) diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PortraitFullscreenPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreen.java similarity index 53% rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PortraitFullscreenPatch.java rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreen.java index 43416337be..fe86097969 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PortraitFullscreenPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreen.java @@ -3,12 +3,12 @@ import app.revanced.extension.youtube.settings.Settings; @SuppressWarnings("unused") -public class PortraitFullscreenPatch { +public class OpenVideosFullscreen { /** * Injection point. */ - public static boolean openVideosInPortraitFullscreen() { - return Settings.PORTRAIT_FULLSCREEN_MODE.get(); + public static boolean openVideoInFullscreenPortrait() { + return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get(); } } diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java index e7f22dc264..5f256fb960 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -140,7 +140,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting PLAYBACK_SPEED_DIALOG_BUTTON = new BooleanSetting("revanced_playback_speed_dialog_button", FALSE); public static final BooleanSetting PLAYER_POPUP_PANELS = new BooleanSetting("revanced_hide_player_popup_panels", FALSE); public static final IntegerSetting PLAYER_OVERLAY_OPACITY = new IntegerSetting("revanced_player_overlay_opacity", 100, true); - public static final BooleanSetting PORTRAIT_FULLSCREEN_MODE = new BooleanSetting("revanced_portrait_fullscreen", FALSE); + public static final BooleanSetting OPEN_VIDEOS_FULLSCREEN_PORTRAIT = new BooleanSetting("revanced_open_videos_fullscreen_portrait", FALSE); // Miniplayer public static final EnumSetting MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.ORIGINAL, true); private static final Availability MINIPLAYER_ANY_MODERN = MINIPLAYER_TYPE.availability(MODERN_1, MODERN_2, MODERN_3, MODERN_4); diff --git a/patches/api/patches.api b/patches/api/patches.api index b57338e77c..36a925df87 100644 --- a/patches/api/patches.api +++ b/patches/api/patches.api @@ -1164,8 +1164,8 @@ public final class app/revanced/patches/youtube/layout/player/background/PlayerC public static final fun getPlayerControlsBackgroundPatch ()Lapp/revanced/patcher/patch/ResourcePatch; } -public final class app/revanced/patches/youtube/layout/player/fullscreen/PortraitFullscreenModePatchKt { - public static final fun getPortraitFullscreenPatch ()Lapp/revanced/patcher/patch/BytecodePatch; +public final class app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenKt { + public static final fun getOpenVideosFullscreenPatch ()Lapp/revanced/patcher/patch/BytecodePatch; } public final class app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatchKt { diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt index 71c2e23786..d188d8442b 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt @@ -4,13 +4,13 @@ import app.revanced.patcher.fingerprint import app.revanced.util.literal import com.android.tools.smali.dexlib2.AccessFlags -internal const val OPEN_VIDEOS_IN_PORTRAIT_FULLSCREEN_FEATURE_FLAG = 45666112L +internal const val OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG = 45666112L -internal val portraitFullscreenModeFingerprint = fingerprint { +internal val openVideosFullscreenPortraitFingerprint = fingerprint { accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL) returns("V") parameters("L", "Lj\$/util/Optional;") literal { - OPEN_VIDEOS_IN_PORTRAIT_FULLSCREEN_FEATURE_FLAG + OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG } } diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/PortraitFullscreenModePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreen.kt similarity index 76% rename from patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/PortraitFullscreenModePatch.kt rename to patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreen.kt index f8e8c4d48d..f79b30c31d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/PortraitFullscreenModePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreen.kt @@ -15,12 +15,12 @@ import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction private const val EXTENSION_CLASS_DESCRIPTOR = - "Lapp/revanced/extension/youtube/patches/PortraitFullscreenPatch;" + "Lapp/revanced/extension/youtube/patches/OpenVideosFullscreen;" @Suppress("unused") -val portraitFullscreenPatch = bytecodePatch( - name = "Portrait fullscreen", - description = "Adds an option to always open videos in portrait full screen mode.", +val openVideosFullscreenPatch = bytecodePatch( + name = "Open videos fullscreen", + description = "Adds an option to open videos in portrait full screen mode.", ) { dependsOn( sharedExtensionPatch, @@ -35,21 +35,21 @@ val portraitFullscreenPatch = bytecodePatch( ) execute { - addResources("youtube", "layout.player.fullscreen.portraitFullscreenPatch") + addResources("youtube", "layout.player.fullscreen.openVideosFullscreen") PreferenceScreen.PLAYER.addPreferences( - SwitchPreference("revanced_portrait_fullscreen") + SwitchPreference("revanced_open_videos_fullscreen_portrait") ) - portraitFullscreenModeFingerprint.method.apply { - val constIndex = indexOfFirstLiteralInstructionOrThrow(OPEN_VIDEOS_IN_PORTRAIT_FULLSCREEN_FEATURE_FLAG) + openVideosFullscreenPortraitFingerprint.method.apply { + val constIndex = indexOfFirstLiteralInstructionOrThrow(OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG) val resultIndex = indexOfFirstInstructionOrThrow(constIndex, Opcode.MOVE_RESULT) val register = getInstruction(resultIndex).registerA addInstructions( resultIndex + 1, """ - invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->openVideosInPortraitFullscreen()Z + invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->openVideoInFullscreenPortrait()Z move-result v$register """ ) diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index b5b67e1f19..7e2740e14b 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -715,10 +715,10 @@ This is because Crowdin requires temporarily flattening this file and removing t Player popup panels are hidden Player popup panels are shown - - Always open videos in portrait fullscreen - Videos open in fullscreen - Videos do not open in fullscreen + + Open videos in portrait fullscreen + Videos open in fullscreen + Videos do not open in fullscreen Player overlay opacity