chore: Release v5.3.0-dev.5 [skip ci]

# [5.3.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.3.0-dev.4...v5.3.0-dev.5) (2024-12-09)

### Bug Fixes

* **Change package name:** Prevent applying the patch to known incompatible apps ([#3943](https://github.com/ReVanced/revanced-patches/issues/3943)) ([b04a11a](b04a11a885))
* **YouTube Music - Permanent shuffle:** Remove obsolete and non functional patch ([#4073](https://github.com/ReVanced/revanced-patches/issues/4073)) ([4983e02](4983e021f9))

### Features

* **YouTube:** Add `Open videos fullscreen` patch ([#4069](https://github.com/ReVanced/revanced-patches/issues/4069)) ([bee917f](bee917f4ed))

CHANGELOG.md

@@ -1,3 +1,30 @@
+# [5.3.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.3.0-dev.4...v5.3.0-dev.5) (2024-12-09)
+
+
+### Bug Fixes
+
+* **Change package name:** Prevent applying the patch to known incompatible apps ([#3943](https://github.com/ReVanced/revanced-patches/issues/3943)) ([44936e7](https://github.com/ReVanced/revanced-patches/commit/44936e71e846f72f7279950232a5dba37765ceb3))
+* **YouTube Music - Permanent shuffle:** Remove obsolete and non functional patch ([#4073](https://github.com/ReVanced/revanced-patches/issues/4073)) ([fbc6ab6](https://github.com/ReVanced/revanced-patches/commit/fbc6ab6a357b351f02d4d486ddc2072cf53199c3))
+
+
+### Features
+
+* **YouTube:** Add `Open videos fullscreen` patch ([#4069](https://github.com/ReVanced/revanced-patches/issues/4069)) ([296d63b](https://github.com/ReVanced/revanced-patches/commit/296d63bd42c338a01efbcb2df702e5822d05a5f1))
+
+# [5.3.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.3.0-dev.3...v5.3.0-dev.4) (2024-12-09)
+
+
+### Features
+
+* **Nyx:** Remove broken `Unlock pro` patch ([1fe8b16](https://github.com/ReVanced/revanced-patches/commit/1fe8b164eab0c4fa80ab2da2581977f5111a2858))
+
+# [5.3.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.3.0-dev.2...v5.3.0-dev.3) (2024-12-09)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Update `Force AVC` client data ([#4064](https://github.com/ReVanced/revanced-patches/issues/4064)) ([7d537dd](https://github.com/ReVanced/revanced-patches/commit/7d537ddff4bb5421fa320741275131a66ef5c7bb))
+
 # [5.3.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.3.0-dev.1...v5.3.0-dev.2) (2024-12-08)
 
 

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java

@@ -1,12 +1,11 @@
 package app.revanced.extension.shared.spoof;
 
-import static app.revanced.extension.shared.spoof.DeviceHardwareSupport.allowAV1;
-import static app.revanced.extension.shared.spoof.DeviceHardwareSupport.allowVP9;
-
 import android.os.Build;
 
 import androidx.annotation.Nullable;
 
+import app.revanced.extension.shared.settings.BaseSettings;
+
 public enum ClientType {
     // Specific purpose for age restricted, or private videos, because the iOS client is not logged in.
     // https://dumps.tadiphone.dev/dumps/oculus/eureka
@@ -16,31 +15,35 @@ public enum ClientType {
             "com.google.android.apps.youtube.vr.oculus/1.56.21 (Linux; U; Android 12; GB) gzip",
             "32", // Android 12.1
             "1.56.21",
-            "ANDROID_VR",
             true
     ),
     // Specific for kids videos.
     IOS(5,
-            // iPhone 15 supports AV1 hardware decoding.
-            // Only use if this Android device also has hardware decoding.
-            allowAV1()
-                    ? "iPhone16,2"  // 15 Pro Max
-                    : "iPhone11,4", // XS Max
-            // iOS 14+ forces VP9.
-            allowVP9()
-                    ? "17.5.1.21F90"
-                    : "13.7.17H35",
-            allowVP9()
-                    ? "com.google.ios.youtube/19.47.7 (iPhone; U; CPU iOS 17_5_1 like Mac OS X)"
-                    : "com.google.ios.youtube/19.47.7 (iPhone; U; CPU iOS 13_7 like Mac OS X)",
+            forceAVC()
+                    ? "iPhone12,5"  // 11 Pro Max (last device with iOS 13)
+                    : "iPhone16,2", // 15 Pro Max
+            // iOS 13 and earlier uses only AVC.  14+ adds VP9 and AV1.
+            forceAVC()
+                    ? "13.7.17H35" // Last release of iOS 13.
+                    : "17.5.1.21F90",
+            forceAVC()
+                    ? "com.google.ios.youtube/17.40.5 (iPhone; U; CPU iOS 13_7 like Mac OS X)"
+                    : "com.google.ios.youtube/19.47.7 (iPhone; U; CPU iOS 17_5_1 like Mac OS X)",
             null,
             // Version number should be a valid iOS release.
             // https://www.ipa4fun.com/history/185230
-            "19.47.7",
-            "IOS",
+            forceAVC()
+                    // Some newer versions can also force AVC,
+                    // but 17.40 is the last version that supports iOS 13.
+                    ? "17.40.5"
+                    : "19.47.7",
             false
     );
 
+    private static boolean forceAVC() {
+        return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
+    }
+
     /**
      * YouTube
      * <a href="https://github.com/zerodytrash/YouTube-Internal-Clients?tab=readme-ov-file#clients">client type</a>
@@ -69,11 +72,6 @@ public enum ClientType {
     @Nullable
     public final String androidSdkVersion;
 
-    /**
-     * Client name.
-     */
-    public final String clientName;
-
     /**
      * App version.
      */
@@ -90,7 +88,6 @@ public enum ClientType {
                String userAgent,
                @Nullable String androidSdkVersion,
                String clientVersion,
-               String clientName,
                boolean canLogin
     ) {
         this.id = id;
@@ -99,7 +96,6 @@ public enum ClientType {
         this.userAgent = userAgent;
         this.androidSdkVersion = androidSdkVersion;
         this.clientVersion = clientVersion;
-        this.clientName = clientName;
         this.canLogin = canLogin;
     }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/DeviceHardwareSupport.java

@@ -1,53 +0,0 @@
-package app.revanced.extension.shared.spoof;
-
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
-import android.os.Build;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BaseSettings;
-
-public class DeviceHardwareSupport {
-    public static final boolean DEVICE_HAS_HARDWARE_DECODING_VP9;
-    public static final boolean DEVICE_HAS_HARDWARE_DECODING_AV1;
-
-    static {
-        boolean vp9found = false;
-        boolean av1found = false;
-        MediaCodecList codecList = new MediaCodecList(MediaCodecList.ALL_CODECS);
-        final boolean deviceIsAndroidTenOrLater = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
-
-        for (MediaCodecInfo codecInfo : codecList.getCodecInfos()) {
-            final boolean isHardwareAccelerated = deviceIsAndroidTenOrLater
-                    ? codecInfo.isHardwareAccelerated()
-                    : !codecInfo.getName().startsWith("OMX.google"); // Software decoder.
-            if (isHardwareAccelerated && !codecInfo.isEncoder()) {
-                for (String type : codecInfo.getSupportedTypes()) {
-                    if (type.equalsIgnoreCase("video/x-vnd.on2.vp9")) {
-                        vp9found = true;
-                    } else if (type.equalsIgnoreCase("video/av01")) {
-                        av1found = true;
-                    }
-                }
-            }
-        }
-
-        DEVICE_HAS_HARDWARE_DECODING_VP9 = vp9found;
-        DEVICE_HAS_HARDWARE_DECODING_AV1 = av1found;
-
-        Logger.printDebug(() -> DEVICE_HAS_HARDWARE_DECODING_AV1
-                ? "Device supports AV1 hardware decoding\n"
-                : "Device does not support AV1 hardware decoding\n"
-                + (DEVICE_HAS_HARDWARE_DECODING_VP9
-                ? "Device supports VP9 hardware decoding"
-                : "Device does not support VP9 hardware decoding"));
-    }
-
-    public static boolean allowVP9() {
-        return DEVICE_HAS_HARDWARE_DECODING_VP9 && !BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
-    }
-
-    public static boolean allowAV1() {
-        return allowVP9() && DEVICE_HAS_HARDWARE_DECODING_AV1;
-    }
-}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreen.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class OpenVideosFullscreen {
+
+    /**
+     * Injection point.
+     */
+    public static boolean openVideoFullscreenPortrait(boolean original) {
+        return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/ThemePatch.java

@@ -55,7 +55,7 @@ public class ThemePatch {
     /**
      * Injection point.
      */
-    public static boolean gradientLoadingScreenEnabled() {
+    public static boolean gradientLoadingScreenEnabled(boolean original) {
         return GRADIENT_LOADING_SCREEN_ENABLED;
     }
 }

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

@@ -140,6 +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 OPEN_VIDEOS_FULLSCREEN_PORTRAIT = new BooleanSetting("revanced_open_videos_fullscreen_portrait", FALSE);
     // Miniplayer
     public static final EnumSetting<MiniplayerType> 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);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ForceAVCSpoofingPreference.java

@@ -1,64 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.spoof.DeviceHardwareSupport.DEVICE_HAS_HARDWARE_DECODING_VP9;
-
-import android.content.Context;
-import android.preference.SwitchPreference;
-import android.util.AttributeSet;
-
-@SuppressWarnings({"unused", "deprecation"})
-public class ForceAVCSpoofingPreference extends SwitchPreference {
-    {
-        if (!DEVICE_HAS_HARDWARE_DECODING_VP9) {
-            setSummaryOn(str("revanced_spoof_video_streams_ios_force_avc_no_hardware_vp9_summary_on"));
-        }
-    }
-
-    public ForceAVCSpoofingPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public ForceAVCSpoofingPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public ForceAVCSpoofingPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ForceAVCSpoofingPreference(Context context) {
-        super(context);
-    }
-
-    private void updateUI() {
-        if (DEVICE_HAS_HARDWARE_DECODING_VP9) {
-            return;
-        }
-
-        // Temporarily remove the preference key to allow changing this preference without
-        // causing the settings UI listeners from showing reboot dialogs by the changes made here.
-        String key = getKey();
-        setKey(null);
-
-        // This setting cannot be changed by the user.
-        super.setEnabled(false);
-        super.setChecked(true);
-
-        setKey(key);
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-
-        updateUI();
-    }
-
-    @Override
-    public void setChecked(boolean checked) {
-        super.setChecked(checked);
-
-        updateUI();
-    }
-}

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.3.0-dev.2
+version = 5.3.0-dev.5

patches/api/patches.api

@@ -1164,6 +1164,10 @@ 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/OpenVideosFullscreenKt {
+	public static final fun getOpenVideosFullscreenPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatchKt {
 	public static final fun getCustomPlayerOverlayOpacityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/src/main/kotlin/app/revanced/patches/all/misc/packagename/ChangePackageNamePatch.kt

@@ -4,6 +4,7 @@ import app.revanced.patcher.patch.Option
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
 import org.w3c.dom.Element
+import java.util.logging.Logger
 
 lateinit var packageNameOption: Option<String>
 
@@ -41,18 +42,38 @@ val changePackageNamePatch = resourcePatch(
         it == "Default" || it!!.matches(Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$"))
     }
 
+    /**
+     * Apps that are confirmed to not work correctly with this patch.
+     * This is not an exhaustive list, and is only the apps with
+     * ReVanced specific patches and are confirmed incompatible with this patch.
+     */
+    val incompatibleAppPackages = setOf(
+        // Cannot login, settings menu is broken.
+        "com.reddit.frontpage",
+
+        // Patches and installs but crashes on launch.
+        "com.duolingo",
+        "com.twitter.android",
+        "tv.twitch.android.app",
+    )
+
     finalize {
         document("AndroidManifest.xml").use { document ->
+            val manifest = document.getElementsByTagName("manifest").item(0) as Element
+            val originalPackageName = manifest.getAttribute("package")
+
+            if (incompatibleAppPackages.contains(originalPackageName)) {
+                return@finalize Logger.getLogger(this::class.java.name).severe(
+                    "'$originalPackageName' does not work correctly with \"Change package name\"")
+            }
 
             val replacementPackageName = packageNameOption.value
-
-            val manifest = document.getElementsByTagName("manifest").item(0) as Element
             manifest.setAttribute(
                 "package",
                 if (replacementPackageName != packageNameOption.default) {
                     replacementPackageName
                 } else {
-                    "${manifest.getAttribute("package")}.revanced"
+                    "${originalPackageName}.revanced"
                 },
             )
         }

patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt

@@ -3,9 +3,9 @@ package app.revanced.patches.music.interaction.permanentshuffle
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 
+@Deprecated("This patch no longer works and will be removed in the future.")
 @Suppress("unused")
 val permanentShufflePatch = bytecodePatch(
-    name = "Permanent shuffle",
     description = "Permanently remember your shuffle preference " +
         "even if the playlist ends or another track is played.",
     use = false,

patches/src/main/kotlin/app/revanced/patches/nyx/misc/pro/UnlockProPatch.kt

@@ -3,10 +3,9 @@ package app.revanced.patches.nyx.misc.pro
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 
+@Deprecated("This patch will be removed in the future.")
 @Suppress("unused")
-val unlockProPatch = bytecodePatch(
-    name = "Unlock pro",
-) {
+val unlockProPatch = bytecodePatch {
     compatibleWith("com.awedea.nyx")
 
     execute {

patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt

@@ -240,14 +240,14 @@ val miniplayerPatch = bytecodePatch(
             ),
         )
 
-        fun MutableMethod.insertBooleanOverride(index: Int, methodName: String) {
+        fun MutableMethod.insertMiniplayerBooleanOverride(index: Int, methodName: String) {
             val register = getInstruction<OneRegisterInstruction>(index).registerA
             addInstructions(
                 index,
                 """
-                invoke-static {v$register}, $EXTENSION_CLASS_DESCRIPTOR->$methodName(Z)Z
-                move-result v$register
-            """,
+                    invoke-static {v$register}, $EXTENSION_CLASS_DESCRIPTOR->$methodName(Z)Z
+                    move-result v$register
+                """
             )
         }
 
@@ -257,29 +257,25 @@ val miniplayerPatch = bytecodePatch(
          * Adds an override to force legacy tablet miniplayer to be used or not used.
          */
         fun MutableMethod.insertLegacyTabletMiniplayerOverride(index: Int) {
-            insertBooleanOverride(index, "getLegacyTabletMiniplayerOverride")
+            insertMiniplayerBooleanOverride(index, "getLegacyTabletMiniplayerOverride")
         }
 
         /**
          * Adds an override to force modern miniplayer to be used or not used.
          */
         fun MutableMethod.insertModernMiniplayerOverride(index: Int) {
-            insertBooleanOverride(index, "getModernMiniplayerOverride")
+            insertMiniplayerBooleanOverride(index, "getModernMiniplayerOverride")
         }
 
-        fun Fingerprint.insertLiteralValueBooleanOverride(
+        fun Fingerprint.insertMiniplayerFeatureFlagBooleanOverride(
             literal: Long,
             extensionMethod: String,
-        ) {
-            method.apply {
-                val literalIndex = indexOfFirstLiteralInstructionOrThrow(literal)
-                val targetIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
+        ) = method.insertFeatureFlagBooleanOverride(
+            literal,
+            "$EXTENSION_CLASS_DESCRIPTOR->$extensionMethod(Z)Z"
+        )
 
-                insertBooleanOverride(targetIndex + 1, extensionMethod)
-            }
-        }
-
-        fun Fingerprint.insertLiteralValueFloatOverride(
+        fun Fingerprint.insertMiniplayerFeatureFlagFloatOverride(
             literal: Long,
             extensionMethod: String,
         ) {
@@ -370,24 +366,24 @@ val miniplayerPatch = bytecodePatch(
         }
 
         if (is_19_23_or_greater) {
-            miniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_DRAG_DROP_FEATURE_KEY,
                 "enableMiniplayerDragAndDrop",
             )
         }
 
         if (is_19_25_or_greater) {
-            miniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_MODERN_FEATURE_LEGACY_KEY,
                 "getModernMiniplayerOverride",
             )
 
-            miniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_MODERN_FEATURE_KEY,
                 "getModernFeatureFlagsActiveOverride",
             )
 
-            miniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_DOUBLE_TAP_FEATURE_KEY,
                 "enableMiniplayerDoubleTapAction",
             )
@@ -426,19 +422,19 @@ val miniplayerPatch = bytecodePatch(
         }
 
         if (is_19_36_or_greater) {
-            miniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_ROUNDED_CORNERS_FEATURE_KEY,
                 "setRoundedCorners",
             )
         }
 
         if (is_19_43_or_greater) {
-            miniplayerOnCloseHandlerFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerOnCloseHandlerFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_DISABLED_FEATURE_KEY,
                 "getMiniplayerOnCloseHandler"
             )
 
-            miniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+            miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_HORIZONTAL_DRAG_FEATURE_KEY,
                 "setHorizontalDrag",
             )

patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.youtube.layout.player.fullscreen
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal const val OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG = 45666112L
+
+internal val openVideosFullscreenPortraitFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters("L", "Lj\$/util/Optional;")
+    literal {
+        OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreen.kt

@@ -0,0 +1,46 @@
+package app.revanced.patches.youtube.layout.player.fullscreen
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.insertFeatureFlagBooleanOverride
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/OpenVideosFullscreen;"
+
+@Suppress("unused")
+val openVideosFullscreenPatch = bytecodePatch(
+    name = "Open videos fullscreen",
+    description = "Adds an option to open videos in full screen portrait mode.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "19.46.42",
+        )
+    )
+
+    execute {
+        openVideosFullscreenPortraitFingerprint.method.insertFeatureFlagBooleanOverride(
+            OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG,
+            "$EXTENSION_CLASS_DESCRIPTOR->openVideoFullscreenPortrait(Z)Z"
+        )
+
+        // Add resources and setting last, in case the user force patches an old incompatible version.
+
+        addResources("youtube", "layout.player.fullscreen.openVideosFullscreen")
+
+        PreferenceScreen.PLAYER.addPreferences(
+            SwitchPreference("revanced_open_videos_fullscreen_portrait")
+        )
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt

@@ -24,6 +24,7 @@ import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
 import app.revanced.util.inputStreamFromBundledResource
+import app.revanced.util.insertFeatureFlagBooleanOverride
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
@@ -228,19 +229,10 @@ val seekbarColorPatch = bytecodePatch(
 
         // 19.25+ changes
 
-        playerSeekbarGradientConfigFingerprint.method.apply {
-            val literalIndex = indexOfFirstLiteralInstructionOrThrow(PLAYER_SEEKBAR_GRADIENT_FEATURE_FLAG)
-            val resultIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
-            val register = getInstruction<OneRegisterInstruction>(resultIndex).registerA
-
-            addInstructions(
-                resultIndex + 1,
-                """
-                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->playerSeekbarGradientEnabled(Z)Z
-                    move-result v$register
-                """
-            )
-        }
+        playerSeekbarGradientConfigFingerprint.method.insertFeatureFlagBooleanOverride(
+            PLAYER_SEEKBAR_GRADIENT_FEATURE_FLAG,
+            "$EXTENSION_CLASS_DESCRIPTOR->playerSeekbarGradientEnabled(Z)Z"
+        )
 
         lithoLinearGradientFingerprint.method.addInstruction(
             0,
@@ -255,19 +247,10 @@ val seekbarColorPatch = bytecodePatch(
             launchScreenLayoutTypeFingerprint,
             mainActivityOnCreateFingerprint
         ).forEach { fingerprint ->
-            fingerprint.method.apply {
-                val literalIndex = indexOfFirstLiteralInstructionOrThrow(launchScreenLayoutTypeLotteFeatureFlag)
-                val resultIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
-                val register = getInstruction<OneRegisterInstruction>(resultIndex).registerA
-
-                addInstructions(
-                    resultIndex + 1,
-                    """
-                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->useLotteLaunchSplashScreen(Z)Z
-                        move-result v$register
-                    """
-                )
-            }
+            fingerprint.method.insertFeatureFlagBooleanOverride(
+                launchScreenLayoutTypeLotteFeatureFlag,
+                "$EXTENSION_CLASS_DESCRIPTOR->useLotteLaunchSplashScreen(Z)Z"
+            )
         }
 
         // Hook the splash animation drawable to set the a seekbar color theme.

patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt

@@ -1,7 +1,6 @@
 package app.revanced.patches.youtube.layout.theme
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
@@ -17,10 +16,7 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.forEachChildElement
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import app.revanced.util.insertFeatureFlagBooleanOverride
 import org.w3c.dom.Element
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
@@ -212,19 +208,10 @@ val themePatch = bytecodePatch(
             SwitchPreference("revanced_gradient_loading_screen"),
         )
 
-        useGradientLoadingScreenFingerprint.method.apply {
-            val literalIndex = indexOfFirstLiteralInstructionOrThrow(GRADIENT_LOADING_SCREEN_AB_CONSTANT)
-            val isEnabledIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
-            val isEnabledRegister = getInstruction<OneRegisterInstruction>(isEnabledIndex).registerA
-
-            addInstructions(
-                isEnabledIndex + 1,
-                """
-                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->gradientLoadingScreenEnabled()Z
-                    move-result v$isEnabledRegister
-                """,
-            )
-        }
+        useGradientLoadingScreenFingerprint.method.insertFeatureFlagBooleanOverride(
+            GRADIENT_LOADING_SCREEN_AB_CONSTANT,
+            "$EXTENSION_CLASS_DESCRIPTOR->gradientLoadingScreenEnabled(Z)Z"
+        )
 
         mapOf(
             themeHelperLightColorFingerprint to lightThemeBackgroundColor,

patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/cairo/DisableCairoSettingsPatch.kt

@@ -34,10 +34,7 @@ internal val disableCairoSettingsPatch = bytecodePatch(
          * <a href="https://github.com/qnblackcat/uYouPlus/issues/1468">uYouPlus#1468</a>.
          */
         cairoFragmentConfigFingerprint.method.apply {
-            val literalIndex = indexOfFirstLiteralInstructionOrThrow(
-                CAIRO_CONFIG_LITERAL_VALUE,
-            )
-
+            val literalIndex = indexOfFirstLiteralInstructionOrThrow(CAIRO_CONFIG_LITERAL_VALUE)
             val resultIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
             val register = getInstruction<OneRegisterInstruction>(resultIndex).registerA
 

patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt

@@ -40,10 +40,7 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
                     "revanced_spoof_video_streams_client",
                     summaryKey = null,
                 ),
-                SwitchPreference(
-                    "revanced_spoof_video_streams_ios_force_avc",
-                    tag = "app.revanced.extension.youtube.settings.preference.ForceAVCSpoofingPreference",
-                ),
+                SwitchPreference("revanced_spoof_video_streams_ios_force_avc"),
                 NonInteractivePreference("revanced_spoof_video_streams_about_android_vr"),
                 NonInteractivePreference("revanced_spoof_video_streams_about_ios"),
             ),

patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt

@@ -17,6 +17,7 @@ import app.revanced.patches.shared.misc.mapping.resourceMappings
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.reference.Reference
@@ -402,6 +403,20 @@ fun Method.findInstructionIndicesReversedOrThrow(opcode: Opcode): List<Int> {
     return instructions
 }
 
+internal fun MutableMethod.insertFeatureFlagBooleanOverride(literal: Long, extensionsMethod: String) {
+    val literalIndex = indexOfFirstLiteralInstructionOrThrow(literal)
+    val index = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
+    val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+    addInstructions(
+        index + 1,
+        """
+            invoke-static { v$register }, $extensionsMethod
+            move-result v$register
+        """
+    )
+}
+
 /**
  * Called for _all_ instructions with the given literal value.
  */

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

@@ -715,6 +715,11 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_hide_player_popup_panels_summary_on">Player popup panels are hidden</string>
             <string name="revanced_hide_player_popup_panels_summary_off">Player popup panels are shown</string>
         </patch>
+        <patch id="layout.player.fullscreen.openVideosFullscreen">
+            <string name="revanced_open_videos_fullscreen_portrait_title">Open videos in fullscreen portrait</string>
+            <string name="revanced_open_videos_fullscreen_portrait_summary_on">Videos open fullscreen</string>
+            <string name="revanced_open_videos_fullscreen_portrait_summary_off">Videos do not open fullscreen</string>
+        </patch>
         <patch id="layout.player.overlay.customPlayerOverlayOpacityResourcePatch">
             <string name="revanced_player_overlay_opacity_title">Player overlay opacity</string>
             <string name="revanced_player_overlay_opacity_summary">Opacity value between 0-100, where 0 is transparent</string>
@@ -1220,10 +1225,9 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_spoof_video_streams_user_dialog_message">Turning off this setting may cause video playback issues.</string>
             <string name="revanced_spoof_video_streams_client_title">Default client</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_title">Force AVC (H.264)</string>
-            <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">Video codec is AVC (H.264)</string>
-            <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">Video codec is VP9 or AV1</string>
-            <string name="revanced_spoof_video_streams_ios_force_avc_no_hardware_vp9_summary_on">Your device does not have VP9 hardware decoding, and this setting is always on when Client spoofing is enabled</string>
-            <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">Enabling this might improve battery life and fix playback stuttering.\n\nAVC has a maximum resolution of 1080p, and video playback will use more internet data than VP9 or AV1.</string>
+            <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">Video codec is forced to AVC (H.264)</string>
+            <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">Video codec is determined automatically</string>
+            <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">Enabling this might improve battery life and fix playback stuttering.\n\nAVC has a maximum resolution of 1080p, Opus audio codec is not available, and video playback will use more internet data than VP9 or AV1.</string>
             <string name="revanced_spoof_video_streams_about_ios_title">iOS spoofing side effects</string>
             <string name="revanced_spoof_video_streams_about_ios_summary">• Private kids videos may not play\n• Livestreams start from the beginning\n• Videos may end 1 second early</string>
             <string name="revanced_spoof_video_streams_about_android_vr_title">Android VR spoofing side effects</string>