From f6983d1769721ac9534a74fa2cda559f0042c1bc Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Sat, 24 Jun 2023 13:10:41 +0900
Subject: [PATCH] feat(youtube/spoof-player-parameters): split into shorts
 parameter and incognito mode parameter

---
 .../youtube/settings/host/values/strings.xml  | 32 +++++++++++++------
 .../youtube/settings/xml/revanced_prefs.xml   |  8 ++---
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 03d4c614d..a0cf49508 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -120,12 +120,6 @@
     <string name="revanced_enable_open_links_directly_title">Enable open links directly</string>
     <string name="revanced_enable_phone_layout_summary">Tricks the dpi to use some phone layouts</string>
     <string name="revanced_enable_phone_layout_title">Enable phone layout</string>
-    <string name="revanced_enable_protobuf_spoof_summary">"Spoofs the protobuf to prevent playback issues
-
-Known issues
-- End screen cards are always hidden
-- Offline downloads may not work (YouTube Premium users)"</string>
-    <string name="revanced_enable_protobuf_spoof_title">Enable protobuf spoof</string>
     <string name="revanced_enable_press_to_swipe_summary_off">Press-to-swipe is disabled</string>
     <string name="revanced_enable_press_to_swipe_summary_on">Press-to-swipe is enabled</string>
     <string name="revanced_enable_press_to_swipe_title">Enable press-to-swipe gesture</string>
@@ -263,6 +257,9 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_channel_watermark_summary_off">Channel watermark is shown</string>
     <string name="revanced_hide_channel_watermark_summary_on">Channel watermark is hidden</string>
     <string name="revanced_hide_channel_watermark_title">Hide channel watermark</string>
+    <string name="revanced_hide_chapters_summary_off">Chapters are shown</string>
+    <string name="revanced_hide_chapters_summary_on">Chapters are hidden</string>
+    <string name="revanced_hide_chapters_title">Hide chapters in the video description</string>
     <string name="revanced_hide_collapse_button_summary_off">Collapse button is shown</string>
     <string name="revanced_hide_collapse_button_summary_on">Collapse button is hidden</string>
     <string name="revanced_hide_collapse_button_title">Hide collapse button</string>
@@ -287,6 +284,9 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_emoji_picker_summary_off">Emoji picker is shown</string>
     <string name="revanced_hide_emoji_picker_summary_on">Emoji picker is hidden</string>
     <string name="revanced_hide_emoji_picker_title">Hide emoji picker</string>
+    <string name="revanced_hide_expandable_chip_summary_off">Expandable chips are shown</string>
+    <string name="revanced_hide_expandable_chip_summary_on">Expandable chips are hidden</string>
+    <string name="revanced_hide_expandable_chip_title">Hide expandable chip under videos</string>
     <string name="revanced_hide_end_screen_cards_summary_off">End screen cards are shown</string>
     <string name="revanced_hide_end_screen_cards_summary_on">End screen cards are hidden</string>
     <string name="revanced_hide_end_screen_cards_title">Hide end screen cards</string>
@@ -457,9 +457,6 @@ Please do not report any issues you encounter while using this feature."</string
     <string name="revanced_hide_suggestions_shelf_summary_off">Following shelves are shown: Breaking news, Explore more channels, Shopping</string>
     <string name="revanced_hide_suggestions_shelf_summary_on">Following shelves are hidden: Breaking news, Explore more channels, Shopping</string>
     <string name="revanced_hide_suggestions_shelf_title">Hide suggestions shelf</string>
-    <string name="revanced_hide_teaser_summary_off">Teasers are shown</string>
-    <string name="revanced_hide_teaser_summary_on">Teasers are hidden</string>
-    <string name="revanced_hide_teaser_title">Hide teaser under videos</string>
     <string name="revanced_hide_ticket_shelf_summary_off">Ticket shelves are shown</string>
     <string name="revanced_hide_ticket_shelf_summary_on">Ticket shelves are hidden</string>
     <string name="revanced_hide_ticket_shelf_title">Hide ticket shelf</string>
@@ -513,7 +510,6 @@ Please do not report any issues you encounter while using this feature."</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">Player</string>
-    <string name="revanced_protobuf_spoof_notice">Spoofing protobuf to prevent playback issues</string>
     <string name="revanced_quick_actions_components_title">Quick actions components</string>
     <string name="revanced_reboot_first_run">Restart to load the layout normally</string>
     <string name="revanced_reboot_warning_general">"As this is still an experimental feature, there may be other unknown issues.
