ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-12 04:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(YouTube Music - Disable music video in album): Remove Dismiss queue options

Browse Source
This commit is contained in:
inotia00 2025-01-06 21:24:02 +09:00
parent 1ce4c05173
commit f02ea01ebe
5 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/AlbumMusicVideoPatch.java
View File

@ -19,18 +19,9 @@ import app.revanced.extension.shared.utils.Logger;
public class AlbumMusicVideoPatch {
public enum RedirectType {
REDIRECT_DISMISS(true),
REDIRECT(false),
ON_CLICK_DISMISS(true),
ON_CLICK(false),
ON_LONG_CLICK_DISMISS(true),
ON_LONG_CLICK(false);
public final boolean dismissQueue;
RedirectType(boolean dismissQueue) {
this.dismissQueue = dismissQueue;
}
REDIRECT,
ON_CLICK,
ON_LONG_CLICK
}
private static final RedirectType REDIRECT_TYPE =
@ -39,17 +30,11 @@ public class AlbumMusicVideoPatch {
private static final boolean DISABLE_MUSIC_VIDEO_IN_ALBUM =
Settings.DISABLE_MUSIC_VIDEO_IN_ALBUM.get();
private static final boolean DISMISS_QUEUE =
DISABLE_MUSIC_VIDEO_IN_ALBUM && REDIRECT_TYPE.dismissQueue;
private static final boolean REDIRECT = REDIRECT_TYPE == RedirectType.REDIRECT;
private static final boolean REDIRECT =
REDIRECT_TYPE == RedirectType.REDIRECT || REDIRECT_TYPE == RedirectType.REDIRECT_DISMISS;
private static final boolean ON_CLICK = REDIRECT_TYPE == RedirectType.ON_CLICK;
private static final boolean ON_CLICK =
REDIRECT_TYPE == RedirectType.ON_CLICK || REDIRECT_TYPE == RedirectType.ON_CLICK_DISMISS;
private static final boolean ON_LONG_CLICK =
REDIRECT_TYPE == RedirectType.ON_LONG_CLICK || REDIRECT_TYPE == RedirectType.ON_LONG_CLICK_DISMISS;
private static final boolean ON_LONG_CLICK = REDIRECT_TYPE == RedirectType.ON_LONG_CLICK;
private static final String YOUTUBE_MUSIC_ALBUM_PREFIX = "OLAK";
@ -63,7 +48,7 @@ public class AlbumMusicVideoPatch {
@GuardedBy("itself")
private static final Map<String, String> lastVideoIds = new LinkedHashMap<>() {
private static final int NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK = 5;
private static final int NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK = 10;
@Override
protected boolean removeEldestEntry(Map.Entry eldest) {
@ -153,10 +138,6 @@ public class AlbumMusicVideoPatch {
private static void openMusic(@NonNull String songId) {
try {
if (DISMISS_QUEUE) {
VideoUtils.dismissQueue();
}
isVideoLaunched.compareAndSet(false, true);
// The newly opened video is not a music video.

2
extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java
View File

@ -180,7 +180,7 @@ public class Settings extends BaseSettings {
public static final BooleanSetting DISABLE_CAIRO_SPLASH_ANIMATION = new BooleanSetting("revanced_disable_cairo_splash_animation", FALSE, true);
public static final BooleanSetting DISABLE_DRC_AUDIO = new BooleanSetting("revanced_disable_drc_audio", FALSE, true);
public static final BooleanSetting DISABLE_MUSIC_VIDEO_IN_ALBUM = new BooleanSetting("revanced_disable_music_video_in_album", FALSE, true);
public static final EnumSetting<RedirectType> DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE = new EnumSetting<>("revanced_disable_music_video_in_album_redirect_type", RedirectType.REDIRECT_DISMISS, true);
public static final EnumSetting<RedirectType> DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE = new EnumSetting<>("revanced_disable_music_video_in_album_redirect_type", RedirectType.REDIRECT, true);
public static final BooleanSetting ENABLE_OPUS_CODEC = new BooleanSetting("revanced_enable_opus_codec", FALSE, true);
public static final BooleanSetting SETTINGS_IMPORT_EXPORT = new BooleanSetting("revanced_extended_settings_import_export", FALSE, false);
public static final BooleanSetting SPOOF_CLIENT = new BooleanSetting("revanced_spoof_client", FALSE, true);

2
patches/src/main/kotlin/app/revanced/patches/music/misc/album/AlbumMusicVideoPatch.kt
View File

@ -5,7 +5,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.bytecodePatch
import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.music.utils.dismiss.dismissQueueHookPatch
import app.revanced.patches.music.utils.extension.Constants.MISC_PATH
import app.revanced.patches.music.utils.patch.PatchList.DISABLE_MUSIC_VIDEO_IN_ALBUM
import app.revanced.patches.music.utils.settings.CategoryType
@ -39,7 +38,6 @@ val albumMusicVideoPatch = bytecodePatch(
dependsOn(
settingsPatch,
dismissQueueHookPatch,
videoInformationPatch,
playerResponseMethodHookPatch,
)

6
patches/src/main/resources/music/settings/host/values/arrays.xml
View File

@ -15,19 +15,13 @@
<item>FEmusic_library_corpus_artists</item>
</string-array>
<string-array name="revanced_disable_music_video_in_album_redirect_type_entries">
<item>@string/revanced_disable_music_video_in_album_redirect_type_entry_redirect_dismiss</item>
<item>@string/revanced_disable_music_video_in_album_redirect_type_entry_redirect</item>
<item>@string/revanced_disable_music_video_in_album_redirect_type_entry_on_click_dismiss</item>
<item>@string/revanced_disable_music_video_in_album_redirect_type_entry_on_click</item>
<item>@string/revanced_disable_music_video_in_album_redirect_type_entry_on_long_click_dismiss</item>
<item>@string/revanced_disable_music_video_in_album_redirect_type_entry_on_long_click</item>
</string-array>
<string-array name="revanced_disable_music_video_in_album_redirect_type_entry_values">
<item>REDIRECT_DISMISS</item>
<item>REDIRECT</item>
<item>ON_CLICK_DISMISS</item>
<item>ON_CLICK</item>
<item>ON_LONG_CLICK_DISMISS</item>
<item>ON_LONG_CLICK</item>
</string-array>
<string-array name="revanced_extended_settings_import_export_entries">

3
patches/src/main/resources/music/settings/host/values/strings.xml
View File

@ -428,11 +428,8 @@ Find the official song if a music video is detected playing from an album.
• Powered by Piped Instance API."</string>
<string name="revanced_disable_music_video_in_album_redirect_type_title">Redirection type</string>
<string name="revanced_disable_music_video_in_album_redirect_type_summary">Specifies how to redirect to official song.</string>
<string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect_dismiss">Redirect (Dismiss queue)</string>
<string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Redirect</string>
<string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click_dismiss">Tap Audio / Video toggle (Dismiss queue)</string>
<string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Tap Audio / Video toggle</string>
<string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click_dismiss">Tap and hold Audio / Video toggle (Dismiss queue)</string>
<string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Tap and hold Audio / Video toggle</string>
<string name="revanced_enable_debug_logging_title">Enable debug logging</string>
<string name="revanced_enable_debug_logging_summary">Prints the debug log.</string>