From 08d5b19c78a669ae04ab5df2d2bfac50465e4dcc Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Sun, 19 May 2024 12:45:52 +0900
Subject: [PATCH] feat(YouTube/Toolbar components): remove `Hide trending
 searches` setting https://github.com/inotia00/ReVanced_Extended/issues/1993

---
 .../general/toolbar/ToolBarComponentsPatch.kt       | 13 +------------
 .../fingerprints/TrendingSearchConfigFingerprint.kt | 10 ----------
 .../youtube/settings/host/values/strings.xml        |  3 ---
 .../youtube/settings/xml/revanced_prefs.xml         |  3 +--
 4 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/TrendingSearchConfigFingerprint.kt

diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
index 5a9462374..15104135e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
@@ -24,7 +24,6 @@ import app.revanced.patches.youtube.general.toolbar.fingerprints.SearchBarParent
 import app.revanced.patches.youtube.general.toolbar.fingerprints.SearchResultFingerprint
 import app.revanced.patches.youtube.general.toolbar.fingerprints.SetActionBarRingoFingerprint
 import app.revanced.patches.youtube.general.toolbar.fingerprints.SetWordMarkHeaderFingerprint
-import app.revanced.patches.youtube.general.toolbar.fingerprints.TrendingSearchConfigFingerprint
 import app.revanced.patches.youtube.general.toolbar.fingerprints.YouActionBarFingerprint
 import app.revanced.patches.youtube.utils.castbutton.CastButtonPatch
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
@@ -79,8 +78,7 @@ object ToolBarComponentsPatch : BaseBytecodePatch(
         SearchBarParentFingerprint,
         SearchResultFingerprint,
         SetActionBarRingoFingerprint,
-        SetWordMarkHeaderFingerprint,
-        TrendingSearchConfigFingerprint
+        SetWordMarkHeaderFingerprint
     )
 ) {
     private const val TARGET_RESOURCE_PATH = "res/layout/action_bar_ringo_background.xml"
@@ -305,15 +303,6 @@ object ToolBarComponentsPatch : BaseBytecodePatch(
 
         // endregion
 
-        // region patch for hide trending searches
-
-        TrendingSearchConfigFingerprint.literalInstructionBooleanHook(
-            45399984,
-            "$GENERAL_CLASS_DESCRIPTOR->hideTrendingSearches(Z)Z"
-        )
-
-        // endregion
-
         // region patch for hide voice search button
 
         if (ForceHideVoiceSearchButton == true) {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/TrendingSearchConfigFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/TrendingSearchConfigFingerprint.kt
deleted file mode 100644
index de676e2ea..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/TrendingSearchConfigFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.general.toolbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.fingerprint.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object TrendingSearchConfigFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    literalSupplier = { 45399984 }
-)
\ No newline at end of file
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 724698d66..e6461f002 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -438,9 +438,6 @@ You tab → View channel → Menu → Settings."</string>
     <string name="revanced_hide_search_term_thumbnail_title">Hide search term thumbnail</string>
     <string name="revanced_hide_search_term_thumbnail_summary_on">Thumbnails in the search term history are hidden.</string>
     <string name="revanced_hide_search_term_thumbnail_summary_off">Thumbnails in the search term history are shown.</string>
-    <string name="revanced_hide_trending_searches_title">Hide trending searches</string>
-    <string name="revanced_hide_trending_searches_summary_on">Trending searches are hidden.</string>
-    <string name="revanced_hide_trending_searches_summary_off">Trending searches are shown.</string>
     <string name="revanced_hide_voice_search_button_title">Hide voice search button</string>
     <string name="revanced_hide_voice_search_button_summary_on">Voice search button is hidden.</string>
     <string name="revanced_hide_voice_search_button_summary_off">Voice search button is shown.</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index efc122571..5f4b50cd1 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -149,8 +149,7 @@
             <SwitchPreference android:title="@string/revanced_hide_toolbar_cast_button_title" android:key="revanced_hide_toolbar_cast_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_toolbar_cast_button_summary_on" android:summaryOff="@string/revanced_hide_toolbar_cast_button_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_toolbar_create_button_title" android:key="revanced_hide_toolbar_create_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_toolbar_create_button_summary_on" android:summaryOff="@string/revanced_hide_toolbar_create_button_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_toolbar_notification_button_title" android:key="revanced_hide_toolbar_notification_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_toolbar_notification_button_summary_on" android:summaryOff="@string/revanced_hide_toolbar_notification_button_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_search_term_thumbnail_title" android:key="revanced_hide_search_term_thumbnail" android:defaultValue="false" android:summaryOn="@string/revanced_hide_search_term_thumbnail_summary_on" android:summaryOff="@string/revanced_hide_search_term_thumbnail_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_trending_searches_title" android:key="revanced_hide_trending_searches" android:defaultValue="true" android:summaryOn="@string/revanced_hide_trending_searches_summary_on" android:summaryOff="@string/revanced_hide_trending_searches_summary_off" />SETTINGS: TOOLBAR_COMPONENTS -->
+            <SwitchPreference android:title="@string/revanced_hide_search_term_thumbnail_title" android:key="revanced_hide_search_term_thumbnail" android:defaultValue="false" android:summaryOn="@string/revanced_hide_search_term_thumbnail_summary_on" android:summaryOff="@string/revanced_hide_search_term_thumbnail_summary_off" />SETTINGS: TOOLBAR_COMPONENTS -->
             <!-- SETTINGS: HIDE_VOICE_SEARCH_BUTTON
             <SwitchPreference android:title="@string/revanced_hide_voice_search_button_title" android:key="revanced_hide_voice_search_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_voice_search_button_summary_on" android:summaryOff="@string/revanced_hide_voice_search_button_summary_off" />SETTINGS: HIDE_VOICE_SEARCH_BUTTON -->
             <!-- SETTINGS: TOOLBAR_COMPONENTS