From 64334b4f79c0e08105f7077617a7b608be4a27ff Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 20 Oct 2025 20:07:17 +0400 Subject: [PATCH] refactor --- .../extension/music/settings/MusicActivityHook.java | 8 -------- .../extension/shared/settings/BaseActivityHook.java | 12 +++++++----- .../youtube/settings/YouTubeActivityHook.java | 8 -------- 3 files changed, 7 insertions(+), 21 deletions(-) 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 c255adaf1..5d6f6ce54 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 @@ -50,14 +50,6 @@ public class MusicActivityHook extends BaseActivityHook { ResourceType.STYLE, "Theme.ReVanced.YouTubeMusic.Settings")); } - /** - * Returns the resource ID for the YouTube Music settings layout. - */ - @Override - protected int getContentViewResourceId() { - return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR; - } - /** * Returns the fixed background color for the toolbar. */ 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 830e5e8af..ec64f5881 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 @@ -125,16 +125,18 @@ public abstract class BaseActivityHook extends Activity { toolBarParent.addView(toolbar, 0); } + /** + * Returns the resource ID for the content view layout. + */ + protected int getContentViewResourceId() { + return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR; + } + /** * Customizes the activity's theme. */ protected abstract void customizeActivityTheme(Activity activity); - /** - * Returns the resource ID for the content view layout. - */ - protected abstract int getContentViewResourceId(); - /** * Returns the background color for the toolbar. */ diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java index 3200b8a15..b6ce40dda 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/YouTubeActivityHook.java @@ -48,14 +48,6 @@ public class YouTubeActivityHook extends BaseActivityHook { activity.setTheme(Utils.getResourceIdentifierOrThrow(ResourceType.STYLE, theme)); } - /** - * Returns the resource ID for the YouTube settings layout. - */ - @Override - protected int getContentViewResourceId() { - return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR; - } - /** * Returns the toolbar background color based on dark/light mode. */