feat(YouTube): Reorganize settings menu

ReVanced · Feb 17, 2024 · 9d2595b · 9d2595b
1 parent 6ee90ef
commit 9d2595b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/app/src/main/java/app/revanced/integrations/shared/Utils.java b/app/src/main/java/app/revanced/integrations/shared/Utils.java
@@ -205,7 +205,9 @@ public static float getResourceDimension(@NonNull String resourceIdentifierName)
     public static <T extends View> T getChildView(@NonNull ViewGroup viewGroup, @NonNull MatchFilter filter) {
         for (int i = 0, childCount = viewGroup.getChildCount(); i < childCount; i++) {
             View childAt = viewGroup.getChildAt(i);
+            //noinspection unchecked
             if (filter.matches(childAt)) {
+                //noinspection unchecked
                 return (T) childAt;
             }
         }
@@ -396,33 +398,37 @@ public static void hideViewByLayoutParams(View view) {
     private static final Regex punctuationRegex = new Regex("\\p{P}+");
 
     /**
-     * Sort the preferences by title and ignore the casing.
+     * Sort the preferences by preference key and/or title and ignore text casing.
      *
-     * Android Preferences are automatically sorted by title,
-     * but if using a localized string key it sorts on the key and not the actual title text that's used at runtime.
-     *
-     * @param menuDepthToSort Maximum menu depth to sort. Menus deeper than this value
-     *                        will show preferences in the order created in patches.
+     * @param menuDepthToSortByKey Menu depth to sort using the preference key.  Index 1 is the first level.
+     *                             Menus deeper than this value are sorted by localized title.
+     * @param menuDepthToSort Maximum menu depth to sort by localized title.
+     *                        Menus deeper than this value will show preferences in the order created during patching.
      */
-    public static void sortPreferenceGroupByTitle(PreferenceGroup group, int menuDepthToSort) {
+    public static void sortPreferenceGroupByTitle(PreferenceGroup group, int menuDepthToSortByKey, int menuDepthToSort) {
         if (menuDepthToSort == 0) return;
 
         SortedMap<String, Preference> preferences = new TreeMap<>();
         for (int i = 0, prefCount = group.getPreferenceCount(); i < prefCount; i++) {
             Preference preference = group.getPreference(i);
             if (preference instanceof PreferenceGroup) {
-                sortPreferenceGroupByTitle((PreferenceGroup) preference, menuDepthToSort - 1);
+                sortPreferenceGroupByTitle((PreferenceGroup) preference,
+                        menuDepthToSortByKey - 1, menuDepthToSort - 1);
+            }
+            String sortValue = preference.getKey();
+            if (sortValue == null || menuDepthToSortByKey <= 0) {
+                sortValue = removePunctuationConvertToLowercase(preference.getTitle());
             }
-            preferences.put(removePunctuationConvertToLowercase(preference.getTitle()), preference);
+            preferences.put(sortValue, preference);
         }
 
         int prefIndex = 0;
         for (Preference pref : preferences.values()) {
             int indexToSet = prefIndex++;
             if (pref instanceof PreferenceGroup || pref.getIntent() != null) {
-                // Place preference groups last.
-                // Use an offset to push the group to the end.
-                indexToSet += 1000;
+                // Place preference groups first.
+                // Use an offset to push the group to the start.
+                indexToSet -= 1000;
             }
             pref.setOrder(indexToSet);
         }

diff --git a/...java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java b/...java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java
@@ -85,7 +85,7 @@ protected void initialize() {
 
         if (identifier == 0) return;
         addPreferencesFromResource(identifier);
-        Utils.sortPreferenceGroupByTitle(getPreferenceScreen(), 2);
+        Utils.sortPreferenceGroupByTitle(getPreferenceScreen(), 1, 2);
     }
 
     private void showSettingUserDialogConfirmation(SwitchPreference switchPref, BooleanSetting setting) {

diff --git a/...nced/integrations/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java b/...nced/integrations/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java
@@ -150,7 +150,7 @@ public void onCreate(Bundle savedInstanceState) {
                 pref.getContext().startActivity(i);
                 return false;
             });
-            preferenceScreen.addPreference(aboutWebsitePreference);
+            aboutCategory.addPreference(aboutWebsitePreference);
 
             // RYD API connection statistics