diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java index f0d636279..454abb0d7 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java @@ -35,10 +35,15 @@ public final class ActionButtonsFilter extends Filter { Settings.HIDE_ACTION_BUTTON_LIKE_DISLIKE, "segmented_like_dislike_button.eml" ); + final StringFilterGroup songVideoButton = new StringFilterGroup( + Settings.HIDE_ACTION_BUTTON_SONG_VIDEO, + "music_audio_video_button.eml" + ); addPathCallbacks( bufferFilterPathRule, downloadButton, - likeDislikeContainer + likeDislikeContainer, + songVideoButton ); bufferButtonsGroupList.addAll( diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java index dd0351ff1..93e3dee01 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java @@ -39,6 +39,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_ACTION_BUTTON_ADD_TO_PLAYLIST = new BooleanSetting("revanced_hide_action_button_add_to_playlist", FALSE, true); public static final BooleanSetting HIDE_ACTION_BUTTON_DOWNLOAD = new BooleanSetting("revanced_hide_action_button_download", FALSE, true); public static final BooleanSetting HIDE_ACTION_BUTTON_SHARE = new BooleanSetting("revanced_hide_action_button_share", FALSE, true); + public static final BooleanSetting HIDE_ACTION_BUTTON_SONG_VIDEO = new BooleanSetting("revanced_hide_action_button_song_video", FALSE, true); public static final BooleanSetting HIDE_ACTION_BUTTON_RADIO = new BooleanSetting("revanced_hide_action_button_radio", FALSE, true); public static final BooleanSetting HIDE_ACTION_BUTTON_LABEL = new BooleanSetting("revanced_hide_action_button_label", FALSE, true); public static final BooleanSetting EXTERNAL_DOWNLOADER_ACTION_BUTTON = new BooleanSetting("revanced_external_downloader_action", FALSE, true); diff --git a/patches/src/main/kotlin/app/revanced/patches/music/actionbar/components/ActionBarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/actionbar/components/ActionBarComponentsPatch.kt index 1d8747c28..d6d6dbf9c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/music/actionbar/components/ActionBarComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/music/actionbar/components/ActionBarComponentsPatch.kt @@ -12,6 +12,7 @@ import app.revanced.patches.music.utils.extension.Constants.COMPONENTS_PATH import app.revanced.patches.music.utils.patch.PatchList.HIDE_ACTION_BAR_COMPONENTS import app.revanced.patches.music.utils.playservice.is_7_17_or_greater import app.revanced.patches.music.utils.playservice.is_7_25_or_greater +import app.revanced.patches.music.utils.playservice.is_7_33_or_greater import app.revanced.patches.music.utils.playservice.versionCheckPatch import app.revanced.patches.music.utils.resourceid.likeDislikeContainer import app.revanced.patches.music.utils.resourceid.sharedResourceIdPatch @@ -223,6 +224,13 @@ val actionBarComponentsPatch = bytecodePatch( "revanced_hide_action_button_share", "false" ) + if (is_7_33_or_greater) { + addSwitchPreference( + CategoryType.ACTION_BAR, + "revanced_hide_action_button_song_video", + "false" + ) + } if (!is_7_25_or_greater) { addSwitchPreference( CategoryType.ACTION_BAR, diff --git a/patches/src/main/resources/music/settings/host/values/strings.xml b/patches/src/main/resources/music/settings/host/values/strings.xml index 8e8ba67d3..1e4cf777e 100644 --- a/patches/src/main/resources/music/settings/host/values/strings.xml +++ b/patches/src/main/resources/music/settings/host/values/strings.xml @@ -40,6 +40,9 @@ Hides the Radio button. Hide Share button Hides the Share button. + Hide Song / Video button + "Hides the Song / Video button. +(This button is only available to some users)" Hide action button labels Hides the labels of the action buttons. Override Download action button