Finish merge

extensions/music/src/main/java/app/revanced/extension/music/settings/GoogleApiActivityHook.java

@@ -8,6 +8,7 @@ import android.view.View;
 
 import app.revanced.extension.music.settings.preference.ReVancedPreferenceFragment;
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseActivityHook;
 
@@ -37,7 +38,7 @@ public class GoogleApiActivityHook extends BaseActivityHook {
     protected void customizeActivityTheme(Activity activity) {
         // Override the default YouTube Music theme to increase start padding of list items.
         // Custom style located in resources/music/values/style.xml
-        activity.setTheme(Utils.getResourceIdentifier("Theme.ReVanced.YouTubeMusic.Settings", "style"));
+        activity.setTheme(Utils.getResourceIdentifier(ResourceType.STYLE, "Theme.ReVanced.YouTubeMusic.Settings"));
     }
 
     /**
@@ -45,7 +46,7 @@ public class GoogleApiActivityHook extends BaseActivityHook {
      */
     @Override
     protected int getContentViewResourceId() {
-        return Utils.getResourceIdentifier("revanced_music_settings_with_toolbar", "layout");
+        return Utils.getResourceIdentifier(ResourceType.LAYOUT, "revanced_music_settings_with_toolbar");
     }
 
     /**

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import android.widget.Toolbar;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
 
@@ -55,7 +56,7 @@ public abstract class BaseActivityHook extends Activity {
 
             activity.getFragmentManager()
                     .beginTransaction()
-                    .replace(Utils.getResourceIdentifier("revanced_settings_fragments", "id"), fragment)
+                    .replace(Utils.getResourceIdentifier(ResourceType.ID, "revanced_settings_fragments"), fragment)
                     .commit();
         } catch (Exception ex) {
             Logger.printException(() -> "initialize failure", ex);
@@ -70,7 +71,7 @@ public abstract class BaseActivityHook extends Activity {
         // Replace dummy placeholder toolbar.
         // This is required to fix submenu title alignment issue with Android ASOP 15+
         ViewGroup toolBarParent = activity.findViewById(
-                Utils.getResourceIdentifier("revanced_toolbar_parent", "id"));
+                Utils.getResourceIdentifier(ResourceType.ID, "revanced_toolbar_parent"));
         ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolBarParent, "revanced_toolbar");
         toolbarLayoutParams = dummyToolbar.getLayoutParams();
         toolBarParent.removeView(dummyToolbar);
@@ -82,7 +83,7 @@ public abstract class BaseActivityHook extends Activity {
         toolbar.setBackgroundColor(getToolbarBackgroundColor());
         toolbar.setNavigationIcon(getNavigationIcon());
         toolbar.setNavigationOnClickListener(getNavigationClickListener(activity));
-        toolbar.setTitle(Utils.getResourceIdentifier("revanced_settings_title", "string"));
+        toolbar.setTitle(Utils.getResourceIdentifier(ResourceType.STRING, "revanced_settings_title"));
 
         final int margin = Utils.dipToPixels(16);
         toolbar.setTitleMarginStart(margin);

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java

@@ -17,6 +17,7 @@ import android.widget.Toolbar;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseActivityHook;
 
@@ -116,7 +117,7 @@ public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
     @SuppressLint("UseCompatLoadingForDrawables")
     public static Drawable getBackButtonDrawable() {
         final int backButtonResource = Utils.getResourceIdentifier(
-                "revanced_settings_toolbar_arrow_left", "drawable");
+                ResourceType.DRAWABLE, "revanced_settings_toolbar_arrow_left");
         Drawable drawable = Utils.getContext().getResources().getDrawable(backButtonResource);
         customizeBackButtonDrawable(drawable);
         return drawable;

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

@@ -6,13 +6,10 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceFragment;
-import android.util.TypedValue;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 import android.widget.Toolbar;
 
-import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseActivityHook;
@@ -53,7 +50,7 @@ public class LicenseActivityHook extends BaseActivityHook {
         final var theme = Utils.isDarkModeEnabled()
                 ? "Theme.YouTube.Settings.Dark"
                 : "Theme.YouTube.Settings";
-        activity.setTheme(Utils.getResourceIdentifier(theme, "style"));
+        activity.setTheme(Utils.getResourceIdentifier(ResourceType.STYLE, theme));
     }
 
     /**
@@ -61,7 +58,7 @@ public class LicenseActivityHook extends BaseActivityHook {
      */
     @Override
     protected int getContentViewResourceId() {
-        return Utils.getResourceIdentifier("revanced_settings_with_toolbar", "layout");
+        return Utils.getResourceIdentifier(ResourceType.LAYOUT, "revanced_settings_with_toolbar");
     }
 
     /**

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

@@ -28,11 +28,13 @@ private val settingsResourcePatch = resourcePatch {
     dependsOn(
         resourceMappingPatch,
         settingsPatch(
-            IntentPreference(
-                titleKey = "revanced_settings_title",
-                summaryKey = null,
-                intent = newIntent("revanced_settings_intent"),
-            ) to "settings_headers",
+            listOf(
+                IntentPreference(
+                    titleKey = "revanced_settings_title",
+                    summaryKey = null,
+                    intent = newIntent("revanced_settings_intent"),
+                ) to "settings_headers"
+            ),
             preferences
         )
     )