From 0553584d5cb4746925d92d3ff5a13aba816b86c4 Mon Sep 17 00:00:00 2001 From: inotia00 Date: Tue, 5 Sep 2023 10:10:00 +0900 Subject: [PATCH] refactor(music/settings): improve UI --- .../fingerprints/DialogSolidFingerprint.kt | 2 +- .../compactdialog/patch/CompactDialogPatch.kt | 10 +-- .../fingerprints/SleepTimerFingerprint.kt | 2 +- .../sleeptimer/patch/SleepTimerPatch.kt | 10 +-- .../amoled/patch/AmoledPatch.kt | 2 +- .../patch/DisableAutoCaptionsPatch.kt | 8 +-- .../icon/patch/CustomBrandingIconMMTPatch.kt | 2 +- .../CustomBrandingIconRevancifyBluePatch.kt | 2 +- .../CustomBrandingIconRevancifyRedPatch.kt | 2 +- .../name/patch/CustomBrandingNamePatch.kt | 0 .../name/patch/RemoveElementsPatch.kt | 0 .../buttonshelf/patch/HideButtonShelfPatch.kt | 4 +- .../patch/HideCarouselShelfPatch.kt | 4 +- .../fingerprints/HideCastButtonFingerprint.kt | 2 +- .../HideCastButtonParentFingerprint.kt | 2 +- .../castbutton/patch/HideCastButtonPatch.kt | 12 ++-- .../fingerprints/ChipCloudFingerprint.kt | 2 +- .../categorybar/patch/CategoryBarPatch.kt | 10 +-- .../patch/HideChannelGuidelinesPatch.kt | 4 +- .../customfilter/patch/CustomFilterPatch.kt | 6 +- .../fingerprints/FloatingButtonFingerprint.kt | 2 +- .../FloatingButtonParentFingerprint.kt | 2 +- .../patch/NewPlaylistButtonPatch.kt | 12 ++-- .../TabletIdentifierFingerprint.kt | 2 +- .../landscapemode/patch/LandScapeModePatch.kt | 10 +-- .../patch/HidePlaylistCardPatch.kt | 4 +- .../fingerprints/TabLayoutTextFingerprint.kt | 21 ------- .../fingerprints/TabLayoutFingerprint.kt | 2 +- .../black}/patch/BlackNavigationBarPatch.kt | 10 +-- .../label}/patch/NavigationLabelPatch.kt | 10 +-- .../ColorMatchPlayerFingerprint.kt | 2 +- .../patch/ColorMatchPlayerPatch.kt | 10 +-- .../MinimizedPlayerFingerprint.kt | 2 +- .../patch/MinimizedPlayerPatch.kt | 10 +-- .../fingerprints/NewLayoutFingerprint.kt | 2 +- .../newlayout/patch/NewLayoutPatch.kt | 10 +-- .../NextButtonVisibilityFingerprint.kt | 2 +- .../fingerprints/SwipeToCloseFingerprint.kt | 2 +- .../patch/OldStyleMiniPlayerPatch.kt | 18 +++--- .../MusicPlaybackControlsFingerprint.kt | 2 +- .../fingerprints/ShuffleClassFingerprint.kt | 2 +- .../ShuffleClassReferenceFingerprint.kt | 2 +- .../shuffle/patch/EnforceShufflePatch.kt | 10 +-- .../fingerprints/ZenModeFingerprint.kt | 2 +- .../zenmode/patch/ZenModePatch.kt | 10 +-- .../utils/litho/patch/LithoFilterPatch.kt | 2 +- .../settings/resource/patch/SettingsPatch.kt | 29 +++++++-- .../app/revanced/util/enum/CategoryType.kt | 12 ++-- .../revanced/util/integrations/Constants.kt | 7 ++- .../util/resources/MusicResourceHelper.kt | 61 ++++++++++++++----- .../music/settings/host/values/strings.xml | 8 ++- 51 files changed, 203 insertions(+), 163 deletions(-) rename src/main/kotlin/app/revanced/patches/music/{layout => flyoutpanel}/compactdialog/fingerprints/DialogSolidFingerprint.kt (90%) rename src/main/kotlin/app/revanced/patches/music/{layout => flyoutpanel}/compactdialog/patch/CompactDialogPatch.kt (84%) rename src/main/kotlin/app/revanced/patches/music/{layout => flyoutpanel}/sleeptimer/fingerprints/SleepTimerFingerprint.kt (81%) rename src/main/kotlin/app/revanced/patches/music/{layout => flyoutpanel}/sleeptimer/patch/SleepTimerPatch.kt (84%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/amoled/patch/AmoledPatch.kt (95%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/autocaptions/patch/DisableAutoCaptionsPatch.kt (87%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/branding/icon/patch/CustomBrandingIconMMTPatch.kt (92%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt (91%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt (91%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/branding/name/patch/CustomBrandingNamePatch.kt (100%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/branding/name/patch/RemoveElementsPatch.kt (100%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/buttonshelf/patch/HideButtonShelfPatch.kt (92%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/carouselshelf/patch/HideCarouselShelfPatch.kt (92%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/castbutton/fingerprints/HideCastButtonFingerprint.kt (83%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/castbutton/fingerprints/HideCastButtonParentFingerprint.kt (83%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/castbutton/patch/HideCastButtonPatch.kt (79%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/categorybar/fingerprints/ChipCloudFingerprint.kt (89%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/categorybar/patch/CategoryBarPatch.kt (85%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/channelguidelines/patch/HideChannelGuidelinesPatch.kt (92%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/customfilter/patch/CustomFilterPatch.kt (91%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/floatingbutton/fingerprints/FloatingButtonFingerprint.kt (85%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt (89%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/floatingbutton/patch/NewPlaylistButtonPatch.kt (82%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/landscapemode/fingerprints/TabletIdentifierFingerprint.kt (91%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/landscapemode/patch/LandScapeModePatch.kt (81%) rename src/main/kotlin/app/revanced/patches/music/{layout => general}/playlistcard/patch/HidePlaylistCardPatch.kt (92%) delete mode 100644 src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/fingerprints/TabLayoutTextFingerprint.kt rename src/main/kotlin/app/revanced/patches/music/{layout/blacknavigationbar => navigation/black}/fingerprints/TabLayoutFingerprint.kt (91%) rename src/main/kotlin/app/revanced/patches/music/{layout/blacknavigationbar => navigation/black}/patch/BlackNavigationBarPatch.kt (84%) rename src/main/kotlin/app/revanced/patches/music/{layout/navigationlabel => navigation/label}/patch/NavigationLabelPatch.kt (88%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt (88%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/colormatchplayer/patch/ColorMatchPlayerPatch.kt (93%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt (89%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/minimizedplayer/patch/MinimizedPlayerPatch.kt (84%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/newlayout/fingerprints/NewLayoutFingerprint.kt (83%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/newlayout/patch/NewLayoutPatch.kt (85%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt (89%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt (83%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt (86%) rename src/main/kotlin/app/revanced/patches/music/{misc => player}/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt (90%) rename src/main/kotlin/app/revanced/patches/music/{misc => player}/shuffle/fingerprints/ShuffleClassFingerprint.kt (93%) rename src/main/kotlin/app/revanced/patches/music/{misc => player}/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt (90%) rename src/main/kotlin/app/revanced/patches/music/{misc => player}/shuffle/patch/EnforceShufflePatch.kt (95%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/zenmode/fingerprints/ZenModeFingerprint.kt (89%) rename src/main/kotlin/app/revanced/patches/music/{layout => player}/zenmode/patch/ZenModePatch.kt (92%) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/fingerprints/DialogSolidFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/fingerprints/DialogSolidFingerprint.kt similarity index 90% rename from src/main/kotlin/app/revanced/patches/music/layout/compactdialog/fingerprints/DialogSolidFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/fingerprints/DialogSolidFingerprint.kt index 906bc6bfe..5d4c666fb 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/fingerprints/DialogSolidFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/fingerprints/DialogSolidFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.compactdialog.fingerprints +package app.revanced.patches.music.flyoutpanel.compactdialog.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/patch/CompactDialogPatch.kt similarity index 84% rename from src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt rename to src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/patch/CompactDialogPatch.kt index 93cb4c140..c91c9e544 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/patch/CompactDialogPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.compactdialog.patch +package app.revanced.patches.music.flyoutpanel.compactdialog.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -9,12 +9,12 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod -import app.revanced.patches.music.layout.compactdialog.fingerprints.DialogSolidFingerprint +import app.revanced.patches.music.flyoutpanel.compactdialog.fingerprints.DialogSolidFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_FLYOUT @Patch @Name("Enable compact dialog") @@ -39,7 +39,7 @@ class CompactDialogPatch : BytecodePatch( ) { addInstructions( 2, """ - invoke-static {p0}, $MUSIC_LAYOUT->enableCompactDialog(I)I + invoke-static {p0}, $MUSIC_FLYOUT->enableCompactDialog(I)I move-result p0 """ ) @@ -47,7 +47,7 @@ class CompactDialogPatch : BytecodePatch( } ?: throw DialogSolidFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.FLYOUT, "revanced_enable_compact_dialog", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/fingerprints/SleepTimerFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/fingerprints/SleepTimerFingerprint.kt similarity index 81% rename from src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/fingerprints/SleepTimerFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/fingerprints/SleepTimerFingerprint.kt index f6a278a78..02f9dd670 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/fingerprints/SleepTimerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/fingerprints/SleepTimerFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.sleeptimer.fingerprints +package app.revanced.patches.music.flyoutpanel.sleeptimer.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.util.bytecode.isWide32LiteralExists diff --git a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/patch/SleepTimerPatch.kt similarity index 84% rename from src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt rename to src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/patch/SleepTimerPatch.kt index 70ca0223a..24e53dc18 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/patch/SleepTimerPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.sleeptimer.patch +package app.revanced.patches.music.flyoutpanel.sleeptimer.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -9,11 +9,11 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.sleeptimer.fingerprints.SleepTimerFingerprint +import app.revanced.patches.music.flyoutpanel.sleeptimer.fingerprints.SleepTimerFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_FLYOUT import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -33,7 +33,7 @@ class SleepTimerPatch : BytecodePatch( addInstructions( insertIndex, """ - invoke-static {}, $MUSIC_LAYOUT->enableSleepTimer()Z + invoke-static {}, $MUSIC_FLYOUT->enableSleepTimer()Z move-result v$targetRegister """ ) @@ -41,7 +41,7 @@ class SleepTimerPatch : BytecodePatch( } ?: throw SleepTimerFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.FLYOUT, "revanced_enable_sleep_timer", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/amoled/patch/AmoledPatch.kt similarity index 95% rename from src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/amoled/patch/AmoledPatch.kt index c105c66eb..9bd33812b 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/amoled/patch/AmoledPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.amoled.patch +package app.revanced.patches.music.general.amoled.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name diff --git a/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/autocaptions/patch/DisableAutoCaptionsPatch.kt similarity index 87% rename from src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/autocaptions/patch/DisableAutoCaptionsPatch.kt index 315325f7f..565ccd45a 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/autocaptions/patch/DisableAutoCaptionsPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.autocaptions.patch +package app.revanced.patches.music.general.autocaptions.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -13,7 +13,7 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.patches.shared.fingerprints.captions.SubtitleTrackFingerprint import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_GENERAL import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -33,7 +33,7 @@ class DisableAutoCaptionsPatch : BytecodePatch( addInstructions( index, """ - invoke-static {v$register}, $MUSIC_LAYOUT->disableAutoCaptions(Z)Z + invoke-static {v$register}, $MUSIC_GENERAL->disableAutoCaptions(Z)Z move-result v$register """ ) @@ -41,7 +41,7 @@ class DisableAutoCaptionsPatch : BytecodePatch( } ?: throw SubtitleTrackFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_disable_auto_captions", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconMMTPatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconMMTPatch.kt index 692659431..e3ba6d2f4 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconMMTPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.branding.icon.patch +package app.revanced.patches.music.general.branding.icon.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt b/src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt similarity index 91% rename from src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt index 21b0b5651..de0a2553a 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.branding.icon.patch +package app.revanced.patches.music.general.branding.icon.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt similarity index 91% rename from src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt index 58231f703..28cd6eaac 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.branding.icon.patch +package app.revanced.patches.music.general.branding.icon.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/music/general/branding/name/patch/CustomBrandingNamePatch.kt similarity index 100% rename from src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/branding/name/patch/CustomBrandingNamePatch.kt diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/RemoveElementsPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/branding/name/patch/RemoveElementsPatch.kt similarity index 100% rename from src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/RemoveElementsPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/branding/name/patch/RemoveElementsPatch.kt diff --git a/src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/buttonshelf/patch/HideButtonShelfPatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/buttonshelf/patch/HideButtonShelfPatch.kt index 92be5a160..bbe67ede7 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/buttonshelf/patch/HideButtonShelfPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.buttonshelf.patch +package app.revanced.patches.music.general.buttonshelf.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name @@ -26,7 +26,7 @@ class HideButtonShelfPatch : BytecodePatch() { override fun execute(context: BytecodeContext) { SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_button_shelf", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/carouselshelf/patch/HideCarouselShelfPatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/carouselshelf/patch/HideCarouselShelfPatch.kt index 529f20029..632fcf94a 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/carouselshelf/patch/HideCarouselShelfPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.carouselshelf.patch +package app.revanced.patches.music.general.carouselshelf.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name @@ -26,7 +26,7 @@ class HideCarouselShelfPatch : BytecodePatch() { override fun execute(context: BytecodeContext) { SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_carousel_shelf", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/HideCastButtonFingerprint.kt similarity index 83% rename from src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/HideCastButtonFingerprint.kt index a781c24fb..8689338e8 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/HideCastButtonFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.castbutton.fingerprints +package app.revanced.patches.music.general.castbutton.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/HideCastButtonParentFingerprint.kt similarity index 83% rename from src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonParentFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/HideCastButtonParentFingerprint.kt index fb2c86383..82f562027 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/HideCastButtonParentFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.castbutton.fingerprints +package app.revanced.patches.music.general.castbutton.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/castbutton/patch/HideCastButtonPatch.kt similarity index 79% rename from src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/castbutton/patch/HideCastButtonPatch.kt index e60d8c40c..7361fcd12 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/castbutton/patch/HideCastButtonPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.castbutton.patch +package app.revanced.patches.music.general.castbutton.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -9,12 +9,12 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion. import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.castbutton.fingerprints.HideCastButtonFingerprint -import app.revanced.patches.music.layout.castbutton.fingerprints.HideCastButtonParentFingerprint +import app.revanced.patches.music.general.castbutton.fingerprints.HideCastButtonFingerprint +import app.revanced.patches.music.general.castbutton.fingerprints.HideCastButtonParentFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_GENERAL @Patch @Name("Hide cast button") @@ -34,14 +34,14 @@ class HideCastButtonPatch : BytecodePatch( ) }.result?.mutableMethod?.addInstructions( 0, """ - invoke-static {p1}, $MUSIC_LAYOUT->hideCastButton(I)I + invoke-static {p1}, $MUSIC_GENERAL->hideCastButton(I)I move-result p1 """ ) ?: throw HideCastButtonFingerprint.exception } ?: throw HideCastButtonParentFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_cast_button", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/fingerprints/ChipCloudFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/general/categorybar/fingerprints/ChipCloudFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/music/layout/categorybar/fingerprints/ChipCloudFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/general/categorybar/fingerprints/ChipCloudFingerprint.kt index 14bf7d90f..79af8de8d 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/fingerprints/ChipCloudFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/categorybar/fingerprints/ChipCloudFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.categorybar.fingerprints +package app.revanced.patches.music.general.categorybar.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.ChipCloud diff --git a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/categorybar/patch/CategoryBarPatch.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/categorybar/patch/CategoryBarPatch.kt index baa152c86..f0b6b1497 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/categorybar/patch/CategoryBarPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.categorybar.patch +package app.revanced.patches.music.general.categorybar.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -9,12 +9,12 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.categorybar.fingerprints.ChipCloudFingerprint +import app.revanced.patches.music.general.categorybar.fingerprints.ChipCloudFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_GENERAL import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -38,13 +38,13 @@ class CategoryBarPatch : BytecodePatch( addInstruction( targetIndex + 1, - "invoke-static { v$targetRegister }, $MUSIC_LAYOUT->hideCategoryBar(Landroid/view/View;)V" + "invoke-static { v$targetRegister }, $MUSIC_GENERAL->hideCategoryBar(Landroid/view/View;)V" ) } } ?: throw ChipCloudFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_category_bar", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/channelguidelines/patch/HideChannelGuidelinesPatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/channelguidelines/patch/HideChannelGuidelinesPatch.kt index 2701fea88..55eb39f66 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/channelguidelines/patch/HideChannelGuidelinesPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.carouselshelf.patch +package app.revanced.patches.music.general.channelguidelines.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name @@ -26,7 +26,7 @@ class HideChannelGuidelinesPatch : BytecodePatch() { override fun execute(context: BytecodeContext) { SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_channel_guidelines", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/customfilter/patch/CustomFilterPatch.kt similarity index 91% rename from src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/customfilter/patch/CustomFilterPatch.kt index 4a873d751..8ae59a819 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/customfilter/patch/CustomFilterPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.customfilter.patch +package app.revanced.patches.music.general.customfilter.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name @@ -26,12 +26,12 @@ class CustomFilterPatch : ResourcePatch { override fun execute(context: ResourceContext) { SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_custom_filter", "false" ) SettingsPatch.addMusicPreferenceWithIntent( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_custom_filter_strings", "revanced_custom_filter" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonFingerprint.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonFingerprint.kt index 14b11f3c1..8f2ae991a 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.floatingbutton.fingerprints +package app.revanced.patches.music.general.floatingbutton.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt index bd6beb59a..4c9f57a9a 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.floatingbutton.fingerprints +package app.revanced.patches.music.general.floatingbutton.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/floatingbutton/patch/NewPlaylistButtonPatch.kt similarity index 82% rename from src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/floatingbutton/patch/NewPlaylistButtonPatch.kt index d54d6e511..04cc2da65 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/floatingbutton/patch/NewPlaylistButtonPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.floatingbutton.patch +package app.revanced.patches.music.general.floatingbutton.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -11,13 +11,13 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.music.layout.floatingbutton.fingerprints.FloatingButtonFingerprint -import app.revanced.patches.music.layout.floatingbutton.fingerprints.FloatingButtonParentFingerprint +import app.revanced.patches.music.general.floatingbutton.fingerprints.FloatingButtonFingerprint +import app.revanced.patches.music.general.floatingbutton.fingerprints.FloatingButtonParentFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_GENERAL @Patch @Name("Hide new playlist button") @@ -44,7 +44,7 @@ class NewPlaylistButtonPatch : BytecodePatch( it.mutableMethod.apply { addInstructionsWithLabels( 1, """ - invoke-static {}, $MUSIC_LAYOUT->hideNewPlaylistButton()Z + invoke-static {}, $MUSIC_GENERAL->hideNewPlaylistButton()Z move-result v0 if-eqz v0, :show return-void @@ -55,7 +55,7 @@ class NewPlaylistButtonPatch : BytecodePatch( } ?: throw FloatingButtonParentFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_new_playlist_button", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/general/landscapemode/fingerprints/TabletIdentifierFingerprint.kt similarity index 91% rename from src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/general/landscapemode/fingerprints/TabletIdentifierFingerprint.kt index 93f28ff58..0a776abc8 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/landscapemode/fingerprints/TabletIdentifierFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.landscapemode.fingerprints +package app.revanced.patches.music.general.landscapemode.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt b/src/main/kotlin/app/revanced/patches/music/general/landscapemode/patch/LandScapeModePatch.kt similarity index 81% rename from src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/landscapemode/patch/LandScapeModePatch.kt index 72088dfcc..600677c65 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/landscapemode/patch/LandScapeModePatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.landscapemode.patch +package app.revanced.patches.music.general.landscapemode.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -8,12 +8,12 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.landscapemode.fingerprints.TabletIdentifierFingerprint +import app.revanced.patches.music.general.landscapemode.fingerprints.TabletIdentifierFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_GENERAL @Patch @Name("Enable landscape mode") @@ -32,14 +32,14 @@ class LandScapeModePatch : BytecodePatch( TabletIdentifierFingerprint.result?.let { it.mutableMethod.addInstructions( it.scanResult.patternScanResult!!.endIndex + 1, """ - invoke-static {p0}, $MUSIC_LAYOUT->enableLandScapeMode(Z)Z + invoke-static {p0}, $MUSIC_GENERAL->enableLandScapeMode(Z)Z move-result p0 """ ) } ?: throw TabletIdentifierFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_enable_landscape_mode", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/playlistcard/patch/HidePlaylistCardPatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt rename to src/main/kotlin/app/revanced/patches/music/general/playlistcard/patch/HidePlaylistCardPatch.kt index 6353639f8..6234219c1 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/playlistcard/patch/HidePlaylistCardPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.playlistcard.patch +package app.revanced.patches.music.general.playlistcard.patch import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name @@ -26,7 +26,7 @@ class HidePlaylistCardPatch : BytecodePatch() { override fun execute(context: BytecodeContext) { SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.GENERAL, "revanced_hide_playlist_card", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/fingerprints/TabLayoutTextFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/fingerprints/TabLayoutTextFingerprint.kt deleted file mode 100644 index 794b1bba6..000000000 --- a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/fingerprints/TabLayoutTextFingerprint.kt +++ /dev/null @@ -1,21 +0,0 @@ -package app.revanced.patches.music.layout.navigationlabel.fingerprints - -import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.Text1 -import app.revanced.util.bytecode.isWideLiteralExists -import com.android.tools.smali.dexlib2.AccessFlags -import com.android.tools.smali.dexlib2.Opcode - -object TabLayoutTextFingerprint : MethodFingerprint( - returnType = "V", - accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, - parameters = listOf("L"), - opcodes = listOf( - Opcode.CONST, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT - ), - customFingerprint = { methodDef, _ -> methodDef.isWideLiteralExists(Text1) } -) - diff --git a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/fingerprints/TabLayoutFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/navigation/black/fingerprints/TabLayoutFingerprint.kt similarity index 91% rename from src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/fingerprints/TabLayoutFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/navigation/black/fingerprints/TabLayoutFingerprint.kt index 6643590f6..e4598e8b2 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/fingerprints/TabLayoutFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/navigation/black/fingerprints/TabLayoutFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.blacknavbar.fingerprints +package app.revanced.patches.music.navigation.black.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/music/navigation/black/patch/BlackNavigationBarPatch.kt similarity index 84% rename from src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt rename to src/main/kotlin/app/revanced/patches/music/navigation/black/patch/BlackNavigationBarPatch.kt index d57f3439c..7a69ba66b 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/navigation/black/patch/BlackNavigationBarPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.blacknavigationbar.patch +package app.revanced.patches.music.navigation.black.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -9,12 +9,12 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.blacknavbar.fingerprints.TabLayoutFingerprint +import app.revanced.patches.music.navigation.black.fingerprints.TabLayoutFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_NAVIGATION import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -39,7 +39,7 @@ class BlackNavigationBarPatch : BytecodePatch( addInstructions( targetIndex + 1, """ - invoke-static {}, $MUSIC_LAYOUT->enableBlackNavigationBar()I + invoke-static {}, $MUSIC_NAVIGATION->enableBlackNavigationBar()I move-result v$targetRegister """ ) @@ -47,7 +47,7 @@ class BlackNavigationBarPatch : BytecodePatch( } ?: throw TabLayoutFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.NAVIGATION, "revanced_enable_black_navigation_bar", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt b/src/main/kotlin/app/revanced/patches/music/navigation/label/patch/NavigationLabelPatch.kt similarity index 88% rename from src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt rename to src/main/kotlin/app/revanced/patches/music/navigation/label/patch/NavigationLabelPatch.kt index a60ee9d20..abd3e111b 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/navigation/label/patch/NavigationLabelPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.navigationlabel.patch +package app.revanced.patches.music.navigation.label.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -10,15 +10,15 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.navigationlabel.fingerprints.TabLayoutTextFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility +import app.revanced.patches.music.utils.fingerprints.TabLayoutTextFingerprint import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.Text1 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch.Companion.contexts import app.revanced.util.bytecode.getWideLiteralIndex import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_NAVIGATION import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction @@ -47,7 +47,7 @@ class NavigationLabelPatch : BytecodePatch( addInstruction( targetIndex + 1, - "invoke-static {v$targetRegister}, $MUSIC_LAYOUT->hideNavigationLabel(Landroid/widget/TextView;)V" + "invoke-static {v$targetRegister}, $MUSIC_NAVIGATION->hideNavigationLabel(Landroid/widget/TextView;)V" ) } } ?: throw TabLayoutTextFingerprint.exception @@ -65,7 +65,7 @@ class NavigationLabelPatch : BytecodePatch( } SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.NAVIGATION, "revanced_hide_navigation_label", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt similarity index 88% rename from src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt index c628be410..0b27263a4 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.colormatchplayer.fingerprints +package app.revanced.patches.music.player.colormatchplayer.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/patch/ColorMatchPlayerPatch.kt similarity index 93% rename from src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt rename to src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/patch/ColorMatchPlayerPatch.kt index aec173aa8..b01b91536 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/patch/ColorMatchPlayerPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.colormatchplayer.patch +package app.revanced.patches.music.player.colormatchplayer.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -13,12 +13,12 @@ import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.music.layout.colormatchplayer.fingerprints.ColorMatchPlayerFingerprint +import app.revanced.patches.music.player.colormatchplayer.fingerprints.ColorMatchPlayerFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.fingerprints.ColorMatchPlayerParentFingerprint import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_PLAYER import com.android.tools.smali.dexlib2.iface.instruction.Instruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction @@ -49,7 +49,7 @@ class ColorMatchPlayerPatch : BytecodePatch( addInstructionsWithLabels( insertIndex, """ - invoke-static {}, $MUSIC_LAYOUT->enableColorMatchPlayer()Z + invoke-static {}, $MUSIC_PLAYER->enableColorMatchPlayer()Z move-result v2 if-eqz v2, :off iget v0, p0, ${descriptor(4)} @@ -74,7 +74,7 @@ class ColorMatchPlayerPatch : BytecodePatch( } ?: throw ColorMatchPlayerParentFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.PLAYER, "revanced_enable_color_match_player", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt index a290a1a49..a5c19c9eb 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.minimizedplayer.fingerprints +package app.revanced.patches.music.player.minimizedplayer.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/patch/MinimizedPlayerPatch.kt similarity index 84% rename from src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt rename to src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/patch/MinimizedPlayerPatch.kt index 4e34ce391..48544b41e 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/patch/MinimizedPlayerPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.minimizedplayer.patch +package app.revanced.patches.music.player.minimizedplayer.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -8,11 +8,11 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.minimizedplayer.fingerprints.MinimizedPlayerFingerprint +import app.revanced.patches.music.player.minimizedplayer.fingerprints.MinimizedPlayerFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_PLAYER import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -33,7 +33,7 @@ class MinimizedPlayerPatch : BytecodePatch( addInstructions( index, """ - invoke-static {v$register}, $MUSIC_LAYOUT->enableForceMinimizedPlayer(Z)Z + invoke-static {v$register}, $MUSIC_PLAYER->enableForceMinimizedPlayer(Z)Z move-result v$register """ ) @@ -41,7 +41,7 @@ class MinimizedPlayerPatch : BytecodePatch( } ?: throw MinimizedPlayerFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.PLAYER, "revanced_enable_force_minimized_player", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/fingerprints/NewLayoutFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/newlayout/fingerprints/NewLayoutFingerprint.kt similarity index 83% rename from src/main/kotlin/app/revanced/patches/music/layout/newlayout/fingerprints/NewLayoutFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/newlayout/fingerprints/NewLayoutFingerprint.kt index 3ace2555c..4076205fc 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/fingerprints/NewLayoutFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/newlayout/fingerprints/NewLayoutFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.newlayout.fingerprints +package app.revanced.patches.music.player.newlayout.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.util.bytecode.isWide32LiteralExists diff --git a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/music/player/newlayout/patch/NewLayoutPatch.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt rename to src/main/kotlin/app/revanced/patches/music/player/newlayout/patch/NewLayoutPatch.kt index 86f25120b..639d2804b 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/newlayout/patch/NewLayoutPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.newlayout.patch +package app.revanced.patches.music.player.newlayout.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -9,11 +9,11 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.newlayout.fingerprints.NewLayoutFingerprint +import app.revanced.patches.music.player.newlayout.fingerprints.NewLayoutFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_PLAYER import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @@ -33,7 +33,7 @@ class NewLayoutPatch : BytecodePatch( addInstructions( insertIndex, """ - invoke-static {}, $MUSIC_LAYOUT->enableNewLayout()Z + invoke-static {}, $MUSIC_PLAYER->enableNewLayout()Z move-result v$targetRegister """ ) @@ -41,7 +41,7 @@ class NewLayoutPatch : BytecodePatch( } ?: throw NewLayoutFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.PLAYER, "revanced_enable_new_layout", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt index 2491777c8..7bd4c1d54 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.oldstyleminiplayer.fingerprints +package app.revanced.patches.music.player.oldstyleminiplayer.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt similarity index 83% rename from src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt index 5ac3585c2..9b7198a2c 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.oldstyleminiplayer.fingerprints +package app.revanced.patches.music.player.oldstyleminiplayer.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.util.bytecode.isWide32LiteralExists diff --git a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt similarity index 86% rename from src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt rename to src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt index 544b643ee..52fb300ef 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.oldstyleminiplayer.patch +package app.revanced.patches.music.player.oldstyleminiplayer.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -10,18 +10,18 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion. import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.oldstyleminiplayer.fingerprints.NextButtonVisibilityFingerprint -import app.revanced.patches.music.layout.oldstyleminiplayer.fingerprints.SwipeToCloseFingerprint +import app.revanced.patches.music.player.oldstyleminiplayer.fingerprints.NextButtonVisibilityFingerprint +import app.revanced.patches.music.player.oldstyleminiplayer.fingerprints.SwipeToCloseFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.fingerprints.ColorMatchPlayerParentFingerprint import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_PLAYER import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction @Patch @Name("Enable old style miniplayer") -@Description("Return the miniplayers to old style. (for YT Music v5.55.53+)") +@Description("Return the miniplayers to old style.") @DependsOn([SettingsPatch::class]) @MusicCompatibility class OldStyleMiniPlayerPatch : BytecodePatch( @@ -46,7 +46,7 @@ class OldStyleMiniPlayerPatch : BytecodePatch( addInstructions( targetIndex + 1, """ - invoke-static {v$targetRegister}, $MUSIC_LAYOUT->enableOldStyleMiniPlayer(Z)Z + invoke-static {v$targetRegister}, $MUSIC_PLAYER->enableOldStyleMiniPlayer(Z)Z move-result v$targetRegister """ ) @@ -61,7 +61,7 @@ class OldStyleMiniPlayerPatch : BytecodePatch( addInstructions( insertIndex, """ - invoke-static {v$targetRegister}, $MUSIC_LAYOUT->enableOldStyleMiniPlayer(Z)Z + invoke-static {v$targetRegister}, $MUSIC_PLAYER->enableOldStyleMiniPlayer(Z)Z move-result v$targetRegister """ ) @@ -69,9 +69,9 @@ class OldStyleMiniPlayerPatch : BytecodePatch( } ?: throw SwipeToCloseFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.PLAYER, "revanced_enable_old_style_mini_player", - "false" + "true" ) } diff --git a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt similarity index 90% rename from src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt index ea9bc119e..535d29b82 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.misc.shuffle.fingerprints +package app.revanced.patches.music.player.shuffle.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassFingerprint.kt similarity index 93% rename from src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassFingerprint.kt index dd93cc6f8..231361176 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.misc.shuffle.fingerprints +package app.revanced.patches.music.player.shuffle.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt similarity index 90% rename from src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt index 29f96c6f2..ab6eb68e2 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.misc.shuffle.fingerprints +package app.revanced.patches.music.player.shuffle.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt b/src/main/kotlin/app/revanced/patches/music/player/shuffle/patch/EnforceShufflePatch.kt similarity index 95% rename from src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt rename to src/main/kotlin/app/revanced/patches/music/player/shuffle/patch/EnforceShufflePatch.kt index 72b4a532f..6fdabec2a 100644 --- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/shuffle/patch/EnforceShufflePatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.misc.shuffle.patch +package app.revanced.patches.music.player.shuffle.patch import app.revanced.extensions.exception import app.revanced.extensions.transformFields @@ -16,9 +16,9 @@ import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable import app.revanced.patcher.util.smali.toInstructions -import app.revanced.patches.music.misc.shuffle.fingerprints.MusicPlaybackControlsFingerprint -import app.revanced.patches.music.misc.shuffle.fingerprints.ShuffleClassFingerprint -import app.revanced.patches.music.misc.shuffle.fingerprints.ShuffleClassReferenceFingerprint +import app.revanced.patches.music.player.shuffle.fingerprints.MusicPlaybackControlsFingerprint +import app.revanced.patches.music.player.shuffle.fingerprints.ShuffleClassFingerprint +import app.revanced.patches.music.player.shuffle.fingerprints.ShuffleClassReferenceFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch @@ -162,7 +162,7 @@ class EnforceShufflePatch : BytecodePatch( } ?: throw MusicPlaybackControlsFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.MISC, + CategoryType.PLAYER, "revanced_enable_force_shuffle", "true" ) diff --git a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/fingerprints/ZenModeFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/player/zenmode/fingerprints/ZenModeFingerprint.kt similarity index 89% rename from src/main/kotlin/app/revanced/patches/music/layout/zenmode/fingerprints/ZenModeFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/player/zenmode/fingerprints/ZenModeFingerprint.kt index 257a04755..cc7de16a7 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/fingerprints/ZenModeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/zenmode/fingerprints/ZenModeFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.zenmode.fingerprints +package app.revanced.patches.music.player.zenmode.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt b/src/main/kotlin/app/revanced/patches/music/player/zenmode/patch/ZenModePatch.kt similarity index 92% rename from src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt rename to src/main/kotlin/app/revanced/patches/music/player/zenmode/patch/ZenModePatch.kt index 527fa9445..4cff94ee6 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/player/zenmode/patch/ZenModePatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.zenmode.patch +package app.revanced.patches.music.player.zenmode.patch import app.revanced.extensions.exception import app.revanced.patcher.annotation.Description @@ -11,12 +11,12 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion. import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.zenmode.fingerprints.ZenModeFingerprint +import app.revanced.patches.music.player.zenmode.fingerprints.ZenModeFingerprint import app.revanced.patches.music.utils.annotations.MusicCompatibility import app.revanced.patches.music.utils.fingerprints.ColorMatchPlayerParentFingerprint import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch import app.revanced.util.enum.CategoryType -import app.revanced.util.integrations.Constants.MUSIC_LAYOUT +import app.revanced.util.integrations.Constants.MUSIC_PLAYER import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction @@ -48,7 +48,7 @@ class ZenModePatch : BytecodePatch( addInstructionsWithLabels( insertIndex, """ - invoke-static {}, $MUSIC_LAYOUT->enableZenMode()Z + invoke-static {}, $MUSIC_PLAYER->enableZenMode()Z move-result v$dummyRegister if-eqz v$dummyRegister, :off const v$dummyRegister, -0xfcfcfd @@ -65,7 +65,7 @@ class ZenModePatch : BytecodePatch( } ?: throw ColorMatchPlayerParentFingerprint.exception SettingsPatch.addMusicPreference( - CategoryType.LAYOUT, + CategoryType.PLAYER, "revanced_enable_zen_mode", "false" ) diff --git a/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt index f9946c077..7dc6a79f7 100644 --- a/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt @@ -54,4 +54,4 @@ class LithoFilterPatch : BytecodePatch( private var filterCount = 0 } -} +} \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt index 7587a88ae..a4f07bf40 100644 --- a/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt @@ -12,14 +12,17 @@ import app.revanced.util.enum.CategoryType import app.revanced.util.resources.IconHelper import app.revanced.util.resources.IconHelper.copyFiles import app.revanced.util.resources.IconHelper.makeDirectoryAndCopyFiles +import app.revanced.util.resources.MusicResourceHelper.YOUTUBE_MUSIC_SETTINGS_KEY import app.revanced.util.resources.MusicResourceHelper.addMusicPreference import app.revanced.util.resources.MusicResourceHelper.addMusicPreferenceCategory import app.revanced.util.resources.MusicResourceHelper.addMusicPreferenceWithIntent +import app.revanced.util.resources.MusicResourceHelper.addMusicPreferenceWithoutSummary import app.revanced.util.resources.MusicResourceHelper.addReVancedMusicPreference import app.revanced.util.resources.MusicResourceHelper.sortMusicPreferenceCategory import app.revanced.util.resources.ResourceUtils import app.revanced.util.resources.ResourceUtils.copyResources import org.w3c.dom.Element +import java.io.Closeable import java.io.File import java.nio.file.Paths @@ -32,9 +35,8 @@ class SettingsPatch : AbstractSettingsResourcePatch( "music/settings", "music/settings/host", false -) { +), Closeable { override fun execute(context: ResourceContext) { - super.execute(context) contexts = context /** @@ -68,7 +70,7 @@ class SettingsPatch : AbstractSettingsResourcePatch( } } - context.addReVancedMusicPreference() + context.addReVancedMusicPreference(YOUTUBE_MUSIC_SETTINGS_KEY) /** * If a custom branding icon path exists, merge it @@ -100,6 +102,8 @@ class SettingsPatch : AbstractSettingsResourcePatch( .let(::copyResources) } + super.execute(context) + } companion object { @@ -113,19 +117,32 @@ class SettingsPatch : AbstractSettingsResourcePatch( val categoryValue = category.value contexts.addMusicPreferenceCategory(categoryValue) contexts.addMusicPreference(categoryValue, key, defaultValue) - contexts.sortMusicPreferenceCategory(categoryValue) + } + + internal fun addMusicPreferenceWithoutSummary( + category: CategoryType, + key: String, + defaultValue: String + ) { + val categoryValue = category.value + contexts.addMusicPreferenceCategory(categoryValue) + contexts.addMusicPreferenceWithoutSummary(categoryValue, key, defaultValue) } internal fun addMusicPreferenceWithIntent( category: CategoryType, key: String, dependencyKey: String - ) { val categoryValue = category.value contexts.addMusicPreferenceCategory(categoryValue) contexts.addMusicPreferenceWithIntent(categoryValue, key, dependencyKey) - contexts.sortMusicPreferenceCategory(categoryValue) + } + } + + override fun close() { + CategoryType.entries.sorted().forEach { + contexts.sortMusicPreferenceCategory(it.value) } } } diff --git a/src/main/kotlin/app/revanced/util/enum/CategoryType.kt b/src/main/kotlin/app/revanced/util/enum/CategoryType.kt index 70118c05c..03cae4632 100644 --- a/src/main/kotlin/app/revanced/util/enum/CategoryType.kt +++ b/src/main/kotlin/app/revanced/util/enum/CategoryType.kt @@ -1,7 +1,11 @@ package app.revanced.util.enum -internal enum class CategoryType(val value: String) { - ADS("ads"), - LAYOUT("layout"), - MISC("misc") +internal enum class CategoryType(val value: String, var added: Boolean) { + ADS("ads", false), + BUTTON_CONTAINER("button_container", false), + FLYOUT("flyout", false), + GENERAL("general", false), + MISC("misc", false), + NAVIGATION("navigation", false), + PLAYER("player", false) } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/util/integrations/Constants.kt b/src/main/kotlin/app/revanced/util/integrations/Constants.kt index 6dcf8cd08..0e39de890 100644 --- a/src/main/kotlin/app/revanced/util/integrations/Constants.kt +++ b/src/main/kotlin/app/revanced/util/integrations/Constants.kt @@ -6,7 +6,6 @@ internal object Constants { const val ADS_PATH = "$PATCHES_PATH/ads" const val SWIPE_PATH = "$PATCHES_PATH/swipe" - const val BOTTOM_PLAYER = "$PATCHES_PATH/layout/BottomPlayerPatch;" const val FLYOUT_PANEL = "$PATCHES_PATH/layout/FlyoutPanelPatch;" const val FULLSCREEN = "$PATCHES_PATH/layout/FullscreenPatch;" const val GENERAL = "$PATCHES_PATH/layout/GeneralPatch;" @@ -23,7 +22,11 @@ internal object Constants { private const val MUSIC_PATCHES_PATH = "$MUSIC_INTEGRATIONS_PATH/patches" const val MUSIC_ADS_PATH = "$MUSIC_PATCHES_PATH/ads" - const val MUSIC_LAYOUT = "$MUSIC_PATCHES_PATH/layout/LayoutPatch;" + const val MUSIC_BUTTON_CONTAINER = "$MUSIC_PATCHES_PATH/buttoncontainer/ButtonContainerPatch;" + const val MUSIC_FLYOUT = "$MUSIC_PATCHES_PATH/flyout/FlyoutPatch;" + const val MUSIC_GENERAL = "$MUSIC_PATCHES_PATH/general/GeneralPatch;" const val MUSIC_MISC_PATH = "$MUSIC_PATCHES_PATH/misc" + const val MUSIC_NAVIGATION = "$MUSIC_PATCHES_PATH/navigation/NavigationPatch;" + const val MUSIC_PLAYER = "$MUSIC_PATCHES_PATH/player/PlayerPatch;" const val MUSIC_UTILS_PATH = "$MUSIC_PATCHES_PATH/utils" } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt b/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt index 75d52000d..5c3dbef93 100644 --- a/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt +++ b/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt @@ -2,6 +2,7 @@ package app.revanced.util.resources import app.revanced.extensions.doRecursively import app.revanced.patcher.data.ResourceContext +import app.revanced.util.enum.CategoryType import org.w3c.dom.Element import org.w3c.dom.Node @@ -26,12 +27,12 @@ private fun Node.insertNode(tagName: String, targetNode: Node, block: Element.() internal object MusicResourceHelper { - private const val YOUTUBE_MUSIC_SETTINGS_PATH = "res/xml/settings_headers.xml" + internal const val YOUTUBE_MUSIC_SETTINGS_PATH = "res/xml/settings_headers.xml" - private const val YOUTUBE_MUSIC_SETTINGS_KEY = "revanced_extended_settings" + internal const val YOUTUBE_MUSIC_SETTINGS_KEY = "revanced_extended_settings" - private const val YOUTUBE_MUSIC_CATEGORY_TAG_NAME = - "com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat" + private const val YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME = + "PreferenceScreen" private const val YOUTUBE_MUSIC_PREFERENCE_TAG_NAME = "com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference" @@ -39,8 +40,6 @@ internal object MusicResourceHelper { private const val YOUTUBE_MUSIC_PREFERENCE_TARGET_CLASS = "com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" - private var currentMusicPreferenceCategory = emptyArray() - private var targetPackage = "com.google.android.apps.youtube.music" internal fun ResourceContext.setMicroG(newPackage: String) { @@ -49,7 +48,18 @@ internal object MusicResourceHelper { } private fun setMusicPreferenceCategory(newCategory: String) { - currentMusicPreferenceCategory += listOf(newCategory) + CategoryType.entries.forEach { preference -> + if (newCategory == preference.value) + preference.added = true + } + } + + private fun included(category: String): Boolean { + CategoryType.entries.forEach { preference -> + if (category == preference.value) + return preference.added + } + return false } internal fun ResourceContext.addMusicPreferenceCategory( @@ -60,8 +70,8 @@ internal object MusicResourceHelper { List(tags.length) { tags.item(it) as Element } .filter { it.getAttribute("android:key").contains(YOUTUBE_MUSIC_SETTINGS_KEY) } .forEach { - if (!currentMusicPreferenceCategory.contains(category)) { - it.adoptChild(YOUTUBE_MUSIC_CATEGORY_TAG_NAME) { + if (!included(category)) { + it.adoptChild(YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME) { setAttribute("android:title", "@string/revanced_category_$category") setAttribute("android:key", "revanced_settings_$category") } @@ -101,7 +111,7 @@ internal object MusicResourceHelper { defaultValue: String ) { this.xmlEditor[YOUTUBE_MUSIC_SETTINGS_PATH].use { editor -> - val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_CATEGORY_TAG_NAME) + val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME) List(tags.length) { tags.item(it) as Element } .filter { it.getAttribute("android:key").contains("revanced_settings_$category") } .forEach { @@ -121,7 +131,7 @@ internal object MusicResourceHelper { dependencyKey: String ) { this.xmlEditor[YOUTUBE_MUSIC_SETTINGS_PATH].use { editor -> - val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_CATEGORY_TAG_NAME) + val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME) List(tags.length) { tags.item(it) as Element } .filter { it.getAttribute("android:key").contains("revanced_settings_$category") } .forEach { @@ -143,7 +153,28 @@ internal object MusicResourceHelper { } } - internal fun ResourceContext.addReVancedMusicPreference() { + internal fun ResourceContext.addMusicPreferenceWithoutSummary( + category: String, + key: String, + defaultValue: String + ) { + this.xmlEditor[YOUTUBE_MUSIC_SETTINGS_PATH].use { editor -> + val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME) + List(tags.length) { tags.item(it) as Element } + .filter { it.getAttribute("android:key").contains("revanced_settings_$category") } + .forEach { + it.adoptChild(YOUTUBE_MUSIC_PREFERENCE_TAG_NAME) { + setAttribute("android:title", "@string/$key" + "_title") + setAttribute("android:key", key) + setAttribute("android:defaultValue", defaultValue) + } + } + } + } + + internal fun ResourceContext.addReVancedMusicPreference( + key: String + ) { this.xmlEditor[YOUTUBE_MUSIC_SETTINGS_PATH].use { editor -> with(editor.file) { doRecursively loop@{ @@ -156,9 +187,11 @@ internal object MusicResourceHelper { it.insertNode("PreferenceScreen", it) { setAttribute( "android:title", - "@string/" + YOUTUBE_MUSIC_SETTINGS_KEY + "_title" + "@string/" + key + "_title" ) - setAttribute("android:key", YOUTUBE_MUSIC_SETTINGS_KEY) + setAttribute("android:key", key) + setAttribute("app:allowDividerAbove", "false") + setAttribute("app:allowDividerAbove", "false") } it.getAttributeNode("app:allowDividerBelow").textContent = "true" return@loop diff --git a/src/main/resources/music/settings/host/values/strings.xml b/src/main/resources/music/settings/host/values/strings.xml index d0d4346e8..38bb351b3 100644 --- a/src/main/resources/music/settings/host/values/strings.xml +++ b/src/main/resources/music/settings/host/values/strings.xml @@ -1,8 +1,12 @@ Ads - Layout + Button Container + Flyout + General Miscellaneous + Navigation + Player Filter components by their name separated by a comma Edit custom filter Enables custom filters @@ -47,7 +51,7 @@ Hide cast button Hides the music category bar at the top of the homepage. Hide category bar - Hides channel guidelines at the top of comments + Hides channel guidelines at the top of comments. Hide channel guidelines Hides ads before playing a music. Hide music ads