From 2b77e46f5edf03ec893c168de666cc105e79fe6f Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Sat, 21 Dec 2024 14:07:30 +0900
Subject: [PATCH] feat(YouTube - Shorts components): Add `Restore old player
 layout` setting (YouTube 18.29.38 ~ 19.16.39)

---
 .../youtube/patches/shorts/ShortsPatch.java          |  4 ++++
 .../extension/youtube/settings/Settings.java         |  1 +
 .../youtube/shorts/components/Fingerprints.kt        | 10 ++++++++++
 .../shorts/components/ShortsComponentPatch.kt        | 12 ++++++++++++
 .../youtube/settings/host/values/strings.xml         |  4 ++++
 .../youtube/settings/xml/revanced_prefs.xml          |  7 ++++++-
 6 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java
index ee598aacd..9125a2138 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java
@@ -207,4 +207,8 @@ public class ShortsPatch {
         );
     }
 
+    public static boolean restoreShortsOldPlayerLayout() {
+        return !Settings.RESTORE_SHORTS_OLD_PLAYER_LAYOUT.get();
+    }
+
 }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java
index f8ec174c3..04c9a60f3 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java
@@ -492,6 +492,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHORTS_NAVIGATION_BAR = new BooleanSetting("revanced_hide_shorts_navigation_bar", FALSE, true);
     public static final IntegerSetting SHORTS_NAVIGATION_BAR_HEIGHT_PERCENTAGE = new IntegerSetting("revanced_shorts_navigation_bar_height_percentage", 45, true, parent(HIDE_SHORTS_NAVIGATION_BAR));
     public static final BooleanSetting REPLACE_CHANNEL_HANDLE = new BooleanSetting("revanced_replace_channel_handle", FALSE, true);
+    public static final BooleanSetting RESTORE_SHORTS_OLD_PLAYER_LAYOUT = new BooleanSetting("revanced_restore_shorts_old_player_layout", FALSE, true);
 
     // PreferenceScreen: Swipe controls
     public static final BooleanSetting ENABLE_SWIPE_BRIGHTNESS = new BooleanSetting("revanced_enable_swipe_brightness", TRUE, true);
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/Fingerprints.kt
index 7f281b150..3ebc3e3db 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/Fingerprints.kt
@@ -177,3 +177,13 @@ internal val shortsToolBarFingerprint = legacyFingerprint(
         method.parameterTypes.firstOrNull() == "Z"
     }
 )
+
+internal const val FULLSCREEN_FEATURE_FLAG = 45398938L
+
+internal val shortsFullscreenFeatureFingerprint = legacyFingerprint(
+    name = "shortsFullscreenFeatureFingerprint",
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    literals = listOf(FULLSCREEN_FEATURE_FLAG),
+)
+
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
index e68949a0e..8d9bbc34c 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
@@ -864,6 +864,18 @@ val shortsComponentPatch = bytecodePatch(
 
         // endregion
 
+        // region patch for restore shorts old player layout
+
+        if (!is_19_25_or_greater) {
+            shortsFullscreenFeatureFingerprint.injectLiteralInstructionBooleanCall(
+                FULLSCREEN_FEATURE_FLAG,
+                "$SHORTS_CLASS_DESCRIPTOR->restoreShortsOldPlayerLayout()Z"
+            )
+            settingArray += "SETTINGS: RESTORE_SHORTS_OLD_PLAYER_LAYOUT"
+        }
+
+        // endregion
+
         addLithoFilter(BUTTON_FILTER_CLASS_DESCRIPTOR)
         addLithoFilter(SHELF_FILTER_CLASS_DESCRIPTOR)
         addLithoFilter(RETURN_YOUTUBE_CHANNEL_NAME_FILTER_CLASS_DESCRIPTOR)
diff --git a/patches/src/main/resources/youtube/settings/host/values/strings.xml b/patches/src/main/resources/youtube/settings/host/values/strings.xml
index 2a9d6a5b5..28863227d 100644
--- a/patches/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/patches/src/main/resources/youtube/settings/host/values/strings.xml
@@ -1432,6 +1432,10 @@ Limitations:
     <string name="revanced_replace_channel_handle_title">Replace channel handle</string>
     <string name="revanced_replace_channel_handle_summary_on">Channel name is used.</string>
     <string name="revanced_replace_channel_handle_summary_off">Channel handle is used.</string>
+    <string name="revanced_restore_shorts_old_player_layout_title">Restore old player layout</string>
+    <string name="revanced_restore_shorts_old_player_layout_summary_on">"Old player layout is used.
+No margins on top and bottom of player."</string>
+    <string name="revanced_restore_shorts_old_player_layout_summary_off">Old player layout is not used.</string>
 
 
     <!-- PreferenceScreen: Swipe controls -->
diff --git a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 472e600ce..0b04b9868 100644
--- a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -617,7 +617,12 @@
             <SwitchPreference android:title="@string/revanced_hide_shorts_toolbar_title" android:key="revanced_hide_shorts_toolbar" android:summaryOn="@string/revanced_hide_shorts_toolbar_summary_on" android:summaryOff="@string/revanced_hide_shorts_toolbar_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_shorts_navigation_bar_title" android:key="revanced_hide_shorts_navigation_bar" android:summaryOn="@string/revanced_hide_shorts_navigation_bar_summary_on" android:summaryOff="@string/revanced_hide_shorts_navigation_bar_summary_off" />
             <app.revanced.extension.shared.settings.preference.ResettableEditTextPreference android:hint="45" android:title="@string/revanced_shorts_navigation_bar_height_percentage_title" android:key="revanced_shorts_navigation_bar_height_percentage" android:summary="@string/revanced_shorts_navigation_bar_height_percentage_summary" android:inputType="number" />
-            <SwitchPreference android:title="@string/revanced_replace_channel_handle_title" android:key="revanced_replace_channel_handle" android:summaryOn="@string/revanced_replace_channel_handle_summary_on" android:summaryOff="@string/revanced_replace_channel_handle_summary_off" />
+            <SwitchPreference android:title="@string/revanced_replace_channel_handle_title" android:key="revanced_replace_channel_handle" android:summaryOn="@string/revanced_replace_channel_handle_summary_on" android:summaryOff="@string/revanced_replace_channel_handle_summary_off" />SETTINGS: SHORTS_COMPONENTS -->
+
+            <!-- SETTINGS: RESTORE_SHORTS_OLD_PLAYER_LAYOUT
+            <SwitchPreference android:title="@string/revanced_restore_shorts_old_player_layout_title" android:key="revanced_restore_shorts_old_player_layout" android:summaryOn="@string/revanced_restore_shorts_old_player_layout_summary_on" android:summaryOff="@string/revanced_restore_shorts_old_player_layout_summary_off" />SETTINGS: RESTORE_SHORTS_OLD_PLAYER_LAYOUT -->
+
+        <!-- SETTINGS: SHORTS_COMPONENTS
         </PreferenceScreen>SETTINGS: SHORTS_COMPONENTS -->
 
         <!-- SETTINGS: DISABLE_SHORTS_BACKGROUND_PLAYBACK