refactor(music/settings): improve UI

ayushTNM · Sep 5, 2023 · 0553584 · 0553584
1 parent 02b54ca
commit 0553584
Show file tree

Hide file tree

Showing 51 changed files with 203 additions and 163 deletions.
diff --git a/...og/fingerprints/DialogSolidFingerprint.kt → ...og/fingerprints/DialogSolidFingerprint.kt b/...og/fingerprints/DialogSolidFingerprint.kt → ...og/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/...compactdialog/patch/CompactDialogPatch.kt → ...compactdialog/patch/CompactDialogPatch.kt b/...compactdialog/patch/CompactDialogPatch.kt → ...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,15 +39,15 @@ class CompactDialogPatch : BytecodePatch(
             ) {
                 addInstructions(
                     2, """
-                        invoke-static {p0}, $MUSIC_LAYOUT->enableCompactDialog(I)I
+                        invoke-static {p0}, $MUSIC_FLYOUT->enableCompactDialog(I)I
                         move-result p0
                         """
                 )
             }
         } ?: throw DialogSolidFingerprint.exception
 
         SettingsPatch.addMusicPreference(
-            CategoryType.LAYOUT,
+            CategoryType.FLYOUT,
             "revanced_enable_compact_dialog",
             "true"
         )

diff --git a/...mer/fingerprints/SleepTimerFingerprint.kt → ...mer/fingerprints/SleepTimerFingerprint.kt b/...mer/fingerprints/SleepTimerFingerprint.kt → ...mer/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/...ayout/sleeptimer/patch/SleepTimerPatch.kt → ...panel/sleeptimer/patch/SleepTimerPatch.kt b/...ayout/sleeptimer/patch/SleepTimerPatch.kt → ...panel/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,15 +33,15 @@ class SleepTimerPatch : BytecodePatch(
 
                 addInstructions(
                     insertIndex, """
-                        invoke-static {}, $MUSIC_LAYOUT->enableSleepTimer()Z
+                        invoke-static {}, $MUSIC_FLYOUT->enableSleepTimer()Z
                         move-result v$targetRegister
                         """
                 )
             }
         } ?: throw SleepTimerFingerprint.exception
 
         SettingsPatch.addMusicPreference(
-            CategoryType.LAYOUT,
+            CategoryType.FLYOUT,
             "revanced_enable_sleep_timer",
             "true"
         )

diff --git a/.../music/layout/amoled/patch/AmoledPatch.kt → ...music/general/amoled/patch/AmoledPatch.kt b/.../music/layout/amoled/patch/AmoledPatch.kt → ...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/...aptions/patch/DisableAutoCaptionsPatch.kt → ...aptions/patch/DisableAutoCaptionsPatch.kt b/...aptions/patch/DisableAutoCaptionsPatch.kt → ...aptions/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,15 +33,15 @@ 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
                         """
                 )
             }
         } ?: throw SubtitleTrackFingerprint.exception
 
         SettingsPatch.addMusicPreference(
-            CategoryType.LAYOUT,
+            CategoryType.GENERAL,
             "revanced_disable_auto_captions",
             "false"
         )

diff --git a/.../icon/patch/CustomBrandingIconMMTPatch.kt → .../icon/patch/CustomBrandingIconMMTPatch.kt b/.../icon/patch/CustomBrandingIconMMTPatch.kt → .../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/...h/CustomBrandingIconRevancifyBluePatch.kt → ...h/CustomBrandingIconRevancifyBluePatch.kt b/...h/CustomBrandingIconRevancifyBluePatch.kt → ...h/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/...ch/CustomBrandingIconRevancifyRedPatch.kt → ...ch/CustomBrandingIconRevancifyRedPatch.kt b/...ch/CustomBrandingIconRevancifyRedPatch.kt → ...ch/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/...ing/name/patch/CustomBrandingNamePatch.kt → ...ing/name/patch/CustomBrandingNamePatch.kt b/...ing/name/patch/CustomBrandingNamePatch.kt → ...ing/name/patch/CustomBrandingNamePatch.kt
diff --git a/...randing/name/patch/RemoveElementsPatch.kt → ...randing/name/patch/RemoveElementsPatch.kt b/...randing/name/patch/RemoveElementsPatch.kt → ...randing/name/patch/RemoveElementsPatch.kt
diff --git a/...buttonshelf/patch/HideButtonShelfPatch.kt → ...buttonshelf/patch/HideButtonShelfPatch.kt b/...buttonshelf/patch/HideButtonShelfPatch.kt → ...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/...uselshelf/patch/HideCarouselShelfPatch.kt → ...uselshelf/patch/HideCarouselShelfPatch.kt b/...uselshelf/patch/HideCarouselShelfPatch.kt → ...uselshelf/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/...fingerprints/HideCastButtonFingerprint.kt → ...fingerprints/HideCastButtonFingerprint.kt b/...fingerprints/HideCastButtonFingerprint.kt → ...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/...prints/HideCastButtonParentFingerprint.kt → ...prints/HideCastButtonParentFingerprint.kt b/...prints/HideCastButtonParentFingerprint.kt → ...prints/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/...t/castbutton/patch/HideCastButtonPatch.kt → ...l/castbutton/patch/HideCastButtonPatch.kt b/...t/castbutton/patch/HideCastButtonPatch.kt → ...l/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/...ybar/fingerprints/ChipCloudFingerprint.kt → ...ybar/fingerprints/ChipCloudFingerprint.kt b/...ybar/fingerprints/ChipCloudFingerprint.kt → ...ybar/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/...out/categorybar/patch/CategoryBarPatch.kt → ...ral/categorybar/patch/CategoryBarPatch.kt b/...out/categorybar/patch/CategoryBarPatch.kt → ...ral/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/...lines/patch/HideChannelGuidelinesPatch.kt → ...lines/patch/HideChannelGuidelinesPatch.kt b/...lines/patch/HideChannelGuidelinesPatch.kt → ...lines/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/...t/customfilter/patch/CustomFilterPatch.kt → ...l/customfilter/patch/CustomFilterPatch.kt b/...t/customfilter/patch/CustomFilterPatch.kt → ...l/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/...fingerprints/FloatingButtonFingerprint.kt → ...fingerprints/FloatingButtonFingerprint.kt b/...fingerprints/FloatingButtonFingerprint.kt → ...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/...prints/FloatingButtonParentFingerprint.kt → ...prints/FloatingButtonParentFingerprint.kt b/...prints/FloatingButtonParentFingerprint.kt → ...prints/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/...ingbutton/patch/NewPlaylistButtonPatch.kt → ...ingbutton/patch/NewPlaylistButtonPatch.kt b/...ingbutton/patch/NewPlaylistButtonPatch.kt → ...ingbutton/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/...ngerprints/TabletIdentifierFingerprint.kt → ...ngerprints/TabletIdentifierFingerprint.kt b/...ngerprints/TabletIdentifierFingerprint.kt → ...ngerprints/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