refactor(YouTube - Settings): Back button/gesture closes search instead of exiting (#5439)

Author: MarcaDian

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

@@ -5,6 +5,7 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.preference.PreferenceFragment;
 import android.util.TypedValue;
 import android.view.ViewGroup;
@@ -171,4 +172,10 @@ public static void updateLightDarkModeStatus(Enum<?> value) {
             Utils.setIsDarkModeEnabled(themeOrdinal == 1);
         }
     }
+
+    public static void handleConfigurationChanged(Activity activity, Configuration newConfig) {
+        if (searchViewController != null) {
+            searchViewController.handleOrientationChange(newConfig.orientation);
+        }
+    }
 }

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

@@ -95,6 +95,7 @@ private SearchViewController(Activity activity, Toolbar toolbar, ReVancedPrefere
         this.originalTitle = toolbar.getTitle();
         this.showSettingsSearchHistory = Settings.SETTINGS_SEARCH_HISTORY.get();
         this.searchHistory = new LinkedList<>();
+        this.currentOrientation = activity.getResources().getConfiguration().orientation;
         StringSetting searchEntries = Settings.SETTINGS_SEARCH_ENTRIES;
         if (showSettingsSearchHistory) {
             String entries = searchEntries.get();
@@ -208,8 +209,6 @@ public boolean onQueryTextChange(String newText) {
                 Logger.printException(() -> "navigation click failure", ex);
             }
         });
-
-        monitorOrientationChanges();
     }
 
     /**
@@ -292,19 +291,14 @@ private void updateSearchHistoryAdapter() {
         }
     }
 
-    private void monitorOrientationChanges() {
-        currentOrientation = activity.getResources().getConfiguration().orientation;
-
-        searchView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
-            int newOrientation = activity.getResources().getConfiguration().orientation;
-            if (newOrientation != currentOrientation) {
-                currentOrientation = newOrientation;
-                if (autoCompleteTextView != null) {
-                    autoCompleteTextView.dismissDropDown();
-                    Logger.printDebug(() -> "Orientation changed, search history dismissed");
-                }
+    public void handleOrientationChange(int newOrientation) {
+        if (newOrientation != currentOrientation) {
+            currentOrientation = newOrientation;
+            if (autoCompleteTextView != null) {
+                autoCompleteTextView.dismissDropDown();
+                Logger.printDebug(() -> "Orientation changed, search history dismissed");
             }
-        });
+        }
     }
 
     /**
@@ -350,14 +344,14 @@ public void closeSearch() {
 
     public static boolean handleBackPress() {
         if (LicenseActivityHook.searchViewController != null
-                && LicenseActivityHook.searchViewController.isSearchExpanded()) {
+                && LicenseActivityHook.searchViewController.isSearchActive()) {
             LicenseActivityHook.searchViewController.closeSearch();
             return true;
         }
         return false;
     }
 
-    public boolean isSearchExpanded() {
+    public boolean isSearchActive() {
         return isSearchActive;
     }
 

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

@@ -280,7 +280,7 @@ private void setPreferenceScreenToolbar(PreferenceScreen parentScreen) {
                             LicenseActivityHook.setToolbarLayoutParams(toolbar);
 
                             if (LicenseActivityHook.searchViewController != null
-                                    && LicenseActivityHook.searchViewController.isSearchExpanded()) {
+                                    && LicenseActivityHook.searchViewController.isSearchActive()) {
                                 toolbar.post(() -> LicenseActivityHook.searchViewController.closeSearch());
                             }
 

patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt

@@ -235,9 +235,9 @@ val settingsPatch = bytecodePatch(
             methods.removeIf { it.name != "onCreate" && !MethodUtil.isConstructor(it) }
         }
 
-        // Add context override to force a specific settings language.
         licenseActivityOnCreateFingerprint.classDef.apply {
-            val attachBaseContext = ImmutableMethod(
+            // Add attachBaseContext method to override the context for setting a specific language.
+            ImmutableMethod(
                 type,
                 "attachBaseContext",
                 listOf(ImmutableMethodParameter("Landroid/content/Context;", null, null)),
@@ -255,21 +255,18 @@ val settingsPatch = bytecodePatch(
                         return-void
                     """
                 )
-            }
-
-            methods.add(attachBaseContext)
-        }
+            }.let(methods::add)
 
-        licenseActivityOnCreateFingerprint.classDef.apply {
-            val onBackPressed = ImmutableMethod(
+            // Add onBackPressed method to handle back button presses, delegating to SearchViewController.
+            ImmutableMethod(
                 type,
                 "onBackPressed",
                 emptyList(),
                 "V",
                 AccessFlags.PUBLIC.value,
                 null,
                 null,
-                MutableMethodImplementation(3)
+                MutableMethodImplementation(3),
             ).toMutable().apply {
                 addInstructions(
                     """
@@ -281,10 +278,28 @@ val settingsPatch = bytecodePatch(
                         return-void
                     """
                 )
+            }.let(methods::add)
 
-            };
-            methods.add(onBackPressed);
-        };
+            // Add onConfigurationChanged method to handle configuration changes (e.g., screen orientation).
+            ImmutableMethod(
+                type,
+                "onConfigurationChanged",
+                listOf(ImmutableMethodParameter("Landroid/content/res/Configuration;", null, null)),
+                "V",
+                AccessFlags.PUBLIC.value,
+                null,
+                null,
+                MutableMethodImplementation(3)
+            ).toMutable().apply {
+                addInstructions(
+                    """
+                        invoke-super { p0, p1 }, Landroid/app/Activity;->onConfigurationChanged(Landroid/content/res/Configuration;)V
+                        invoke-static { p0, p1 }, $EXTENSION_CLASS_DESCRIPTOR->handleConfigurationChanged(Landroid/app/Activity;Landroid/content/res/Configuration;)V
+                        return-void
+                    """
+                )
+            }.let(methods::add)
+        }
 
         // Update shared dark mode status based on YT theme.
         // This is needed because YT allows forcing light/dark mode