diff --git a/extensions/music/src/main/java/app/revanced/extension/music/patches/ChangeHeaderPatch.java b/extensions/music/src/main/java/app/revanced/extension/music/patches/ChangeHeaderPatch.java index 143bedd549..74d9f458d3 100644 --- a/extensions/music/src/main/java/app/revanced/extension/music/patches/ChangeHeaderPatch.java +++ b/extensions/music/src/main/java/app/revanced/extension/music/patches/ChangeHeaderPatch.java @@ -1,5 +1,7 @@ package app.revanced.extension.music.patches; +import java.util.Objects; + import app.revanced.extension.shared.Logger; import app.revanced.extension.shared.ResourceType; import app.revanced.extension.shared.Utils; @@ -34,4 +36,15 @@ public class ChangeHeaderPatch { return id; } } + + /** + * Injection point. + */ + @SuppressWarnings("unused") + public static int getHeaderDrawableId(int original) { + return Objects.requireNonNullElse( + Settings.HEADER_LOGO.get().getDrawableId(), + original + ); + } } diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java index 395f4e7c21..eb6929d947 100644 --- a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java +++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java @@ -31,7 +31,7 @@ public class Settings extends YouTubeAndMusicSettings { public static final BooleanSetting HIDE_NAVIGATION_BAR_UPGRADE_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_upgrade_button", TRUE, true); public static final BooleanSetting HIDE_NAVIGATION_BAR = new BooleanSetting("revanced_music_hide_navigation_bar", FALSE, true); public static final BooleanSetting HIDE_NAVIGATION_BAR_LABEL = new BooleanSetting("revanced_music_hide_navigation_bar_labels", FALSE, true); - public static final EnumSetting HEADER_LOGO = new EnumSetting<>("revnaced_header_logo", HeaderLogo.DEFAULT, true); + public static final EnumSetting HEADER_LOGO = new EnumSetting<>("revanced_header_logo", HeaderLogo.DEFAULT, true); // Player public static final BooleanSetting CHANGE_MINIPLAYER_COLOR = new BooleanSetting("revanced_music_change_miniplayer_color", FALSE, true); diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/branding/header/ChangeHeaderPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/branding/header/ChangeHeaderPatch.kt index 40c6bb9422..5952682118 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/layout/branding/header/ChangeHeaderPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/branding/header/ChangeHeaderPatch.kt @@ -4,7 +4,6 @@ import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.extensions.getInstruction import app.revanced.patcher.extensions.wideLiteral import app.revanced.patcher.patch.bytecodePatch -import app.revanced.patches.all.misc.resources.addResources import app.revanced.patches.music.misc.settings.PreferenceScreen import app.revanced.patches.shared.layout.branding.header.changeHeaderPatch import app.revanced.patches.shared.misc.mapping.ResourceType @@ -20,7 +19,11 @@ private val targetResourceDirectoryNames = mapOf( ) private val variants = arrayOf("dark") -private val logoResourceNames = arrayOf("revanced_header_dark") + +private val logoResourceNames = arrayOf( + "revanced_header_minimal", + "revanced_header_rounded", +) private val headerDrawableNames = arrayOf( "action_bar_logo_ringo2", diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/miniplayer/ChangeMiniplayerColor.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/miniplayer/ChangeMiniplayerColor.kt index 608a33e319..974130d15f 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/layout/miniplayer/ChangeMiniplayerColor.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/miniplayer/ChangeMiniplayerColor.kt @@ -48,7 +48,7 @@ val changeMiniplayerColorPatch = bytecodePatch( ) apply { - addResources("music", "layout.miniplayercolor.changeMiniplayerColor") + addResources("music", "layout.miniplayer.changeMiniplayerColor") PreferenceScreen.PLAYER.addPreferences( SwitchPreference("revanced_music_change_miniplayer_color"),