@@ -568,6 +564,22 @@ If later turned off, the old UI may remain until clear the app data"</string>
     <string name="revanced_spoof_app_version_target_entry_4">16.08.35 - Restore explore tab</string>
     <string name="revanced_spoof_app_version_target_summary">Type the spoof app version target</string>
     <string name="revanced_spoof_app_version_target_title">Spoof app version target</string>
+    <string name="revanced_spoof_player_parameter_notice">Spoofed player parameters to fix playback issue</string>
+    <string name="revanced_spoof_player_parameter_reload">Please reload the video</string>
+    <string name="revanced_spoof_player_parameter_type_summary_off">"Player parameters of Shorts
+
+Known issues
+- Downloading videos may not work
+- End screen cards are always hidden"</string>
+    <string name="revanced_spoof_player_parameter_type_summary_on">"Player parameters of incognito mode
+
+Known issues
+- Ambient mode may not work
+- Downloading videos may not work
+- Seekbar thumbnails are hidden"</string>
+    <string name="revanced_spoof_player_parameter_type_title">Spoof player parameter type</string>
+    <string name="revanced_spoof_player_parameter_summary">Spoofs player parameters to prevent playback issues</string>
+    <string name="revanced_spoof_player_parameter_title">Spoof player parameter</string>
     <string name="revanced_swipe_controls">Swipe controls</string>
     <string name="revanced_swipe_magnitude_threshold_summary">The amount of threshold for swipe to occur</string>
     <string name="revanced_swipe_magnitude_threshold_title">Swipe magnitude threshold</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index b69a1f393..a41cbc0af 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -266,9 +266,6 @@
         <!-- SETTINGS: LAYOUT_SWITCH
         <SwitchPreference android:title="@string/revanced_enable_phone_layout_title" android:key="revanced_enable_phone_layout" android:summary="@string/revanced_enable_phone_layout_summary" android:defaultValue="false" />SETTINGS: LAYOUT_SWITCH -->
 
-        <!-- SETTINGS: ENABLE_PROTOBUF_SPOOF
-        <SwitchPreference android:title="@string/revanced_enable_protobuf_spoof_title" android:key="revanced_enable_protobuf_spoof" android:defaultValue="true" android:summary="@string/revanced_enable_protobuf_spoof_summary" />SETTINGS: ENABLE_PROTOBUF_SPOOF -->
-
         <!-- SETTINGS: LAYOUT_SWITCH
         <SwitchPreference android:title="@string/revanced_enable_tablet_layout_title" android:key="revanced_enable_tablet_layout" android:summary="@string/revanced_enable_tablet_layout_summary" android:defaultValue="false" />SETTINGS: LAYOUT_SWITCH -->
 
@@ -286,6 +283,10 @@
         <ListPreference android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:entries="@array/revanced_spoof_app_version_target_entry" android:defaultValue="17.30.34" android:entryValues="@array/revanced_spoof_app_version_target_entry_value" />
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="17.30.34" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
 
+        <!-- SETTINGS: SPOOF_PLAYER_PARAMETER
+        <SwitchPreference android:title="@string/revanced_spoof_player_parameter_title" android:key="revanced_spoof_player_parameter" android:defaultValue="true" android:summary="@string/revanced_spoof_player_parameter_summary" />
+        <SwitchPreference android:title="@string/revanced_spoof_player_parameter_type_title" android:key="revanced_spoof_player_parameter_type" android:defaultValue="false" android:summaryOn="@string/revanced_spoof_player_parameter_type_summary_on" android:summaryOff="@string/revanced_spoof_player_parameter_type_summary_off" />SETTINGS: SPOOF_PLAYER_PARAMETER -->
+
         <Preference android:title=" " android:selectable="false" android:summary="@string/pref_about_category" />
         <PreferenceScreen android:title="@string/revanced_patches_information"  android:summary="@string/revanced_patches_information_summary" >
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_tool_used" />
@@ -346,7 +347,6 @@
             <Preference android:title="force-opus-codec" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="force-vp9-codec" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="layout-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="protobuf-spoof" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="spoof-app-version" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_navigation" />