diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java index bb19d2497..c255adaf1 100644 --- a/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java +++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java @@ -11,6 +11,7 @@ import android.widget.Toolbar; import app.revanced.extension.music.settings.preference.MusicPreferenceFragment; import app.revanced.extension.music.settings.search.MusicSearchViewController; 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; @@ -46,7 +47,7 @@ public class MusicActivityHook extends BaseActivityHook { // 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.getResourceIdentifierOrThrow( - "Theme.ReVanced.YouTubeMusic.Settings", "style")); + ResourceType.STYLE, "Theme.ReVanced.YouTubeMusic.Settings")); } /** diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java index 92903b9f9..740b29e33 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java @@ -328,53 +328,6 @@ public class Utils { return getResourceIdentifierOrThrow(getContext(), type, resourceIdentifierName); } - /** - * @return The resource identifier, or throws an exception if not found. - */ - @Deprecated - public static int getResourceIdentifierOrThrow(Context context, String resourceIdentifierName, @Nullable String type) { - final int resourceId = getResourceIdentifier(context, type, resourceIdentifierName); - if (resourceId == 0) { - throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName - + " type: " + type); - } - return resourceId; - } - - - /** - * Instead use {@link #getResourceIdentifierOrThrow(ResourceType, String)} - */ - @Deprecated - public static int getResourceIdentifierOrThrow(String resourceIdentifierName, @Nullable String stringType) { - return getResourceIdentifierOrThrow(getContext(), resourceIdentifierName, stringType); - } - - /** - * Instead use {@link #getResourceIdentifier(ResourceType, String)} - */ - @Deprecated - public static int getResourceIdentifier(String resourceIdentifierName, @Nullable String stringType) { - return getResourceIdentifier(getContext(), resourceIdentifierName, stringType); - } - - /** - * Instead use {@link #getResourceIdentifier(Context, ResourceType, String)} - */ - @Deprecated - public static int getResourceIdentifier(Context context, String resourceIdentifierName, @Nullable String stringType) { - // Find ResourceType with same name as type parameter string - ResourceType convertedType = null; - for (ResourceType type : ResourceType.values()) { - if (type.value.equals(stringType)) { - convertedType = type; - break; - } - } - - return getResourceIdentifierOrThrow(context, convertedType, resourceIdentifierName); - } - public static int getResourceInteger(String resourceIdentifierName) throws Resources.NotFoundException { return getContext().getResources().getInteger(getResourceIdentifierOrThrow(ResourceType.INTEGER, resourceIdentifierName)); } diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java index 7a3a2e1d4..53db12c4d 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java @@ -129,7 +129,7 @@ abstract class Check { // Add icon to the dialog. ImageView iconView = new ImageView(activity); iconView.setImageResource(Utils.getResourceIdentifierOrThrow( - "revanced_ic_dialog_alert", "drawable")); + ResourceType.DRAWABLE, "revanced_ic_dialog_alert")); iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); iconView.setPadding(0, 0, 0, 0); LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams( diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java index d29e5e085..830e5e8af 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java @@ -26,13 +26,13 @@ import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragme public abstract class BaseActivityHook extends Activity { private static final int ID_REVANCED_SETTINGS_FRAGMENTS = - getResourceIdentifierOrThrow("revanced_settings_fragments", "id"); + getResourceIdentifierOrThrow(ResourceType.ID, "revanced_settings_fragments"); private static final int ID_REVANCED_TOOLBAR_PARENT = - getResourceIdentifierOrThrow("revanced_toolbar_parent", "id"); + getResourceIdentifierOrThrow(ResourceType.ID, "revanced_toolbar_parent"); public static final int LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR = - getResourceIdentifierOrThrow("revanced_settings_with_toolbar", "layout"); + getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_settings_with_toolbar"); private static final int STRING_REVANCED_SETTINGS_TITLE = - getResourceIdentifierOrThrow("revanced_settings_title", "string"); + getResourceIdentifierOrThrow(ResourceType.STRING, "revanced_settings_title"); /** * Layout parameters for the toolbar, extracted from the dummy toolbar. diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java index ff728838b..841a3529f 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java @@ -20,6 +20,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import app.revanced.extension.shared.ResourceType; import app.revanced.extension.shared.Utils; import app.revanced.extension.shared.ui.CustomDialog; @@ -30,14 +31,14 @@ import app.revanced.extension.shared.ui.CustomDialog; @SuppressWarnings({"unused", "deprecation"}) public class CustomDialogListPreference extends ListPreference { - public static final int ID_REVANCED_CHECK_ICON = - getResourceIdentifierOrThrow("revanced_check_icon", "id"); - public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER = - getResourceIdentifierOrThrow("revanced_check_icon_placeholder", "id"); - public static final int ID_REVANCED_ITEM_TEXT = - getResourceIdentifierOrThrow("revanced_item_text", "id"); - public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED = - getResourceIdentifierOrThrow("revanced_custom_list_item_checked", "layout"); + public static final int ID_REVANCED_CHECK_ICON = getResourceIdentifierOrThrow( + ResourceType.ID, "revanced_check_icon"); + public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER = getResourceIdentifierOrThrow( + ResourceType.ID, "revanced_check_icon_placeholder"); + public static final int ID_REVANCED_ITEM_TEXT = getResourceIdentifierOrThrow( + ResourceType.ID, "revanced_item_text"); + public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED = getResourceIdentifierOrThrow( + ResourceType.LAYOUT, "revanced_custom_list_item_checked"); private String staticSummary = null; private CharSequence[] highlightedEntriesForDialog = null; diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java index 9b5c9464c..9936f9ffb 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import app.revanced.extension.shared.ResourceType; import app.revanced.extension.shared.Utils; import app.revanced.extension.shared.settings.preference.ColorPickerPreference; import app.revanced.extension.shared.settings.preference.CustomDialogListPreference; @@ -38,18 +39,18 @@ public abstract class BaseSearchResultItem { // Get the corresponding layout resource ID. public int getLayoutResourceId() { return switch (this) { - case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular"); - case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch"); - case LIST -> getResourceIdentifier("revanced_preference_search_result_list"); - case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color"); - case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header"); - case NO_RESULTS -> getResourceIdentifier("revanced_preference_search_no_result"); + case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular"); + case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch"); + case LIST -> getResourceIdentifier("revanced_preference_search_result_list"); + case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color"); + case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header"); + case NO_RESULTS -> getResourceIdentifier("revanced_preference_search_no_result"); }; } private static int getResourceIdentifier(String name) { // Placeholder for actual resource identifier retrieval. - return Utils.getResourceIdentifierOrThrow(name, "layout"); + return Utils.getResourceIdentifierOrThrow(ResourceType.LAYOUT, name); } } diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java index f1893a232..87d35ae24 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java @@ -33,6 +33,7 @@ import java.lang.reflect.Method; import java.util.List; 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.ColorPickerPreference; import app.revanced.extension.shared.settings.preference.CustomDialogListPreference; @@ -54,15 +55,15 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter searchHistory; private final Activity activity; diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java index 7bf99f479..23ecdcfd0 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java @@ -7,6 +7,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import app.revanced.extension.shared.Logger; +import app.revanced.extension.shared.ResourceType; import app.revanced.extension.shared.Utils; import app.revanced.extension.youtube.settings.Settings; @@ -40,10 +41,10 @@ public final class HidePlayerOverlayButtonsPatch { = Settings.HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS.get(); private static final int PLAYER_CONTROL_PREVIOUS_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow( - "player_control_previous_button_touch_area", "id"); + ResourceType.ID, "player_control_previous_button_touch_area"); private static final int PLAYER_CONTROL_NEXT_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow( - "player_control_next_button_touch_area", "id"); + ResourceType.ID, "player_control_next_button_touch_area"); /** * Injection point. diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java index 6a5f03231..b153aa296 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/NewSegmentLayout.java @@ -15,6 +15,7 @@ import android.widget.FrameLayout; import android.widget.ImageButton; import app.revanced.extension.shared.Logger; +import app.revanced.extension.shared.ResourceType; import app.revanced.extension.youtube.patches.VideoInformation; import app.revanced.extension.youtube.settings.Settings; import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils; @@ -44,8 +45,8 @@ public final class NewSegmentLayout extends FrameLayout { final int defStyleAttr, final int defStyleRes) { super(context, attributeSet, defStyleAttr, defStyleRes); - LayoutInflater.from(context).inflate( - getResourceIdentifierOrThrow(context, "revanced_sb_new_segment", "layout"), this, true + LayoutInflater.from(context).inflate(getResourceIdentifierOrThrow(context, + ResourceType.LAYOUT, "revanced_sb_new_segment"), this, true ); initializeButton( @@ -104,7 +105,7 @@ public final class NewSegmentLayout extends FrameLayout { */ private void initializeButton(final Context context, final String resourceIdentifierName, final ButtonOnClickHandlerFunction handler, final String debugMessage) { - ImageButton button = findViewById(getResourceIdentifierOrThrow(context, resourceIdentifierName, "id")); + ImageButton button = findViewById(getResourceIdentifierOrThrow(context, ResourceType.ID, resourceIdentifierName)); // Add ripple effect RippleDrawable rippleDrawable = new RippleDrawable( diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java index d6e027802..6e2c9e241 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java @@ -64,9 +64,10 @@ public class SponsorBlockViewController { Context context = Utils.getContext(); RelativeLayout layout = new RelativeLayout(context); - layout.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,RelativeLayout.LayoutParams.MATCH_PARENT)); + layout.setLayoutParams(new RelativeLayout.LayoutParams( + RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)); LayoutInflater.from(context).inflate(getResourceIdentifierOrThrow( - "revanced_sb_inline_sponsor_overlay", "layout"), layout); + ResourceType.LAYOUT, "revanced_sb_inline_sponsor_overlay"), layout); inlineSponsorOverlayRef = new WeakReference<>(layout); viewGroup.addView(layout); @@ -85,14 +86,14 @@ public class SponsorBlockViewController { }); youtubeOverlaysLayoutRef = new WeakReference<>(viewGroup); - skipHighlightButtonRef = new WeakReference<>(Objects.requireNonNull( - layout.findViewById(getResourceIdentifier("revanced_sb_skip_highlight_button", "id")))); + skipHighlightButtonRef = new WeakReference<>(Objects.requireNonNull(layout.findViewById( + getResourceIdentifier(ResourceType.ID, "revanced_sb_skip_highlight_button")))); - skipSponsorButtonRef = new WeakReference<>(Objects.requireNonNull( - layout.findViewById(getResourceIdentifier("revanced_sb_skip_sponsor_button", "id")))); + skipSponsorButtonRef = new WeakReference<>(Objects.requireNonNull(layout.findViewById( + getResourceIdentifier(ResourceType.ID, "revanced_sb_skip_sponsor_button")))); - NewSegmentLayout newSegmentLayout = Objects.requireNonNull( - layout.findViewById(getResourceIdentifier("revanced_sb_new_segment_view", "id"))); + NewSegmentLayout newSegmentLayout = Objects.requireNonNull(layout.findViewById( + getResourceIdentifier(ResourceType.ID, "revanced_sb_new_segment_view"))); newSegmentLayoutRef = new WeakReference<>(newSegmentLayout); newSegmentLayout.updateLayout();