Merge pull request #67 from meowarex/dev

Upgrade Tidal Version + Native Blur <3

Manager/app/build.gradle.kts

@@ -228,3 +228,13 @@ fun ProviderFactory.execIgnoreCode(vararg command: String): String = try {
 } catch (_: Exception) {
     ""
 }
+
+// Sync Local Cached Assets with Repo Releases to keep them up to date
+val syncBundledManifest by tasks.registering(Copy::class) {
+    val src = rootProject.rootDir.resolve("../patches/manifest.json")
+    onlyIf { src.exists() }
+    from(src)
+    into(layout.projectDirectory.dir("src/main/assets"))
+    rename { "patches-manifest.json" }
+}
+tasks.named("preBuild") { dependsOn(syncBundledManifest) }

Manager/app/src/main/assets/patches-manifest.json

@@ -0,0 +1,347 @@
+{
+  "version": 1,
+  "patches": [
+    {
+      "id": "EnableLegacyUi",
+      "order": 10,
+      "fileNames": [
+        "enable-legacy-ui.patch"
+      ],
+      "title": "Enable Legacy UI",
+      "description": "[This patch will stop working soon] - Replaces the New Compose based UI with the Legacy UI (disables player-market-ui feature flag)",
+      "default": false,
+      "requires": [
+        "DebugMenuUnlock"
+      ],
+      "disables": [
+        "LyricsDisableCover",
+        "LyricsReplaceLyricsButton",
+        "LyricsReplaceShareButton",
+        "LyricsRlApi",
+        "LyricsKeepControlsVisible",
+        "PlayerBackdrop",
+        "QualityBadgeColors",
+        "PlayerMovePlayingFrom",
+        "PlayerOneHanded",
+        "LyricsProgressPill",
+        "MiniPlayerRedesign"
+      ]
+    },
+    {
+      "id": "LyricsRlApi",
+      "order": 20,
+      "fileNames": [
+        "lyrics-rl-api.patch",
+        "lyrics-rl-api-observer.patch"
+      ],
+      "title": "Radiant Lyrics API - WIP",
+      "description": "Use Radiant Lyrics API to fetch Lyrics (Higher quality & More providers)",
+      "default": false
+    },
+    {
+      "id": "PlayerBackdrop",
+      "order": 30,
+      "fileNames": [],
+      "title": "Player Backdrop",
+      "description": "Lets you fully adjust how the player backdrop blur looks and behaves",
+      "default": true,
+      "defaultVariantIndex": 2,
+      "variants": [
+        {
+          "title": "Static",
+          "fileNames": [
+            "player-backdrop-static.patch"
+          ]
+        },
+        {
+          "title": "Animated",
+          "fileNames": [
+            "player-backdrop-animated.patch"
+          ]
+        },
+        {
+          "title": "Playback",
+          "fileNames": [
+            "player-backdrop-playback.patch"
+          ]
+        }
+      ],
+      "advancedOptions": [
+        {
+          "type": "toggle",
+          "key": "cover_everywhere",
+          "title": "Cover Everywhere - WIP",
+          "description": "Applies TIDAL's player backdrop to every Compose based page (Home & Collection)",
+          "default": false,
+          "inline": true,
+          "fileNames": [
+            "home-backdrop.patch",
+            "collection-backdrop.patch",
+            "cover-capture.patch"
+          ]
+        }
+      ]
+    },
+    {
+      "id": "QualityBadgeColors",
+      "order": 36,
+      "fileNames": [
+        "player-quality-badge-colors.patch"
+      ],
+      "title": "Quality Badge Colors",
+      "description": "Brings color back to the player quality badge.",
+      "default": true
+    },
+    {
+      "id": "PlayerMovePlayingFrom",
+      "order": 37,
+      "fileNames": [
+        "player-move-playing-from.patch"
+      ],
+      "extensionFiles": [
+        "radiant/PlayingFrom.smali"
+      ],
+      "title": "Playing From",
+      "description": "Shows the source name (playlist/album/mix) above the track title",
+      "default": true
+    },
+    {
+      "id": "PlayerOneHanded",
+      "order": 38,
+      "fileNames": [
+        "player-one-handed.patch"
+      ],
+      "title": "One-Handed Mode",
+      "description": "Mirrors the bottom player buttons left-to-right for easier one-handed reach.",
+      "default": false
+    },
+    {
+      "id": "LyricsProgressPill",
+      "order": 40,
+      "fileNames": [
+        "lyrics-progress-pill.patch",
+        "lyrics-fade-region.patch"
+      ],
+      "title": "Lyrics Progress Pill",
+      "description": "Restores the old Track Progress Pill in the top of the Lyrics screen!",
+      "default": true,
+      "requires": [
+        "LyricsDisableCover",
+        "LyricsReplaceLyricsButton",
+        "LyricsReplaceShareButton"
+      ]
+    },
+    {
+      "id": "LyricsDisableCover",
+      "order": 41,
+      "fileNames": [
+        "lyrics-disable-cover.patch"
+      ],
+      "title": "Disable Lyrics Cover",
+      "description": "Removes the mini track cover from the lyrics screen.",
+      "default": true
+    },
+    {
+      "id": "LyricsReplaceLyricsButton",
+      "order": 42,
+      "fileNames": [
+        "lyrics-replace-lyrics-button.patch",
+        "lyrics-sparkle-conditional-visibility.patch"
+      ],
+      "title": "Replace Lyrics Button",
+      "description": "Replaces the Lyrics button with the RL Sparkle!",
+      "default": true
+    },
+    {
+      "id": "LyricsReplaceShareButton",
+      "order": 43,
+      "fileNames": [
+        "lyrics-replace-share-button.patch"
+      ],
+      "title": "Replace Share Button",
+      "description": "Replaces the share button with the Tidal Connect button from the top of the screen. (it's in the menu already)",
+      "default": true
+    },
+    {
+      "id": "MiniPlayerRedesign",
+      "order": 50,
+      "fileNames": [],
+      "title": "Redesigned Mini-Player",
+      "description": "Integrates the Seekbar into the control panel at the bottom of the screen.",
+      "default": false,
+      "defaultVariantIndex": 2,
+      "variants": [
+        {
+          "title": "Floating",
+          "fileNames": []
+        },
+        {
+          "title": "Grey",
+          "fileNames": [
+            "mini-player-grey.patch"
+          ]
+        },
+        {
+          "title": "Black",
+          "fileNames": [
+            "mini-player-black.patch"
+          ]
+        }
+      ],
+      "advancedOptions": [
+        {
+          "type": "toggle",
+          "key": "dynamic_bg",
+          "title": "Mini-Player Dynamic Background",
+          "description": "Colorizes the Mini-Player depending on the currently playing track.",
+          "default": false,
+          "inline": true,
+          "fileNames": [
+            "mini-player-dynamic-bg.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniPlayerBackground.smali"
+          ],
+          "hidesVariants": [
+            2
+          ],
+          "relabelVariants": {
+            "1": "Legacy"
+          }
+        },
+        {
+          "type": "toggle",
+          "key": "border",
+          "title": "Progress Border",
+          "description": "Draws an animated progress ring around the floating mini-player. Requires the Floating style.",
+          "default": false,
+          "requiresVariant": 0,
+          "fileNames": [
+            "mini-player-floating-border.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniSeekerFloating.smali"
+          ]
+        },
+        {
+          "type": "toggle",
+          "key": "gestures",
+          "title": "Mini-Player Gestures",
+          "description": "Adds swipe up gesture to the mini-player to reopen the player",
+          "default": true,
+          "fileNames": [
+            "mini-player-gestures.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniPlayerGestures.smali",
+            "radiant/MiniPlayerGestures$Gesture.smali",
+            "radiant/MiniPlayerGestures$FeedbackLayer.smali",
+            "radiant/MiniPlayerGestures$FeedbackResetAnimator.smali",
+            "radiant/MiniPlayerGestures$RootGesture.smali",
+            "radiant/MiniPlayerGestures$ApplyPending.smali"
+          ]
+        },
+        {
+          "type": "choice",
+          "key": "swipe_up_drag",
+          "title": "Swipe Up Style",
+          "entries": [
+            "Static",
+            "Drag"
+          ],
+          "values": [
+            "0x0",
+            "0x1"
+          ],
+          "defaultIndex": 1,
+          "requiresOption": "gestures",
+          "token": "RL_MINI_PLAYER_SWIPE_UP_DRAG"
+        },
+        {
+          "type": "toggle",
+          "key": "next_prev",
+          "title": "Next/Previous Gestures",
+          "description": "Swipe left or right on the mini-player to skip tracks.",
+          "default": false,
+          "requiresOption": "gestures",
+          "fileNames": [
+            "mini-player-gestures-left-right.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniPlayerTrackGestures.smali",
+            "radiant/MiniPlayerTrackGestures$Gesture.smali",
+            "radiant/MiniPlayerTrackGestures$OffsetLayer.smali",
+            "radiant/MiniPlayerTrackGestures$ResetAnimator.smali",
+            "radiant/MiniPlayerTrackGestures$TextDraw.smali",
+            "com/tidal/android/feature/appscaffold/ui/r$c.smali"
+          ]
+        }
+      ]
+    },
+    {
+      "id": "LyricsKeepControlsVisible",
+      "order": 60,
+      "fileNames": [
+        "lyrics-keep-controls-visible.patch"
+      ],
+      "extensionFiles": [
+        "radiant/LyricsReinitGuard.smali"
+      ],
+      "title": "Keep Controls Visible",
+      "description": "Inverts the auto-hide behavior on the lyrics screen, playback controls stay visible by default and only hide when you tap them off. Also stops the open lyrics view from randomly closing when the player re-fetches the same track.",
+      "default": true
+    },
+    {
+      "id": "WazeIntegration",
+      "order": 90,
+      "category": "integration",
+      "pathLocked": true,
+      "fileNames": [
+        "integration-waze-playback.patch"
+      ],
+      "extensionFiles": [
+        "radiant/WazeInitReceiver.smali",
+        "radiant/WazeServiceConnection.smali"
+      ],
+      "title": "Waze Integration",
+      "description": "Control TIDAL playback from the Waze app",
+      "default": true,
+      "advancedOptions": [
+        {
+          "type": "choice",
+          "key": "browse_root",
+          "title": "Media Menu",
+          "entries": [
+            "Auto Menu",
+            "Home",
+            "Recents"
+          ],
+          "values": [
+            "ROOT_AUTO",
+            "HOME_V2::home_page_v2_id",
+            "RECENTLY_PLAYED::home/pages/CONTINUE_LISTEN_TO/view-all"
+          ],
+          "defaultIndex": 0,
+          "token": "RL_WAZE_ROOT_ID"
+        },
+        {
+          "type": "color",
+          "key": "accent_color",
+          "title": "Accent Color",
+          "default": -16747037,
+          "token": "RL_WAZE_THEME_COLOR"
+        }
+      ]
+    },
+    {
+      "id": "DebugMenuUnlock",
+      "order": 100,
+      "fileNames": [
+        "debug-menu-unlock.patch"
+      ],
+      "title": "Unlock Debug Menu",
+      "description": "Reveals TIDAL's hidden Debug Menu in Settings. (Unlocks Feature Flags & the legacy Debug Options)",
+      "default": false
+    }
+  ]
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/manager/PathManager.kt

@@ -22,7 +22,8 @@ class PathManager(
 
     val patchingDownloadDir = patchingDir.resolve("downloads")
 
-    val cacheDownloadDir = context.cacheDir.resolve("downloads")
+    // Persistent Stash of assets for Offline Repatching
+    val cacheDownloadDir = patchingDir.resolve("downloads-cache")
 
     val customComponentsDir = patchingDir.resolve("custom")
 
@@ -34,11 +35,15 @@ class PathManager(
 
     val patchedApk = patchingWorkingDir.resolve("patched.apk")
 
+    // Persistent snapshot of the last successful release fetch (build info + patches asset URL)
+    val cachedReleaseInfo = patchingDir.resolve("release-info.json")
+
     fun clearCache() {
         val targets = arrayOf(
             patchingDownloadDir,
             patchingWorkingDir,
             cacheDownloadDir,
+            cachedReleaseInfo,
             context.cacheDir,
         )
         for (dir in targets) {
@@ -54,6 +59,16 @@ class PathManager(
         .resolve("patches")
         .resolve("$version.zip")
 
+    fun hasCachedTidalApk(version: Int, split: String = "base"): Boolean {
+        val rel = "tidal/$version/$split.apk"
+        return patchingDownloadDir.resolve(rel).exists() || cacheDownloadDir.resolve(rel).exists()
+    }
+
+    fun hasCachedSmaliPatches(version: SemVer): Boolean {
+        val rel = "patches/$version.zip"
+        return patchingDownloadDir.resolve(rel).exists() || cacheDownloadDir.resolve(rel).exists()
+    }
+
     fun customTidalApks() = customTidalApksDir.listFiles()?.asList() ?: emptyList()
 
     fun customSmaliPatches() = customPatchesDir.listFiles()?.asList() ?: emptyList()

Manager/app/src/main/kotlin/com/meowarex/rlmobile/manager/PreferencesManager.kt

@@ -12,6 +12,8 @@ class PreferencesManager(preferences: SharedPreferences) : BasePreferenceManager
     var devMode by booleanPreference("dev_mode", false)
     var installer by enumPreference<InstallerSetting>("installer", InstallerSetting.PackageInstaller)
     var keepPatchedApks by booleanPreference("keep_patched_apks", false)
+    // Dev: force-apply path-gated ("incompatible") patches even under a non-stock package name
+    var bypassIncompatible by booleanPreference("bypass_incompatible", false)
     var showPlayProtectWarning by booleanPreference("show_play_protect_warning", true)
     var autoUpdateCheck by booleanPreference("auto_update_check", true)
 

Manager/app/src/main/kotlin/com/meowarex/rlmobile/manager/ReleaseInfoCache.kt

@@ -0,0 +1,32 @@
+package com.meowarex.rlmobile.manager
+
+import android.util.Log
+import com.meowarex.rlmobile.BuildConfig
+import com.meowarex.rlmobile.network.models.RLBuildInfo
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+
+// Snapshot of the last successful release fetch (build info + patches asset URL)
+@Serializable
+data class CachedReleaseInfo(
+    val data: RLBuildInfo,
+    val patchesAssetUrl: String,
+)
+
+object ReleaseInfoCache {
+    fun load(paths: PathManager, json: Json): CachedReleaseInfo? = try {
+        paths.cachedReleaseInfo
+            .takeIf { it.exists() }
+            ?.let { json.decodeFromString<CachedReleaseInfo>(it.readText()) }
+    } catch (t: Throwable) {
+        Log.w(BuildConfig.TAG, "Failed to read cached release info", t)
+        null
+    }
+
+    fun save(paths: PathManager, json: Json, info: CachedReleaseInfo) = try {
+        paths.cachedReleaseInfo.parentFile?.mkdirs()
+        paths.cachedReleaseInfo.writeText(json.encodeToString(info))
+    } catch (t: Throwable) {
+        Log.w(BuildConfig.TAG, "Failed to cache release info", t)
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/patcher/steps/patch/PatchManifestStep.kt

@@ -26,11 +26,16 @@ class PatchManifestStep(private val options: PatchOptions) : Step() {
             ?: throw IllegalArgumentException("No manifest found in APK")
 
         container.log("Patching manifest")
+        val wazeDefault = container.getStep<SmaliPatchStep>().specs
+            .firstOrNull { it.id == "WazeIntegration" }?.defaultEnabled ?: false
+        val enableWazeIntegration = options.patchStates["WazeIntegration"] ?: wazeDefault
+
         val patchedManifest = ManifestPatcher.patchManifest(
             manifestBytes = manifest,
             packageName = options.packageName,
             appName = options.appName,
             debuggable = options.debuggable,
+            enableWazeIntegration = enableWazeIntegration,
         )
 
         container.log("Repacking apk with patched manifest")

Manager/app/src/main/kotlin/com/meowarex/rlmobile/patcher/steps/patch/SmaliPatchStep.kt

@@ -1,5 +1,6 @@
 package com.meowarex.rlmobile.patcher.steps.patch
 
+import android.content.Context
 import com.meowarex.rlmobile.R
 import com.meowarex.rlmobile.manager.PathManager
 import com.meowarex.rlmobile.patcher.StepRunner
@@ -8,7 +9,10 @@ import com.meowarex.rlmobile.patcher.steps.base.IDexProvider
 import com.meowarex.rlmobile.patcher.steps.base.Step
 import com.meowarex.rlmobile.patcher.steps.download.CopyDependenciesStep
 import com.meowarex.rlmobile.patcher.steps.download.DownloadPatchesStep
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchManifest
 import com.meowarex.rlmobile.ui.screens.patchopts.PatchOptions
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchSpec
+import com.meowarex.rlmobile.ui.screens.patchopts.builtinPatchSpecs
 import com.android.tools.smali.baksmali.Baksmali
 import com.android.tools.smali.baksmali.BaksmaliOptions
 import com.android.tools.smali.dexlib2.Opcodes
@@ -19,6 +23,7 @@ import com.github.diamondminer88.zip.ZipReader
 import com.github.difflib.DiffUtils
 import com.github.difflib.UnifiedDiffUtils
 import com.github.difflib.patch.Patch
+import kotlinx.serialization.json.Json
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.*
@@ -27,6 +32,11 @@ class SmaliPatchStep(
     private val options: PatchOptions,
 ) : Step(), IDexProvider, KoinComponent {
     private val paths: PathManager by inject()
+    private val json: Json by inject()
+    private val context: Context by inject()
+
+    var specs: List<PatchSpec> = emptyList()
+        private set
 
     override val group = StepGroup.Patch
     override val localizedName = R.string.patch_step_patch_smali
@@ -42,6 +52,29 @@ class SmaliPatchStep(
         val patches = mutableListOf<LoadedPatch>()
         val localsBumps = mutableMapOf<Pair<String, String>, Int>()
 
+        // The patch list/options metadata lives in the zip's manifest.json
+        val manifestSpecs = try {
+            ZipReader(patchesZip).use { it.openEntry("manifest.json")?.read() }
+                ?.let { json.decodeFromString(PatchManifest.serializer(), it.decodeToString()).patches }
+                ?.takeIf { it.isNotEmpty() }
+        } catch (t: Throwable) {
+            container.log("Failed to parse manifest.json (${t.message}); using built-in patch specs")
+            null
+        }
+        specs = manifestSpecs ?: builtinPatchSpecs(context, json)
+        container.log(
+            "Loaded ${specs.size} patch specs from " +
+                if (manifestSpecs != null) "manifest.json" else "built-in list"
+        )
+
+        val disabledFiles = options.disabledPatchFiles(specs)
+        val knownExtensionFiles = options.knownExtensionFiles(specs)
+        val enabledExtensionFiles = options.enabledExtensionFiles(specs)
+        val substitutions = options.smaliSubstitutions(specs)
+        if (substitutions.isNotEmpty()) {
+            container.log("Patch option substitutions: ${substitutions.entries.joinToString { "${it.key}=${it.value}" }}")
+        }
+
         // Load and parse all the patches from the smali archive.
         container.log("Loading patches from smali patch archive: ${patchesZip.absolutePath}")
         smaliDir.mkdirs()
@@ -53,6 +86,11 @@ class SmaliPatchStep(
 
                 if (patchFile.endsWith(".smali") && patchFile.startsWith("extension/")) {
                     val relative = patchFile.removePrefix("extension/")
+                    // Only bundle helper smali patch/variant/sub-option is enabled
+                    if (relative in knownExtensionFiles && relative !in enabledExtensionFiles) {
+                        container.log("Skipping disabled extension smali: $relative")
+                        continue
+                    }
                     val out = smaliDir.resolve(relative)
                     // Guard against zip-slip: a crafted entry could otherwise escape smaliDir.
                     val baseCanonical = smaliDir.canonicalPath + File.separator
@@ -63,7 +101,19 @@ class SmaliPatchStep(
                     val entry = zip.openEntry(patchFile)
                         ?: throw FileNotFoundException("Missing zip entry: $patchFile")
                     out.canonicalFile.parentFile?.mkdirs()
-                    out.writeBytes(entry.read())
+                    var smaliText = entry.read()
+                        .decodeToString()
+                        .replace("\r\n", "\n")
+                    for ((token, value) in substitutions) {
+                        if (smaliText.contains(token)) {
+                            smaliText = smaliText.replace(token, value)
+                            container.log("Applied substitution $token -> $value in $patchFile")
+                        }
+                    }
+                    UNRESOLVED_TOKEN.find(smaliText)?.let { match ->
+                        throw Error("Unresolved option placeholder ${match.value} in $patchFile")
+                    }
+                    out.writeText(smaliText)
                     container.log("Extracted extension smali: $relative")
                     continue
                 }
@@ -71,16 +121,39 @@ class SmaliPatchStep(
                 if (!patchFile.endsWith(".patch")) continue
 
                 val basename = patchFile.substringAfterLast('/')
-                if (basename in options.disabledPatches) {
+                if (basename in disabledFiles) {
                     container.log("Skipping disabled patch $patchFile")
                     continue
                 }
 
-                val lines = zip.openEntry(patchFile)!!.read()
+                var patchText = zip.openEntry(patchFile)!!.read()
                     .decodeToString()
                     .replace("\r\n", "\n") // Replace CRLF endings with LF
                     .trimEnd { it == '\n' } // Remove trailing new lines
-                    .split('\n')
+
+                // Bake advanced option values into the patch
+                for ((token, value) in substitutions) {
+                    if (patchText.contains(token)) {
+                        patchText = patchText.replace(token, value)
+                        container.log("Applied substitution $token -> $value in $patchFile")
+                    }
+                }
+
+                // Fail fast
+                UNRESOLVED_TOKEN.find(patchText)?.let { match ->
+                    throw Error("Unresolved option placeholder ${match.value} in $patchFile")
+                }
+
+                // Skip a patch that references a helper class which won't be bundled
+                val missingHelper = (knownExtensionFiles - enabledExtensionFiles).firstOrNull { rel ->
+                    patchText.contains("L${rel.removeSuffix(".smali")};")
+                }
+                if (missingHelper != null) {
+                    container.log("Skipping $patchFile: references gated-off helper class $missingHelper")
+                    continue
+                }
+
+                val lines = patchText.split('\n')
 
                 try {
                     for (directive in lines) {
@@ -320,6 +393,7 @@ class SmaliPatchStep(
 
     private companion object {
         val LOCALS_DIRECTIVE = Regex("""^#\s*rl-locals:\s+(\S+)\s+(\S+)\s+(\d+)\s*$""")
+        val UNRESOLVED_TOKEN = Regex("""__RL_[A-Z0-9_]+__""")
     }
 
     /**

Manager/app/src/main/kotlin/com/meowarex/rlmobile/patcher/steps/prepare/FetchInfoStep.kt

@@ -1,19 +1,30 @@
 package com.meowarex.rlmobile.patcher.steps.prepare
 
+import android.app.Application
+import android.util.Log
 import androidx.compose.runtime.Stable
 import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.manager.CachedReleaseInfo
+import com.meowarex.rlmobile.manager.PathManager
+import com.meowarex.rlmobile.manager.ReleaseInfoCache
 import com.meowarex.rlmobile.network.models.RLBuildInfo
 import com.meowarex.rlmobile.network.services.RadiantLyricsGithubService
 import com.meowarex.rlmobile.network.utils.getOrThrow
 import com.meowarex.rlmobile.patcher.StepRunner
 import com.meowarex.rlmobile.patcher.steps.StepGroup
 import com.meowarex.rlmobile.patcher.steps.base.Step
+import com.meowarex.rlmobile.util.isOnline
+import kotlinx.serialization.json.Json
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
+import kotlin.coroutines.cancellation.CancellationException
 
 @Stable
 class FetchInfoStep : Step(), KoinComponent {
     private val github: RadiantLyricsGithubService by inject()
+    private val context: Application by inject()
+    private val paths: PathManager by inject()
+    private val json: Json by inject()
 
     override val group = StepGroup.Prepare
     override val localizedName = R.string.patch_step_fetch_info
@@ -25,6 +36,33 @@ class FetchInfoStep : Step(), KoinComponent {
         private set
 
     override suspend fun execute(container: StepRunner) {
+        // Fetch the latest release and refresh the cache (when online)
+        if (context.isOnline()) {
+            try {
+                fetchFromRemote(container)
+                return
+            } catch (e: CancellationException) {
+                throw e
+            } catch (t: Throwable) {
+                container.log("Failed to fetch latest release: ${Log.getStackTraceString(t)}")
+                container.log("Falling back to cached release info for a local re-patch")
+            }
+        } else {
+            container.log("No network connection — using cached release info for a local re-patch")
+        }
+
+        val cached = ReleaseInfoCache.load(paths, json)
+            ?: throw IllegalStateException(
+                "Could not fetch the latest release and no cached release info is available. " +
+                    "Connect to the internet and try again."
+            )
+        data = cached.data
+        patchesAssetUrl = cached.patchesAssetUrl
+        container.log("Using cached build info: $data")
+        container.log("Cached patches asset URL: $patchesAssetUrl")
+    }
+
+    private suspend fun fetchFromRemote(container: StepRunner) {
         container.log("Fetching latest release from ${RadiantLyricsGithubService.REPO_OWNER}/${RadiantLyricsGithubService.REPO_NAME}")
         val release = github.getLatestRelease(force = true).getOrThrow()
 
@@ -33,14 +71,19 @@ class FetchInfoStep : Step(), KoinComponent {
             ?.browserDownloadUrl
             ?: throw IllegalStateException("No ${RadiantLyricsGithubService.DATA_JSON_ASSET_NAME} asset found in latest release ${release.tagName}")
 
-        patchesAssetUrl = release.assets
+        val patchesUrl = release.assets
             .find { it.name == RadiantLyricsGithubService.PATCHES_ASSET_NAME }
             ?.browserDownloadUrl
             ?: throw IllegalStateException("No ${RadiantLyricsGithubService.PATCHES_ASSET_NAME} asset found in latest release ${release.tagName}")
 
         container.log("Fetching build info from $dataJsonUrl")
-        data = github.getBuildInfo(dataJsonUrl, force = true).getOrThrow()
+        val buildInfo = github.getBuildInfo(dataJsonUrl, force = true).getOrThrow()
+
+        data = buildInfo
+        patchesAssetUrl = patchesUrl
         container.log("Fetched build info: $data")
         container.log("Patches asset URL: $patchesAssetUrl")
+
+        ReleaseInfoCache.save(paths, json, CachedReleaseInfo(buildInfo, patchesUrl))
     }
 }

Manager/app/src/main/kotlin/com/meowarex/rlmobile/patcher/util/ManifestPatcher.kt

@@ -18,12 +18,16 @@ object ManifestPatcher {
     private const val IS_SPLIT_REQUIRED = "isSplitRequired"
     private const val REQUIRED_SPLIT_TYPES = "requiredSplitTypes"
     private const val SPLIT_TYPES = "splitTypes"
+    private const val WAZE_PACKAGE = "com.waze"
+    private const val WAZE_INIT_RECEIVER = "radiant.WazeInitReceiver"
+    private const val WAZE_ACTION_INIT = "com.waze.sdk.audio.ACTION_INIT"
 
     fun patchManifest(
         manifestBytes: ByteArray,
         packageName: String,
         appName: String,
         debuggable: Boolean,
+        enableWazeIntegration: Boolean,
     ): ByteArray {
         // Extract original package name to rewrite every reference to it
         // (permissions, provider authorities) to the new packageName.
@@ -84,6 +88,49 @@ object ManifestPatcher {
                         }
 
                         return when (name) {
+                            "queries" -> object : NodeVisitor(nv) {
+                                private var hasWazePackage = false
+
+                                override fun child(ns: String?, name: String): NodeVisitor {
+                                    val visitor = super.child(ns, name)
+
+                                    return if (enableWazeIntegration && name == "package") {
+                                        object : NodeVisitor(visitor) {
+                                            override fun attr(
+                                                ns: String?,
+                                                name: String?,
+                                                resourceId: Int,
+                                                type: Int,
+                                                value: Any?,
+                                            ) {
+                                                if (name == "name" && value == WAZE_PACKAGE) {
+                                                    hasWazePackage = true
+                                                }
+                                                super.attr(ns, name, resourceId, type, value)
+                                            }
+                                        }
+                                    } else {
+                                        visitor
+                                    }
+                                }
+
+                                override fun end() {
+                                    if (enableWazeIntegration && !hasWazePackage) {
+                                        super.child(null, "package").apply {
+                                            attr(
+                                                ANDROID_NAMESPACE,
+                                                "name",
+                                                android.R.attr.name,
+                                                TYPE_STRING,
+                                                WAZE_PACKAGE,
+                                            )
+                                            end()
+                                        }
+                                    }
+                                    super.end()
+                                }
+                            }
+
                             "uses-permission" -> object : NodeVisitor(nv) {
                                 override fun attr(ns: String?, name: String?, resourceId: Int, type: Int, value: Any?) {
                                     if (name != "maxSdkVersion") {
@@ -132,6 +179,7 @@ object ManifestPatcher {
                                 private var addUseEmbeddedDex = true
                                 private var addExtractNativeLibs = true
                                 private var addMetadata = true
+                                private var hasWazeInitReceiver = false
 
                                 override fun attr(ns: String?, name: String, resourceId: Int, type: Int, value: Any?) {
                                     if (name == REQUEST_LEGACY_EXTERNAL_STORAGE) addLegacyStorage = false
@@ -161,6 +209,22 @@ object ManifestPatcher {
 
                                     return when (name) {
                                         "activity" -> ReplaceAttrsVisitor(visitor, mapOf("label" to appName))
+
+                                        "receiver" -> object : NodeVisitor(visitor) {
+                                            override fun attr(
+                                                ns: String?,
+                                                name: String,
+                                                resourceId: Int,
+                                                type: Int,
+                                                value: Any?
+                                            ) {
+                                                if (name == "name" && value == WAZE_INIT_RECEIVER) {
+                                                    hasWazeInitReceiver = true
+                                                }
+                                                super.attr(ns, name, resourceId, type, value)
+                                            }
+                                        }
+
                                         "provider" -> object : NodeVisitor(visitor) {
                                             override fun attr(
                                                 ns: String?,
@@ -219,6 +283,39 @@ object ManifestPatcher {
                                         0
                                     )
 
+                                    if (enableWazeIntegration && !hasWazeInitReceiver) {
+                                        super.child(null, "receiver").apply {
+                                            attr(
+                                                ANDROID_NAMESPACE,
+                                                "name",
+                                                android.R.attr.name,
+                                                TYPE_STRING,
+                                                WAZE_INIT_RECEIVER,
+                                            )
+                                            attr(
+                                                ANDROID_NAMESPACE,
+                                                "exported",
+                                                android.R.attr.exported,
+                                                TYPE_INT_BOOLEAN,
+                                                1,
+                                            )
+                                            child(null, "intent-filter").apply {
+                                                child(null, "action").apply {
+                                                    attr(
+                                                        ANDROID_NAMESPACE,
+                                                        "name",
+                                                        android.R.attr.name,
+                                                        TYPE_STRING,
+                                                        WAZE_ACTION_INIT,
+                                                    )
+                                                    end()
+                                                }
+                                                end()
+                                            }
+                                            end()
+                                        }
+                                    }
+
                                     super.end()
                                 }
                             }

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/previews/screens/PatchOptionsScreenPreview.kt

@@ -2,11 +2,14 @@ package com.meowarex.rlmobile.ui.previews.screens
 
 import android.content.res.Configuration
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.*
 import com.meowarex.rlmobile.network.utils.SemVer
 import com.meowarex.rlmobile.ui.screens.componentopts.PatchComponent
 import com.meowarex.rlmobile.ui.screens.patchopts.*
 import com.meowarex.rlmobile.ui.theme.ManagerTheme
+import kotlinx.serialization.json.Json
 import kotlin.time.Clock
 
 // This preview has scrollable/interactable content that cannot be tested from an IDE preview
@@ -18,28 +21,37 @@ private fun PatchOptionsScreenPreview(
     @PreviewParameter(PatchOptionsParametersProvider::class)
     parameters: PatchOptionsParameters,
 ) {
+    val context = LocalContext.current
+    val specs = remember { builtinPatchSpecs(context, Json { ignoreUnknownKeys = true }) }
+
     ManagerTheme {
         PatchOptionsScreenContent(
             isUpdate = parameters.isUpdate,
             isDevMode = parameters.isDevMode,
             debuggable = parameters.debuggable,
             setDebuggable = {},
+            bypassIncompatible = false,
+            setBypassIncompatible = {},
             appName = parameters.appName,
             appNameIsError = parameters.appNameIsError,
             setAppName = {},
             packageName = parameters.packageName,
             packageNameState = parameters.packageNameState,
             setPackageName = {},
+            packageNameLocked = parameters.packageName == PatchOptions.Default.packageName,
+            onUnlockPackageName = {},
+            onLockPackageName = {},
             customTidalApk = parameters.customTidalApk,
             onSelectCustomTidalApk = {},
             customPatches = parameters.customPatches,
             onSelectCustomPatches = {},
-            enabledPatchCount = KnownPatch.All.size,
+            specs = specs,
             isPatchEnabled = { true },
             onTogglePatch = { _, _ -> },
             patchLockState = { PatchLock.Free },
             variantIndex = { 0 },
             onSelectVariant = { _, _ -> },
+            optionState = PatchOptionState.Preview,
             isConfigValid = parameters.isConfigValid,
             onInstall = {},
         )

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/home/HomeModel.kt

@@ -19,7 +19,9 @@ import cafe.adriel.voyager.core.model.screenModelScope
 import com.github.diamondminer88.zip.ZipReader
 import com.meowarex.rlmobile.BuildConfig
 import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.manager.PathManager
 import com.meowarex.rlmobile.manager.PreferencesManager
+import com.meowarex.rlmobile.manager.ReleaseInfoCache
 import com.meowarex.rlmobile.network.models.GithubCommit
 import com.meowarex.rlmobile.network.models.RLBuildInfo
 import com.meowarex.rlmobile.network.services.RadiantLyricsGithubService
@@ -42,6 +44,7 @@ class HomeModel(
     private val github: RadiantLyricsGithubService,
     private val json: Json,
     private val prefs: PreferencesManager,
+    private val paths: PathManager,
 ) : ScreenModel {
 
     var state by mutableStateOf<HomeState>(HomeState.Loading)
@@ -170,16 +173,23 @@ class HomeModel(
 
         refreshingLock.withLock {
             val pkg = fetchInstalled()
-            val remote = async(Dispatchers.IO) { if (remoteDataJson == null) fetchRemoteData() }
-            remote.await()
+            // Skip the remote fetch entirely when offline
+            val online = application.isOnline()
+            if (online) {
+                val remote = async(Dispatchers.IO) { if (remoteDataJson == null) fetchRemoteData() }
+                remote.await()
+            }
 
             val install = pkg?.toInstallData()
             val latest = remoteDataJson?.tidalVersionCode
+            val offlineRepatchReady = hasOfflineRepatchAssets()
 
             mainThread {
                 state = HomeState.Loaded(
                     install = install,
                     latestTidalVersionCode = latest,
+                    offline = !online,
+                    offlineRepatchReady = offlineRepatchReady,
                 )
                 maybeCheckManagerUpdate(pkg)
             }
@@ -257,6 +267,13 @@ class HomeModel(
         )
     }
 
+    // check if an offline "Local Repatch" is possible
+    private fun hasOfflineRepatchAssets(): Boolean {
+        val info = ReleaseInfoCache.load(paths, json) ?: return false
+        return paths.hasCachedTidalApk(info.data.tidalVersionCode) &&
+            paths.hasCachedSmaliPatches(info.data.patchesVersion)
+    }
+
     private suspend fun fetchRemoteData() {
         val release = try {
             github.getLatestRelease().fold(

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/home/HomeScreen.kt

@@ -210,14 +210,19 @@ private fun ColumnScope.HomeContent(
     }
 
     val blockedByManagerUpdate = managerUpdateAvailable && (patchesBehind || tidalBehind)
+    val canLocalRepatch = install != null && state.offlineRepatchReady
+    val onlineEnabled = state.latestTidalVersionCode != null || install != null
+    val buttonEnabled = !blockedByManagerUpdate && (if (state.offline) canLocalRepatch else onlineEnabled)
     Button(
         onClick = if (install == null) onInstall else onRepatch,
-        enabled = state.latestTidalVersionCode != null && !blockedByManagerUpdate,
+        enabled = buttonEnabled,
         modifier = Modifier.fillMaxWidth(),
     ) {
         val label = when {
             blockedByManagerUpdate -> "Manager Update Required"
-            state.latestTidalVersionCode == null -> "Loading…"
+            state.offline && install != null -> "Local Repatch"
+            state.offline -> "No Network"
+            install == null && state.latestTidalVersionCode == null -> "Loading…"
             install == null -> "Install"
             patchesBehind && tidalBehind -> "Update Patches & TIDAL"
             patchesBehind -> "Update Patches"
@@ -234,6 +239,18 @@ private fun ColumnScope.HomeContent(
         )
     }
 
+    if (state.offline && install != null) {
+        Text(
+            text = "No Network Connection",
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 6.dp),
+        )
+    }
+
     AnimatedVisibility(visible = install != null) {
         Row(
             horizontalArrangement = Arrangement.spacedBy(2.dp),

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/home/HomeState.kt

@@ -8,5 +8,7 @@ sealed interface HomeState {
     data class Loaded(
         val install: InstallData?,
         val latestTidalVersionCode: Int?,
+        val offline: Boolean = false,
+        val offlineRepatchReady: Boolean = false,
     ) : HomeState
 }

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/KnownPatch.kt

@@ -1,150 +0,0 @@
-package com.meowarex.rlmobile.ui.screens.patchopts
-
-import androidx.annotation.StringRes
-import com.meowarex.rlmobile.R
-
-data class PatchVariant(
-    @StringRes val titleRes: Int,
-    val fileNames: List<String>,
-)
-
-enum class KnownPatch(
-    /**
-     * Numeric display order in the patch options list. Lower = higher up.
-     *
-     * Convention: main patches use multiples of 10 (10, 20, 30, …). Patches
-     * that act as helpers/dependencies of a main patch get offsets adjacent to
-     * the requirer (e.g. main at 40, helpers at 41, 42, 43). DebugMenuUnlock
-     * is pinned to 100 to keep it at the bottom of the list.
-     */
-    val order: Int,
-    val fileNames: List<String>,
-    @StringRes val titleRes: Int,
-    @StringRes val descRes: Int,
-    val requires: List<KnownPatch> = emptyList(),
-    val disables: List<KnownPatch> = emptyList(),
-    val variants: List<PatchVariant> = emptyList(),
-    val defaultVariantIndex: Int = 0,
-) {
-    // Dependency-first order (later refs need backward resolution).
-    // The `order` field controls display order; declaration order doesn't matter.
-    LyricsDisableCover(
-        order = 41,
-        fileNames = listOf("lyrics-disable-cover.patch"),
-        titleRes = R.string.patch_lyrics_disable_cover_title,
-        descRes = R.string.patch_lyrics_disable_cover_desc,
-    ),
-    LyricsReplaceLyricsButton(
-        order = 42,
-        fileNames = listOf(
-            "lyrics-replace-lyrics-button.patch",
-            "lyrics-sparkle-conditional-visibility.patch",
-        ),
-        titleRes = R.string.patch_lyrics_replace_button_title,
-        descRes = R.string.patch_lyrics_replace_button_desc,
-    ),
-    LyricsReplaceShareButton(
-        order = 43,
-        fileNames = listOf("lyrics-replace-share-button.patch"),
-        titleRes = R.string.patch_lyrics_replace_share_button_title,
-        descRes = R.string.patch_lyrics_replace_share_button_desc,
-    ),
-    LyricsRlApi(
-        order = 20,
-        fileNames = listOf(
-            "lyrics-rl-api.patch",
-            "lyrics-rl-api-observer.patch",
-        ),
-        titleRes = R.string.patch_lyrics_rl_api_title,
-        descRes = R.string.patch_lyrics_rl_api_desc,
-    ),
-    LyricsKeepControlsVisible(
-        order = 60,
-        fileNames = listOf("lyrics-keep-controls-visible.patch"),
-        titleRes = R.string.patch_lyrics_keep_controls_title,
-        descRes = R.string.patch_lyrics_keep_controls_desc,
-    ),
-    PlayerBackdrop(
-        order = 30,
-        fileNames = listOf("player-backdrop.patch"),
-        titleRes = R.string.patch_player_backdrop_title,
-        descRes = R.string.patch_player_backdrop_desc,
-    ),
-    CoverEverywhere(
-        order = 35,
-        fileNames = listOf(
-            "home-backdrop.patch",
-            "collection-backdrop.patch",
-            "cover-capture.patch",
-        ),
-        titleRes = R.string.patch_cover_everywhere_title,
-        descRes = R.string.patch_cover_everywhere_desc,
-    ),
-    DebugMenuUnlock(
-        order = 100,
-        fileNames = listOf("debug-menu-unlock.patch"),
-        titleRes = R.string.patch_debug_menu_unlock_title,
-        descRes = R.string.patch_debug_menu_unlock_desc,
-    ),
-    LyricsProgressPill(
-        order = 40,
-        fileNames = listOf(
-            "lyrics-progress-pill.patch",
-            "lyrics-fade-region.patch",
-        ),
-        titleRes = R.string.patch_lyrics_progress_pill_title,
-        descRes = R.string.patch_lyrics_progress_pill_desc,
-        requires = listOf(LyricsDisableCover, LyricsReplaceLyricsButton, LyricsReplaceShareButton),
-    ),
-    MiniPlayerRedesign(
-        order = 50,
-        fileNames = emptyList(),
-        titleRes = R.string.patch_mini_player_redesign_title,
-        descRes = R.string.patch_mini_player_redesign_desc,
-        defaultVariantIndex = 2,
-        variants = listOf(
-            PatchVariant(
-                titleRes = R.string.patch_mini_player_variant_floating_title,
-                fileNames = listOf("mini-player-floating.patch"),
-            ),
-            PatchVariant(
-                titleRes = R.string.patch_mini_player_variant_square_grey_title,
-                fileNames = listOf("mini-player-grey.patch"),
-            ),
-            PatchVariant(
-                titleRes = R.string.patch_mini_player_variant_square_black_title,
-                fileNames = listOf("mini-player-black.patch"),
-            ),
-        ),
-    ),
-    EnableLegacyUi(
-        order = 10,
-        fileNames = listOf("enable-legacy-ui.patch"),
-        titleRes = R.string.patch_enable_legacy_ui_title,
-        descRes = R.string.patch_enable_legacy_ui_desc,
-        requires = listOf(DebugMenuUnlock),
-        disables = listOf(
-            LyricsDisableCover,
-            LyricsReplaceLyricsButton,
-            LyricsReplaceShareButton,
-            LyricsRlApi,
-            LyricsKeepControlsVisible,
-            PlayerBackdrop,
-            LyricsProgressPill,
-            CoverEverywhere,
-        ),
-    );
-
-    val allVariantFileNames: Set<String>
-        get() = variants.flatMapTo(mutableSetOf()) { it.fileNames }
-
-    companion object {
-        /**
-         * Sorted by `order` ascending. Tie-breaks fall back to the first filename
-         * (alphabetical) so the order is always deterministic.
-         */
-        val All: List<KnownPatch> = entries.sortedWith(
-            compareBy({ it.order }, { it.fileNames.firstOrNull() ?: it.name })
-        )
-    }
-}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/PatchOptions.kt

@@ -32,27 +32,126 @@ data class PatchOptions(
      */
     val customPatches: PatchComponent? = null,
 
-    val disabledPatches: Set<String> = emptySet(),
+    val patchStates: Map<String, Boolean> = emptyMap(),
 
     val selectedVariants: Map<String, Int> = emptyMap(),
+    val optionFloats: Map<String, Float> = emptyMap(),
+    val optionBools: Map<String, Boolean> = emptyMap(),
+    val optionInts: Map<String, Int> = emptyMap(),
 ) : Parcelable {
-    companion object {
-        val Default: PatchOptions = run {
-            val miniPlayerFiles = KnownPatch.MiniPlayerRedesign.allVariantFileNames
-            val disabled = (
-                KnownPatch.DebugMenuUnlock.fileNames +
-                KnownPatch.EnableLegacyUi.fileNames +
-                miniPlayerFiles
-            ).toSet()
 
-            PatchOptions(
-                appName = "TIDAL",
-                packageName = "com.aspiro.tidal",
-                debuggable = false,
-                customTidalApk = null,
-                customPatches = null,
-                disabledPatches = disabled,
-            )
+    fun isEnabled(spec: PatchSpec): Boolean =
+        patchStates[spec.id] ?: spec.defaultEnabled
+
+    fun variantIndex(spec: PatchSpec): Int {
+        val stored = (selectedVariants[spec.id] ?: spec.defaultVariantIndex)
+            .coerceIn(0, spec.variants.lastIndex.coerceAtLeast(0))
+        return spec.resolveVariantIndex(stored) { isToggleOn(spec, it) }
+    }
+
+    fun sliderValue(spec: PatchSpec, option: OptionSpec.Slider): Float =
+        (optionFloats["${spec.id}/${option.key}"] ?: option.default).coerceIn(option.min, option.max)
+
+    fun choiceIndex(spec: PatchSpec, option: OptionSpec.Choice): Int =
+        (optionInts["${spec.id}/${option.key}"] ?: option.defaultIndex)
+            .coerceIn(0, option.entries.lastIndex.coerceAtLeast(0))
+
+    fun colorValue(spec: PatchSpec, option: OptionSpec.Color): Int =
+        optionInts["${spec.id}/${option.key}"] ?: option.default
+
+    fun isToggleOn(spec: PatchSpec, option: OptionSpec.Toggle): Boolean =
+        optionBools["${spec.id}/${option.key}"] ?: option.default
+
+    fun isToggleActive(spec: PatchSpec, option: OptionSpec.Toggle): Boolean {
+        if (!isToggleOn(spec, option)) return false
+        option.requiresVariant?.let { if (variantIndex(spec) != it) return false }
+        option.requiresOption?.let { key ->
+            val required = spec.advancedOptions.filterIsInstance<OptionSpec.Toggle>()
+                .firstOrNull { it.key == key }
+            if (required != null && !isToggleOn(spec, required)) return false
+        }
+        return true
+    }
+
+    fun disabledPatchFiles(specs: List<PatchSpec>): Set<String> = buildSet {
+        for (spec in specs) {
+            val enabled = isEnabled(spec)
+            if (spec.variants.isEmpty()) {
+                if (!enabled) addAll(spec.fileNames)
+            } else {
+                val selected = variantIndex(spec)
+                spec.variants.forEachIndexed { index, variant ->
+                    if (!enabled || index != selected) addAll(variant.fileNames)
+                }
+            }
+            // Toggle sub-options that gate patch files.
+            for (option in spec.advancedOptions) {
+                if (option is OptionSpec.Toggle && option.fileNames.isNotEmpty()) {
+                    if (!enabled || !isToggleActive(spec, option)) addAll(option.fileNames)
+                }
+            }
         }
     }
+
+    fun knownExtensionFiles(specs: List<PatchSpec>): Set<String> = buildSet {
+        for (spec in specs) {
+            addAll(spec.extensionFiles)
+            spec.variants.forEach { addAll(it.extensionFiles) }
+            spec.advancedOptions.forEach { if (it is OptionSpec.Toggle) addAll(it.extensionFiles) }
+        }
+    }
+
+    fun enabledExtensionFiles(specs: List<PatchSpec>): Set<String> = buildSet {
+        for (spec in specs) {
+            if (!isEnabled(spec)) continue
+            addAll(spec.extensionFiles)
+            if (spec.variants.isNotEmpty()) {
+                spec.variants.getOrNull(variantIndex(spec))?.let { addAll(it.extensionFiles) }
+            }
+            for (option in spec.advancedOptions) {
+                if (option is OptionSpec.Toggle && isToggleActive(spec, option)) addAll(option.extensionFiles)
+            }
+        }
+    }
+
+    fun smaliSubstitutions(specs: List<PatchSpec>): Map<String, String> = buildMap {
+        for (spec in specs) {
+            if (!isEnabled(spec)) continue
+            for (option in spec.advancedOptions) {
+                when (option) {
+                    is OptionSpec.Toggle -> {
+                        val token = option.token ?: continue
+                        put("__${token}__", if (isToggleActive(spec, option)) "0x1" else "0x0")
+                    }
+                    is OptionSpec.Slider -> {
+                        val token = option.token ?: continue
+                        val encode = option.encode ?: continue
+                        put("__${token}__", encode.encode(sliderValue(spec, option)))
+                    }
+                    is OptionSpec.Choice -> {
+                        val token = option.token ?: continue
+                        val gatedOff = option.requiresOption?.let { key ->
+                            spec.advancedOptions.filterIsInstance<OptionSpec.Toggle>()
+                                .firstOrNull { it.key == key }
+                                ?.let { !isToggleOn(spec, it) }
+                        } ?: false
+                        val index = if (gatedOff) 0 else choiceIndex(spec, option)
+                        put("__${token}__", option.values.getOrNull(index) ?: continue)
+                    }
+                    is OptionSpec.Color -> {
+                        val token = option.token ?: continue
+                        put("__${token}__", colorValue(spec, option).toString())
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        val Default: PatchOptions = PatchOptions(
+            appName = "TIDAL",
+            packageName = "com.aspiro.tidal",
+            debuggable = false,
+        )
+    }
 }

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/PatchOptionsModel.kt

@@ -2,21 +2,35 @@ package com.meowarex.rlmobile.ui.screens.patchopts
 
 import android.content.Context
 import android.content.pm.PackageManager.NameNotFoundException
+import android.util.Log
 import androidx.compose.runtime.*
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import cafe.adriel.voyager.navigator.Navigator
+import com.github.diamondminer88.zip.ZipReader
+import com.meowarex.rlmobile.BuildConfig
+import com.meowarex.rlmobile.manager.PathManager
 import com.meowarex.rlmobile.manager.PreferencesManager
 import com.meowarex.rlmobile.ui.screens.componentopts.ComponentOptionsScreen
 import com.meowarex.rlmobile.ui.screens.componentopts.PatchComponent
 import com.meowarex.rlmobile.ui.util.pushForResult
 import com.meowarex.rlmobile.util.*
+import com.meowarex.rlmobile.manager.download.IDownloadManager
+import com.meowarex.rlmobile.manager.download.KtorDownloadManager
+import com.meowarex.rlmobile.network.services.RadiantLyricsGithubService
+import com.meowarex.rlmobile.network.utils.getOrThrow
 import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
+import java.io.File
 
 class PatchOptionsModel(
     prefilledOptions: PatchOptions,
     private val context: Context,
     private val prefs: PreferencesManager,
+    private val paths: PathManager,
+    private val json: Json,
+    private val github: RadiantLyricsGithubService,
+    private val downloader: KtorDownloadManager,
 ) : ScreenModel {
     var packageName by mutableStateOf(prefilledOptions.packageName)
         private set
@@ -29,6 +43,24 @@ class PatchOptionsModel(
         fetchPkgNameStateDebounced()
     }
 
+    /** Patches flagged [PatchSpec.pathLocked] only work under the stock package name. */
+    fun isBlockedByPackageName(spec: PatchSpec): Boolean =
+        spec.pathLocked && packageName != PatchOptions.Default.packageName && !bypassIncompatible
+
+    /** The package-name field starts locked & editing requires confirming the unlock dialog */
+    var packageNameLocked by mutableStateOf(prefilledOptions.packageName == PatchOptions.Default.packageName)
+        private set
+
+    fun unlockPackageName() {
+        packageNameLocked = false
+    }
+
+    /** Re-locking snaps the package name back to the stock default */
+    fun lockPackageName() {
+        packageNameLocked = true
+        changePackageName(PatchOptions.Default.packageName)
+    }
+
     var appName by mutableStateOf(prefilledOptions.appName)
         private set
 
@@ -47,93 +79,172 @@ class PatchOptionsModel(
         debuggable = value
     }
 
-    var disabledPatches by mutableStateOf(prefilledOptions.disabledPatches)
+    /** Dev override: force-allow path-gated ("incompatible") patches under a non-stock package name. */
+    var bypassIncompatible by mutableStateOf(prefs.bypassIncompatible)
+        private set
+
+    fun changeBypassIncompatible(value: Boolean) {
+        bypassIncompatible = value
+        prefs.bypassIncompatible = value
+        validatePatchSelection()
+    }
+
+    // The accordion renders from [specs]. It defaults to the compiled-in (localized) list and is
+    // rebuilt from a custom zip's manifest.json whenever a custom patch set is selected. (Rminder for others about the new custom patch selection flow)
+
+    private val builtinSpecs: List<PatchSpec> = builtinPatchSpecs(context, json)
+
+    var specs by mutableStateOf(builtinSpecs)
+        private set
+
+    var specsLoading by mutableStateOf(false)
+        private set
+
+    var patchStates by mutableStateOf(prefilledOptions.patchStates)
         private set
 
     var selectedVariants by mutableStateOf(prefilledOptions.selectedVariants)
         private set
 
-    fun variantIndex(patch: KnownPatch): Int = selectedVariants[patch.name]
-        ?.coerceIn(0, patch.variants.lastIndex.coerceAtLeast(0))
-        ?: patch.defaultVariantIndex.coerceIn(0, patch.variants.lastIndex.coerceAtLeast(0))
+    fun variantIndex(spec: PatchSpec): Int =
+        (selectedVariants[spec.id] ?: spec.defaultVariantIndex)
+            .coerceIn(0, spec.variants.lastIndex.coerceAtLeast(0))
 
-    fun isPatchEnabled(patch: KnownPatch): Boolean = if (patch.variants.isNotEmpty()) {
-        val v = patch.variants[variantIndex(patch)]
-        v.fileNames.isNotEmpty() && v.fileNames.none { it in disabledPatches }
-    } else {
-        patch.fileNames.isNotEmpty() && patch.fileNames.none { it in disabledPatches }
-    }
+    fun isPatchEnabled(spec: PatchSpec): Boolean =
+        !isBlockedByPackageName(spec) && (patchStates[spec.id] ?: spec.defaultEnabled)
 
-    fun setPatchEnabled(patch: KnownPatch, enabled: Boolean) {
-        if (patch.variants.isNotEmpty()) {
-            val all = patch.allVariantFileNames
-            val selected = patch.variants[variantIndex(patch)].fileNames.toSet()
-            disabledPatches = if (enabled) {
-                (disabledPatches + all) - selected
-            } else {
-                disabledPatches + all
-            }
-            return
-        }
-
-        fun closure(seed: KnownPatch, step: (KnownPatch) -> List<KnownPatch>): Set<KnownPatch> =
+    fun setPatchEnabled(spec: PatchSpec, enabled: Boolean) {
+        val byId = specs.associateBy { it.id }
+        fun closure(seed: PatchSpec, step: (PatchSpec) -> List<PatchSpec>): Set<PatchSpec> =
             buildSet {
-                fun walk(p: KnownPatch) { if (add(p)) step(p).forEach(::walk) }
+                fun walk(p: PatchSpec) { if (add(p)) step(p).forEach(::walk) }
                 walk(seed)
             }
 
-        val enableUnits: Set<KnownPatch>
-        val disableUnits: Set<KnownPatch>
+        val requiresOf = { p: PatchSpec -> p.requires.mapNotNull(byId::get) }
+        val dependentsOf = { p: PatchSpec -> specs.filter { p.id in it.requires } }
+
+        val enableUnits: Set<PatchSpec>
+        val disableUnits: Set<PatchSpec>
         if (enabled) {
-            enableUnits = closure(patch) { it.requires }
+            enableUnits = closure(spec, requiresOf)
             disableUnits = enableUnits.flatMap { it.disables }
-                .flatMapTo(mutableSetOf()) { d ->
-                    closure(d) { dep -> KnownPatch.All.filter { dep in it.requires } }
-                }
+                .mapNotNull(byId::get)
+                .flatMapTo(mutableSetOf()) { d -> closure(d, dependentsOf) }
         } else {
             enableUnits = emptySet()
-            disableUnits = closure(patch) { p -> KnownPatch.All.filter { p in it.requires } }
+            disableUnits = closure(spec, dependentsOf)
         }
 
-        val enableFiles = enableUnits.flatMap { it.fileNames }.toSet()
-        val disableFiles = disableUnits.flatMap { it.fileNames }.toSet()
-        disabledPatches = (disabledPatches - enableFiles) + disableFiles
+        patchStates = patchStates.toMutableMap().apply {
+            enableUnits.forEach { this[it.id] = true }
+            disableUnits.forEach { this[it.id] = false }
+        }
     }
 
-    fun selectVariant(patch: KnownPatch, index: Int) {
-        if (patch.variants.isEmpty() || index !in patch.variants.indices) return
-        val wasOn = isPatchEnabled(patch)
-        selectedVariants = selectedVariants + (patch.name to index)
-        if (wasOn) setPatchEnabled(patch, true)
+    fun selectVariant(spec: PatchSpec, index: Int) {
+        if (spec.variants.isEmpty() || index !in spec.variants.indices) return
+        selectedVariants = selectedVariants + (spec.id to index)
     }
 
-    fun lockState(patch: KnownPatch): PatchLock {
-        if (patch.variants.isNotEmpty()) return PatchLock.Free
+    // Advanced (per-patch) options
+    // Values are seeded from the prefilled config, edited here, and written back out in
+    // generateConfig(). At patch time PatchOptions.smaliSubstitutions() turns slider values into
+    // the literals baked into the matching `.patch` files (see SmaliPatchStep). ()
 
-        fun closure(seed: KnownPatch, step: (KnownPatch) -> List<KnownPatch>): Set<KnownPatch> =
+    private var optionBools by mutableStateOf(prefilledOptions.optionBools)
+    private var optionFloats by mutableStateOf(prefilledOptions.optionFloats)
+    private var optionInts by mutableStateOf(prefilledOptions.optionInts)
+
+    private fun keyOf(spec: PatchSpec, option: OptionSpec): String = "${spec.id}/${option.key}"
+
+    fun toggleValue(spec: PatchSpec, option: OptionSpec.Toggle): Boolean =
+        optionBools[keyOf(spec, option)] ?: option.default
+
+    fun setToggleValue(spec: PatchSpec, option: OptionSpec.Toggle, value: Boolean) {
+        optionBools = optionBools + (keyOf(spec, option) to value)
+    }
+
+    fun sliderValue(spec: PatchSpec, option: OptionSpec.Slider): Float =
+        (optionFloats[keyOf(spec, option)] ?: option.default).coerceIn(option.min, option.max)
+
+    fun setSliderValue(spec: PatchSpec, option: OptionSpec.Slider, value: Float) {
+        optionFloats = optionFloats + (keyOf(spec, option) to value)
+    }
+
+    fun choiceValue(spec: PatchSpec, option: OptionSpec.Choice): Int =
+        (optionInts[keyOf(spec, option)] ?: option.defaultIndex)
+            .coerceIn(0, option.entries.lastIndex.coerceAtLeast(0))
+
+    fun setChoiceValue(spec: PatchSpec, option: OptionSpec.Choice, index: Int) {
+        if (index !in option.entries.indices) return
+        optionInts = optionInts + (keyOf(spec, option) to index)
+    }
+
+    fun colorValue(spec: PatchSpec, option: OptionSpec.Color): Int =
+        optionInts[keyOf(spec, option)] ?: option.default
+
+    fun setColorValue(spec: PatchSpec, option: OptionSpec.Color, value: Int) {
+        optionInts = optionInts + (keyOf(spec, option) to value)
+    }
+
+    fun isAdvancedModified(spec: PatchSpec): Boolean = spec.advancedOptions.any { option ->
+        when (option) {
+            is OptionSpec.Toggle -> toggleValue(spec, option) != option.default
+            is OptionSpec.Slider -> sliderValue(spec, option) != option.default
+            is OptionSpec.Choice -> choiceValue(spec, option) != option.defaultIndex
+            is OptionSpec.Color -> colorValue(spec, option) != option.default
+        }
+    }
+
+    fun resetAdvanced(spec: PatchSpec) {
+        val prefix = "${spec.id}/"
+        optionBools = optionBools.filterKeys { !it.startsWith(prefix) }
+        optionFloats = optionFloats.filterKeys { !it.startsWith(prefix) }
+        optionInts = optionInts.filterKeys { !it.startsWith(prefix) }
+    }
+
+    val optionState: PatchOptionState = PatchOptionState(
+        toggle = ::toggleValue,
+        setToggle = ::setToggleValue,
+        slider = ::sliderValue,
+        setSlider = ::setSliderValue,
+        choice = ::choiceValue,
+        setChoice = ::setChoiceValue,
+        color = ::colorValue,
+        setColor = ::setColorValue,
+        isModified = ::isAdvancedModified,
+        reset = ::resetAdvanced,
+    )
+
+    fun lockState(spec: PatchSpec): PatchLock {
+        if (isBlockedByPackageName(spec)) return PatchLock.RequiresDefaultPackage
+        if (spec.variants.isNotEmpty()) return PatchLock.Free
+
+        val byId = specs.associateBy { it.id }
+        fun closure(seed: PatchSpec, step: (PatchSpec) -> List<PatchSpec>): Set<PatchSpec> =
             buildSet {
-                fun walk(p: KnownPatch) { if (add(p)) step(p).forEach(::walk) }
+                fun walk(p: PatchSpec) { if (add(p)) step(p).forEach(::walk) }
                 walk(seed)
             }
 
-        for (other in KnownPatch.All) {
-            if (other == patch || !isPatchEnabled(other)) continue
+        val requiresOf = { p: PatchSpec -> p.requires.mapNotNull(byId::get) }
+        val dependentsOf = { p: PatchSpec -> specs.filter { p.id in it.requires } }
 
-            val requiresClosure = closure(other) { it.requires }
-            if (patch in requiresClosure - other) return PatchLock.LockedOn(other)
+        for (other in specs) {
+            if (other.id == spec.id || !isPatchEnabled(other)) continue
+
+            val requiresClosure = closure(other, requiresOf)
+            if (spec in requiresClosure - other) return PatchLock.LockedOn(other)
 
             val disablesClosure = requiresClosure.flatMap { it.disables }
-                .flatMapTo(mutableSetOf()) { d ->
-                    closure(d) { dep -> KnownPatch.All.filter { dep in it.requires } }
-                }
-            if (patch in disablesClosure) return PatchLock.LockedOff(other)
+                .mapNotNull(byId::get)
+                .flatMapTo(mutableSetOf()) { d -> closure(d, dependentsOf) }
+            if (spec in disablesClosure) return PatchLock.LockedOff(other)
         }
         return PatchLock.Free
     }
 
-    val enabledPatchCount: Int
-        get() = KnownPatch.All.count { isPatchEnabled(it) }
-
     var customTidalApk by mutableStateOf<PatchComponent?>(null)
         private set
     var customPatches by mutableStateOf<PatchComponent?>(null)
@@ -155,6 +266,89 @@ class PatchOptionsModel(
                 componentType = PatchComponent.Type.Patches,
             )
         )
+        reloadSpecs(customPatches)
+    }
+
+    /**
+     * Rebuilds [specs] from the selected patch set
+     */
+    private fun reloadSpecs(component: PatchComponent?) = screenModelScope.launchIO {
+        mainThread { specsLoading = true }
+        val loaded = if (component == null) builtinSpecs else loadManifestSpecs(component) ?: builtinSpecs
+        mainThread {
+            specs = loaded
+            validatePatchSelection()
+            specsLoading = false
+        }
+    }
+
+    private fun loadManifestSpecs(component: PatchComponent): List<PatchSpec>? =
+        loadManifestSpecs(component.getFile(paths))
+
+    private fun loadManifestSpecs(file: File): List<PatchSpec>? {
+        if (!file.exists()) return null
+        return try {
+            val bytes = ZipReader(file).use { it.openEntry(MANIFEST_NAME)?.read() } ?: return null
+            json.decodeFromString(PatchManifest.serializer(), bytes.decodeToString())
+                .patches
+                .sortedBy { it.order }   // manifest is authoritative for UI order (not KnownPatch)
+                .takeIf { it.isNotEmpty() }
+        } catch (t: Throwable) {
+            Log.w(BuildConfig.TAG, "Failed to parse $MANIFEST_NAME; using built-in list", t)
+            null
+        }
+    }
+
+    /**
+     * Pulls the patch list from the latest GitHub release's patches.zip manifest
+     */
+    private suspend fun loadLatestReleaseSpecs(): List<PatchSpec>? = try {
+        val release = github.getLatestRelease().getOrThrow()
+        val url = release.assets
+            .find { it.name == RadiantLyricsGithubService.PATCHES_ASSET_NAME }
+            ?.browserDownloadUrl
+        if (url == null) {
+            Log.w(BuildConfig.TAG, "Latest release ${release.tagName} has no patches.zip asset; using built-in list")
+            null
+        } else {
+            // Cached per release tag so re-opening the screen doesn't re-download the same zip.
+            val dest = paths.cacheDownloadDir.resolve("manifest-${release.tagName}.zip")
+                .apply { parentFile?.mkdirs() }
+            if (dest.exists() || downloader.download(url, dest) is IDownloadManager.Result.Success) {
+                loadManifestSpecs(dest).also { loaded ->
+                    if (loaded != null) {
+                        Log.i(BuildConfig.TAG, "Loaded ${loaded.size} patches from latest release ${release.tagName} manifest")
+                    } else {
+                        Log.w(BuildConfig.TAG, "Latest release ${release.tagName} ships no manifest.json; using built-in list")
+                    }
+                }
+            } else {
+                null
+            }
+        }
+    } catch (t: Throwable) {
+        Log.w(BuildConfig.TAG, "Failed to load latest release manifest; using built-in list", t)
+        null
+    }
+
+    private fun loadCachedReleaseManifestSpecs(): List<PatchSpec>? =
+        paths.cacheDownloadDir
+            .listFiles { f -> f.name.startsWith("manifest-") && f.name.endsWith(".zip") }
+            ?.maxByOrNull { it.lastModified() }
+            ?.let { loadManifestSpecs(it) }
+            ?.also { Log.i(BuildConfig.TAG, "Loaded ${it.size} patches from cached release manifest (offline)") }
+
+    /** Default (non-custom) source: latest release manifest → last cached manifest → built-in list. */
+    private fun loadDefaultSpecs() = screenModelScope.launchIO {
+        mainThread { specsLoading = true }
+        // Only hit the network when actually online
+        val loaded = (if (context.isOnline()) loadLatestReleaseSpecs() else null)
+            ?: loadCachedReleaseManifestSpecs() ?: builtinSpecs
+        mainThread {
+            specs = loaded
+            validatePatchSelection()
+            specsLoading = false
+        }
     }
 
     val isConfigValid by derivedStateOf {
@@ -175,8 +369,14 @@ class PatchOptionsModel(
             debuggable = debuggable,
             customTidalApk = customTidalApk,
             customPatches = customPatches,
-            disabledPatches = disabledPatches,
+            // Hard-disable package-name-bound patches so the patcher can't apply
+            patchStates = patchStates.toMutableMap().apply {
+                specs.filter { isBlockedByPackageName(it) }.forEach { this[it.id] = false }
+            },
             selectedVariants = selectedVariants,
+            optionFloats = optionFloats,
+            optionBools = optionBools,
+            optionInts = optionInts,
         )
     }
 
@@ -202,9 +402,9 @@ class PatchOptionsModel(
     }
 
     private fun validatePatchSelection() {
-        for (patch in KnownPatch.All) {
-            if (isPatchEnabled(patch)) {
-                setPatchEnabled(patch, true)
+        for (spec in specs) {
+            if (isPatchEnabled(spec)) {
+                setPatchEnabled(spec, true)
             }
         }
     }
@@ -212,9 +412,13 @@ class PatchOptionsModel(
     init {
         validatePatchSelection()
         screenModelScope.launchBlock { fetchPkgNameState() }
+        // Default source is the latest release's manifest; custom selections drive themselves.
+        if (customPatches == null) loadDefaultSpecs()
     }
 
     companion object {
+        private const val MANIFEST_NAME = "manifest.json"
+
         private val PACKAGE_REGEX = """^[a-z]\w*(\.[a-z]\w*)+$"""
             .toRegex(RegexOption.IGNORE_CASE)
     }
@@ -227,7 +431,10 @@ enum class PackageNameState {
 }
 
 sealed class PatchLock {
-    object Free : PatchLock()
-    data class LockedOn(val by: KnownPatch) : PatchLock()
-    data class LockedOff(val by: KnownPatch) : PatchLock()
+    data object Free : PatchLock()
+    data class LockedOn(val by: PatchSpec) : PatchLock()
+    data class LockedOff(val by: PatchSpec) : PatchLock()
+
+    /** Locked off because the install uses a non-default package name */
+    data object RequiresDefaultPackage : PatchLock()
 }

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/PatchOptionsScreen.kt

@@ -19,7 +19,9 @@ import com.meowarex.rlmobile.R
 import com.meowarex.rlmobile.ui.components.*
 import com.meowarex.rlmobile.ui.screens.componentopts.PatchComponent
 import com.meowarex.rlmobile.ui.screens.patching.PatchingScreen
+import androidx.compose.runtime.saveable.rememberSaveable
 import com.meowarex.rlmobile.ui.screens.patchopts.components.PackageNameStateLabel
+import com.meowarex.rlmobile.ui.screens.patchopts.components.PackageNameUnlockDialog
 import com.meowarex.rlmobile.ui.screens.patchopts.components.PatchOptionsAppBar
 import com.meowarex.rlmobile.ui.screens.patchopts.components.PatchSelectionAccordion
 import com.meowarex.rlmobile.ui.screens.patchopts.components.options.*
@@ -46,6 +48,8 @@ class PatchOptionsScreen(
 
             debuggable = model.debuggable,
             setDebuggable = model::changeDebuggable,
+            bypassIncompatible = model.bypassIncompatible,
+            setBypassIncompatible = model::changeBypassIncompatible,
 
             appName = model.appName,
             appNameIsError = model.appNameIsError,
@@ -55,17 +59,22 @@ class PatchOptionsScreen(
             packageNameState = model.packageNameState,
             setPackageName = model::changePackageName,
 
+            packageNameLocked = model.packageNameLocked,
+            onUnlockPackageName = model::unlockPackageName,
+            onLockPackageName = model::lockPackageName,
+
             customTidalApk = model.customTidalApk,
             customPatches = model.customPatches,
             onSelectCustomTidalApk = { model.selectCustomTidalApk(navigator) },
             onSelectCustomPatches = { model.selectCustomPatches(navigator) },
 
-            enabledPatchCount = model.enabledPatchCount,
+            specs = model.specs,
             isPatchEnabled = model::isPatchEnabled,
             onTogglePatch = model::setPatchEnabled,
             patchLockState = model::lockState,
             variantIndex = model::variantIndex,
             onSelectVariant = model::selectVariant,
+            optionState = model.optionState,
 
             isConfigValid = model.isConfigValid,
             onInstall = {
@@ -82,6 +91,8 @@ fun PatchOptionsScreenContent(
 
     debuggable: Boolean,
     setDebuggable: (Boolean) -> Unit,
+    bypassIncompatible: Boolean,
+    setBypassIncompatible: (Boolean) -> Unit,
 
     appName: String,
     appNameIsError: Boolean,
@@ -91,21 +102,39 @@ fun PatchOptionsScreenContent(
     packageNameState: PackageNameState,
     setPackageName: (String) -> Unit,
 
+    packageNameLocked: Boolean,
+    onUnlockPackageName: () -> Unit,
+    onLockPackageName: () -> Unit,
+
     customTidalApk: PatchComponent?,
     onSelectCustomTidalApk: () -> Unit,
     customPatches: PatchComponent?,
     onSelectCustomPatches: () -> Unit,
 
-    enabledPatchCount: Int,
-    isPatchEnabled: (KnownPatch) -> Boolean,
-    onTogglePatch: (KnownPatch, Boolean) -> Unit,
-    patchLockState: (KnownPatch) -> PatchLock,
-    variantIndex: (KnownPatch) -> Int,
-    onSelectVariant: (KnownPatch, Int) -> Unit,
+    specs: List<PatchSpec>,
+    isPatchEnabled: (PatchSpec) -> Boolean,
+    onTogglePatch: (PatchSpec, Boolean) -> Unit,
+    patchLockState: (PatchSpec) -> PatchLock,
+    variantIndex: (PatchSpec) -> Int,
+    onSelectVariant: (PatchSpec, Int) -> Unit,
+    optionState: PatchOptionState,
 
     isConfigValid: Boolean,
     onInstall: () -> Unit,
 ) {
+    var showPkgUnlockDialog by rememberSaveable { mutableStateOf(false) }
+    if (showPkgUnlockDialog) {
+        PackageNameUnlockDialog(
+            // With "Bypass Incompatible" on, path-gated patches are force-applied, not disabled.
+            blockedTitles = if (bypassIncompatible) emptyList() else specs.filter { it.pathLocked }.map { it.title },
+            onConfirm = {
+                showPkgUnlockDialog = false
+                onUnlockPackageName()
+            },
+            onDismiss = { showPkgUnlockDialog = false },
+        )
+    }
+
     Scaffold(
         topBar = { PatchOptionsAppBar(isUpdate = isUpdate) },
     ) { paddingValues ->
@@ -155,6 +184,10 @@ fun PatchOptionsScreenContent(
                     valueIsDefault = packageNameIsDefault,
                     onValueChange = setPackageName,
                     onValueReset = { setPackageName(PatchOptions.Default.packageName) },
+                    locked = packageNameLocked,
+                    onLockClick = {
+                        if (packageNameLocked) showPkgUnlockDialog = true else onLockPackageName()
+                    },
                 ) {
                     PackageNameStateLabel(
                         state = packageNameState,
@@ -163,15 +196,40 @@ fun PatchOptionsScreenContent(
                 }
             }
 
+            val (integrations, patches) = remember(specs) { specs.partition { it.isIntegration } }
+
+            if (integrations.isNotEmpty()) {
+                PatchSelectionAccordion(
+                    iconRes = R.drawable.ic_extension,
+                    titleRes = R.string.patchopts_integrations_title,
+                    descriptionRes = R.string.patchopts_integrations_desc,
+                    specs = integrations,
+                    enabledCount = integrations.count(isPatchEnabled),
+                    totalCount = integrations.size,
+                    isEnabled = isPatchEnabled,
+                    onToggle = onTogglePatch,
+                    lockState = patchLockState,
+                    variantIndex = variantIndex,
+                    onSelectVariant = onSelectVariant,
+                    optionState = optionState,
+                    modifier = Modifier.padding(top = 4.dp),
+                )
+            }
+
             PatchSelectionAccordion(
-                enabledCount = enabledPatchCount,
-                totalCount = KnownPatch.All.size,
+                iconRes = R.drawable.ic_healing,
+                titleRes = R.string.patchopts_patches_title,
+                descriptionRes = R.string.patchopts_patches_desc,
+                specs = patches,
+                enabledCount = patches.count(isPatchEnabled),
+                totalCount = patches.size,
                 isEnabled = isPatchEnabled,
                 onToggle = onTogglePatch,
                 lockState = patchLockState,
                 variantIndex = variantIndex,
                 onSelectVariant = onSelectVariant,
-                modifier = Modifier.padding(top = 4.dp),
+                optionState = optionState,
+                modifier = if (integrations.isEmpty()) Modifier.padding(top = 4.dp) else Modifier,
             )
 
             if (isDevMode) {
@@ -215,6 +273,14 @@ fun PatchOptionsScreenContent(
                         )
                     }
                 }
+
+                SwitchPatchOption(
+                    icon = painterResource(R.drawable.ic_lock_open),
+                    name = stringResource(R.string.patchopts_bypass_incompatible_title),
+                    description = stringResource(R.string.patchopts_bypass_incompatible_desc),
+                    value = bypassIncompatible,
+                    onValueChange = setBypassIncompatible,
+                )
             }
 
             Spacer(Modifier.weight(1f))

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/PatchSpec.kt

@@ -0,0 +1,257 @@
+package com.meowarex.rlmobile.ui.screens.patchopts
+
+import android.content.Context
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlin.math.roundToInt
+
+@Serializable
+data class PatchManifest(
+    val version: Int = 1,
+    val patches: List<PatchSpec> = emptyList(),
+)
+
+@Immutable
+@Serializable
+data class PatchSpec(
+    val id: String,
+    val order: Int = 0,
+    val fileNames: List<String> = emptyList(),
+    val extensionFiles: List<String> = emptyList(),
+    val title: String,
+    val description: String = "",
+    @SerialName("default") val defaultEnabled: Boolean = false,
+    /** ids of patches that get force-enabled when this one is enabled. */
+    val requires: List<String> = emptyList(),
+    /** ids of patches that get force-disabled when this one is enabled. */
+    val disables: List<String> = emptyList(),
+    val variants: List<VariantSpec> = emptyList(),
+    val defaultVariantIndex: Int = 0,
+    val advancedOptions: List<OptionSpec> = emptyList(),
+    val category: String = CATEGORY_PATCH,
+    val pathLocked: Boolean = false,
+) {
+    val isIntegration: Boolean get() = category == CATEGORY_INTEGRATION
+
+    companion object {
+        const val CATEGORY_PATCH = "patch"
+        const val CATEGORY_INTEGRATION = "integration"
+    }
+}
+
+@Immutable
+@Serializable
+data class VariantSpec(
+    val title: String,
+    val fileNames: List<String> = emptyList(),
+    val extensionFiles: List<String> = emptyList(),
+)
+
+/** A single advanced option. Discriminated by `"type"` in JSON. */
+@Serializable
+sealed interface OptionSpec {
+    val key: String
+    val title: String
+    val description: String
+
+    @Immutable
+    @Serializable
+    @SerialName("toggle")
+    data class Toggle(
+        override val key: String,
+        override val title: String,
+        override val description: String = "",
+        val default: Boolean = false,
+        /** Patch files applied only while this toggle is on (and its patch is enabled). */
+        val fileNames: List<String> = emptyList(),
+        /** Helper smali extracted only while this toggle is on. */
+        val extensionFiles: List<String> = emptyList(),
+        /** Render inline beneath the variant selector instead of inside the advanced sheet. */
+        val inline: Boolean = false,
+        /** Greyed out (with the lock dialog) unless this variant index is the selected one. */
+        val requiresVariant: Int? = null,
+        /** Greyed out unless the sibling option with this key is currently on. */
+        val requiresOption: String? = null,
+        /** Variant indices hidden from the picker while this toggle is on. */
+        val hidesVariants: List<Int> = emptyList(),
+        /** Variant title overrides (index -> title) applied while this toggle is on. */
+        val relabelVariants: Map<Int, String> = emptyMap(),
+        /** Placeholder name (without the surrounding `__`) baked into the `.patch` files. */
+        val token: String? = null,
+    ) : OptionSpec
+
+    @Immutable
+    @Serializable
+    @SerialName("slider")
+    data class Slider(
+        override val key: String,
+        override val title: String,
+        override val description: String = "",
+        val default: Float = 0f,
+        val min: Float = 0f,
+        val max: Float = 100f,
+        val steps: Int = 0,
+        val displayAsPercent: Boolean = false,
+        val unit: String? = null,
+        /** Placeholder name (without the surrounding `__`) baked into the `.patch` files. */
+        val token: String? = null,
+        /** How the chosen value becomes the smali literal that replaces the token. */
+        val encode: SmaliEncode? = null,
+    ) : OptionSpec {
+        val valueRange: ClosedFloatingPointRange<Float> get() = min..max
+    }
+
+    @Immutable
+    @Serializable
+    @SerialName("choice")
+    data class Choice(
+        override val key: String,
+        override val title: String = "",
+        override val description: String = "",
+        val entries: List<String> = emptyList(),
+        val defaultIndex: Int = 0,
+        val values: List<String> = emptyList(),
+        val requiresOption: String? = null,
+        val token: String? = null,
+    ) : OptionSpec
+
+    @Immutable
+    @Serializable
+    @SerialName("color")
+    data class Color(
+        override val key: String,
+        override val title: String = "",
+        override val description: String = "",
+        val default: Int = 0,
+        /** Placeholder name (without the surrounding `__`) baked into the `.patch`/extension files. */
+        val token: String? = null,
+    ) : OptionSpec
+}
+
+@Serializable
+enum class EncodeKind {
+    @SerialName("floatBits")
+    FloatBits,
+
+    @SerialName("argbAlpha")
+    ArgbAlpha,
+
+    @SerialName("int")
+    IntValue,
+}
+
+@Immutable
+@Serializable
+data class SmaliEncode(
+    val kind: EncodeKind,
+    val scale: Float = 1f,
+) {
+    fun encode(value: Float): String = when (kind) {
+        // Float dp bit-pattern: const vX, <bits>; Dp.constructor-impl(F)F
+        EncodeKind.FloatBits -> (value * scale).toRawBits().toString()
+        // ARGB int with black RGB and a percentage-derived alpha: const vX, <argb>
+        EncodeKind.ArgbAlpha -> ((value / 100f * 255f).roundToInt() shl 24).toString()
+        // Plain (optionally scaled) integer literal.
+        EncodeKind.IntValue -> (value * scale).roundToInt().toString()
+    }
+}
+
+/** Asset filename of the bundled fallback manifest snapshot (a copy of the release manifest.json). */
+const val BUNDLED_MANIFEST_ASSET = "patches-manifest.json"
+
+// Fallback patch list (snapshot of the release manifest bundled in the app's assets)
+fun builtinPatchSpecs(context: Context, json: Json): List<PatchSpec> = try {
+    context.assets.open(BUNDLED_MANIFEST_ASSET).use { it.readBytes() }
+        .let { json.decodeFromString(PatchManifest.serializer(), it.decodeToString()) }
+        .patches
+        .sortedBy { it.order }
+} catch (t: Throwable) {
+    emptyList()
+}
+
+@Immutable
+data class EffectiveVariant(val originalIndex: Int, val title: String)
+
+fun PatchSpec.effectiveVariants(isOptionOn: (OptionSpec.Toggle) -> Boolean): List<EffectiveVariant> {
+    if (variants.isEmpty()) return emptyList()
+    val hidden = mutableSetOf<Int>()
+    val relabel = mutableMapOf<Int, String>()
+    for (option in advancedOptions) {
+        if (option is OptionSpec.Toggle && isOptionOn(option)) {
+            hidden += option.hidesVariants
+            relabel += option.relabelVariants
+        }
+    }
+    return variants.mapIndexedNotNull { index, variant ->
+        if (index in hidden) null else EffectiveVariant(index, relabel[index] ?: variant.title)
+    }
+}
+
+fun PatchSpec.resolveVariantIndex(stored: Int, isOptionOn: (OptionSpec.Toggle) -> Boolean): Int {
+    val visible = effectiveVariants(isOptionOn)
+    if (visible.isEmpty() || visible.any { it.originalIndex == stored }) return stored
+    val relabelKeys = buildSet {
+        for (option in advancedOptions) {
+            if (option is OptionSpec.Toggle && isOptionOn(option)) addAll(option.relabelVariants.keys)
+        }
+    }
+    return visible.firstOrNull { it.originalIndex in relabelKeys }?.originalIndex
+        ?: visible.first().originalIndex
+}
+
+sealed interface OptionLock {
+    data object Free : OptionLock
+    data class NeedsVariant(val title: String) : OptionLock
+    data class NeedsOption(val title: String) : OptionLock
+}
+
+fun PatchSpec.optionLock(
+    option: OptionSpec,
+    selectedVariant: Int,
+    isOptionOn: (OptionSpec.Toggle) -> Boolean,
+): OptionLock {
+    if (option !is OptionSpec.Toggle) return OptionLock.Free
+    option.requiresVariant?.let { required ->
+        if (selectedVariant != required) {
+            variants.getOrNull(required)?.let { return OptionLock.NeedsVariant(it.title) }
+        }
+    }
+    option.requiresOption?.let { key ->
+        val required = advancedOptions.filterIsInstance<OptionSpec.Toggle>().firstOrNull { it.key == key }
+        if (required != null && !isOptionOn(required)) return OptionLock.NeedsOption(required.title)
+    }
+    return OptionLock.Free
+}
+
+@Stable
+class PatchOptionState(
+    val toggle: (PatchSpec, OptionSpec.Toggle) -> Boolean,
+    val setToggle: (PatchSpec, OptionSpec.Toggle, Boolean) -> Unit,
+    val slider: (PatchSpec, OptionSpec.Slider) -> Float,
+    val setSlider: (PatchSpec, OptionSpec.Slider, Float) -> Unit,
+    val choice: (PatchSpec, OptionSpec.Choice) -> Int,
+    val setChoice: (PatchSpec, OptionSpec.Choice, Int) -> Unit,
+    val color: (PatchSpec, OptionSpec.Color) -> Int,
+    val setColor: (PatchSpec, OptionSpec.Color, Int) -> Unit,
+    val isModified: (PatchSpec) -> Boolean,
+    val reset: (PatchSpec) -> Unit,
+) {
+    companion object {
+        /** Read-only stub returning defaults — for Compose previews. */
+        val Preview = PatchOptionState(
+            toggle = { _, option -> option.default },
+            setToggle = { _, _, _ -> },
+            slider = { _, option -> option.default },
+            setSlider = { _, _, _ -> },
+            choice = { _, option -> option.defaultIndex },
+            setChoice = { _, _, _ -> },
+            color = { _, option -> option.default },
+            setColor = { _, _, _ -> },
+            isModified = { false },
+            reset = {},
+        )
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/components/PackageNameUnlockDialog.kt

@@ -0,0 +1,88 @@
+package com.meowarex.rlmobile.ui.screens.patchopts.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.unit.dp
+import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchOptions
+
+/**
+ * Confirms unlocking the package-name field, warning that a custom name
+ * blocks the listed patches/integrations from working.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PackageNameUnlockDialog(
+    blockedTitles: List<String>,
+    onConfirm: () -> Unit,
+    onDismiss: () -> Unit,
+) {
+    BasicAlertDialog(onDismissRequest = onDismiss) {
+        Surface(
+            shape = MaterialTheme.shapes.large,
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
+            tonalElevation = 6.dp,
+        ) {
+            Column(
+                modifier = Modifier.padding(start = 24.dp, end = 12.dp, top = 20.dp, bottom = 8.dp),
+                verticalArrangement = Arrangement.spacedBy(6.dp),
+            ) {
+                Text(
+                    text = stringResource(R.string.patchopts_pkgname_warning_title),
+                    style = MaterialTheme.typography.titleLarge,
+                )
+                Text(
+                    text = AnnotatedString.fromHtml(
+                        stringResource(R.string.patchopts_pkgname_warning_msg, PatchOptions.Default.packageName),
+                    ),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+                if (blockedTitles.isNotEmpty()) {
+                    Column(
+                        verticalArrangement = Arrangement.spacedBy(2.dp),
+                        modifier = Modifier.padding(start = 4.dp),
+                    ) {
+                        for (title in blockedTitles) {
+                            Text(
+                                text = "• $title",
+                                style = MaterialTheme.typography.bodyLarge,
+                                fontWeight = FontWeight.Bold,
+                            )
+                        }
+                    }
+                }
+                Text(
+                    text = stringResource(R.string.patchopts_pkgname_warning_permanent),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+                Box(modifier = Modifier.fillMaxWidth()) {
+                    Row(modifier = Modifier.align(Alignment.CenterEnd)) {
+                        TextButton(onClick = onDismiss) {
+                            Text(stringResource(R.string.action_cancel))
+                        }
+                        TextButton(onClick = onConfirm) {
+                            Text(stringResource(R.string.action_continue))
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/components/PatchAdvancedOptionsSheet.kt

@@ -0,0 +1,682 @@
+package com.meowarex.rlmobile.ui.screens.patchopts.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.ui.components.ResetToDefaultButton
+import com.meowarex.rlmobile.ui.screens.patchopts.OptionLock
+import com.meowarex.rlmobile.ui.screens.patchopts.OptionSpec
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchOptionState
+import com.meowarex.rlmobile.ui.screens.patchopts.optionLock
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchSpec
+import kotlinx.coroutines.launch
+import kotlin.math.roundToInt
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PatchAdvancedOptionsSheet(
+    patch: PatchSpec,
+    state: PatchOptionState,
+    selectedVariant: Int,
+    onDismiss: () -> Unit,
+) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val scope = rememberCoroutineScope()
+    var lockDialog by remember { mutableStateOf<OptionLock?>(null) }
+
+    fun dismiss() {
+        scope.launch { sheetState.hide() }.invokeOnCompletion {
+            if (!sheetState.isVisible) onDismiss()
+        }
+    }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .verticalScroll(rememberScrollState())
+                .padding(horizontal = 24.dp)
+                .padding(bottom = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(20.dp),
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(2.dp),
+                    modifier = Modifier.weight(1f),
+                ) {
+                    Text(
+                        text = stringResource(R.string.patchopts_advanced_sheet_label),
+                        style = MaterialTheme.typography.labelMedium,
+                        color = MaterialTheme.colorScheme.primary,
+                    )
+                    Text(
+                        text = patch.title,
+                        style = MaterialTheme.typography.headlineSmall,
+                    )
+                }
+
+                ResetToDefaultButton(
+                    enabled = state.isModified(patch),
+                    onClick = { state.reset(patch) },
+                )
+            }
+
+            HorizontalDivider()
+
+            val parentKeys = patch.advancedOptions
+                .filterIsInstance<OptionSpec.Toggle>()
+                .filter { !it.inline }
+                .map { it.key }
+                .toSet()
+            val sheetOptions = patch.advancedOptions.filter { option ->
+                when {
+                    option is OptionSpec.Toggle && option.inline -> false
+                    option is OptionSpec.Toggle && option.requiresOption in parentKeys -> false
+                    else -> true
+                }
+            }
+            for (option in sheetOptions) key(option.key) {
+                val lock = patch.optionLock(option, selectedVariant) { state.toggle(patch, it) }
+                when (option) {
+                    is OptionSpec.Toggle -> {
+                        val toggleOn = state.toggle(patch, option)
+                        val gatedChoices = patch.advancedOptions.filterIsInstance<OptionSpec.Choice>()
+                            .filter { it.requiresOption == option.key }
+                        val gatedToggles = patch.advancedOptions.filterIsInstance<OptionSpec.Toggle>()
+                            .filter { it.requiresOption == option.key && !it.inline }
+                        val hasSubOptions = gatedChoices.isNotEmpty() || gatedToggles.isNotEmpty()
+                        val carded = hasSubOptions && toggleOn
+
+                        Column(
+                            modifier = if (carded) {
+                                Modifier
+                                    .fillMaxWidth()
+                                    .clip(MaterialTheme.shapes.medium)
+                                    .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.07f))
+                                    .border(
+                                        width = 1.5.dp,
+                                        color = MaterialTheme.colorScheme.primary.copy(alpha = 0.55f),
+                                        shape = MaterialTheme.shapes.medium,
+                                    )
+                                    .padding(horizontal = 12.dp, vertical = 4.dp)
+                            } else {
+                                Modifier.fillMaxWidth()
+                            },
+                        ) {
+                            ToggleOptionRow(
+                                title = option.title,
+                                description = option.description,
+                                checked = toggleOn,
+                                onCheckedChange = { state.setToggle(patch, option, it) },
+                                locked = lock != OptionLock.Free,
+                                onLockedTap = { lockDialog = lock },
+                                modifier = if (hasSubOptions) Modifier.padding(vertical = 6.dp) else Modifier,
+                            )
+                            if (hasSubOptions) {
+                                AnimatedVisibility(visible = toggleOn) {
+                                    Column(
+                                        verticalArrangement = Arrangement.spacedBy(10.dp),
+                                        modifier = Modifier
+                                            .fillMaxWidth()
+                                            .padding(bottom = 8.dp),
+                                    ) {
+                                        gatedChoices.forEach { choice ->
+                                            key(choice.key) {
+                                                ChoiceOptionRow(
+                                                    title = choice.title,
+                                                    entries = choice.entries,
+                                                    selectedIndex = state.choice(patch, choice),
+                                                    onSelect = { state.setChoice(patch, choice, it) },
+                                                )
+                                            }
+                                        }
+                                        gatedToggles.forEach { sub ->
+                                            key(sub.key) {
+                                                val subLock = patch.optionLock(sub, selectedVariant) { state.toggle(patch, it) }
+                                                ToggleOptionRow(
+                                                    title = sub.title,
+                                                    description = sub.description,
+                                                    checked = state.toggle(patch, sub),
+                                                    onCheckedChange = { state.setToggle(patch, sub, it) },
+                                                    locked = subLock != OptionLock.Free,
+                                                    onLockedTap = { lockDialog = subLock },
+                                                )
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    is OptionSpec.Slider -> SliderOptionRow(
+                        title = option.title,
+                        description = option.description,
+                        value = state.slider(patch, option),
+                        valueLabel = formatSliderValue(option, state.slider(patch, option)),
+                        valueRange = option.valueRange,
+                        steps = option.steps,
+                        onValueChange = { state.setSlider(patch, option, it) },
+                    )
+
+                    is OptionSpec.Choice ->
+                        if (option.requiresOption == null) {
+                            ChoiceOptionRow(
+                                title = option.title,
+                                entries = option.entries,
+                                selectedIndex = state.choice(patch, option),
+                                onSelect = { state.setChoice(patch, option, it) },
+                            )
+                        }
+
+                    is OptionSpec.Color -> ColorOptionRow(
+                        title = option.title,
+                        color = state.color(patch, option),
+                        onColorChange = { state.setColor(patch, option, it) },
+                    )
+                }
+            }
+
+            FilledTonalButton(
+                onClick = { dismiss() },
+                colors = ButtonDefaults.filledTonalButtonColors(
+                    contentColor = MaterialTheme.colorScheme.primary,
+                ),
+                modifier = Modifier
+                    .align(Alignment.End)
+                    .padding(top = 4.dp),
+            ) {
+                Text(stringResource(R.string.action_done))
+            }
+        }
+    }
+
+    lockDialog?.let { lock ->
+        OptionLockDialog(lock = lock, onDismiss = { lockDialog = null })
+    }
+}
+
+@Composable
+private fun ToggleOptionRow(
+    title: String,
+    description: String,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    locked: Boolean = false,
+    onLockedTap: () -> Unit = {},
+    modifier: Modifier = Modifier,
+) {
+    val interactionSource = remember(::MutableInteractionSource)
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .clickable(
+                interactionSource = interactionSource,
+                indication = null,
+                role = Role.Switch,
+            ) { if (locked) onLockedTap() else onCheckedChange(!checked) }
+            .alpha(if (locked) 0.45f else 1f),
+    ) {
+        OptionText(
+            title = title,
+            description = description,
+            modifier = Modifier.weight(1f),
+        )
+
+        Box {
+            Switch(
+                checked = checked,
+                enabled = !locked,
+                onCheckedChange = onCheckedChange,
+                interactionSource = interactionSource,
+            )
+            if (locked) {
+                Box(
+                    modifier = Modifier
+                        .matchParentSize()
+                        .clickable(
+                            interactionSource = remember(::MutableInteractionSource),
+                            indication = null,
+                            role = Role.Switch,
+                        ) { onLockedTap() }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun SliderOptionRow(
+    title: String,
+    description: String,
+    value: Float,
+    valueLabel: String,
+    valueRange: ClosedFloatingPointRange<Float>,
+    steps: Int,
+    onValueChange: (Float) -> Unit,
+) {
+    // Whether the slider snaps to the step dots
+    var snap by rememberSaveable { mutableStateOf(true) }
+
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(2.dp),
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.titleMedium,
+                modifier = Modifier.weight(1f),
+            )
+            Text(
+                text = valueLabel,
+                style = MaterialTheme.typography.labelLarge,
+                color = MaterialTheme.colorScheme.primary,
+            )
+            if (steps > 0) {
+                IconButton(
+                    onClick = {
+                        snap = !snap
+                        if (snap) onValueChange(snapToNearestStep(value, valueRange, steps))
+                    },
+                    modifier = Modifier.size(32.dp),
+                ) {
+                    Icon(
+                        painter = painterResource(
+                            if (snap) R.drawable.ic_lock else R.drawable.ic_lock_open,
+                        ),
+                        contentDescription = stringResource(R.string.patchopts_toggle_snap),
+                        tint = if (snap) MaterialTheme.colorScheme.primary
+                        else MaterialTheme.colorScheme.onSurfaceVariant,
+                        modifier = Modifier.size(18.dp),
+                    )
+                }
+            }
+        }
+
+        Text(
+            text = description,
+            style = MaterialTheme.typography.bodySmall,
+            modifier = Modifier.alpha(.7f),
+        )
+
+        // Locked -> native stepped slider (dots + snapping), left exactly as-is
+        // Unlocked -> plain continuous slider with the trailing stop-indicator dot removed
+        if (snap) {
+            Slider(
+                value = value,
+                onValueChange = onValueChange,
+                valueRange = valueRange,
+                steps = steps,
+            )
+        } else {
+            Slider(
+                value = value,
+                onValueChange = onValueChange,
+                valueRange = valueRange,
+                track = { SliderDefaults.Track(sliderState = it, drawStopIndicator = null) },
+            )
+        }
+    }
+}
+
+private fun snapToNearestStep(
+    value: Float,
+    range: ClosedFloatingPointRange<Float>,
+    steps: Int,
+): Float {
+    if (steps <= 0) return value
+    val stepSize = (range.endInclusive - range.start) / (steps + 1)
+    if (stepSize <= 0f) return value
+    val snapped = range.start + Math.round((value - range.start) / stepSize) * stepSize
+    return snapped.coerceIn(range.start, range.endInclusive)
+}
+
+@Composable
+private fun ChoiceOptionRow(
+    entries: List<String>,
+    selectedIndex: Int,
+    onSelect: (Int) -> Unit,
+    title: String = "",
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(6.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        if (title.isNotEmpty()) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                textAlign = TextAlign.Center,
+            )
+        }
+        if (entries.size > 3) {
+            var expanded by rememberSaveable { mutableStateOf(false) }
+            val selectedLabel = entries.getOrNull(selectedIndex).orEmpty()
+
+            Box(modifier = Modifier.fillMaxWidth()) {
+                OutlinedButton(
+                    onClick = { expanded = true },
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Text(
+                        text = selectedLabel,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                DropdownMenu(
+                    expanded = expanded,
+                    onDismissRequest = { expanded = false },
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    entries.forEachIndexed { index, entry ->
+                        DropdownMenuItem(
+                            text = { Text(entry) },
+                            onClick = {
+                                onSelect(index)
+                                expanded = false
+                            },
+                        )
+                    }
+                }
+            }
+            return@Column
+        }
+        SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) {
+            entries.forEachIndexed { index, entry ->
+                SegmentedButton(
+                    selected = index == selectedIndex,
+                    onClick = { onSelect(index) },
+                    shape = SegmentedButtonDefaults.itemShape(index = index, count = entries.size),
+                    icon = {},
+                    label = {
+                        Text(
+                            text = entry,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.typography.labelMedium,
+                        )
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun ColorOptionRow(
+    title: String,
+    color: Int,
+    onColorChange: (Int) -> Unit,
+) {
+    var showPicker by rememberSaveable { mutableStateOf(false) }
+    val selectedColor = color.withOpaqueAlpha()
+    val materialYouColor = MaterialTheme.colorScheme.primary.toArgb().withOpaqueAlpha()
+    val presets = listOf(
+        stringResource(R.string.patch_waze_color_waze_default),
+        stringResource(R.string.patch_waze_color_tidal_cyan),
+        stringResource(R.string.patch_waze_color_material_you),
+    )
+    val presetColors = listOf(WAZE_DEFAULT, TIDAL_CYAN, materialYouColor)
+    val selectedPreset = presetColors.indexOf(selectedColor)
+
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.labelMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.align(Alignment.CenterHorizontally),
+        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(MaterialTheme.shapes.medium)
+                .clickable { showPicker = true }
+                .padding(vertical = 4.dp),
+        ) {
+            ColorSwatch(color = selectedColor)
+            Text(
+                text = selectedColor.toRgbHex(),
+                style = MaterialTheme.typography.labelLarge,
+                color = MaterialTheme.colorScheme.primary,
+            )
+        }
+        SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) {
+            presets.forEachIndexed { index, label ->
+                SegmentedButton(
+                    selected = index == selectedPreset,
+                    onClick = { onColorChange(presetColors[index]) },
+                    shape = SegmentedButtonDefaults.itemShape(index = index, count = presets.size),
+                    icon = {},
+                    label = {
+                        Text(
+                            text = label,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.typography.labelMedium,
+                        )
+                    },
+                )
+            }
+        }
+    }
+
+    if (showPicker) {
+        ColorPickerDialog(
+            initialColor = selectedColor,
+            onDismiss = { showPicker = false },
+            onColorSelected = {
+                onColorChange(it)
+                showPicker = false
+            },
+        )
+    }
+}
+
+@Composable
+private fun ColorSwatch(color: Int, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .size(32.dp)
+            .clip(CircleShape)
+            .background(Color(color))
+            .border(1.dp, MaterialTheme.colorScheme.outlineVariant, CircleShape),
+    )
+}
+
+@Composable
+private fun ColorPickerDialog(
+    initialColor: Int,
+    onDismiss: () -> Unit,
+    onColorSelected: (Int) -> Unit,
+) {
+    var color by rememberSaveable(initialColor) { mutableIntStateOf(initialColor.withOpaqueAlpha()) }
+    var hex by rememberSaveable(initialColor) { mutableStateOf(color.toRgbHex()) }
+    val parsedHex = parseRgbHex(hex)
+
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text(stringResource(R.string.patch_color_picker_title)) },
+        text = {
+            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
+                ) {
+                    ColorSwatch(color = parsedHex ?: color, modifier = Modifier.size(40.dp))
+                    OutlinedTextField(
+                        value = hex,
+                        onValueChange = { value ->
+                            hex = value
+                            parseRgbHex(value)?.let { color = it }
+                        },
+                        label = { Text(stringResource(R.string.patch_color_picker_hex)) },
+                        singleLine = true,
+                        isError = parsedHex == null,
+                        keyboardOptions = KeyboardOptions(
+                            capitalization = KeyboardCapitalization.Characters,
+                            keyboardType = KeyboardType.Ascii,
+                        ),
+                        supportingText = if (parsedHex == null) {
+                            { Text(stringResource(R.string.patch_color_picker_hex_error)) }
+                        } else null,
+                        modifier = Modifier.weight(1f),
+                    )
+                }
+            }
+        },
+        confirmButton = {
+            TextButton(
+                enabled = parsedHex != null,
+                onClick = { parsedHex?.let(onColorSelected) },
+            ) {
+                Text(stringResource(R.string.action_done))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.action_cancel))
+            }
+        },
+    )
+}
+
+@Composable
+private fun OptionText(
+    title: String,
+    description: String,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(2.dp),
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.titleMedium,
+        )
+        Text(
+            text = description,
+            style = MaterialTheme.typography.bodySmall,
+            modifier = Modifier.alpha(.7f),
+        )
+    }
+}
+
+private fun formatSliderValue(option: OptionSpec.Slider, value: Float): String {
+    val rounded = value.roundToInt()
+    val unit = option.unit
+    return when {
+        option.displayAsPercent -> "$rounded%"
+        unit != null -> "$rounded $unit"
+        else -> rounded.toString()
+    }
+}
+
+private const val OPAQUE_ALPHA = -0x1000000
+private const val WAZE_DEFAULT = -16747037 // #ff0075e3
+private const val TIDAL_CYAN = -14549268 // #ff21feec
+
+private fun Int.withOpaqueAlpha(): Int = (this and 0x00FFFFFF) or OPAQUE_ALPHA
+
+private fun Int.toRgbHex(): String = "#" +
+        (this and 0x00FFFFFF).toString(16).uppercase().padStart(6, '0')
+
+private fun parseRgbHex(value: String): Int? {
+    val clean = value.trim()
+        .removePrefix("#")
+        .removePrefix("0x")
+        .removePrefix("0X")
+    if (clean.length != 6 && clean.length != 8) return null
+    val parsed = clean.toLongOrNull(16) ?: return null
+    val rgb = if (clean.length == 8) parsed and 0x00FFFFFFL else parsed
+    return (0xFF000000L or rgb).toInt()
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun OptionLockDialog(lock: OptionLock, onDismiss: () -> Unit) {
+    val message = when (lock) {
+        is OptionLock.NeedsVariant -> stringResource(R.string.patch_opt_lock_needs_variant, lock.title)
+        is OptionLock.NeedsOption -> stringResource(R.string.patch_opt_lock_needs_option, lock.title)
+        OptionLock.Free -> return
+    }
+
+    BasicAlertDialog(onDismissRequest = onDismiss) {
+        Surface(
+            shape = MaterialTheme.shapes.large,
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
+            tonalElevation = 6.dp,
+        ) {
+            Column(
+                modifier = Modifier.padding(start = 24.dp, end = 12.dp, top = 20.dp, bottom = 8.dp),
+                verticalArrangement = Arrangement.spacedBy(6.dp),
+            ) {
+                Text(
+                    text = stringResource(R.string.patch_opt_lock_title),
+                    style = MaterialTheme.typography.titleLarge,
+                )
+                Text(
+                    text = AnnotatedString.fromHtml(message),
+                    style = MaterialTheme.typography.titleMedium,
+                )
+                Box(modifier = Modifier.fillMaxWidth()) {
+                    TextButton(
+                        onClick = onDismiss,
+                        modifier = Modifier.align(Alignment.CenterEnd),
+                    ) {
+                        Text(stringResource(R.string.action_got_it))
+                    }
+                }
+            }
+        }
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/components/PatchSelectionAccordion.kt

@@ -1,12 +1,16 @@
 package com.meowarex.rlmobile.ui.screens.patchopts.components
 
 
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -22,20 +26,30 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.fromHtml
 import androidx.compose.ui.unit.dp
 import com.meowarex.rlmobile.R
-import com.meowarex.rlmobile.ui.screens.patchopts.KnownPatch
+import com.meowarex.rlmobile.ui.screens.patchopts.OptionSpec
 import com.meowarex.rlmobile.ui.screens.patchopts.PatchLock
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchOptionState
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchOptions
+import com.meowarex.rlmobile.ui.screens.patchopts.PatchSpec
+import com.meowarex.rlmobile.ui.screens.patchopts.effectiveVariants
+import com.meowarex.rlmobile.ui.screens.patchopts.resolveVariantIndex
 
-private data class LockInfo(val patch: KnownPatch, val lock: PatchLock)
+private data class LockInfo(val patch: PatchSpec, val lock: PatchLock)
 
 @Composable
 fun PatchSelectionAccordion(
+    @DrawableRes iconRes: Int,
+    @StringRes titleRes: Int,
+    @StringRes descriptionRes: Int,
+    specs: List<PatchSpec>,
     enabledCount: Int,
     totalCount: Int,
-    isEnabled: (KnownPatch) -> Boolean,
-    onToggle: (KnownPatch, Boolean) -> Unit,
-    lockState: (KnownPatch) -> PatchLock,
-    variantIndex: (KnownPatch) -> Int,
-    onSelectVariant: (KnownPatch, Int) -> Unit,
+    isEnabled: (PatchSpec) -> Boolean,
+    onToggle: (PatchSpec, Boolean) -> Unit,
+    lockState: (PatchSpec) -> PatchLock,
+    variantIndex: (PatchSpec) -> Int,
+    onSelectVariant: (PatchSpec, Int) -> Unit,
+    optionState: PatchOptionState,
     modifier: Modifier = Modifier,
 ) {
     var expanded by rememberSaveable { mutableStateOf(false) }
@@ -45,6 +59,7 @@ fun PatchSelectionAccordion(
     )
 
     var lockInfo by remember { mutableStateOf<LockInfo?>(null) }
+    var advancedFor by remember { mutableStateOf<PatchSpec?>(null) }
 
     Column(
         modifier = modifier
@@ -60,12 +75,17 @@ fun PatchSelectionAccordion(
                 .clickable(role = Role.Button) { expanded = !expanded }
                 .padding(horizontal = 16.dp, vertical = 14.dp),
         ) {
+            Icon(
+                painter = painterResource(iconRes),
+                contentDescription = null,
+            )
+
             Column(
                 verticalArrangement = Arrangement.spacedBy(2.dp),
                 modifier = Modifier.weight(1f),
             ) {
                 Text(
-                    text = stringResource(R.string.patchopts_patches_title),
+                    text = stringResource(titleRes),
                     style = MaterialTheme.typography.titleMedium,
                 )
                 Text(
@@ -97,37 +117,95 @@ fun PatchSelectionAccordion(
                     .padding(horizontal = 16.dp, vertical = 12.dp),
             ) {
                 Text(
-                    text = stringResource(R.string.patchopts_patches_desc),
+                    text = stringResource(descriptionRes),
                     style = MaterialTheme.typography.bodySmall,
                     modifier = Modifier
                         .alpha(.7f)
                         .padding(bottom = 8.dp),
                 )
 
-                for (patch in KnownPatch.All) key(patch) {
+                for (patch in specs) key(patch.id) {
                     val checked = isEnabled(patch)
                     val lock = lockState(patch)
-                    PatchSwitchRow(
-                        title = stringResource(patch.titleRes),
-                        description = stringResource(patch.descRes),
-                        checked = checked,
-                        lock = lock,
-                        onCheckedChange = { onToggle(patch, it) },
-                        onLockedTap = { lockInfo = LockInfo(patch, lock) },
-                    )
 
-                    if (patch.variants.isNotEmpty()) {
-                        AnimatedVisibility(visible = checked) {
-                            Column(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(start = 4.dp, end = 4.dp, top = 4.dp, bottom = 4.dp),
-                            ) {
-                                PatchVariantSelector(
-                                    variants = patch.variants,
-                                    selectedIndex = variantIndex(patch),
-                                    onSelect = { idx -> onSelectVariant(patch, idx) },
+                    val inlineToggles = patch.advancedOptions
+                        .filterIsInstance<OptionSpec.Toggle>()
+                        .filter { it.inline }
+                    val hasSheetOptions = patch.advancedOptions.any { it !is OptionSpec.Toggle || !it.inline }
+                    val hasSettings = patch.variants.isNotEmpty() || inlineToggles.isNotEmpty() || hasSheetOptions
+
+                    // When a patch is enabled and has settings show a carded view of the settings
+                    val carded = checked && hasSettings
+                    Column(
+                        modifier = if (carded) {
+                            Modifier
+                                .fillMaxWidth()
+                                .clip(MaterialTheme.shapes.medium)
+                                .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.07f))
+                                .border(
+                                    width = 1.5.dp,
+                                    color = MaterialTheme.colorScheme.primary.copy(alpha = 0.55f),
+                                    shape = MaterialTheme.shapes.medium,
                                 )
+                                .padding(horizontal = 12.dp, vertical = 4.dp)
+                        } else {
+                            Modifier.fillMaxWidth()
+                        },
+                    ) {
+                        PatchSwitchRow(
+                            title = patch.title,
+                            description = patch.description,
+                            checked = checked,
+                            lock = lock,
+                            onCheckedChange = { onToggle(patch, it) },
+                            onLockedTap = { lockInfo = LockInfo(patch, lock) },
+                        )
+
+                        if (hasSettings) {
+                            AnimatedVisibility(visible = checked) {
+                                Column(
+                                    verticalArrangement = Arrangement.spacedBy(10.dp),
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .padding(bottom = 8.dp),
+                                ) {
+                                    if (patch.variants.isNotEmpty()) {
+                                        val effective = patch.effectiveVariants { optionState.toggle(patch, it) }
+                                        val resolved = patch.resolveVariantIndex(variantIndex(patch)) {
+                                            optionState.toggle(patch, it)
+                                        }
+                                        PatchVariantSelector(
+                                            variants = effective,
+                                            selectedIndex = effective
+                                                .indexOfFirst { it.originalIndex == resolved }
+                                                .coerceAtLeast(0),
+                                            onSelect = { pos ->
+                                                effective.getOrNull(pos)?.let { onSelectVariant(patch, it.originalIndex) }
+                                            },
+                                        )
+                                    }
+
+                                    for (option in inlineToggles) key(option.key) {
+                                        InlineToggleRow(
+                                            title = option.title,
+                                            description = option.description,
+                                            checked = optionState.toggle(patch, option),
+                                            onCheckedChange = { optionState.setToggle(patch, option, it) },
+                                        )
+                                    }
+
+                                    if (hasSheetOptions) {
+                                        Box(
+                                            modifier = Modifier.fillMaxWidth(),
+                                            contentAlignment = Alignment.Center,
+                                        ) {
+                                            AdvancedOptionsButton(
+                                                modified = optionState.isModified(patch),
+                                                onClick = { advancedFor = patch },
+                                            )
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -143,6 +221,84 @@ fun PatchSelectionAccordion(
             onDismiss = { lockInfo = null },
         )
     }
+
+    advancedFor?.let { patch ->
+        PatchAdvancedOptionsSheet(
+            patch = patch,
+            state = optionState,
+            selectedVariant = patch.resolveVariantIndex(variantIndex(patch)) { optionState.toggle(patch, it) },
+            onDismiss = { advancedFor = null },
+        )
+    }
+}
+
+@Composable
+private fun AdvancedOptionsButton(
+    modified: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    FilledTonalButton(
+        onClick = onClick,
+        modifier = modifier,
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_tune),
+            contentDescription = null,
+            modifier = Modifier.size(18.dp),
+        )
+        Spacer(Modifier.width(8.dp))
+        Text(stringResource(R.string.patchopts_advanced_button))
+        if (modified) {
+            Spacer(Modifier.width(8.dp))
+            Box(
+                modifier = Modifier
+                    .size(8.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.primary),
+            )
+        }
+    }
+}
+
+@Composable
+private fun InlineToggleRow(
+    title: String,
+    description: String,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    val interactionSource = remember(::MutableInteractionSource)
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(
+                interactionSource = interactionSource,
+                indication = null,
+                role = Role.Switch,
+            ) { onCheckedChange(!checked) }
+            .padding(vertical = 4.dp),
+    ) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(2.dp),
+            modifier = Modifier.weight(1f),
+        ) {
+            Text(text = title, style = MaterialTheme.typography.titleSmall)
+            Text(
+                text = description,
+                style = MaterialTheme.typography.bodySmall,
+                modifier = Modifier.alpha(.7f),
+            )
+        }
+        Switch(
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+            interactionSource = interactionSource,
+        )
+    }
 }
 
 @Composable
@@ -212,7 +368,7 @@ private fun PatchSwitchRow(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun PatchLockDialog(
-    thisPatch: KnownPatch,
+    thisPatch: PatchSpec,
     lock: PatchLock,
     onDismiss: () -> Unit,
 ) {
@@ -220,12 +376,17 @@ private fun PatchLockDialog(
         is PatchLock.LockedOn -> Triple(
             R.string.patch_lock_required_title,
             R.string.patch_lock_required_msg,
-            stringResource(lock.by.titleRes),
+            lock.by.title,
         )
         is PatchLock.LockedOff -> Triple(
             R.string.patch_lock_blocked_title,
             R.string.patch_lock_blocked_msg,
-            stringResource(lock.by.titleRes),
+            lock.by.title,
+        )
+        PatchLock.RequiresDefaultPackage -> Triple(
+            R.string.patch_lock_pkgname_title,
+            R.string.patch_lock_pkgname_msg,
+            PatchOptions.Default.packageName,
         )
         PatchLock.Free -> return
     }
@@ -246,7 +407,7 @@ private fun PatchLockDialog(
                 )
                 Text(
                     text = AnnotatedString.fromHtml(stringResource(msgRes, blockerTitle)),
-                    style = MaterialTheme.typography.titleMedium,
+                    style = MaterialTheme.typography.bodyLarge,
                 )
                 Box(modifier = Modifier.fillMaxWidth()) {
                     TextButton(

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/components/PatchVariantSelector.kt

@@ -4,15 +4,14 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
-import com.meowarex.rlmobile.ui.screens.patchopts.PatchVariant
+import com.meowarex.rlmobile.ui.screens.patchopts.EffectiveVariant
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PatchVariantSelector(
-    variants: List<PatchVariant>,
+    variants: List<EffectiveVariant>,
     selectedIndex: Int,
     onSelect: (Int) -> Unit,
     modifier: Modifier = Modifier,
@@ -31,7 +30,7 @@ fun PatchVariantSelector(
                 icon = {},
                 label = {
                     Text(
-                        text = stringResource(variant.titleRes),
+                        text = variant.title,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
                         textAlign = TextAlign.Center,

Manager/app/src/main/kotlin/com/meowarex/rlmobile/ui/screens/patchopts/components/options/TextPatchOption.kt

@@ -3,8 +3,12 @@ package com.meowarex.rlmobile.ui.screens.patchopts.components.options
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.meowarex.rlmobile.R
 import com.meowarex.rlmobile.ui.components.Label
 import com.meowarex.rlmobile.ui.components.ResetToDefaultButton
 
@@ -18,6 +22,8 @@ fun TextPatchOption(
     onValueChange: (String) -> Unit,
     onValueReset: () -> Unit,
     modifier: Modifier = Modifier,
+    locked: Boolean? = null,
+    onLockClick: () -> Unit = {},
     extra: (@Composable ColumnScope.() -> Unit)? = null,
 ) {
     Label(
@@ -30,16 +36,41 @@ fun TextPatchOption(
             onValueChange = onValueChange,
             isError = valueIsError,
             singleLine = true,
+            enabled = locked != true,
             colors = OutlinedTextFieldDefaults.colors(
                 unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainerLow,
                 focusedContainerColor = MaterialTheme.colorScheme.surfaceContainerLow,
                 errorContainerColor = MaterialTheme.colorScheme.surfaceContainerLow,
+                disabledContainerColor = MaterialTheme.colorScheme.surfaceContainerLow,
             ),
             trailingIcon = {
-                ResetToDefaultButton(
-                    enabled = !valueIsDefault,
-                    onClick = onValueReset,
-                )
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    if (locked != true) {
+                        ResetToDefaultButton(
+                            enabled = !valueIsDefault,
+                            onClick = onValueReset,
+                        )
+                    }
+                    if (locked != null) {
+                        IconButton(
+                            onClick = onLockClick,
+                            modifier = Modifier.size(32.dp),
+                        ) {
+                            Icon(
+                                painter = painterResource(
+                                    if (locked) R.drawable.ic_lock else R.drawable.ic_lock_open,
+                                ),
+                                contentDescription = stringResource(
+                                    if (locked) R.string.patchopts_field_unlock else R.string.patchopts_field_lock,
+                                ),
+                                tint = if (locked) MaterialTheme.colorScheme.primary
+                                else MaterialTheme.colorScheme.onSurfaceVariant,
+                                modifier = Modifier.size(18.dp),
+                            )
+                        }
+                        Spacer(Modifier.width(8.dp))
+                    }
+                }
             },
             modifier = Modifier
                 .fillMaxWidth()

Manager/app/src/main/kotlin/com/meowarex/rlmobile/util/Context.kt

@@ -5,6 +5,8 @@ import android.app.Activity
 import android.content.*
 import android.content.pm.PackageManager
 import android.content.res.Resources
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.net.Uri
 import android.os.*
 import android.provider.Settings
@@ -63,6 +65,15 @@ fun Context.getPackageVersion(pkg: String): Pair<String?, Int> {
         .let { it.versionName to it.versionCode }
 }
 
+// Whether the device currently has a validated internet connection
+fun Context.isOnline(): Boolean {
+    val cm = getSystemService<ConnectivityManager>() ?: return true
+    val network = cm.activeNetwork ?: return false
+    val caps = cm.getNetworkCapabilities(network) ?: return false
+    return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+        caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+}
+
 fun Context.isPackageInstalled(packageName: String): Boolean {
     return try {
         packageManager.getPackageInfo(packageName, 0)

Manager/app/src/main/res/drawable/ic_healing.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#e8eaed"
+      android:pathData="M218,856L104,742Q81,719 81,686Q81,653 104,630L630,104Q653,81 686,81Q719,81 742,104L856,218Q879,241 879,274Q879,307 856,330L330,856Q307,879 274,879Q241,879 218,856ZM508,734L734,508L856,630Q879,653 879,686Q879,719 856,742L742,856Q719,879 686,879Q653,879 630,856L508,734ZM480,600Q497,600 508.5,588.5Q520,577 520,560Q520,543 508.5,531.5Q497,520 480,520Q463,520 451.5,531.5Q440,543 440,560Q440,577 451.5,588.5Q463,600 480,600ZM400,520Q417,520 428.5,508.5Q440,497 440,480Q440,463 428.5,451.5Q417,440 400,440Q383,440 371.5,451.5Q360,463 360,480Q360,497 371.5,508.5Q383,520 400,520ZM560,520Q577,520 588.5,508.5Q600,497 600,480Q600,463 588.5,451.5Q577,440 560,440Q543,440 531.5,451.5Q520,463 520,480Q520,497 531.5,508.5Q543,520 560,520ZM225,451L104,330Q81,307 81,274Q81,241 104,218L218,104Q241,81 274,81Q307,81 330,104L452,226L225,451ZM480,440Q497,440 508.5,428.5Q520,417 520,400Q520,383 508.5,371.5Q497,360 480,360Q463,360 451.5,371.5Q440,383 440,400Q440,417 451.5,428.5Q463,440 480,440Z" />
+</vector>

Manager/app/src/main/res/drawable/ic_lock.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#e8eaed"
+      android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8H8.9V6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>

Manager/app/src/main/res/drawable/ic_lock_open.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#e8eaed"
+      android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2zM18,20H6V10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z" />
+</vector>

Manager/app/src/main/res/drawable/ic_tune.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#e8eaed"
+      android:pathData="M3,17v2h6v-2H3zM3,5v2h10V5H3zM13,21v-2h8v-2h-8v-2h-2v6h2zM7,9v2H3v2h4v2h2V9H7zM21,13v-2H11v2h10zM15,7h2V5h4V3h-4V1h-2v6z" />
+</vector>

Manager/app/src/main/res/values/strings.xml

@@ -22,6 +22,7 @@
   <string name="action_retry_install">Retry installation</string>
   <string name="action_open_error_log">Open error log</string>
   <string name="action_apply">Apply</string>
+  <string name="action_done">Done</string>
   <string name="action_confirm">Confirm</string>
   <string name="action_dismiss">Dismiss</string>
   <string name="action_install">Install</string>
@@ -179,7 +180,7 @@
   <string name="install_error_timeout">Installer timed out</string>
 
   <string name="install_group_prepare">Prepare</string>
-  <string name="install_group_download">Download dependencies</string>
+  <string name="install_group_download">Download Batteries</string>
   <string name="install_group_patch">Patch APK</string>
   <string name="install_group_install">Install APK</string>
 
@@ -246,11 +247,23 @@
   <string name="patchopts_custom_tidal_apk_desc">Provide your own Stock TIDAL APK to patch instead of the version from Github.</string>
   <string name="patchopts_custom_patches_title">Custom Patches</string>
   <string name="patchopts_custom_patches_desc">Provide your own Patches Zip to use instead of the ones from Github.</string>
+  <string name="patchopts_bypass_incompatible_title">Bypass Incompatible</string>
+  <string name="patchopts_bypass_incompatible_desc">Force-allow path-gated patches. This can be VERY DANGEROUS!</string>
   <string name="patchopts_divider_basic">Basic</string>
   <string name="patchopts_divider_advanced">Advanced</string>
   <string name="patchopts_patches_title">Patches</string>
   <string name="patchopts_patches_desc">Toggle which patches are applied during installation. Unchecked patches are skipped entirely.</string>
   <string name="patchopts_patches_summary">%1$d of %2$d enabled</string>
+  <string name="patchopts_integrations_title">Integrations</string>
+  <string name="patchopts_integrations_desc">Connect TIDAL to other systems/apps</string>
+  <string name="patchopts_pkgname_warning_title">Custom Package Name</string>
+  <string name="patchopts_pkgname_warning_msg">Installing under a package name other than &lt;b>%s&lt;/b> will block the following from working:</string>
+  <string name="patchopts_pkgname_warning_permanent">The package name is permanent once installed (requires a fresh install)</string>
+  <string name="patchopts_advanced_button">Advanced Options</string>
+  <string name="patchopts_advanced_sheet_label">Advanced Options</string>
+  <string name="patchopts_toggle_snap">Toggle snapping to steps</string>
+  <string name="patchopts_field_unlock">Unlock editing</string>
+  <string name="patchopts_field_lock">Lock and reset to default</string>
 
   <string name="patch_lyrics_disable_cover_title">Disable Lyrics Cover</string>
   <string name="patch_lyrics_disable_cover_desc">Removes the mini track cover from the lyrics screen.</string>
@@ -268,6 +281,10 @@
   >Inverts the auto-hide behavior on the lyrics screen, playback controls stay visible by default and only hide when you tap them off.</string>
   <string name="patch_player_backdrop_title">Player Backdrop</string>
   <string name="patch_player_backdrop_desc">Restores the legacy translucent backdrop blur behind the player.</string>
+  <string name="patch_quality_badge_colors_title">Quality Badge Colors</string>
+  <string name="patch_quality_badge_colors_desc">Brings color back to the player quality badge.</string>
+  <string name="patch_player_one_handed_title">One-Handed Mode</string>
+  <string name="patch_player_one_handed_desc">Mirrors the bottom player buttons left-to-right for easier one-handed reach.</string>
   <string name="patch_cover_everywhere_title">Cover Everywhere - WIP</string>
   <string name="patch_cover_everywhere_desc">Applies the blurred backdrop to every Compose based page (Home &amp; Collection)</string>
   <string name="patch_lyrics_replace_share_button_title">Replace Share Button</string>
@@ -278,6 +295,19 @@
   <string
     name="patch_debug_menu_unlock_desc"
   >Reveals TIDAL\'s hidden Debug Menu in Settings. (Unlocks Feature Flags &amp; the legacy Debug Options)</string>
+  <string name="patch_waze_integration_title">Waze Integration</string>
+  <string name="patch_waze_integration_desc">Control TIDAL playback from the Waze app</string>
+  <string name="patch_waze_browse_root_title">Media Menu</string>
+  <string name="patch_waze_accent_color_title">Accent Color</string>
+  <string name="patch_waze_color_waze_default">Waze Default</string>
+  <string name="patch_waze_color_tidal_cyan">TIDAL Cyan</string>
+  <string name="patch_waze_color_material_you">Material You</string>
+  <string name="patch_waze_root_auto">Auto Menu</string>
+  <string name="patch_waze_root_home">Home</string>
+  <string name="patch_waze_root_recents">Recents</string>
+  <string name="patch_color_picker_title">Custom color</string>
+  <string name="patch_color_picker_hex">Hex color</string>
+  <string name="patch_color_picker_hex_error">Use #RRGGBB or #AARRGGBB.</string>
   <string name="patch_enable_legacy_ui_title">Enable Legacy UI</string>
   <string
     name="patch_enable_legacy_ui_desc"
@@ -285,14 +315,38 @@
 
   <string name="patch_mini_player_redesign_title">Redesigned Mini-Player</string>
   <string name="patch_mini_player_redesign_desc">Integrates the Seekbar into the control panel at the bottom of the screen.</string>
+  <string name="patch_mini_player_gestures_title">Mini-Player Gestures</string>
+  <string name="patch_mini_player_gestures_desc">Swipe up on the mini-player to open the full player.</string>
+  <string name="patch_mini_player_drag_title">Swipe Up Style</string>
+  <string name="patch_mini_player_drag_desc">Whether the player follows your finger when swiping up to open it.</string>
+  <string name="patch_mini_player_drag_static">Static</string>
+  <string name="patch_mini_player_drag_drag">Drag</string>
+  <string name="patch_mini_player_left_right_gestures_title">Next/Previous Gestures</string>
+  <string name="patch_mini_player_left_right_gestures_desc">Swipe left or right on the mini-player to skip tracks.</string>
+  <string name="patch_mini_player_dynamic_bg_title">Mini-Player Dynamic Background</string>
+  <string name="patch_mini_player_dynamic_bg_desc">Colorizes the Mini-Player depending on the currently playing track.</string>
   <string name="patch_mini_player_variant_floating_title">Floating</string>
   <string name="patch_mini_player_variant_square_grey_title">Grey</string>
   <string name="patch_mini_player_variant_square_black_title">Black</string>
+  <string name="patch_mini_player_variant_legacy_title">Legacy</string>
+  <string name="patch_mini_player_border_title">Progress Border</string>
+  <string name="patch_mini_player_border_desc">Draws an animated progress ring around the floating mini-player. Requires the Floating style.</string>
+
+  <!-- Advanced option labels -->
+  <string name="patch_opt_backdrop_blur_title">Blur Strength</string>
+  <string name="patch_opt_backdrop_blur_desc">How strongly the album art behind the player is blurred.</string>
+  <string name="patch_opt_backdrop_dimming_title">Backdrop Dimming</string>
+  <string name="patch_opt_backdrop_dimming_desc">Adjusts the level of darkening on the backdrop to keep foreground controls legible.</string>
 
   <string name="patch_lock_required_title">Patch Required!</string>
   <string name="patch_lock_blocked_title">Patch Blocked!</string>
   <string name="patch_lock_required_msg">Patch Required by &lt;b>%s&lt;/b>.</string>
   <string name="patch_lock_blocked_msg">Patch Blocked by &lt;b>%s&lt;/b>.</string>
+  <string name="patch_lock_pkgname_title">Original Package Name Invalid!</string>
+  <string name="patch_lock_pkgname_msg">This only works while the app keeps its original &lt;b>%s&lt;/b> package name. Reset the Package Name option to enable it.&lt;br/>&lt;br/>An existing install can\'t be renamed (requires a fresh install)</string>
+  <string name="patch_opt_lock_title">Option Locked</string>
+  <string name="patch_opt_lock_needs_variant">Requires the &lt;b>%s&lt;/b> style.</string>
+  <string name="patch_opt_lock_needs_option">Requires the &lt;b>%s&lt;/b> option.</string>
   <string name="action_got_it">Got it</string>
 
   <string name="componentopts_screen_title">Custom Component (%s)</string>

patches/collection-backdrop.patch

@@ -9,14 +9,14 @@
 +    invoke-static {v1, v0}, Lradiant/HomeBackdrop;->render(Landroidx/compose/runtime/Composer;I)V    # render album-art backdrop
 +
      new-instance v0, Lcom/tidal/wave2/foundation/WaveScaffoldKt$WaveScaffold$2;
-
+ 
      .line 388
 @@ -991,7 +995,7 @@
-
+ 
      .line 436
      .line 437
 -    move-wide v15, v10
 +    const-wide/16 v15, 0x0    # transparent containerColor
-
+ 
      .line 438
      const/4 v11, 0x0

patches/cover-capture.patch

@@ -1,11 +1,22 @@
---- a/com/tidal/android/feature/appscaffold/ui/p.smali
-+++ b/com/tidal/android/feature/appscaffold/ui/p.smali
-@@ -51,6 +51,8 @@
+--- a/com/tidal/android/feature/appscaffold/ui/q.smali
++++ b/com/tidal/android/feature/appscaffold/ui/q.smali
+@@ -55,6 +55,8 @@
      .line 10
-     iput-object p4, p0, Lcom/tidal/android/feature/appscaffold/ui/p;->d:Ljava/lang/String;
-
+     iput-object p4, p0, Lcom/tidal/android/feature/appscaffold/ui/q;->d:Ljava/lang/String;
+ 
 +    invoke-static {p3, p4}, Lradiant/HomeBackdrop;->fromMiniPlayer(ILjava/lang/String;)V    # capture cover state
 +
      .line 11
      .line 12
-     iput-boolean p5, p0, Lcom/tidal/android/feature/appscaffold/ui/p;->e:Z
+     iput-boolean p5, p0, Lcom/tidal/android/feature/appscaffold/ui/q;->e:Z
+--- a/com/tidal/android/feature/appscaffold/ui/t.smali
++++ b/com/tidal/android/feature/appscaffold/ui/t.smali
+@@ -23,6 +23,8 @@
+ .method public constructor <init>(Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$ItemType;Lcom/tidal/android/feature/appscaffold/ui/q;Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;Z)V
+     .locals 0
+ 
++    invoke-static {p3}, Lradiant/HomeBackdrop;->onPlayState(Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;)V    # RL: publish live play state to Cover Everywhere
++
+     .line 1
+     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+ 

patches/data.json

@@ -1,5 +1,5 @@
 {
-  "tidalVersionCode": 9090,
+  "tidalVersionCode": 10004,
   "tidalApkUrl": "https://github.com/meowarex/rl-mobile/releases/download/latest/tidal-stock.apk",
-  "patchesVersion": "0.9.7"
+  "patchesVersion": "0.11.0"
 }

patches/debug-menu-unlock.patch

@@ -3,17 +3,17 @@
 @@ -54,6 +54,9 @@
  .method public final a()Z
      .locals 2
-
+ 
 +    const/4 v0, 0x1    # force true
 +    return v0    # bypass debug flag
 +
      .line 1
-     iget-object v0, p0, Lcom/tidal/android/core/debug/DebugFeatureInteractorDefault;->a:Lcom/tidal/android/featureflags/l;
-
-@@ -98,6 +101,14 @@
+     iget-object v0, p0, Lcom/tidal/android/core/debug/DebugFeatureInteractorDefault;->a:Lcom/tidal/android/featureflags/n;
+ 
+@@ -99,6 +102,14 @@
          }
      .end annotation
-
+ 
 +    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;    # always-true value
 +
 +    invoke-static {v0}, Lkotlinx/coroutines/flow/StateFlowKt;->MutableStateFlow(Ljava/lang/Object;)Lkotlinx/coroutines/flow/MutableStateFlow;    # wrap in flow
@@ -23,14 +23,15 @@
 +    return-object v0    # short-circuit b()
 +
      .line 1
-     sget-object v0, Lj50/a;->a:Ljava/lang/String;
-
-@@ -261,5 +272,8 @@
+     sget-object v0, Lo50/a;->a:Ljava/lang/String;
+ 
+@@ -261,6 +272,9 @@
  .method public final c()Z
      .locals 3
-
+ 
 +    const/4 v0, 0x1    # force true
 +    return v0    # bypass debug flag
 +
      .line 1
-     sget-object v0, Lj50/a;->a:Ljava/lang/String;
+     sget-object v0, Lo50/a;->a:Ljava/lang/String;
+ 

patches/enable-legacy-ui.patch

@@ -1,12 +1,11 @@
---- a/kg/e.smali
-+++ b/kg/e.smali
-@@ -26,8 +26,8 @@
-     new-instance v0, Lkg/e;
-
+--- a/hg/d.smali
++++ b/hg/d.smali
+@@ -27,7 +27,7 @@
+ 
      .line 2
      .line 3
 -    const-string v1, "player-market-ui"
 +    const-string v1, "player-market-ui-rl-forced-off"    # break flag key lookup
-
+ 
      .line 4
      .line 5

patches/extension/com/tidal/android/feature/appscaffold/ui/r$c.smali

@@ -0,0 +1,73 @@
+.class public final Lcom/tidal/android/feature/appscaffold/ui/r$c;
+.super Lcom/tidal/android/feature/appscaffold/ui/r;
+.source "SourceFile"
+
+# Synthetic mini-player event used by right swipe (previous/rewind).
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/tidal/android/feature/appscaffold/ui/r;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+
+# static fields
+.field public static final a:Lcom/tidal/android/feature/appscaffold/ui/r$c;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/tidal/android/feature/appscaffold/ui/r$c;
+
+    invoke-direct {v0}, Lcom/tidal/android/feature/appscaffold/ui/r;-><init>()V
+
+    sput-object v0, Lcom/tidal/android/feature/appscaffold/ui/r$c;->a:Lcom/tidal/android/feature/appscaffold/ui/r$c;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    if-ne p0, p1, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of p1, p1, Lcom/tidal/android/feature/appscaffold/ui/r$c;
+
+    if-nez p1, :cond_1
+
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    const v0, -0x5d6a0f8
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "PreviousButtonClicked"
+
+    return-object v0
+.end method

patches/extension/radiant/HomeBackdrop.smali

@@ -5,6 +5,20 @@
 # static fields
 .field public static volatile currentAlbumId:I
 
+# 0 = Static, 1 = Animated (always rotate), 2 = Playback (follow live play state)
+.field public static volatile mode:I
+
+# Live play state from the mini-player (t.c PlayState = Playing)
+.field public static isPlayingState:Landroidx/compose/runtime/MutableState;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Landroidx/compose/runtime/MutableState<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field public static coverUuidState:Landroidx/compose/runtime/MutableState;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -24,6 +38,24 @@
 
     sput v0, Lradiant/HomeBackdrop;->currentAlbumId:I
 
+    const/4 v0, 0x2
+
+    sput v0, Lradiant/HomeBackdrop;->mode:I
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v1, v2, v3}, Landroidx/compose/runtime/SnapshotStateKt;->mutableStateOf$default(Ljava/lang/Object;Landroidx/compose/runtime/SnapshotMutationPolicy;ILjava/lang/Object;)Landroidx/compose/runtime/MutableState;
+
+    move-result-object v0
+
+    sput-object v0, Lradiant/HomeBackdrop;->isPlayingState:Landroidx/compose/runtime/MutableState;
+
     const/4 v0, 0x0
 
     const/4 v1, 0x0
@@ -41,6 +73,64 @@
     return-void
 .end method
 
+.method public static setModeStatic()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    sput v0, Lradiant/HomeBackdrop;->mode:I
+
+    return-void
+.end method
+
+.method public static setModeAnimated()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    sput v0, Lradiant/HomeBackdrop;->mode:I
+
+    return-void
+.end method
+
+.method public static setModePlayback()V
+    .locals 1
+
+    const/4 v0, 0x2
+
+    sput v0, Lradiant/HomeBackdrop;->mode:I
+
+    return-void
+.end method
+
+# from the mini-player state ctor (t.<init>) whenever play state changes.
+.method public static onPlayState(Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;)V
+    .locals 2
+
+    sget-object v0, Lradiant/HomeBackdrop;->isPlayingState:Landroidx/compose/runtime/MutableState;
+
+    if-nez v0, :cond_ready
+
+    return-void
+
+    :cond_ready
+    sget-object v1, Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;->Playing:Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;
+
+    if-ne p0, v1, :cond_paused
+
+    sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    goto :goto_set
+
+    :cond_paused
+    sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    :goto_set
+    invoke-interface {v0, v1}, Landroidx/compose/runtime/MutableState;->setValue(Ljava/lang/Object;)V
+
+    return-void
+.end method
+
 
 .method private constructor <init>()V
     .locals 0
@@ -271,97 +361,52 @@
 
     if-eqz v2, :skip
 
-    sget v2, Lradiant/HomeBackdrop;->currentAlbumId:I
-
-    new-instance v3, Lcom/tidal/android/feature/playerscreen/ui/composables/n0;
-
-    invoke-direct {v3, v2, v1}, Lcom/tidal/android/feature/playerscreen/ui/composables/n0;-><init>(ILjava/lang/String;)V
-
-    sget-object v4, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x1
-
-    const/4 v7, 0x0
-
-    invoke-static {v4, v5, v6, v7}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxSize$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;
-
-    move-result-object v4
-
-    const/high16 v5, 0x42200000
-
-    invoke-static {v5}, Landroidx/compose/ui/unit/Dp;->constructor-impl(F)F
-
-    move-result v5
-
-    sget-object v6, Landroidx/compose/ui/draw/BlurredEdgeTreatment;->Companion:Landroidx/compose/ui/draw/BlurredEdgeTreatment$Companion;
-
-    invoke-virtual {v6}, Landroidx/compose/ui/draw/BlurredEdgeTreatment$Companion;->getRectangle---Goahg()Landroidx/compose/ui/graphics/Shape;
-
-    move-result-object v6
-
-    invoke-static {v4, v5, v6}, Landroidx/compose/ui/draw/BlurKt;->blur-F8QBwvs(Landroidx/compose/ui/Modifier;FLandroidx/compose/ui/graphics/Shape;)Landroidx/compose/ui/Modifier;
-
-    move-result-object v4
-
-    sget-object v5, Landroidx/compose/ui/layout/ContentScale;->Companion:Landroidx/compose/ui/layout/ContentScale$Companion;
-
-    invoke-virtual {v5}, Landroidx/compose/ui/layout/ContentScale$Companion;->getCrop()Landroidx/compose/ui/layout/ContentScale;
-
-    move-result-object v5
-
-    move-object/from16 v6, v3
-
-    const/4 v7, 0x0
-
-    move-object/from16 v8, v4
+    # Render TIDAL's NATIVE DarkBlurBackground (p3.a)
+    sget-object v8, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;
 
     const/4 v9, 0x0
 
-    move-object/from16 v10, v5
+    const/4 v10, 0x1
 
-    move-object/from16 v11, v1    # uuid as cache key
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
+    invoke-static {v8, v9, v10, v11}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxSize$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;
 
-    move-object/from16 v13, v0
+    move-result-object v13    # v13 = fillMaxSize modifier
 
-    const/4 v14, 0x0
+    sget v8, Lradiant/HomeBackdrop;->currentAlbumId:I    # v8 = album id
 
-    const/16 v15, 0x48
+    move-object v9, v1    # v9 = cover uuid
 
-    invoke-static/range {v6 .. v15}, Lxd0/f;->a(Lyl0/l;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/graphics/ColorFilter;Landroidx/compose/ui/layout/ContentScale;Ljava/lang/Object;Lyl0/a;Landroidx/compose/runtime/Composer;II)V
+    # v10 = isPlaying, mirrored from the Player Backdrop variant
+    sget v10, Lradiant/HomeBackdrop;->mode:I
 
-    sget-object v3, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;
+    const/4 v11, 0x2
 
-    const/4 v4, 0x0
+    if-ne v10, v11, :rl_mode_done
 
-    const/4 v5, 0x1
+    sget-object v10, Lradiant/HomeBackdrop;->isPlayingState:Landroidx/compose/runtime/MutableState;
 
-    const/4 v6, 0x0
+    invoke-interface {v10}, Landroidx/compose/runtime/State;->getValue()Ljava/lang/Object;
 
-    invoke-static {v3, v4, v5, v6}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxSize$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;
+    move-result-object v10
 
-    move-result-object v3
+    check-cast v10, Ljava/lang/Boolean;
 
-    const v4, -0x80000000
+    invoke-virtual {v10}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {v4}, Landroidx/compose/ui/graphics/ColorKt;->Color(I)J
+    move-result v10
 
-    move-result-wide v4
+    :rl_mode_done
+    const/4 v11, 0x0    # v11 = isSeeking = false
 
-    invoke-static {}, Landroidx/compose/ui/graphics/RectangleShapeKt;->getRectangleShape()Landroidx/compose/ui/graphics/Shape;
+    const/4 v12, 0x0    # v12 = progress callback = null (unused while not seeking)
 
-    move-result-object v6
+    move-object v14, v0    # v14 = composer
 
-    invoke-static {v3, v4, v5, v6}, Landroidx/compose/foundation/BackgroundKt;->background-bw27NRU(Landroidx/compose/ui/Modifier;JLandroidx/compose/ui/graphics/Shape;)Landroidx/compose/ui/Modifier;
+    const/4 v15, 0x0    # v15 = changed flags
 
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    invoke-static {v3, v0, v4}, Landroidx/compose/foundation/layout/SpacerKt;->Spacer(Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
+    invoke-static/range {v8 .. v15}, Lcom/tidal/android/feature/playerscreen/ui/composables/p3;->a(ILjava/lang/String;ZZLam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
 
     :skip
     invoke-interface {v0}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V

patches/extension/radiant/LyricsReinitGuard.smali

@@ -0,0 +1,21 @@
+.class public final Lradiant/LyricsReinitGuard;
+.super Ljava/lang/Object;
+.source "LyricsReinitGuard.smali"
+
+
+# static fields
+
+# stuff that makes lyrics view stays open.. i forgot what it actually does other than short circuit a call or some shit <3
+.field public static lastMediaId:I
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, -0x1
+
+    sput v0, Lradiant/LyricsReinitGuard;->lastMediaId:I
+
+    return-void
+.end method

patches/extension/radiant/MiniPlayerBackground.smali

@@ -0,0 +1,139 @@
+.class public final Lradiant/MiniPlayerBackground;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final colorState:Landroidx/compose/runtime/MutableState; # player bg color
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    invoke-static {v0, v0, v1, v0}, Landroidx/compose/runtime/SnapshotStateKt;->mutableStateOf$default(Ljava/lang/Object;Landroidx/compose/runtime/SnapshotMutationPolicy;ILjava/lang/Object;)Landroidx/compose/runtime/MutableState;
+
+    move-result-object v0
+
+    sput-object v0, Lradiant/MiniPlayerBackground;->colorState:Landroidx/compose/runtime/MutableState;
+
+    return-void
+.end method
+
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+.method public static color(JLandroidx/compose/runtime/Composer;I)J
+    .locals 8
+    .annotation build Landroidx/compose/runtime/Composable;
+    .end annotation
+
+    const v0, 0x4d504442 # compose group key
+
+    invoke-interface {p2, v0}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V
+
+    sget-object v0, Lradiant/MiniPlayerBackground;->colorState:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {v0}, Landroidx/compose/runtime/MutableState;->getValue()Ljava/lang/Object; # read player color
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/compose/ui/graphics/Color;
+
+    if-eqz v0, :fallback
+
+    invoke-virtual {v0}, Landroidx/compose/ui/graphics/Color;->unbox-impl()J
+
+    move-result-wide p0
+
+    :fallback
+    const/16 v0, 0x2ee # 750ms
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x6
+
+    const/4 v4, 0x0
+
+    invoke-static {v0, v1, v2, v3, v4}, Landroidx/compose/animation/core/AnimationSpecKt;->tween$default(IILandroidx/compose/animation/core/Easing;ILjava/lang/Object;)Landroidx/compose/animation/core/TweenSpec;
+
+    move-result-object v2
+
+    move-wide v0, p0
+
+    const-string v3, "miniPlayerBackgroundColorAnimation"
+
+    const/4 v4, 0x0
+
+    move-object v5, p2
+
+    const/16 v6, 0x1b0
+
+    const/16 v7, 0x8
+
+    invoke-static/range {v0 .. v7}, Landroidx/compose/animation/SingleValueAnimationKt;->animateColorAsState-euL9pac(JLandroidx/compose/animation/core/AnimationSpec;Ljava/lang/String;Lam0/l;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Landroidx/compose/runtime/State;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/compose/ui/graphics/Color;
+
+    invoke-virtual {v0}, Landroidx/compose/ui/graphics/Color;->unbox-impl()J
+
+    move-result-wide p0
+
+    invoke-interface {p2}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V
+
+    return-wide p0
+.end method
+
+
+.method public static setHex(Ljava/lang/String;)V
+    .locals 3
+
+    const/4 v0, 0x0
+
+    if-eqz p0, :set_color
+
+    :try_start
+    invoke-static {p0}, Landroid/graphics/Color;->parseColor(Ljava/lang/String;)I
+
+    move-result p0
+
+    invoke-static {p0}, Landroidx/compose/ui/graphics/ColorKt;->Color(I)J # pack ARGB color
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Landroidx/compose/ui/graphics/Color;->box-impl(J)Landroidx/compose/ui/graphics/Color;
+
+    move-result-object v0
+    :try_end
+    .catch Ljava/lang/Throwable; {:try_start .. :try_end} :catch_parse
+
+    goto :set_color
+
+    :catch_parse
+    move-exception p0
+
+    :set_color
+    sget-object p0, Lradiant/MiniPlayerBackground;->colorState:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {p0, v0}, Landroidx/compose/runtime/MutableState;->setValue(Ljava/lang/Object;)V
+
+    return-void
+.end method

patches/extension/radiant/MiniPlayerGestures$ApplyPending.smali

@@ -0,0 +1,62 @@
+.class public final Lradiant/MiniPlayerGestures$ApplyPending;
+.super Ljava/lang/Object;
+.implements Ljava/lang/Runnable;
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ApplyPending"
+.end annotation
+
+
+# instance fields
+.field public final a:Landroidx/compose/material3/SheetState;
+
+.field public final b:I
+
+
+# direct methods
+.method public constructor <init>(Landroidx/compose/material3/SheetState;I)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lradiant/MiniPlayerGestures$ApplyPending;->a:Landroidx/compose/material3/SheetState;
+
+    iput p2, p0, Lradiant/MiniPlayerGestures$ApplyPending;->b:I
+
+    return-void
+.end method
+
+
+# virtual methods
+# Apply once, then re schedule if there is still pending movement
+# -> Sheet anchors can appear one (or more) frames after opening the player, so this keeps applying the latest drag until no delta remains
+.method public final run()V
+    .locals 3
+
+    iget-object v0, p0, Lradiant/MiniPlayerGestures$ApplyPending;->a:Landroidx/compose/material3/SheetState;
+
+    invoke-static {v0}, Lradiant/MiniPlayerGestures;->applyPendingDrag(Landroidx/compose/material3/SheetState;)V
+
+    iget v1, p0, Lradiant/MiniPlayerGestures$ApplyPending;->b:I
+
+    add-int/lit8 v1, v1, -0x1
+
+    if-lez v1, :done
+
+    invoke-static {v0}, Lradiant/MiniPlayerGestures;->needsApply(Landroidx/compose/material3/SheetState;)Z
+
+    move-result v2
+
+    if-eqz v2, :done
+
+    invoke-static {v0, v1}, Lradiant/MiniPlayerGestures;->scheduleApply(Landroidx/compose/material3/SheetState;I)V
+
+    :done
+    return-void
+.end method

patches/extension/radiant/MiniPlayerGestures$FeedbackLayer.smali

@@ -0,0 +1,70 @@
+.class public final Lradiant/MiniPlayerGestures$FeedbackLayer;
+.super Ljava/lang/Object;
+.implements Lam0/l;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "FeedbackLayer"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lradiant/MiniPlayerGestures$FeedbackLayer;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lradiant/MiniPlayerGestures$FeedbackLayer;
+
+    invoke-direct {v0}, Lradiant/MiniPlayerGestures$FeedbackLayer;-><init>()V
+
+    sput-object v0, Lradiant/MiniPlayerGestures$FeedbackLayer;->INSTANCE:Lradiant/MiniPlayerGestures$FeedbackLayer;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Landroidx/compose/ui/graphics/GraphicsLayerScope;)Lkotlin/u;
+    .locals 1
+
+    sget-object v0, Lradiant/MiniPlayerGestures;->v:Landroidx/compose/runtime/MutableFloatState;
+
+    invoke-interface {v0}, Landroidx/compose/runtime/MutableFloatState;->getFloatValue()F
+
+    move-result v0
+
+    invoke-interface {p1, v0}, Landroidx/compose/ui/graphics/GraphicsLayerScope;->setTranslationY(F)V
+
+    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroidx/compose/ui/graphics/GraphicsLayerScope;
+
+    invoke-virtual {p0, p1}, Lradiant/MiniPlayerGestures$FeedbackLayer;->invoke(Landroidx/compose/ui/graphics/GraphicsLayerScope;)Lkotlin/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method

patches/extension/radiant/MiniPlayerGestures$FeedbackResetAnimator.smali

@@ -0,0 +1,60 @@
+.class public final Lradiant/MiniPlayerGestures$FeedbackResetAnimator;
+.super Ljava/lang/Object;
+.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "FeedbackResetAnimator"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+
+# virtual methods
+.method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
+    .locals 3
+
+    move-object v0, p1
+
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Float;
+
+    invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
+
+    move-result v1
+
+    invoke-static {v1}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackDirect(F)V
+
+    invoke-virtual {v0}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
+
+    move-result v1
+
+    const/high16 v2, 0x3f800000    # 1.0f
+
+    cmpg-float v1, v1, v2
+
+    if-gez v1, :done
+
+    invoke-static {v0}, Lradiant/MiniPlayerGestures;->clearSwipeFeedbackAnimator(Landroid/animation/ValueAnimator;)V
+
+    :done
+    return-void
+.end method

patches/extension/radiant/MiniPlayerGestures$Gesture.smali

@@ -0,0 +1,521 @@
+.class public final Lradiant/MiniPlayerGestures$Gesture;
+.super Ljava/lang/Object;
+.implements Lam0/l;
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Gesture"
+.end annotation
+
+
+# instance fields
+.field public final a:Lam0/l;
+
+# Y at ACTION_DOWN
+.field public b:F
+
+# Last Y seen (on this pointer stream)
+.field public c:F
+
+# True while this listener owns an active pointer stream
+.field public d:Z
+
+# True when sheet drag has started
+.field public e:Z
+
+.field public final f:Landroidx/compose/material3/SheetState;
+
+.field public g:F
+
+# X at ACTION_DOWN
+.field public i:F
+
+# True once horizontal movement wins (prevents later vertical start)
+.field public j:Z
+
+# Drag option enabled
+.field public final k:Z
+
+
+# direct methods
+.method public constructor <init>(Lam0/l;Landroidx/compose/material3/SheetState;Z)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lradiant/MiniPlayerGestures$Gesture;->a:Lam0/l;
+
+    iput-object p2, p0, Lradiant/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
+
+    iput-boolean p3, p0, Lradiant/MiniPlayerGestures$Gesture;->k:Z
+
+    return-void
+.end method
+
+.method private static dp(F)F
+    .locals 1
+
+    invoke-static {}, Landroid/content/res/Resources;->getSystem()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
+
+    move-result-object v0
+
+    iget v0, v0, Landroid/util/DisplayMetrics;->density:F
+
+    mul-float/2addr p0, v0
+
+    return p0
+.end method
+
+.method private dragSheet(FJ)V
+    .locals 1
+
+    iget-object v0, p0, Lradiant/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
+
+    invoke-static {v0, p1, p2, p3}, Lradiant/MiniPlayerGestures;->updateDragTimed(Landroidx/compose/material3/SheetState;FJ)V
+
+    return-void
+.end method
+
+.method private finishSheet(F)V
+    .locals 2
+
+    iget-object v0, p0, Lradiant/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
+
+    iget-object v1, p0, Lradiant/MiniPlayerGestures$Gesture;->a:Lam0/l;
+
+    invoke-static {v0, v1, p1}, Lradiant/MiniPlayerGestures;->finishDrag(Landroidx/compose/material3/SheetState;Lam0/l;F)V
+
+    return-void
+.end method
+
+.method private openPlayer()V
+    .locals 2
+
+    iget-object v0, p0, Lradiant/MiniPlayerGestures$Gesture;->a:Lam0/l;
+
+    sget-object v1, Lcom/tidal/android/feature/appscaffold/ui/b$b;->a:Lcom/tidal/android/feature/appscaffold/ui/b$b;
+
+    invoke-interface {v0, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method private reset()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->d:Z
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->j:Z
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->i:F
+
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->g:F
+
+    return-void
+.end method
+
+.method private startSheet(FJ)V
+    .locals 2
+
+    # empty player guard
+    invoke-static {}, Lradiant/MiniPlayerGestures;->hasMiniPlayerMedia()Z
+
+    move-result v0
+
+    if-nez v0, :start_guard
+
+    return-void
+
+    :start_guard
+
+    # avoid starting twice
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    if-eqz v0, :start
+
+    return-void
+
+    :start
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->k:Z
+
+    if-eqz v0, :done
+
+    iget-object v1, p0, Lradiant/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
+
+    iget v0, p0, Lradiant/MiniPlayerGestures$Gesture;->b:F
+
+    invoke-static {v1, p1, v0, p2, p3}, Lradiant/MiniPlayerGestures;->beginDrag(Landroidx/compose/material3/SheetState;FFJ)V
+
+    invoke-direct {p0}, Lradiant/MiniPlayerGestures$Gesture;->openPlayer()V
+
+    :done
+    return-void
+.end method
+
+
+# virtual methods
+# Listens for MotionEvents
+.method public final invoke(Landroid/view/MotionEvent;)Lkotlin/u;
+    .locals 11
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
+
+    move-result v0
+
+    if-eqz v0, :down
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :up
+
+    const/4 v1, 0x2
+
+    if-eq v0, v1, :move
+
+    const/4 v1, 0x3
+
+    if-eq v0, v1, :cancel
+
+    goto :done
+
+    # ACTION_DOWN
+    :down
+    invoke-static {}, Lradiant/MiniPlayerGestures;->resetGestureLock()V
+
+    invoke-static {p1}, Lradiant/MiniPlayerGestures;->beginMotion(Landroid/view/MotionEvent;)V
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v0
+
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->b:F
+
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->c:F
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->d:Z
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->g:F
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
+
+    move-result v0
+
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->i:F
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->j:Z
+
+    iget v0, p0, Lradiant/MiniPlayerGestures$Gesture;->b:F
+
+    invoke-static {v0}, Lradiant/MiniPlayerGestures;->beginSwipeGesture(F)V
+
+    :skip_feedback_down
+
+    goto :done
+
+    # ACTION_MOVE
+    :move
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->d:Z
+
+    if-eqz v0, :done
+
+    invoke-static {p1}, Lradiant/MiniPlayerGestures;->trackMotion(Landroid/view/MotionEvent;)V
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v0
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
+
+    move-result-wide v5
+
+    iget v1, p0, Lradiant/MiniPlayerGestures$Gesture;->c:F
+
+    sub-float v1, v0, v1
+
+    iput v1, p0, Lradiant/MiniPlayerGestures$Gesture;->g:F
+
+    iget v2, p0, Lradiant/MiniPlayerGestures$Gesture;->b:F
+
+    sub-float v2, v0, v2
+
+    iget-boolean v3, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    if-eqz v3, :maybe_start
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->suppressHorizontalGestures()V
+
+    iget-boolean v3, p0, Lradiant/MiniPlayerGestures$Gesture;->k:Z
+
+    if-eqz v3, :feedback_active
+
+    invoke-direct {p0, v2, v5, v6}, Lradiant/MiniPlayerGestures$Gesture;->dragSheet(FJ)V
+
+    :feedback_active
+    invoke-static {v2}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackFromDrag(F)V
+
+    goto :store_last
+
+    :maybe_start
+    iget-boolean v3, p0, Lradiant/MiniPlayerGestures$Gesture;->j:Z
+
+    if-eqz v3, :axis_check
+
+    goto :store_last
+
+    :axis_check
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
+
+    move-result v7
+
+    iget v8, p0, Lradiant/MiniPlayerGestures$Gesture;->i:F
+
+    sub-float/2addr v7, v8
+
+    invoke-static {v7}, Ljava/lang/Math;->abs(F)F
+
+    move-result v7
+
+    invoke-static {v2}, Ljava/lang/Math;->abs(F)F
+
+    move-result v8
+
+    const/high16 v9, 0x40c00000    # 6.0f axis deadzone
+
+    invoke-static {v9}, Lradiant/MiniPlayerGestures$Gesture;->dp(F)F
+
+    move-result v9
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->isHorizontalGestureLocked()Z
+
+    move-result v10
+
+    if-eqz v10, :horizontal_check
+
+    const/4 v10, 0x0
+
+    invoke-static {v10}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackDirect(F)V
+
+    goto :store_last
+
+    :horizontal_check
+
+    cmpg-float v10, v7, v9
+
+    if-gez v10, :horizontal_dominance
+
+    goto :vertical_check
+
+    :horizontal_dominance
+
+    const v10, 0x3f8ccccd    # 1.1f
+
+    mul-float/2addr v10, v8
+
+    cmpg-float v10, v7, v10
+
+    if-gez v10, :horizontal_wins
+
+    goto :vertical_check
+
+    :horizontal_wins
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->lockHorizontalGesture()Z
+
+    move-result v10
+
+    if-eqz v10, :store_last
+
+    const/4 v10, 0x1
+
+    iput-boolean v10, p0, Lradiant/MiniPlayerGestures$Gesture;->j:Z
+
+    const/4 v10, 0x0
+
+    invoke-static {v10}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackDirect(F)V
+
+    goto :store_last
+
+    # At least 16dp up to open the player
+    :vertical_check
+    neg-float v9, v9
+
+    cmpg-float v10, v2, v9
+
+    if-lez v10, :vertical_dominance
+
+    invoke-static {v2}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackFromDrag(F)V
+
+    goto :store_last
+
+    :vertical_dominance
+    const v10, 0x3f8ccccd    # 1.1f -> early vertical axis lock
+
+    mul-float/2addr v7, v10
+
+    cmpl-float v10, v8, v7
+
+    if-gtz v10, :begin
+
+    goto :store_last
+
+    :begin
+    invoke-static {}, Lradiant/MiniPlayerGestures;->lockVerticalGesture()Z
+
+    move-result v10
+
+    if-eqz v10, :store_last
+
+    invoke-direct {p0, v2, v5, v6}, Lradiant/MiniPlayerGestures$Gesture;->startSheet(FJ)V
+
+    iget-boolean v10, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    if-eqz v10, :store_last
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->suppressHorizontalGestures()V
+
+    iget-boolean v10, p0, Lradiant/MiniPlayerGestures$Gesture;->k:Z
+
+    if-eqz v10, :feedback_begin
+
+    invoke-direct {p0, v2, v5, v6}, Lradiant/MiniPlayerGestures$Gesture;->dragSheet(FJ)V
+
+    :feedback_begin
+    invoke-static {v2}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackFromDrag(F)V
+
+
+    :store_last
+    iput v0, p0, Lradiant/MiniPlayerGestures$Gesture;->c:F
+
+    goto :done
+
+    # ACTION_UP
+    :up
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->d:Z
+
+    if-eqz v0, :done
+
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    if-eqz v0, :up_no_drag
+
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->k:Z
+
+    if-eqz v0, :open_simple
+
+    invoke-static {p1}, Lradiant/MiniPlayerGestures;->trackMotion(Landroid/view/MotionEvent;)V
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v0
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
+
+    move-result-wide v5
+
+    iget-object v1, p0, Lradiant/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
+
+    invoke-static {v1, v0, v5, v6}, Lradiant/MiniPlayerGestures;->updateDragToYTimed(Landroidx/compose/material3/SheetState;FJ)V
+
+    invoke-static {v1}, Lradiant/MiniPlayerGestures;->releaseVelocity(Landroidx/compose/material3/SheetState;)F
+
+    move-result v0
+
+    invoke-direct {p0, v0}, Lradiant/MiniPlayerGestures$Gesture;->finishSheet(F)V
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    goto :finish
+
+    :up_no_drag
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    goto :finish
+
+    :open_simple
+    invoke-static {}, Lradiant/MiniPlayerGestures;->suppressHorizontalGestures()V
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v0
+
+    iget-object v1, p0, Lradiant/MiniPlayerGestures$Gesture;->a:Lam0/l;
+
+    invoke-static {v1, v0}, Lradiant/MiniPlayerGestures;->completeSimpleSwipe(Lam0/l;F)Z
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+
+    :finish
+    invoke-direct {p0}, Lradiant/MiniPlayerGestures$Gesture;->reset()V
+
+    goto :done
+
+    # ACTION_CANCEL
+    :cancel
+    iget-boolean v0, p0, Lradiant/MiniPlayerGestures$Gesture;->e:Z
+
+    if-eqz v0, :cancel_no_active
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    iget-object v0, p0, Lradiant/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
+
+    iget-object v1, p0, Lradiant/MiniPlayerGestures$Gesture;->a:Lam0/l;
+
+    invoke-static {v0, v1}, Lradiant/MiniPlayerGestures;->cancelDrag(Landroidx/compose/material3/SheetState;Lam0/l;)V
+
+    goto :cancel_reset
+
+    :cancel_no_active
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    :cancel_reset
+    invoke-direct {p0}, Lradiant/MiniPlayerGestures$Gesture;->reset()V
+
+
+    :done
+    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/MotionEvent;
+
+    invoke-virtual {p0, p1}, Lradiant/MiniPlayerGestures$Gesture;->invoke(Landroid/view/MotionEvent;)Lkotlin/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method

patches/extension/radiant/MiniPlayerGestures$RootGesture.smali

@@ -0,0 +1,178 @@
+.class public final Lradiant/MiniPlayerGestures$RootGesture;
+.super Ljava/lang/Object;
+.implements Lam0/l;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "RootGesture"
+.end annotation
+
+
+# instance fields
+.field public final a:Lam0/l;
+
+.field public final b:Landroidx/compose/material3/SheetState;
+
+
+# direct methods
+.method public constructor <init>(Lam0/l;Landroidx/compose/material3/SheetState;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lradiant/MiniPlayerGestures$RootGesture;->a:Lam0/l;
+
+    iput-object p2, p0, Lradiant/MiniPlayerGestures$RootGesture;->b:Landroidx/compose/material3/SheetState;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Landroid/view/MotionEvent;)Lkotlin/u;
+    .locals 6
+
+    iget-object v0, p0, Lradiant/MiniPlayerGestures$RootGesture;->b:Landroidx/compose/material3/SheetState;
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
+
+    move-result v1
+
+    invoke-static {v0}, Lradiant/MiniPlayerGestures;->isDragging(Landroidx/compose/material3/SheetState;)Z
+
+    move-result v2
+
+    if-eqz v2, :maybe_reset_only
+
+    const/4 v2, 0x1
+
+    if-eq v1, v2, :up
+
+    const/4 v2, 0x2
+
+    if-eq v1, v2, :move
+
+    const/4 v2, 0x3
+
+    if-eq v1, v2, :cancel
+
+    goto :done
+
+    :maybe_reset_only
+    const/4 v2, 0x1
+
+    if-eq v1, v2, :simple_up
+
+    const/4 v2, 0x3
+
+    if-eq v1, v2, :reset_only
+
+    const/4 v2, 0x2
+
+    if-eq v1, v2, :simple_move
+
+    goto :done
+
+    :reset_only
+    invoke-static {}, Lradiant/MiniPlayerGestures;->resetGestureLock()V
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    goto :done
+
+    :simple_move
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v1
+
+    invoke-static {v1}, Lradiant/MiniPlayerGestures;->updateSimpleSwipe(F)Z
+
+    goto :done
+
+    :simple_up
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v1
+
+    iget-object v2, p0, Lradiant/MiniPlayerGestures$RootGesture;->a:Lam0/l;
+
+    invoke-static {v2, v1}, Lradiant/MiniPlayerGestures;->completeSimpleSwipe(Lam0/l;F)Z
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    goto :done
+
+
+    # ACTION_MOVE
+    :move
+    invoke-static {p1}, Lradiant/MiniPlayerGestures;->trackMotion(Landroid/view/MotionEvent;)V
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v2
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
+
+    move-result-wide v4
+
+    invoke-static {v0, v2, v4, v5}, Lradiant/MiniPlayerGestures;->updateDragToYTimed(Landroidx/compose/material3/SheetState;FJ)V
+
+    goto :done
+
+    # ACTION_UP
+    :up
+    invoke-static {p1}, Lradiant/MiniPlayerGestures;->trackMotion(Landroid/view/MotionEvent;)V
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v1
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
+
+    move-result-wide v4
+
+    invoke-static {v0, v1, v4, v5}, Lradiant/MiniPlayerGestures;->updateDragToYTimed(Landroidx/compose/material3/SheetState;FJ)V
+
+    invoke-static {v0}, Lradiant/MiniPlayerGestures;->releaseVelocity(Landroidx/compose/material3/SheetState;)F
+
+    move-result v1
+
+    iget-object v2, p0, Lradiant/MiniPlayerGestures$RootGesture;->a:Lam0/l;
+
+    invoke-static {v0, v2, v1}, Lradiant/MiniPlayerGestures;->finishDrag(Landroidx/compose/material3/SheetState;Lam0/l;F)V
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    goto :done
+
+    # ACTION_CANCEL
+    :cancel
+    iget-object v2, p0, Lradiant/MiniPlayerGestures$RootGesture;->a:Lam0/l;
+
+    invoke-static {v0, v2}, Lradiant/MiniPlayerGestures;->cancelDrag(Landroidx/compose/material3/SheetState;Lam0/l;)V
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->animateSwipeFeedbackReset()V
+
+    :done
+    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/MotionEvent;
+
+    invoke-virtual {p0, p1}, Lradiant/MiniPlayerGestures$RootGesture;->invoke(Landroid/view/MotionEvent;)Lkotlin/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method

patches/extension/radiant/MiniPlayerTrackGestures$Gesture.smali

@@ -0,0 +1,150 @@
+.class public final Lradiant/MiniPlayerTrackGestures$Gesture;
+.super Ljava/lang/Object;
+.implements Lam0/l;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerTrackGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Gesture"
+.end annotation
+
+
+# instance fields
+.field public final a:Lam0/l;
+
+
+# direct methods
+.method public constructor <init>(Lam0/l;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->a:Lam0/l;
+
+    return-void
+.end method
+
+.method private nextTrack()V
+    .locals 2
+
+    iget-object v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->a:Lam0/l;
+
+    sget-object v1, Lcom/tidal/android/feature/appscaffold/ui/r$a;->a:Lcom/tidal/android/feature/appscaffold/ui/r$a; # Tidal's built-in next track mini-player event
+
+    invoke-interface {v0, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+.method private previousTrack()V
+    .locals 2
+
+    iget-object v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->a:Lam0/l;
+
+    sget-object v1, Lcom/tidal/android/feature/appscaffold/ui/r$c;->a:Lcom/tidal/android/feature/appscaffold/ui/r$c; # Our synthetic previous track event
+
+    invoke-interface {v0, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Landroid/view/MotionEvent;)Lkotlin/u;
+    .locals 3
+
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
+
+    move-result v0
+
+    if-eqz v0, :down
+
+    const/4 v1, 0x1
+
+    if-eq v0, v1, :up
+
+    const/4 v1, 0x2
+
+    if-eq v0, v1, :move
+
+    const/4 v1, 0x3
+
+    if-eq v0, v1, :cancel
+
+    goto :done
+
+    # ACTION_DOWN
+    :down
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
+
+    move-result v0
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v1
+    invoke-static {v0, v1}, Lradiant/MiniPlayerTrackGestures;->beginDrag(FF)V
+    goto :done
+
+    # ACTION_MOVE
+    :move
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
+
+    move-result v0
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v1
+    invoke-static {v0, v1}, Lradiant/MiniPlayerTrackGestures;->moveDrag(FF)V
+    goto :done
+
+    # ACTION_UP
+    :up
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
+
+    move-result v0
+    invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
+
+    move-result v1
+    invoke-static {v0, v1}, Lradiant/MiniPlayerTrackGestures;->finishDrag(FF)I
+
+    move-result v0
+
+    if-eqz v0, :done
+
+    # Negative result = swipe left -> next. Positive result = swipe right -> previous
+    if-gez v0, :previous
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
+    invoke-direct {p0}, Lradiant/MiniPlayerTrackGestures$Gesture;->nextTrack()V
+    goto :done
+
+    :previous
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
+    invoke-direct {p0}, Lradiant/MiniPlayerTrackGestures$Gesture;->previousTrack()V
+    goto :done
+
+    # ACTION_CANCEL
+    :cancel
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->cancelDrag()V
+
+    :done
+    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroid/view/MotionEvent;
+
+    invoke-virtual {p0, p1}, Lradiant/MiniPlayerTrackGestures$Gesture;->invoke(Landroid/view/MotionEvent;)Lkotlin/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method

patches/extension/radiant/MiniPlayerTrackGestures$OffsetLayer.smali

@@ -0,0 +1,70 @@
+.class public final Lradiant/MiniPlayerTrackGestures$OffsetLayer;
+.super Ljava/lang/Object;
+.implements Lam0/l;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerTrackGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "OffsetLayer"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lradiant/MiniPlayerTrackGestures$OffsetLayer;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lradiant/MiniPlayerTrackGestures$OffsetLayer;
+
+    invoke-direct {v0}, Lradiant/MiniPlayerTrackGestures$OffsetLayer;-><init>()V
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures$OffsetLayer;->INSTANCE:Lradiant/MiniPlayerTrackGestures$OffsetLayer;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Landroidx/compose/ui/graphics/GraphicsLayerScope;)Lkotlin/u;
+    .locals 1
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->b:Landroidx/compose/runtime/MutableFloatState;
+
+    invoke-interface {v0}, Landroidx/compose/runtime/MutableFloatState;->getFloatValue()F
+
+    move-result v0
+
+    invoke-interface {p1, v0}, Landroidx/compose/ui/graphics/GraphicsLayerScope;->setTranslationX(F)V
+
+    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
+
+    return-object p1
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroidx/compose/ui/graphics/GraphicsLayerScope;
+
+    invoke-virtual {p0, p1}, Lradiant/MiniPlayerTrackGestures$OffsetLayer;->invoke(Landroidx/compose/ui/graphics/GraphicsLayerScope;)Lkotlin/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method

patches/extension/radiant/MiniPlayerTrackGestures$ResetAnimator.smali

@@ -0,0 +1,60 @@
+.class public final Lradiant/MiniPlayerTrackGestures$ResetAnimator;
+.super Ljava/lang/Object;
+.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerTrackGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ResetAnimator"
+.end annotation
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
+    .locals 3
+
+    move-object v0, p1
+
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Float;
+
+    invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
+
+    move-result v1
+
+    invoke-static {v1}, Lradiant/MiniPlayerTrackGestures;->setDragOffsetDirect(F)V
+
+    invoke-virtual {v0}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
+
+    move-result v1
+
+    const/high16 v2, 0x3f800000    # 1.0f
+
+    cmpg-float v1, v1, v2
+
+    if-gez v1, :done
+
+    invoke-static {v0}, Lradiant/MiniPlayerTrackGestures;->clearResetAnimator(Landroid/animation/ValueAnimator;)V
+
+    :done
+
+    return-void
+.end method

patches/extension/radiant/MiniPlayerTrackGestures$TextDraw.smali

@@ -0,0 +1,140 @@
+.class public final Lradiant/MiniPlayerTrackGestures$TextDraw;
+.super Ljava/lang/Object;
+.implements Lam0/l;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lradiant/MiniPlayerTrackGestures;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "TextDraw"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lradiant/MiniPlayerTrackGestures$TextDraw;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lradiant/MiniPlayerTrackGestures$TextDraw;
+
+    invoke-direct {v0}, Lradiant/MiniPlayerTrackGestures$TextDraw;-><init>()V
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures$TextDraw;->INSTANCE:Lradiant/MiniPlayerTrackGestures$TextDraw;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke(Landroidx/compose/ui/graphics/drawscope/ContentDrawScope;)Lkotlin/u;
+    .locals 12
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->b:Landroidx/compose/runtime/MutableFloatState;
+
+    invoke-interface {v0}, Landroidx/compose/runtime/MutableFloatState;->getFloatValue()F
+
+    move-result v10
+
+    invoke-interface {p1}, Landroidx/compose/ui/graphics/drawscope/DrawScope;->getDrawContext()Landroidx/compose/ui/graphics/drawscope/DrawContext;
+
+    move-result-object v7
+
+    invoke-interface {v7}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->getSize-NH-jbRc()J
+
+    move-result-wide v8
+
+    const/16 v0, 0x20
+
+    shr-long v1, v8, v0
+
+    long-to-int v1, v1
+
+    invoke-static {v1}, Ljava/lang/Float;->intBitsToFloat(I)F
+
+    move-result v4
+
+    invoke-interface {v7}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->getCanvas()Landroidx/compose/ui/graphics/Canvas;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Landroidx/compose/ui/graphics/Canvas;->save()V
+
+    :try_start_0
+    sget-object v0, Landroidx/compose/ui/graphics/ClipOp;->Companion:Landroidx/compose/ui/graphics/ClipOp$Companion;
+
+    invoke-virtual {v0}, Landroidx/compose/ui/graphics/ClipOp$Companion;->getIntersect-rtfAjoo()I
+
+    move-result v6
+
+    invoke-interface {v7}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->getTransform()Landroidx/compose/ui/graphics/drawscope/DrawTransform;
+
+    move-result-object v1
+
+    const v2, -0x800001 # -Float.MAX_VALUE -> unbounded left
+
+    const v3, -0x800001 # -Float.MAX_VALUE -> unbounded top
+
+    const v5, 0x7f7fffff # Float.MAX_VALUE -> unbounded bottom
+
+    invoke-interface/range {v1 .. v6}, Landroidx/compose/ui/graphics/drawscope/DrawTransform;->clipRect-N_I0leg(FFFFI)V
+
+    const/4 v0, 0x0
+
+    invoke-interface {v1, v10, v0}, Landroidx/compose/ui/graphics/drawscope/DrawTransform;->translate(FF)V
+
+    invoke-interface {p1}, Landroidx/compose/ui/graphics/drawscope/ContentDrawScope;->drawContent()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    invoke-interface {v7}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->getCanvas()Landroidx/compose/ui/graphics/Canvas;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Landroidx/compose/ui/graphics/Canvas;->restore()V
+
+    invoke-interface {v7, v8, v9}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->setSize-uvyYCjk(J)V
+
+    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
+
+    return-object p1
+
+    :catchall_0
+    move-exception v0
+
+    invoke-interface {v7}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->getCanvas()Landroidx/compose/ui/graphics/Canvas;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Landroidx/compose/ui/graphics/Canvas;->restore()V
+
+    invoke-interface {v7, v8, v9}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->setSize-uvyYCjk(J)V
+
+    throw v0
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroidx/compose/ui/graphics/drawscope/ContentDrawScope;
+
+    invoke-virtual {p0, p1}, Lradiant/MiniPlayerTrackGestures$TextDraw;->invoke(Landroidx/compose/ui/graphics/drawscope/ContentDrawScope;)Lkotlin/u;
+
+    move-result-object p1
+
+    return-object p1
+.end method

patches/extension/radiant/MiniPlayerTrackGestures.smali

@@ -0,0 +1,605 @@
+.class public final Lradiant/MiniPlayerTrackGestures;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field private static a:J
+
+.field public static b:Landroidx/compose/runtime/MutableFloatState;
+
+.field private static c:Landroid/animation/ValueAnimator;
+
+.field private static d:Ljava/lang/Object;
+
+# X at ACTION_DOWN
+.field private static e:F
+
+# Y at ACTION_DOWN
+.field private static f:F
+
+.field private static g:Z
+
+.field private static h:Z
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Landroidx/compose/runtime/PrimitiveSnapshotStateKt;->mutableFloatStateOf(F)Landroidx/compose/runtime/MutableFloatState;
+
+    move-result-object v0
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures;->b:Landroidx/compose/runtime/MutableFloatState;
+
+    return-void
+.end method
+
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public static animateReset()V
+    .locals 7
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    if-eqz v0, :read_offset
+
+    invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
+
+    const/4 v0, 0x0
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    :read_offset
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->b:Landroidx/compose/runtime/MutableFloatState;
+
+    invoke-interface {v0}, Landroidx/compose/runtime/MutableFloatState;->getFloatValue()F
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Math;->abs(F)F
+
+    move-result v1
+
+    const/4 v3, 0x0
+
+    const/high16 v2, 0x3f000000    # 0.5f
+
+    cmpg-float v1, v1, v2
+
+    if-lez v1, :snap_zero
+
+    const/4 v1, 0x2
+
+    new-array v1, v1, [F
+
+    const/4 v2, 0x0
+
+    aput v0, v1, v2
+
+    const/4 v0, 0x1
+
+    aput v3, v1, v0
+
+    invoke-static {v1}, Landroid/animation/ValueAnimator;->ofFloat([F)Landroid/animation/ValueAnimator;
+
+    move-result-object v1
+
+    const-wide/16 v4, 0xb4    # 180ms
+
+    invoke-virtual {v1, v4, v5}, Landroid/animation/ValueAnimator;->setDuration(J)Landroid/animation/ValueAnimator;
+
+    new-instance v0, Landroid/view/animation/DecelerateInterpolator;
+
+    const/high16 v4, 0x3fc00000    # 1.5f
+
+    invoke-direct {v0, v4}, Landroid/view/animation/DecelerateInterpolator;-><init>(F)V
+
+    invoke-virtual {v1, v0}, Landroid/animation/ValueAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)V
+
+    new-instance v0, Lradiant/MiniPlayerTrackGestures$ResetAnimator;
+
+    invoke-direct {v0}, Lradiant/MiniPlayerTrackGestures$ResetAnimator;-><init>()V
+
+    invoke-virtual {v1, v0}, Landroid/animation/ValueAnimator;->addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
+
+    sput-object v1, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    invoke-virtual {v1}, Landroid/animation/ValueAnimator;->start()V
+
+    return-void
+
+    :snap_zero
+    invoke-static {v3}, Lradiant/MiniPlayerTrackGestures;->setDragOffsetDirect(F)V
+
+    return-void
+.end method
+
+.method public static beginDrag(FF)V
+    .locals 2
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->resetGestureLock()V
+
+    sput p0, Lradiant/MiniPlayerTrackGestures;->e:F
+
+    sput p1, Lradiant/MiniPlayerTrackGestures;->f:F
+
+    const/4 v0, 0x1
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    const/4 v0, 0x0
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    if-eqz v0, :zero
+
+    invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
+
+    const/4 v0, 0x0
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    :zero
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Lradiant/MiniPlayerTrackGestures;->setDragOffsetDirect(F)V
+
+    return-void
+.end method
+
+.method public static cancelDrag()V
+    .locals 1
+
+    const/4 v0, 0x0
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->animateReset()V
+
+    return-void
+.end method
+
+.method public static clearResetAnimator(Landroid/animation/ValueAnimator;)V
+    .locals 1
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    if-ne v0, p0, :done
+
+    const/4 v0, 0x0
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    :done
+    return-void
+.end method
+
+.method public static finishDrag(FF)I
+    .locals 5
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->isAnyDragging()Z
+
+    move-result v0
+
+    if-eqz v0, :check_active
+
+    const/4 v0, 0x0
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->animateReset()V
+
+    return v0
+
+    :check_active
+
+    sget-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    if-nez v0, :active
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :active
+    const/4 v0, 0x0
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    sget-boolean v1, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    sget v2, Lradiant/MiniPlayerTrackGestures;->e:F
+
+    sub-float/2addr p0, v2
+
+    sget v2, Lradiant/MiniPlayerTrackGestures;->f:F
+
+    sub-float/2addr p1, v2
+
+    if-eqz v1, :reset
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
+
+    :reset
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->animateReset()V
+
+    invoke-static {p0}, Ljava/lang/Math;->abs(F)F
+
+    move-result v1
+
+    const/high16 v2, 0x42400000    # 48.0f -> at least 48dp horizontal swipe
+
+    invoke-static {v2}, Lradiant/MiniPlayerTrackGestures;->dp(F)F
+
+    move-result v2
+
+    cmpg-float v3, v1, v2
+
+    if-gez v3, :check_axis
+
+    return v0
+
+    :check_axis
+    invoke-static {p1}, Ljava/lang/Math;->abs(F)F
+
+    move-result p1
+
+    const/high16 v2, 0x3fc00000    # 1.5f -> horizontal distance must dominate vertical mov. by 1.5x
+
+    mul-float/2addr p1, v2
+
+    cmpg-float v1, v1, p1
+
+    if-lez v1, :no_swipe
+
+    const/4 p1, 0x0
+
+    cmpg-float p0, p0, p1
+
+    if-ltz p0, :next
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :next
+    const/4 v0, -0x1
+
+    return v0
+
+    :no_swipe
+    return v0
+.end method
+
+.method public static moveDrag(FF)V
+    .locals 6
+
+    sget-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    if-eqz v0, :done
+
+    invoke-static {}, Lradiant/MiniPlayerGestures;->isAnyDragging()Z
+
+    move-result v0
+
+    if-eqz v0, :move_continue
+
+    const/4 v0, 0x0
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->animateReset()V
+
+    goto :done
+
+    :move_continue
+    sget v0, Lradiant/MiniPlayerTrackGestures;->e:F
+
+    sub-float/2addr p0, v0
+
+    sget v0, Lradiant/MiniPlayerTrackGestures;->f:F
+
+    sub-float/2addr p1, v0
+
+    invoke-static {p0}, Ljava/lang/Math;->abs(F)F
+
+    move-result v0
+
+    invoke-static {p1}, Ljava/lang/Math;->abs(F)F
+
+    move-result v1
+
+    sget-boolean v2, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    if-nez v2, :publish
+
+    const/high16 v2, 0x40c00000    # 6.0f dp dead zone
+
+    invoke-static {v2}, Lradiant/MiniPlayerTrackGestures;->dp(F)F
+
+    move-result v2
+
+    cmpg-float v3, v0, v2
+
+    if-gez v3, :move_axis
+
+    goto :done
+
+    :move_axis
+    const v2, 0x3f8ccccd    # 1.1f horizontal dominance while dragging
+
+    mul-float/2addr v1, v2
+
+    cmpg-float v2, v0, v1
+
+    if-gez v2, :accept
+
+    goto :done
+
+    :accept
+    invoke-static {}, Lradiant/MiniPlayerGestures;->lockHorizontalGesture()Z
+
+    move-result v2
+
+    if-eqz v2, :cancel_locked
+
+    const/4 v2, 0x1
+
+    sput-boolean v2, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    :publish
+    const/4 v2, 0x0
+
+    invoke-static {v2}, Lradiant/MiniPlayerGestures;->setSwipeFeedbackDirect(F)V
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
+
+    invoke-static {p0}, Lradiant/MiniPlayerTrackGestures;->setDragOffset(F)V
+
+    :done
+    return-void
+
+    :cancel_locked
+    const/4 v0, 0x0
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->g:Z
+
+    sput-boolean v0, Lradiant/MiniPlayerTrackGestures;->h:Z
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->animateReset()V
+
+    goto :done
+.end method
+
+.method private static dp(F)F
+    .locals 1
+
+    invoke-static {}, Landroid/content/res/Resources;->getSystem()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
+
+    move-result-object v0
+
+    iget v0, v0, Landroid/util/DisplayMetrics;->density:F
+
+    mul-float/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static feedbackModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
+    .locals 2
+
+    const/high16 v0, 0x3f800000    # 1.0f
+
+    invoke-static {p0, v0}, Landroidx/compose/ui/ZIndexModifierKt;->zIndex(Landroidx/compose/ui/Modifier;F)Landroidx/compose/ui/Modifier;
+
+    move-result-object p0
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures$OffsetLayer;->INSTANCE:Lradiant/MiniPlayerTrackGestures$OffsetLayer;
+
+    invoke-static {p0, v0}, Landroidx/compose/ui/graphics/GraphicsLayerModifierKt;->graphicsLayer(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static textFeedbackModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
+    .locals 1
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures$TextDraw;->INSTANCE:Lradiant/MiniPlayerTrackGestures$TextDraw; # text clip on right only
+
+    invoke-static {p0, v0}, Landroidx/compose/ui/draw/DrawModifierKt;->drawWithContent(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static onRenderedItem(Ljava/lang/Object;)V
+    .locals 2
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->d:Ljava/lang/Object;
+
+    if-eqz v0, :store_initial
+
+    invoke-virtual {v0, p0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :done
+
+    sput-object p0, Lradiant/MiniPlayerTrackGestures;->d:Ljava/lang/Object;
+
+    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->animateReset()V
+
+    return-void
+
+    :store_initial
+    sput-object p0, Lradiant/MiniPlayerTrackGestures;->d:Ljava/lang/Object;
+
+    :done
+    return-void
+.end method
+
+.method public static consumeTapOpenSuppression()Z
+    .locals 5
+
+    sget-wide v0, Lradiant/MiniPlayerTrackGestures;->a:J
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-nez v4, :check_time
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :check_time
+    sput-wide v2, Lradiant/MiniPlayerTrackGestures;->a:J
+
+    invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
+
+    move-result-wide v2
+
+    cmp-long v4, v2, v0
+
+    if-lez v4, :yes
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :yes
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public static suppressTapOpen()V
+    .locals 4
+
+    invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
+
+    move-result-wide v0
+
+    const-wide/16 v2, 0x258
+
+    add-long/2addr v0, v2
+
+    sput-wide v0, Lradiant/MiniPlayerTrackGestures;->a:J
+
+    return-void
+.end method
+
+.method public static setDragOffset(F)V
+    .locals 5
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    if-eqz v0, :rubber_band
+
+    invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
+
+    const/4 v0, 0x0
+
+    sput-object v0, Lradiant/MiniPlayerTrackGestures;->c:Landroid/animation/ValueAnimator;
+
+    :rubber_band
+    invoke-static {p0}, Ljava/lang/Math;->abs(F)F
+
+    move-result v0
+
+    const/high16 v1, 0x42800000    # 64.0f dp free travel
+
+    invoke-static {v1}, Lradiant/MiniPlayerTrackGestures;->dp(F)F
+
+    move-result v1
+
+    cmpg-float v2, v0, v1
+
+    if-lez v2, :publish
+
+    sub-float/2addr v0, v1
+
+    const/high16 v2, 0x3e800000    # 0.25f resistance after 64dp
+
+    mul-float/2addr v0, v2
+
+    const v2, 0x3eb33333    # 0.35f max extra travel
+
+    mul-float/2addr v2, v1
+
+    invoke-static {v0, v2}, Ljava/lang/Math;->min(FF)F
+
+    move-result v0
+
+    add-float/2addr v0, v1
+
+    const/4 v1, 0x0
+
+    cmpg-float v2, p0, v1
+
+    if-gez v2, :positive
+
+    neg-float p0, v0
+
+    goto :publish
+
+    :positive
+    move p0, v0
+
+
+    :publish
+    invoke-static {p0}, Lradiant/MiniPlayerTrackGestures;->setDragOffsetDirect(F)V
+
+    return-void
+.end method
+
+.method public static setDragOffsetDirect(F)V
+    .locals 1
+
+    sget-object v0, Lradiant/MiniPlayerTrackGestures;->b:Landroidx/compose/runtime/MutableFloatState;
+
+    invoke-interface {v0, p0}, Landroidx/compose/runtime/MutableFloatState;->setFloatValue(F)V
+
+    return-void
+.end method
+
+.method public static trackModifier(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;
+    .locals 1
+
+    new-instance v0, Lradiant/MiniPlayerTrackGestures$Gesture;
+
+    invoke-direct {v0, p1}, Lradiant/MiniPlayerTrackGestures$Gesture;-><init>(Lam0/l;)V
+
+    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;
+
+    move-result-object p0
+
+    return-object p0
+.end method

patches/extension/radiant/MiniSeekerFloating.smali

@@ -1,7 +1,7 @@
 .class public final Lradiant/MiniSeekerFloating;
 .super Ljava/lang/Object;
 
-.implements Lyl0/l;
+.implements Lam0/l;
 
 
 # static fields

patches/extension/radiant/MiniSeekerLine.smali

@@ -5,7 +5,7 @@
 # static fields
 .field public static progressState:Landroidx/compose/runtime/MutableFloatState;
 
-.field public static volatile vm:Ljh/h;
+.field public static volatile vm:Lgh/j;
 
 .field public static volatile sub:Lio/reactivex/disposables/Disposable;
 
@@ -57,7 +57,7 @@
 
     :start_block
     :try_start
-    sget-object v0, Lradiant/MiniSeekerLine;->vm:Ljh/h;    # cached vm
+    sget-object v0, Lradiant/MiniSeekerLine;->vm:Lgh/j;    # cached vm
 
     if-nez v0, :got_vm    # reuse if present
 
@@ -65,32 +65,32 @@
 
     move-result-object v0    # app
 
-    invoke-virtual {v0}, Lcom/aspiro/wamp/App;->e()Lf5/c;    # dagger component
+    invoke-virtual {v0}, Lcom/aspiro/wamp/App;->e()Le5/c;    # dagger component
 
     move-result-object v0    # component
 
-    check-cast v0, Lf5/d0$n2;    # narrow type
+    check-cast v0, Le5/z$n2;    # narrow type
 
-    iget-object v0, v0, Lf5/d0$n2;->z0:Ldagger/internal/j;    # playqueue provider
+    iget-object v0, v0, Le5/z$n2;->z0:Ldagger/internal/j;    # playqueue provider
 
-    invoke-interface {v0}, Lol0/a;->get()Ljava/lang/Object;    # resolve
+    invoke-interface {v0}, Lql0/a;->get()Ljava/lang/Object;    # resolve
 
     move-result-object v0    # playqueue
 
-    check-cast v0, Lcom/aspiro/wamp/playqueue/z0;    # narrow type
+    check-cast v0, Lcom/aspiro/wamp/playqueue/d1;    # narrow type
 
-    new-instance v1, Ljh/h;    # build vm
+    new-instance v1, Lgh/j;    # build vm
 
-    invoke-direct {v1, v0}, Ljh/h;-><init>(Lcom/aspiro/wamp/playqueue/z0;)V    # ctor
+    invoke-direct {v1, v0}, Lgh/j;-><init>(Lcom/aspiro/wamp/playqueue/d1;)V    # ctor
 
-    sput-object v1, Lradiant/MiniSeekerLine;->vm:Ljh/h;    # cache
+    sput-object v1, Lradiant/MiniSeekerLine;->vm:Lgh/j;    # cache
 
     :got_vm
-    sget-object v0, Lradiant/MiniSeekerLine;->vm:Ljh/h;    # vm ref
+    sget-object v0, Lradiant/MiniSeekerLine;->vm:Lgh/j;    # vm ref
 
-    invoke-virtual {v0}, Ljh/h;->a()V    # activate emission
+    invoke-virtual {v0}, Lgh/j;->a()V    # activate emission
 
-    iget-object v0, v0, Ljh/h;->d:Lio/reactivex/subjects/BehaviorSubject;    # position subject
+    iget-object v0, v0, Lgh/j;->d:Lio/reactivex/subjects/BehaviorSubject;    # position subject
 
     invoke-static {}, Lio/reactivex/android/schedulers/AndroidSchedulers;->mainThread()Lio/reactivex/Scheduler;    # main scheduler
 

patches/extension/radiant/NoOp.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/NoOp;
 .super Ljava/lang/Object;
-.implements Lyl0/a;
+.implements Lam0/a;
 
 
 # static fields

patches/extension/radiant/PlayingFrom.smali

@@ -0,0 +1,9 @@
+.class public final Lradiant/PlayingFrom;
+.super Ljava/lang/Object;
+.source "PlayingFrom.smali"
+
+
+# static fields
+
+#  puts the "Playing from" source above track title
+.field public static a:Ljava/lang/String;

patches/extension/radiant/QualityBadge.smali

@@ -0,0 +1,124 @@
+.class public final Lradiant/QualityBadge;
+.super Ljava/lang/Object;
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+# qualities : 0 = LOW / HIGH, 1 = LOSSLESS, 2 = HI_RES_LOSSLESS
+.method private static backgroundArgb(I)I
+    .locals 0
+
+    packed-switch p0, :quality_switch
+
+    const p0, 0x66475569    # LOW / HIGH bg
+    return p0
+
+    :lossless
+    const p0, 0x3306b6d4    # LOSSLESS bg
+    return p0
+
+    :hires
+    const p0, 0x40f59e0b    # HI_RES_LOSSLESS bg
+    return p0
+
+    :quality_switch
+    .packed-switch 0x1
+        :lossless
+        :hires
+    .end packed-switch
+.end method
+
+.method private static textArgb(I)I
+    .locals 0
+
+    packed-switch p0, :quality_switch
+
+    const p0, -0x1d1710    # LOW / HIGH text
+    return p0
+
+    :lossless
+    const p0, -0x5a0c04    # LOSSLESS text
+    return p0
+
+    :hires
+    const p0, -0x21976    # HI_RES_LOSSLESS text
+    return p0
+
+    :quality_switch
+    .packed-switch 0x1
+        :lossless
+        :hires
+    .end packed-switch
+.end method
+
+
+.method public static modifier(Landroidx/compose/ui/Modifier;I)Landroidx/compose/ui/Modifier;
+    .locals 3
+
+    invoke-static {p1}, Lradiant/QualityBadge;->backgroundArgb(I)I
+
+    move-result p1
+    invoke-static {p1}, Landroidx/compose/ui/graphics/ColorKt;->Color(I)J
+    move-result-wide v0
+    const/high16 p1, 0x40800000    # 4.0f
+    invoke-static {p1}, Landroidx/compose/ui/unit/Dp;->constructor-impl(F)F
+    move-result p1
+    invoke-static {p1}, Landroidx/compose/foundation/shape/RoundedCornerShapeKt;->RoundedCornerShape-0680j_4(F)Landroidx/compose/foundation/shape/RoundedCornerShape;
+    move-result-object v2
+    invoke-static {p0, v0, v1, v2}, Landroidx/compose/foundation/BackgroundKt;->background-bw27NRU(Landroidx/compose/ui/Modifier;JLandroidx/compose/ui/graphics/Shape;)Landroidx/compose/ui/Modifier;
+    move-result-object p0
+    const/high16 p1, 0x40c00000    # 6.0f
+    invoke-static {p1}, Landroidx/compose/ui/unit/Dp;->constructor-impl(F)F
+    move-result p1
+    const/high16 v0, 0x40000000    # 2.0f
+    invoke-static {v0}, Landroidx/compose/ui/unit/Dp;->constructor-impl(F)F
+    move-result v0
+    invoke-static {p0, p1, v0}, Landroidx/compose/foundation/layout/PaddingKt;->padding-VpY3zN4(Landroidx/compose/ui/Modifier;FF)Landroidx/compose/ui/Modifier;
+    move-result-object p0
+    return-object p0
+.end method
+
+.method public static style(ILq20/c2;)Lq20/c2;
+    .registers 16
+
+    invoke-static {p0}, Lradiant/QualityBadge;->textArgb(I)I
+
+    move-result v0
+    new-instance v1, Lf20/a;
+    invoke-direct {v1, v0}, Lf20/a;-><init>(I)V
+    new-instance v0, Lf20/d;
+    const/4 v2, 0x0
+    const/4 v3, 0x0
+    const/4 v4, 0x0
+    const/4 v5, 0x0
+    const/4 v6, 0x0
+    const/4 v7, 0x0
+    const/4 v8, 0x0
+    const/4 v9, 0x0
+    const/4 v10, 0x0
+    const/4 v11, 0x0
+    const/4 v12, 0x0
+    const/16 v13, 0xffe
+    const/4 v14, 0x0
+    invoke-direct/range {v0 .. v14}, Lf20/d;-><init>(Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;Lf20/a;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    move-object v9, v0
+    move-object/from16 v0, p1
+    const/4 v1, 0x0
+    move-object v2, v9
+    const/4 v3, 0x0
+    const/4 v4, 0x0
+    const/4 v5, 0x0
+    const/16 v6, 0x1d
+    const/4 v7, 0x0
+    invoke-static/range {v0 .. v7}, Lq20/c2;->g(Lq20/c2;Lq20/s4;Lf20/d;Lcom/squareup/ui/market/core/text/MarketTextAlignment;Lcom/squareup/ui/market/core/text/MarketTextTransform;Lq20/r4;ILjava/lang/Object;)Lq20/c2;
+    move-result-object p0
+    return-object p0
+.end method

patches/extension/radiant/RLAPILyricsHook.smali

@@ -65,10 +65,6 @@
 
     invoke-static {p1}, Lradiant/HomeBackdrop;->onTrack(Lcom/aspiro/wamp/model/Track;)V
 
-    const/4 v3, 0x0
-
-    sput-boolean v3, Lradiant/RLAPILyricsHook;->isRlState:Z
-
     const-string v3, "onWampTrack: hook entered"
 
     invoke-static {v3}, Lradiant/RLAPILyricsHook;->dlog(Ljava/lang/String;)V
@@ -157,6 +153,25 @@
 
     move-result-object v4
 
+    sget-object v5, Lradiant/RLAPILyricsHook;->currentKey:Ljava/lang/String;
+
+    invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v5
+
+    if-eqz v5, :rl_new_track
+
+    const-string v5, "onWampTrack: same track re-fired, skipping duplicate fetch"
+
+    invoke-static {v5}, Lradiant/RLAPILyricsHook;->dlog(Ljava/lang/String;)V
+
+    return-void
+
+    :rl_new_track
+    const/4 v5, 0x0
+
+    sput-boolean v5, Lradiant/RLAPILyricsHook;->isRlState:Z
+
     sput-object v4, Lradiant/RLAPILyricsHook;->currentKey:Ljava/lang/String;
 
     new-instance v5, Ljava/lang/StringBuilder;

patches/extension/radiant/RLAPILyricsWorker.smali

@@ -396,13 +396,23 @@
 
     invoke-static {v4}, Lradiant/RLAPILyricsHook;->dlog(Ljava/lang/String;)V
 
+    iget-object v4, p0, Lradiant/RLAPILyricsWorker;->key:Ljava/lang/String;
+
+    sget-object v5, Lradiant/RLAPILyricsHook;->currentKey:Ljava/lang/String;
+
+    invoke-virtual {v4, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v4
+
+    if-eqz v4, :no_close    # Smthn needed to keep lyrics open
+
     sget-boolean v4, Lradiant/StickyLyrics;->enabled:Z
 
     if-nez v4, :no_close
 
     iget-object v4, p0, Lradiant/RLAPILyricsWorker;->vm:Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;
 
-    iget-object v5, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->N:Lkotlinx/coroutines/flow/MutableStateFlow;
+    iget-object v5, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;
 
     sget-object v6, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -475,9 +485,9 @@
     :key_ok
     iget-object v4, p0, Lradiant/RLAPILyricsWorker;->vm:Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;
 
-    iget-object v5, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->M:Lkotlinx/coroutines/flow/MutableStateFlow;
+    iget-object v5, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->O:Lkotlinx/coroutines/flow/MutableStateFlow;
 
-    invoke-static {v3}, Ltn0/a;->c(Ljava/lang/Iterable;)Ltn0/b;
+    invoke-static {v3}, Lvn0/a;->c(Ljava/lang/Iterable;)Lvn0/b;
 
     move-result-object v6
 
@@ -494,9 +504,9 @@
 
     const/4 v10, 0x0
 
-    invoke-direct {v8, v7, v6, v9, v10}, Lcom/tidal/android/feature/playerscreen/ui/g$c;-><init>(Ljava/lang/String;Ltn0/b;IZ)V
+    invoke-direct {v8, v7, v6, v9, v10}, Lcom/tidal/android/feature/playerscreen/ui/g$c;-><init>(Ljava/lang/String;Lvn0/b;IZ)V
 
-    const-string v6, "publishing g$c -> J=true N=true M=g$c"
+    const-string v6, "publishing g$c -> K=true (O=true if sticky) N=g$c"
 
     invoke-static {v6}, Lradiant/RLAPILyricsHook;->dlog(Ljava/lang/String;)V
 
@@ -504,7 +514,7 @@
 
     sput-boolean v6, Lradiant/RLAPILyricsHook;->isRlState:Z
 
-    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->J:Lkotlinx/coroutines/flow/MutableStateFlow;
+    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->K:Lkotlinx/coroutines/flow/MutableStateFlow;
 
     sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
@@ -514,7 +524,7 @@
 
     if-eqz v9, :skip_n
 
-    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->N:Lkotlinx/coroutines/flow/MutableStateFlow;
+    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;
 
     invoke-interface {v6, v7}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
 

patches/extension/radiant/SeekerConsumer.smali

@@ -20,13 +20,13 @@
 
     if-eqz p1, :ret    # null guard
 
-    instance-of v0, p1, Ljh/b;    # type guard
+    instance-of v0, p1, Lgh/b;    # type guard
 
     if-eqz v0, :ret    # skip if wrong type
 
-    check-cast p1, Ljh/b;    # narrow type
+    check-cast p1, Lgh/b;    # narrow type
 
-    iget v0, p1, Ljh/b;->b:F    # raw progress
+    iget v0, p1, Lgh/b;->b:F    # raw progress
 
     invoke-static {v0}, Ljava/lang/Float;->isNaN(F)Z    # nan check
 

patches/extension/radiant/SparkleButton.smali

@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static final a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V
+.method public static final a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lam0/a;)V
     .locals 21
     .annotation build Landroidx/compose/runtime/Composable;
     .end annotation
@@ -98,7 +98,7 @@
 
     const/4 v4, 0x6
 
-    invoke-static {v2, v11, v4}, Lcom/squareup/ui/market/core/theme/x;->t(Lcom/squareup/ui/market/core/theme/k$a;Landroidx/compose/runtime/Composer;I)Lcom/squareup/ui/market/core/theme/MarketStylesheet;
+    invoke-static {v2, v11, v4}, Lcom/squareup/ui/market/core/theme/z;->t(Lcom/squareup/ui/market/core/theme/k$a;Landroidx/compose/runtime/Composer;I)Lcom/squareup/ui/market/core/theme/MarketStylesheet;
 
     move-result-object v15
 
@@ -131,7 +131,7 @@
 
     const/16 v18, 0x0
 
-    invoke-static/range {v15 .. v20}, Lcom/squareup/ui/market/components/MarketIconButtonKt;->P(Lcom/squareup/ui/market/core/theme/MarketStylesheet;Lcom/squareup/ui/market/core/components/properties/IconButton$Size;Lcom/squareup/ui/market/core/components/properties/IconButton$Rank;Lcom/squareup/ui/market/core/components/properties/IconButton$Variant;ILjava/lang/Object;)Ln20/w1;
+    invoke-static/range {v15 .. v20}, Lcom/squareup/ui/market/components/MarketIconButtonKt;->P(Lcom/squareup/ui/market/core/theme/MarketStylesheet;Lcom/squareup/ui/market/core/components/properties/IconButton$Size;Lcom/squareup/ui/market/core/components/properties/IconButton$Rank;Lcom/squareup/ui/market/core/components/properties/IconButton$Variant;ILjava/lang/Object;)Lq20/u1;
 
     move-result-object v4
 
@@ -140,7 +140,7 @@
     :cond_5
     move-object v9, v4
 
-    check-cast v9, Ln20/w1;
+    check-cast v9, Lq20/u1;
 
     sget v2, Lcom/tidal/android/feature/playerscreen/ui/R$string;->lyrics:I
 
@@ -172,7 +172,7 @@
 
     const/4 v8, 0x0
 
-    invoke-static/range {v1 .. v13}, Lcom/squareup/ui/market/components/MarketIconButtonKt;->c(Lyl0/a;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/interaction/MutableInteractionSource;ZLcom/squareup/ui/market/components/n;Lyl0/a;Ljava/lang/String;Ln20/w1;Lyl0/p;Landroidx/compose/runtime/Composer;II)V
+    invoke-static/range {v1 .. v13}, Lcom/squareup/ui/market/components/MarketIconButtonKt;->b(Lam0/a;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/interaction/MutableInteractionSource;ZLcom/squareup/ui/market/components/n;Lam0/a;Ljava/lang/String;Lq20/u1;Lam0/p;Landroidx/compose/runtime/Composer;II)V
 
     invoke-static {}, Landroidx/compose/runtime/ComposerKt;->isTraceInProgress()Z
 

patches/extension/radiant/SparkleContent.smali

@@ -3,7 +3,7 @@
 .source "SourceFile"
 
 # interfaces
-.implements Lyl0/p;
+.implements Lam0/p;
 
 
 # virtual methods
@@ -35,7 +35,7 @@
     invoke-static {v0, p2, v1, v2}, Landroidx/compose/runtime/ComposerKt;->traceEventStart(IIILjava/lang/String;)V
 
     :cond_0
-    const p2, 0x7f08051d
+    const p2, 0x7f080522
 
     const/4 v0, 0x0
 

patches/extension/radiant/SpvFactory.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/SpvFactory;
 .super Ljava/lang/Object;
-.implements Lyl0/l;
+.implements Lam0/l;
 
 
 # static fields

patches/extension/radiant/WazeInitReceiver.smali

@@ -0,0 +1,87 @@
+.class public final Lradiant/WazeInitReceiver;
+.super Landroid/content/BroadcastReceiver;
+.source "WazeInitReceiver.smali"
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 5
+
+    if-eqz p1, :return
+
+    if-eqz p2, :return
+
+    const-string v0, "com.waze.sdk.audio.ACTION_INIT"
+
+    invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :return
+
+    const-string v0, "token"
+
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :return
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    if-lez v1, :return
+
+    invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    if-eqz v1, :context_ready
+
+    move-object p1, v1
+
+    :context_ready
+    new-instance v1, Landroid/content/Intent;
+
+    invoke-direct {v1}, Landroid/content/Intent;-><init>()V
+
+    const-string v2, "com.waze"
+
+    const-string v3, "com.waze.sdk.SdkService"
+
+    invoke-virtual {v1, v2, v3}, Landroid/content/Intent;->setClassName(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
+
+    new-instance v2, Lradiant/WazeServiceConnection;
+
+    invoke-direct {v2, p1, v0}, Lradiant/WazeServiceConnection;-><init>(Landroid/content/Context;Ljava/lang/String;)V
+
+    :try_start_0
+    const/4 v3, 0x1
+
+    invoke-virtual {p1, v1, v2, v3}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :return
+
+    :catch_0
+    move-exception v4
+
+    :return
+    return-void
+.end method

patches/extension/radiant/WazeServiceConnection.smali

@@ -0,0 +1,228 @@
+.class public final Lradiant/WazeServiceConnection;
+.super Ljava/lang/Object;
+.source "WazeServiceConnection.smali"
+
+# interfaces
+.implements Landroid/content/ServiceConnection;
+
+
+# instance fields
+.field private final context:Landroid/content/Context;
+
+.field private final token:Ljava/lang/String;
+
+
+# direct methods
+.method public constructor <init>(Landroid/content/Context;Ljava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lradiant/WazeServiceConnection;->context:Landroid/content/Context;
+
+    iput-object p2, p0, Lradiant/WazeServiceConnection;->token:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method private addOpenMeIntent(Landroid/os/Bundle;)V
+    .locals 4
+
+    iget-object v0, p0, Lradiant/WazeServiceConnection;->context:Landroid/content/Context;
+
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Landroid/content/pm/PackageManager;->getLaunchIntentForPackage(Ljava/lang/String;)Landroid/content/Intent;
+
+    move-result-object v1
+
+    if-eqz v1, :return
+
+    const/high16 v2, 0x10000000
+
+    invoke-virtual {v1, v2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
+
+    const v2, 0xc000000
+
+    const/4 v3, 0x0
+
+    invoke-static {v0, v3, v1, v2}, Landroid/app/PendingIntent;->getActivity(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
+
+    move-result-object v1
+
+    const-string v2, "openMeIntent"
+
+    invoke-virtual {p1, v2, v1}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+
+    :return
+    return-void
+.end method
+
+.method private createClientMessenger()Landroid/os/Messenger;
+    .locals 3
+
+    new-instance v0, Landroid/os/Handler;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    new-instance v2, Landroid/os/Messenger;
+
+    invoke-direct {v2, v0}, Landroid/os/Messenger;-><init>(Landroid/os/Handler;)V
+
+    return-object v2
+.end method
+
+.method private createConfigBundle()Landroid/os/Bundle;
+    .locals 3
+
+    new-instance v0, Landroid/os/Bundle;
+
+    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
+
+    const-string v1, "versionCode"
+
+    const/16 v2, 0xa
+
+    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    const-string v1, "themeColor"
+
+    const v2, __RL_WAZE_THEME_COLOR__ # Waze SDK themeColor
+
+    invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    invoke-direct {p0, v0}, Lradiant/WazeServiceConnection;->addOpenMeIntent(Landroid/os/Bundle;)V
+
+    return-object v0
+.end method
+
+.method private register(Landroid/os/IBinder;)V
+    .locals 5
+
+    if-eqz p1, :return
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v0
+
+    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
+
+    move-result-object v1
+
+    const-string v2, "com.waze.sdk.ISdkService"
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeInterfaceToken(Ljava/lang/String;)V
+
+    iget-object v2, p0, Lradiant/WazeServiceConnection;->token:Ljava/lang/String;
+
+    invoke-virtual {v0, v2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lradiant/WazeServiceConnection;->createConfigBundle()Landroid/os/Bundle;
+
+    move-result-object v2
+
+    invoke-static {v0, v2}, Lradiant/WazeServiceConnection;->writeParcelable(Landroid/os/Parcel;Landroid/os/Parcelable;)V
+
+    invoke-direct {p0}, Lradiant/WazeServiceConnection;->createClientMessenger()Landroid/os/Messenger;
+
+    move-result-object v2
+
+    invoke-static {v0, v2}, Lradiant/WazeServiceConnection;->writeParcelable(Landroid/os/Parcel;Landroid/os/Parcelable;)V
+
+    const/4 v2, 0x1
+
+    const/4 v3, 0x0
+
+    invoke-interface {p1, v2, v0, v1, v3}, Landroid/os/IBinder;->transact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
+
+    move-result v4
+
+    if-eqz v4, :cleanup
+
+    invoke-virtual {v1}, Landroid/os/Parcel;->readException()V
+
+    :cleanup
+    invoke-virtual {v1}, Landroid/os/Parcel;->recycle()V
+
+    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
+
+    :return
+    return-void
+.end method
+
+.method private safeUnbind()V
+    .locals 1
+
+    :try_start_0
+    iget-object v0, p0, Lradiant/WazeServiceConnection;->context:Landroid/content/Context;
+
+    invoke-virtual {v0, p0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :return
+
+    :catch_0
+    move-exception v0
+
+    :return
+    return-void
+.end method
+
+.method private static writeParcelable(Landroid/os/Parcel;Landroid/os/Parcelable;)V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :null_value
+
+    const/4 v1, 0x1
+
+    invoke-virtual {p0, v1}, Landroid/os/Parcel;->writeInt(I)V
+
+    invoke-interface {p1, p0, v0}, Landroid/os/Parcelable;->writeToParcel(Landroid/os/Parcel;I)V
+
+    return-void
+
+    :null_value
+    invoke-virtual {p0, v0}, Landroid/os/Parcel;->writeInt(I)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
+    .locals 1
+
+    :try_start_0
+    invoke-direct {p0, p2}, Lradiant/WazeServiceConnection;->register(Landroid/os/IBinder;)V
+    :try_end_0
+    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :unbind
+
+    :catch_0
+    move-exception v0
+
+    :unbind
+    invoke-direct {p0}, Lradiant/WazeServiceConnection;->safeUnbind()V
+
+    return-void
+.end method
+
+.method public onServiceDisconnected(Landroid/content/ComponentName;)V
+    .locals 0
+
+    return-void
+.end method

patches/home-backdrop.patch

@@ -2,15 +2,15 @@
 +++ b/com/tidal/android/feature/home/ui/k.smali
 @@ -424,7 +424,7 @@
      const/4 v6, 0x0
-
+ 
      .line 181
 -    move-wide v7, v8
 +    const-wide/16 v7, 0x0    # transparent containerColor
-
+ 
      .line 182
      const-wide/16 v9, 0x0
---- a/com/tidal/android/feature/home/ui/p.smali
-+++ b/com/tidal/android/feature/home/ui/p.smali
+--- a/com/tidal/android/feature/home/ui/o.smali
++++ b/com/tidal/android/feature/home/ui/o.smali
 @@ -187,6 +187,10 @@
      .line 61
      .line 62
@@ -20,24 +20,25 @@
 +    invoke-static {v4, v0}, Lradiant/HomeBackdrop;->render(Landroidx/compose/runtime/Composer;I)V    # render album-art backdrop
 +
      invoke-interface {p1}, Landroidx/compose/foundation/layout/PaddingValues;->calculateTopPadding-D9Ej5fM()F
-
+ 
      .line 63
---- a/com/tidal/android/feature/home/ui/composables/e.smali
-+++ b/com/tidal/android/feature/home/ui/composables/e.smali
+--- a/com/tidal/android/feature/home/ui/composables/g.smali
++++ b/com/tidal/android/feature/home/ui/composables/g.smali
 @@ -790,6 +790,8 @@
      .line 104
      move-result-wide v14
-
+ 
 +    const-wide/16 v14, 0x0    # transparent topBar background
 +
      .line 105
      const/16 v17, 0x2
-
+ 
 @@ -850,6 +852,8 @@
      .line 134
      move-result-wide v14
-
+ 
 +    const-wide/16 v14, 0x0    # transparent TopAppBar containerColor
 +
      .line 135
      sget-object v3, Landroidx/compose/ui/graphics/Color;->Companion:Landroidx/compose/ui/graphics/Color$Companion;
+ 

patches/integration-waze-playback.patch

@@ -0,0 +1,55 @@
+--- a/mb/f.smali
++++ b/mb/f.smali
+@@ -613,6 +613,25 @@
+ 
+     .line 236
+     :goto_8
++    const-string/jumbo v5, "com.waze"
++
++    invoke-static {v3, v5}, Lkotlin/jvm/internal/n;->b(Ljava/lang/Object;Ljava/lang/Object;)Z # package match
++
++    move-result v5
++
++    if-eqz v5, :rl_waze_done
++
++    const-string/jumbo v5, "03:63:7f:6c:5d:8f:60:4e:6f:db:79:a6:ff:bf:a5:78:de:4e:31:8f:8d:a2:2f:c6:10:66:65:24:7f:88:07:d7" # Waze cert
++
++    invoke-static {v2, v5}, Lkotlin/jvm/internal/n;->b(Ljava/lang/Object;Ljava/lang/Object;)Z # cert match
++
++    move-result v5
++
++    if-eqz v5, :rl_waze_done
++
++    goto :goto_9 # trust Waze
++
++    :rl_waze_done
+     invoke-static {}, Landroid/os/Process;->myUid()I
+ 
+     .line 237
+@@ -769,6 +788,26 @@
+     :goto_b
+     if-eqz v2, :cond_14
+ 
++    const-string/jumbo v1, "com.waze"
++
++    invoke-static {v3, v1}, Lkotlin/jvm/internal/n;->b(Ljava/lang/Object;Ljava/lang/Object;)Z # package match
++
++    move-result v1
++
++    if-eqz v1, :rl_waze_recent_root_done_2
++
++    new-instance v1, Landroidx/media/MediaBrowserServiceCompat$BrowserRoot;
++
++    const-string/jumbo v4, "__RL_WAZE_ROOT_ID__"
++
++    const/4 v5, 0x0
++
++    invoke-direct {v1, v4, v5}, Landroidx/media/MediaBrowserServiceCompat$BrowserRoot;-><init>(Ljava/lang/String;Landroid/os/Bundle;)V
++
++    return-object v1
++
++    :rl_waze_recent_root_done_2
++
+     .line 306
+     .line 307
+     iget-object v1, v0, Lmb/f;->c:Ljava/util/Map;

patches/lyrics-disable-cover.patch

@@ -1,23 +1,23 @@
---- a/com/tidal/android/feature/playerscreen/ui/h0.smali
-+++ b/com/tidal/android/feature/playerscreen/ui/h0.smali
+--- a/com/tidal/android/feature/playerscreen/ui/b0.smali
++++ b/com/tidal/android/feature/playerscreen/ui/b0.smali
 @@ -669,8 +669,23 @@
      move-object v5, v1
-
+ 
      .line 289
 +    const v1, 0x52414443    # group key
 +
 +    invoke-interface {v7, v1}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open group around the cover
 +
-+    iget-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/h0;->b:Lcom/tidal/android/feature/playerscreen/ui/r$a;    # player state
++    iget-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/b0;->b:Lcom/tidal/android/feature/playerscreen/ui/s$a;    # player state
 +
-+    iget-object v1, v1, Lcom/tidal/android/feature/playerscreen/ui/r$a;->j:Lcom/tidal/android/feature/playerscreen/ui/g;    # current view mode
++    iget-object v1, v1, Lcom/tidal/android/feature/playerscreen/ui/s$a;->j:Lcom/tidal/android/feature/playerscreen/ui/g;    # current view mode
 +
 +    instance-of v1, v1, Lcom/tidal/android/feature/playerscreen/ui/g$a;    # cover mode only
 +
 +    if-eqz v1, :radiant_after_cover    # lyrics/credits mode -> skip cover
 +
-     invoke-static/range {v2 .. v9}, Lcom/tidal/android/feature/playerscreen/ui/composables/CoverPagerKt;->c(Lcom/tidal/android/feature/playerscreen/ui/d;Lyl0/l;FLandroidx/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V
-
+     invoke-static/range {v2 .. v9}, Lcom/tidal/android/feature/playerscreen/ui/composables/CoverPagerKt;->c(Lcom/tidal/android/feature/playerscreen/ui/d;Lam0/l;FLandroidx/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V
+ 
 +    :radiant_after_cover    # skip target
 +    invoke-interface {v7}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close group
 +

patches/lyrics-fade-region.patch

@@ -1,16 +1,15 @@
 --- a/com/tidal/android/feature/playerscreen/ui/composables/o1.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/composables/o1.smali
-@@ -64,26 +64,29 @@
-
+@@ -64,7 +64,7 @@
+ 
      .line 16
      .line 17
 -    iget v2, p0, Lcom/tidal/android/feature/playerscreen/ui/composables/o1;->a:F
 +    const/high16 v2, 0x43200000    # 160f start dp
-
+ 
      .line 18
      .line 19
-     invoke-interface {p1, v2}, Landroidx/compose/ui/unit/Density;->toPx-0680j_4(F)F
-
+@@ -73,7 +73,13 @@
      .line 20
      .line 21
      .line 22
@@ -22,16 +21,16 @@
 +    invoke-interface {p1, v3}, Landroidx/compose/ui/unit/Density;->toPx-0680j_4(F)F    # dp to px
 +
 +    move-result v3    # endY in px
-
+ 
      .line 23
      const/16 v5, 0x8
-
-     .line 24
+@@ -82,9 +88,6 @@
      .line 25
      const/4 v6, 0x0
-
+ 
 -    .line 26
 -    const/4 v2, 0x0
 -
      .line 27
      const/4 v4, 0x0
+ 

patches/lyrics-keep-controls-visible.patch

@@ -1,15 +1,28 @@
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt$PlayerScreenPortrait$2$1.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt$PlayerScreenPortrait$2$1.smali
-@@ -228,11 +228,11 @@
-     .line 23
-     .line 24
-     iget-boolean p1, p0, Lcom/tidal/android/feature/playerscreen/ui/PlayerScreenKt$PlayerScreenPortrait$2$1;->$isLyricsVisible:Z
-
+@@ -231,7 +231,7 @@
+ 
      .line 25
      .line 26
 -    if-eqz p1, :cond_3
 +    goto :cond_3    # skip auto-hide branch
-
+ 
      .line 27
      .line 28
-     iput v2, p0, Lcom/tidal/android/feature/playerscreen/ui/PlayerScreenKt$PlayerScreenPortrait$2$1;->label:I
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
+@@ -1382,6 +1382,14 @@
+     .line 109
+     .line 110
+     move-result v1
++    sget v4, Lradiant/LyricsReinitGuard;->lastMediaId:I
++    if-eq v1, v4, :rl_skip_reinit    # same track re-emitted -> skip the redundant re-init (avoids the loading-state flash)
++    sput v1, Lradiant/LyricsReinitGuard;->lastMediaId:I
++    goto :rl_reinit_ok
++    :rl_skip_reinit
++    sget-object v4, Lkotlin/u;->a:Lkotlin/u;
++    return-object v4
++    :rl_reinit_ok
+ 
+     .line 111
+     invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;

patches/lyrics-progress-pill.patch

@@ -1,18 +1,18 @@
---- a/com/tidal/android/feature/playerscreen/ui/c0.smali
-+++ b/com/tidal/android/feature/playerscreen/ui/c0.smali
-@@ -47,7 +47,7 @@
-
+--- a/com/tidal/android/feature/playerscreen/ui/m0.smali
++++ b/com/tidal/android/feature/playerscreen/ui/m0.smali
+@@ -45,7 +45,7 @@
+ 
  # virtual methods
  .method public final invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 -    .locals 17
 +    .locals 26    # extra regs for AndroidView
-
+ 
      .line 1
      move-object/from16 v0, p0
-@@ -461,6 +461,64 @@
+@@ -460,6 +460,64 @@
      .line 200
-     invoke-static/range {v2 .. v9}, Lcom/tidal/android/feature/playerscreen/ui/composables/LyricsKt;->a(Lcom/tidal/android/feature/playerscreen/ui/g;Lyl0/l;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/PaddingValues;Lyl0/l;Landroidx/compose/runtime/Composer;II)V
-
+     invoke-static/range {v2 .. v9}, Lcom/tidal/android/feature/playerscreen/ui/composables/LyricsKt;->a(Lcom/tidal/android/feature/playerscreen/ui/g;Lam0/l;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/PaddingValues;Lam0/l;Landroidx/compose/runtime/Composer;II)V
+ 
 +    sget-object v17, Lradiant/SpvFactory;->a:Lradiant/SpvFactory;    # progress view factory
 +
 +    sget-object v18, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;    # base modifier
@@ -29,7 +29,7 @@
 +
 +    const/16 v24, 0x0    # synthetic null
 +
-+    invoke-static/range {v18 .. v24}, Landroidx/compose/foundation/ClickableKt;->clickable-XHw0xAI$default(Landroidx/compose/ui/Modifier;ZLjava/lang/String;Landroidx/compose/ui/semantics/Role;Lyl0/a;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;    # apply clickable
++    invoke-static/range {v18 .. v24}, Landroidx/compose/foundation/ClickableKt;->clickable-XHw0xAI$default(Landroidx/compose/ui/Modifier;ZLjava/lang/String;Landroidx/compose/ui/semantics/Role;Lam0/a;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;    # apply clickable
 +
 +    move-result-object v23    # clickable modifier
 +
@@ -69,7 +69,7 @@
 +
 +    const/16 v22, 0x4    # default mask
 +
-+    invoke-static/range {v17 .. v22}, Landroidx/compose/ui/viewinterop/AndroidView_androidKt;->AndroidView(Lyl0/l;Landroidx/compose/ui/Modifier;Lyl0/l;Landroidx/compose/runtime/Composer;II)V    # mount progress pill
++    invoke-static/range {v17 .. v22}, Landroidx/compose/ui/viewinterop/AndroidView_androidKt;->AndroidView(Lam0/l;Landroidx/compose/ui/Modifier;Lam0/l;Landroidx/compose/runtime/Composer;II)V    # mount progress pill
 +
      .line 201
      .line 202

patches/lyrics-replace-lyrics-button.patch

@@ -1,34 +1,30 @@
 # rl-locals: com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali e( 79
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
-@@ -4945,7 +4945,11 @@
-     const/4 v7, 0x0
-
-     .line 226
--    invoke-static {v7, v9, v4, v2, v10}, Lcom/tidal/android/feature/playerscreen/ui/composables/k1;->a(Landroidx/compose/ui/Modifier;Lyl0/a;ZLandroidx/compose/runtime/Composer;I)V
-+    const v10, 0x52414448    # empty group key
+@@ -5183,7 +5183,11 @@
+     const/4 v12, 0x0
+ 
+     .line 259
+-    invoke-static {v7, v8, v4, v15, v12}, Lcom/tidal/android/feature/playerscreen/ui/composables/k1;->a(Landroidx/compose/ui/Modifier;Lam0/a;ZLandroidx/compose/runtime/Composer;I)V
++    const v7, 0x52414448    # empty group key
 +
-+    invoke-interface {v2, v10}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open empty
++    invoke-interface {v15, v7}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open empty
 +
-+    invoke-interface {v2}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close empty
-
-     .line 227
-     invoke-interface {v2}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V
-@@ -5720,6 +5724,22 @@
-     :cond_51
-     check-cast v4, Lyl0/a;
-
-     const/4 v2, 0x0
-
-     invoke-static {v13, v7, v2, v4}, Lcom/tidal/android/feature/playerscreen/ui/composables/l3;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V
++    invoke-interface {v15}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close empty
+ 
+     .line 260
+     invoke-interface {v15}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V
+@@ -5967,6 +5971,22 @@
+ 
+     invoke-static {v4, v3, v7, v6}, Lcom/tidal/android/feature/playerscreen/ui/composables/s3;->a(ILam0/a;Landroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;)V
+ 
++    new-instance v74, Landroidx/window/embedding/a2;    # lyrics toggle lambda
 +
-+    new-instance v74, Lcom/tidal/android/feature/playerscreen/ui/g0;    # lyrics toggle lambda
++    move-object/from16 v75, p2    # action dispatcher
 +
-+    move-object/from16 v75, p5    # action dispatcher
++    const/16 v76, 0x1    # lyrics action disc
 +
-+    const/16 v76, 0x0    # lyrics action disc
-+
-+    invoke-direct/range {v74 .. v76}, Lcom/tidal/android/feature/playerscreen/ui/g0;-><init>(Ljava/lang/Object;I)V    # build lambda
++    invoke-direct/range {v74 .. v76}, Landroidx/window/embedding/a2;-><init>(Ljava/lang/Object;I)V    # build lambda
 +
 +    const/16 v71, 0x0    # changed flags
 +
@@ -36,4 +32,8 @@
 +
 +    const/16 v73, 0x0    # null modifier
 +
-+    invoke-static/range {v71 .. v74}, Lradiant/SparkleButton;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V    # render sparkle button
++    invoke-static/range {v71 .. v74}, Lradiant/SparkleButton;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lam0/a;)V    # render sparkle button
++
+     .line 365
+     iget-object v3, v11, Lcom/tidal/android/feature/playerscreen/ui/s$a;->m:Lcom/tidal/android/feature/playerscreen/ui/p;
+ 

patches/lyrics-replace-share-button.patch

@@ -1,50 +1,46 @@
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
-@@ -5094,7 +5094,11 @@
-     const/4 v13, 0x0
-
-     .line 247
--    invoke-static {v9, v0, v10, v2, v13}, Lcom/tidal/android/feature/playerscreen/ui/composables/BroadcastButtonKt;->b(Lcom/tidal/android/feature/playerscreen/ui/b;Lyl0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
-+    const v9, 0x52414244    # empty group key
+@@ -5328,7 +5328,11 @@
+     const/4 v12, 0x0
+ 
+     .line 280
+-    invoke-static {v8, v6, v12, v15, v3}, Lcom/tidal/android/feature/playerscreen/ui/composables/BroadcastButtonKt;->b(Lcom/tidal/android/feature/playerscreen/ui/b;Lam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
++    const v3, 0x52414244    # empty group key
 +
-+    invoke-interface {v2, v9}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open empty
++    invoke-interface {v15, v3}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open empty
 +
-+    invoke-interface {v2}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close empty
-
-     .line 248
-     invoke-interface {v2}, Landroidx/compose/runtime/Composer;->endNode()V
-@@ -5770,16 +5774,20 @@
-     .line 335
-     :cond_53
--    new-instance v4, Lcom/aspiro/wamp/tidalconnect/playback/i;
--
--    invoke-direct {v4, v11, v1}, Lcom/aspiro/wamp/tidalconnect/playback/i;-><init>(Ljava/lang/Object;I)V
--
--    .line 336
--    invoke-interface {v7, v4}, Landroidx/compose/runtime/Composer;->updateRememberedValue(Ljava/lang/Object;)V
--
--    .line 337
--    :cond_54
--    check-cast v4, Lyl0/a;
--
--    const/4 v2, 0x0
--
--    invoke-static {v13, v7, v2, v4}, Lcom/tidal/android/feature/playerscreen/ui/composables/x4;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V
-+    new-instance v4, Landroidx/navigation/fragment/k;    # connect click lambda factory
++    invoke-interface {v15}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close empty
+ 
+     .line 281
+     invoke-interface {v15}, Landroidx/compose/runtime/Composer;->endNode()V
+@@ -6156,11 +6160,11 @@
+     .line 385
+     :cond_61
+     :goto_2e
+-    new-instance v1, Lcom/tidal/android/feature/playerscreen/ui/e0;
++    new-instance v1, Landroidx/window/embedding/b2;    # connect click lambda (was share e0)
+ 
+-    const/4 v6, 0x0
++    const/4 v6, 0x1    # connect-clicked disc
+ 
+-    invoke-direct {v1, v10, v6}, Lcom/tidal/android/feature/playerscreen/ui/e0;-><init>(Ljava/lang/Object;I)V
++    invoke-direct {v1, v10, v6}, Landroidx/window/embedding/b2;-><init>(Ljava/lang/Object;I)V    # build connect lambda
+ 
+     .line 386
+     invoke-interface {v7, v1}, Landroidx/compose/runtime/Composer;->updateRememberedValue(Ljava/lang/Object;)V
+@@ -6169,9 +6173,13 @@
+     :goto_2f
+     check-cast v1, Lam0/a;
+ 
+-    const/4 v3, 0x0
++    iget-object v8, v11, Lcom/tidal/android/feature/playerscreen/ui/s$a;->d:Lcom/tidal/android/feature/playerscreen/ui/b;    # broadcast state
 +
-+    move-object/from16 v6, p5    # action dispatcher
++    const/4 v3, 0x0    # null modifier
 +
-+    const/4 v8, 0x1    # connect-clicked disc
-+
-+    invoke-direct {v4, v6, v8}, Landroidx/navigation/fragment/k;-><init>(Ljava/lang/Object;I)V    # build lambda
-+
-+    invoke-interface {v7, v4}, Landroidx/compose/runtime/Composer;->updateRememberedValue(Ljava/lang/Object;)V    # cache lambda
-+
-+    :cond_54    # cache join
-+    check-cast v4, Lyl0/a;    # cast to Function0
-+
-+    iget-object v8, v10, Lcom/tidal/android/feature/playerscreen/ui/r$a;->d:Lcom/tidal/android/feature/playerscreen/ui/b;    # broadcast state
-+
-+    const/4 v2, 0x0    # changed flags
-+
-+    invoke-static {v8, v4, v13, v7, v2}, Lcom/tidal/android/feature/playerscreen/ui/composables/BroadcastButtonKt;->b(Lcom/tidal/android/feature/playerscreen/ui/b;Lyl0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # render connect button
++    const/4 v6, 0x0    # changed flags
+ 
+-    invoke-static {v6, v1, v7, v3}, Lcom/tidal/android/feature/playerscreen/ui/composables/e5;->a(ILam0/a;Landroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;)V
++    invoke-static {v8, v1, v3, v7, v6}, Lcom/tidal/android/feature/playerscreen/ui/composables/BroadcastButtonKt;->b(Lcom/tidal/android/feature/playerscreen/ui/b;Lam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # render connect button
+ 
+     if-ne v0, v2, :cond_62
+ 

patches/lyrics-rl-api-observer.patch

@@ -1,8 +1,7 @@
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel$observeLyricsProgress$1$a.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel$observeLyricsProgress$1$a.smali
-@@ -190,7 +190,14 @@
-     goto :goto_0
-
+@@ -191,6 +191,13 @@
+ 
      .line 67
      :cond_3
 +    sget-boolean v6, Lradiant/RLAPILyricsHook;->isRlState:Z    # read RL flag
@@ -13,5 +12,5 @@
 +
 +    :radiant_skip
      if-gez v4, :cond_4
-
+ 
      .line 68

patches/lyrics-rl-api.patch

@@ -1,21 +1,66 @@
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
-@@ -1277,7 +1277,9 @@
-     .line 104
+@@ -1374,6 +1374,8 @@
      .line 105
      check-cast v1, Lcom/aspiro/wamp/model/Track;
-
+ 
 +    invoke-static {v0, v1}, Lradiant/RLAPILyricsHook;->onWampTrack(Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;Lcom/aspiro/wamp/model/Track;)V    # RL API lyrics hook
 +
      .line 106
      .line 107
      invoke-virtual {v1}, Lcom/aspiro/wamp/model/MediaItem;->getId()I
-@@ -1551,7 +1553,7 @@
-     .line 235
-     .line 236
-     .line 237
--    if-nez v9, :cond_a
-+    goto :cond_a    # skip TIDAL N=false setter
-
-     .line 238
+@@ -1655,7 +1657,7 @@
      .line 239
+     .line 240
+     .line 241
+-    if-nez v9, :cond_a
++    goto :cond_a    # skip TIDAL P=false in the has-lyrics path (for some reason)
+ 
+     .line 242
+     .line 243
+@@ -2347,7 +2349,10 @@
+ 
+     .line 572
+     :goto_c
++    sget-boolean v5, Lradiant/RLAPILyricsHook;->isRlState:Z
++    if-nez v5, :rl_keep_n2    # RL active -> keep worker content
+     invoke-interface {v9, v1}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
++    :rl_keep_n2
+ 
+     .line 573
+     .line 574
+@@ -2396,7 +2401,10 @@
+ 
+     .line 595
+     .line 596
++    sget-boolean v7, Lradiant/RLAPILyricsHook;->isRlState:Z
++    if-nez v7, :rl_keep_o    # RL active -> keep view-open flag
+     invoke-interface {v1, v5}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
++    :rl_keep_o
+ 
+     .line 597
+     .line 598
+@@ -2425,7 +2433,10 @@
+ 
+     .line 610
+     .line 611
++    sget-boolean v7, Lradiant/RLAPILyricsHook;->isRlState:Z
++    if-nez v7, :rl_keep_n    # RL active -> keep worker content
+     invoke-interface {v1, v6}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
++    :rl_keep_n
+ 
+     .line 612
+     .line 613
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel$special$$inlined$mapNotNull$1$2.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel$special$$inlined$mapNotNull$1$2.smali
+@@ -2256,6 +2256,10 @@
+     .line 1040
+     .line 1041
+     move-result v34
++    sget-boolean v4, Lradiant/RLAPILyricsHook;->isRlState:Z
++    if-eqz v4, :rl_hl_done    # not RL = use TIDAL's hasLyrics
++    const/16 v34, 0x1    # RL lyrics active = force hasLyrics so the sparkle stays
++    :rl_hl_done
+ 
+     .line 1042
+     iget-object v4, v1, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;

patches/lyrics-sparkle-conditional-visibility.patch

@@ -1,41 +1,37 @@
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
-@@ -5725,17 +5725,38 @@
-     invoke-static {v13, v7, v2, v4}, Lcom/tidal/android/feature/playerscreen/ui/composables/l3;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V
+@@ -5971,6 +5971,14 @@
+ 
+     invoke-static {v4, v3, v7, v6}, Lcom/tidal/android/feature/playerscreen/ui/composables/s3;->a(ILam0/a;Landroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;)V
+ 
++    iget-boolean v3, v11, Lcom/tidal/android/feature/playerscreen/ui/s$a;->i:Z    # hasLyrics flag
 +
-+    iget-boolean v2, v10, Lcom/tidal/android/feature/playerscreen/ui/r$a;->i:Z    # hasLyrics flag
++    if-eqz v3, :cond_sparkle_no_lyrics    # branch when no lyrics
 +
-+    if-eqz v2, :cond_sparkle_no_lyrics    # branch when no lyrics
++    const v3, 0x30551b59    # group key (lyrics)
 +
-+    const v2, 0x30551b59    # group key (lyrics)
-+
-+    invoke-interface {v7, v2}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open lyrics branch
-
-     new-instance v74, Lcom/tidal/android/feature/playerscreen/ui/g0;    # lyrics toggle lambda
-
-     move-object/from16 v75, p5    # action dispatcher
-
-     const/16 v76, 0x0    # lyrics action disc
-
-     invoke-direct/range {v74 .. v76}, Lcom/tidal/android/feature/playerscreen/ui/g0;-><init>(Ljava/lang/Object;I)V    # build lambda
-
-     const/16 v71, 0x0    # changed flags
-
-     move-object/from16 v72, v7    # composer
-
-     const/16 v73, 0x0    # null modifier
-
-     invoke-static/range {v71 .. v74}, Lradiant/SparkleButton;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V    # render sparkle button
++    invoke-interface {v7, v3}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open lyrics branch
 +
+     new-instance v74, Landroidx/window/embedding/a2;    # lyrics toggle lambda
+ 
+     move-object/from16 v75, p2    # action dispatcher
+@@ -5987,6 +5995,19 @@
+ 
+     invoke-static/range {v71 .. v74}, Lradiant/SparkleButton;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lam0/a;)V    # render sparkle button
+ 
 +    invoke-interface {v7}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close lyrics branch
 +
 +    goto :goto_sparkle_done    # skip empty branch
 +
 +    :cond_sparkle_no_lyrics    # no-lyrics branch
-+    const v2, 0x3057f75c    # group key (no lyrics)
++    const v3, 0x3057f75c    # group key (no lyrics)
 +
-+    invoke-interface {v7, v2}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open empty
++    invoke-interface {v7, v3}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open empty
 +
 +    invoke-interface {v7}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close empty
 +
 +    :goto_sparkle_done    # join target
++
+     .line 365
+     iget-object v3, v11, Lcom/tidal/android/feature/playerscreen/ui/s$a;->m:Lcom/tidal/android/feature/playerscreen/ui/p;
+ 

patches/manifest.json

@@ -0,0 +1,347 @@
+{
+  "version": 1,
+  "patches": [
+    {
+      "id": "EnableLegacyUi",
+      "order": 10,
+      "fileNames": [
+        "enable-legacy-ui.patch"
+      ],
+      "title": "Enable Legacy UI",
+      "description": "[This patch will stop working soon] - Replaces the New Compose based UI with the Legacy UI (disables player-market-ui feature flag)",
+      "default": false,
+      "requires": [
+        "DebugMenuUnlock"
+      ],
+      "disables": [
+        "LyricsDisableCover",
+        "LyricsReplaceLyricsButton",
+        "LyricsReplaceShareButton",
+        "LyricsRlApi",
+        "LyricsKeepControlsVisible",
+        "PlayerBackdrop",
+        "QualityBadgeColors",
+        "PlayerMovePlayingFrom",
+        "PlayerOneHanded",
+        "LyricsProgressPill",
+        "MiniPlayerRedesign"
+      ]
+    },
+    {
+      "id": "LyricsRlApi",
+      "order": 20,
+      "fileNames": [
+        "lyrics-rl-api.patch",
+        "lyrics-rl-api-observer.patch"
+      ],
+      "title": "Radiant Lyrics API - WIP",
+      "description": "Use Radiant Lyrics API to fetch Lyrics (Higher quality & More providers)",
+      "default": false
+    },
+    {
+      "id": "PlayerBackdrop",
+      "order": 30,
+      "fileNames": [],
+      "title": "Player Backdrop",
+      "description": "Lets you fully adjust how the player backdrop blur looks and behaves",
+      "default": true,
+      "defaultVariantIndex": 2,
+      "variants": [
+        {
+          "title": "Static",
+          "fileNames": [
+            "player-backdrop-static.patch"
+          ]
+        },
+        {
+          "title": "Animated",
+          "fileNames": [
+            "player-backdrop-animated.patch"
+          ]
+        },
+        {
+          "title": "Playback",
+          "fileNames": [
+            "player-backdrop-playback.patch"
+          ]
+        }
+      ],
+      "advancedOptions": [
+        {
+          "type": "toggle",
+          "key": "cover_everywhere",
+          "title": "Cover Everywhere - WIP",
+          "description": "Applies TIDAL's native blurred album-art backdrop to every Compose based page (Home & Collection)",
+          "default": false,
+          "inline": true,
+          "fileNames": [
+            "home-backdrop.patch",
+            "collection-backdrop.patch",
+            "cover-capture.patch"
+          ]
+        }
+      ]
+    },
+    {
+      "id": "QualityBadgeColors",
+      "order": 36,
+      "fileNames": [
+        "player-quality-badge-colors.patch"
+      ],
+      "title": "Quality Badge Colors",
+      "description": "Brings color back to the player quality badge.",
+      "default": true
+    },
+    {
+      "id": "PlayerMovePlayingFrom",
+      "order": 37,
+      "fileNames": [
+        "player-move-playing-from.patch"
+      ],
+      "extensionFiles": [
+        "radiant/PlayingFrom.smali"
+      ],
+      "title": "Playing From",
+      "description": "Shows the source name (playlist/album/mix) above the track title",
+      "default": true
+    },
+    {
+      "id": "PlayerOneHanded",
+      "order": 38,
+      "fileNames": [
+        "player-one-handed.patch"
+      ],
+      "title": "One-Handed Mode",
+      "description": "Mirrors the bottom player buttons left-to-right for easier one-handed reach.",
+      "default": false
+    },
+    {
+      "id": "LyricsProgressPill",
+      "order": 40,
+      "fileNames": [
+        "lyrics-progress-pill.patch",
+        "lyrics-fade-region.patch"
+      ],
+      "title": "Lyrics Progress Pill",
+      "description": "Restores the old Track Progress Pill in the top of the Lyrics screen!",
+      "default": true,
+      "requires": [
+        "LyricsDisableCover",
+        "LyricsReplaceLyricsButton",
+        "LyricsReplaceShareButton"
+      ]
+    },
+    {
+      "id": "LyricsDisableCover",
+      "order": 41,
+      "fileNames": [
+        "lyrics-disable-cover.patch"
+      ],
+      "title": "Disable Lyrics Cover",
+      "description": "Removes the mini track cover from the lyrics screen.",
+      "default": true
+    },
+    {
+      "id": "LyricsReplaceLyricsButton",
+      "order": 42,
+      "fileNames": [
+        "lyrics-replace-lyrics-button.patch",
+        "lyrics-sparkle-conditional-visibility.patch"
+      ],
+      "title": "Replace Lyrics Button",
+      "description": "Replaces the Lyrics button with the RL Sparkle!",
+      "default": true
+    },
+    {
+      "id": "LyricsReplaceShareButton",
+      "order": 43,
+      "fileNames": [
+        "lyrics-replace-share-button.patch"
+      ],
+      "title": "Replace Share Button",
+      "description": "Replaces the share button with the Tidal Connect button from the top of the screen. (it's in the menu already)",
+      "default": true
+    },
+    {
+      "id": "MiniPlayerRedesign",
+      "order": 50,
+      "fileNames": [],
+      "title": "Redesigned Mini-Player",
+      "description": "Integrates the Seekbar into the control panel at the bottom of the screen.",
+      "default": false,
+      "defaultVariantIndex": 2,
+      "variants": [
+        {
+          "title": "Floating",
+          "fileNames": []
+        },
+        {
+          "title": "Grey",
+          "fileNames": [
+            "mini-player-grey.patch"
+          ]
+        },
+        {
+          "title": "Black",
+          "fileNames": [
+            "mini-player-black.patch"
+          ]
+        }
+      ],
+      "advancedOptions": [
+        {
+          "type": "toggle",
+          "key": "dynamic_bg",
+          "title": "Mini-Player Dynamic Background",
+          "description": "Colorizes the Mini-Player depending on the currently playing track.",
+          "default": false,
+          "inline": true,
+          "fileNames": [
+            "mini-player-dynamic-bg.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniPlayerBackground.smali"
+          ],
+          "hidesVariants": [
+            2
+          ],
+          "relabelVariants": {
+            "1": "Legacy"
+          }
+        },
+        {
+          "type": "toggle",
+          "key": "border",
+          "title": "Progress Border",
+          "description": "Draws an animated progress ring around the floating mini-player. Requires the Floating style.",
+          "default": false,
+          "requiresVariant": 0,
+          "fileNames": [
+            "mini-player-floating-border.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniSeekerFloating.smali"
+          ]
+        },
+        {
+          "type": "toggle",
+          "key": "gestures",
+          "title": "Mini-Player Gestures",
+          "description": "Adds swipe up gesture to the mini-player to reopen the player",
+          "default": true,
+          "fileNames": [
+            "mini-player-gestures.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniPlayerGestures.smali",
+            "radiant/MiniPlayerGestures$Gesture.smali",
+            "radiant/MiniPlayerGestures$FeedbackLayer.smali",
+            "radiant/MiniPlayerGestures$FeedbackResetAnimator.smali",
+            "radiant/MiniPlayerGestures$RootGesture.smali",
+            "radiant/MiniPlayerGestures$ApplyPending.smali"
+          ]
+        },
+        {
+          "type": "choice",
+          "key": "swipe_up_drag",
+          "title": "Swipe Up Style",
+          "entries": [
+            "Static",
+            "Drag"
+          ],
+          "values": [
+            "0x0",
+            "0x1"
+          ],
+          "defaultIndex": 1,
+          "requiresOption": "gestures",
+          "token": "RL_MINI_PLAYER_SWIPE_UP_DRAG"
+        },
+        {
+          "type": "toggle",
+          "key": "next_prev",
+          "title": "Next/Previous Gestures",
+          "description": "Swipe left or right on the mini-player to skip tracks.",
+          "default": false,
+          "requiresOption": "gestures",
+          "fileNames": [
+            "mini-player-gestures-left-right.patch"
+          ],
+          "extensionFiles": [
+            "radiant/MiniPlayerTrackGestures.smali",
+            "radiant/MiniPlayerTrackGestures$Gesture.smali",
+            "radiant/MiniPlayerTrackGestures$OffsetLayer.smali",
+            "radiant/MiniPlayerTrackGestures$ResetAnimator.smali",
+            "radiant/MiniPlayerTrackGestures$TextDraw.smali",
+            "com/tidal/android/feature/appscaffold/ui/r$c.smali"
+          ]
+        }
+      ]
+    },
+    {
+      "id": "LyricsKeepControlsVisible",
+      "order": 60,
+      "fileNames": [
+        "lyrics-keep-controls-visible.patch"
+      ],
+      "extensionFiles": [
+        "radiant/LyricsReinitGuard.smali"
+      ],
+      "title": "Keep Controls Visible",
+      "description": "Inverts the auto-hide behavior on the lyrics screen, playback controls stay visible by default and only hide when you tap them off. Also stops the open lyrics view from randomly closing when the player re-fetches the same track.",
+      "default": true
+    },
+    {
+      "id": "WazeIntegration",
+      "order": 90,
+      "category": "integration",
+      "pathLocked": true,
+      "fileNames": [
+        "integration-waze-playback.patch"
+      ],
+      "extensionFiles": [
+        "radiant/WazeInitReceiver.smali",
+        "radiant/WazeServiceConnection.smali"
+      ],
+      "title": "Waze Integration",
+      "description": "Control TIDAL playback from the Waze app",
+      "default": true,
+      "advancedOptions": [
+        {
+          "type": "choice",
+          "key": "browse_root",
+          "title": "Media Menu",
+          "entries": [
+            "Auto Menu",
+            "Home",
+            "Recents"
+          ],
+          "values": [
+            "ROOT_AUTO",
+            "HOME_V2::home_page_v2_id",
+            "RECENTLY_PLAYED::home/pages/CONTINUE_LISTEN_TO/view-all"
+          ],
+          "defaultIndex": 0,
+          "token": "RL_WAZE_ROOT_ID"
+        },
+        {
+          "type": "color",
+          "key": "accent_color",
+          "title": "Accent Color",
+          "default": -16747037,
+          "token": "RL_WAZE_THEME_COLOR"
+        }
+      ]
+    },
+    {
+      "id": "DebugMenuUnlock",
+      "order": 100,
+      "fileNames": [
+        "debug-menu-unlock.patch"
+      ],
+      "title": "Unlock Debug Menu",
+      "description": "Reveals TIDAL's hidden Debug Menu in Settings. (Unlocks Feature Flags & the legacy Debug Options)",
+      "default": false
+    }
+  ]
+}

patches/mini-player-black.patch

@@ -20,50 +20,60 @@
      .line 71
 --- a/com/tidal/android/feature/appscaffold/ui/composable/i.smali
 +++ b/com/tidal/android/feature/appscaffold/ui/composable/i.smali
-@@ -2756,12 +2756,7 @@
-     invoke-static {v0, v8, v11, v12}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxWidth$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;
+@@ -2275,11 +2275,7 @@
  
-     move-result-object v0
+     move-result-object v2
+ 
+-    .line 143
+-    invoke-static {v2}, Landroidx/compose/foundation/layout/WindowInsetsPadding_androidKt;->navigationBarsPadding(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
 -
--    .line 140
--    invoke-static {v0}, Landroidx/compose/foundation/layout/WindowInsetsPadding_androidKt;->navigationBarsPadding(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
--
--    move-result-object v0
+-    move-result-object v2
 -
 +    # flush bottom; skip nav inset
-     .line 141
-     invoke-interface/range {v17 .. v17}, Landroidx/compose/runtime/State;->getValue()Ljava/lang/Object;
+     .line 144
+     invoke-interface/range {v21 .. v21}, Landroidx/compose/runtime/State;->getValue()Ljava/lang/Object;
  
-@@ -2773,6 +2768,8 @@
+@@ -2291,6 +2287,8 @@
  
-     move-result v10
+     move-result v4
  
-+    const/4 v10, 0x0    # zero horizontal padding
++    const/4 v4, 0x0    # zero horizontal padding
 +
-     const/4 v11, 0x2
+     const/4 v6, 0x2
  
-     .line 142
-@@ -2816,6 +2813,12 @@
+     .line 145
+@@ -2334,6 +2332,12 @@
  
-     move-result-wide v10
+     move-result-wide v3
  
-+    const v8, -0x1000000    # 0xFF000000 opaque black
++    const v5, -0x1000000    # 0xFF000000 opaque black
 +
-+    invoke-static {v8}, Landroidx/compose/ui/graphics/ColorKt;->Color(I)J    # pack to color long
++    invoke-static {v5}, Landroidx/compose/ui/graphics/ColorKt;->Color(I)J    # pack to color long
 +
-+    move-result-wide v10    # override theme color
++    move-result-wide v3    # override theme color
 +
-     .line 147
-     sget-object v8, Lcom/tidal/android/feature/appscaffold/ui/composable/a;->c:Landroidx/compose/foundation/shape/RoundedCornerShape;
+     .line 150
+     sget-object v5, Lcom/tidal/android/feature/appscaffold/ui/composable/a;->c:Landroidx/compose/foundation/shape/RoundedCornerShape;
  
-@@ -2969,6 +2972,10 @@
+@@ -2375,6 +2379,10 @@
  
-     invoke-static {v12, v0, v8}, Landroidx/compose/runtime/Updater;->set-impl(Landroidx/compose/runtime/Composer;Ljava/lang/Object;Lyl0/p;)V
+     move-result-object v2
+ 
++    invoke-static {v2}, Landroidx/compose/foundation/layout/WindowInsetsPadding_androidKt;->navigationBarsPadding(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # inset bar content above nav bar (Prevents Bleeding behind Nav Buttons)
++
++    move-result-object v2
++
+     .line 158
+     sget-object v3, Landroidx/compose/foundation/layout/Arrangement;->INSTANCE:Landroidx/compose/foundation/layout/Arrangement;
+ 
+@@ -2487,6 +2495,10 @@
+ 
+     invoke-static {v6, v2, v3}, Landroidx/compose/runtime/Updater;->set-impl(Landroidx/compose/runtime/Composer;Ljava/lang/Object;Lam0/p;)V
  
 +    const/4 v8, 0x0    # composer $changed flags
 +
-+    invoke-static {v15, v8}, Lradiant/MiniSeekerLine;->render(Landroidx/compose/runtime/Composer;I)V    # draw top-edge seeker
++    invoke-static {v7, v8}, Lradiant/MiniSeekerLine;->render(Landroidx/compose/runtime/Composer;I)V    # draw top-edge seeker
 +
-     .line 172
-     sget-object v0, Landroidx/compose/foundation/layout/ColumnScopeInstance;->INSTANCE:Landroidx/compose/foundation/layout/ColumnScopeInstance;
+     .line 175
+     sget-object v2, Landroidx/compose/foundation/layout/ColumnScopeInstance;->INSTANCE:Landroidx/compose/foundation/layout/ColumnScopeInstance;
  

patches/mini-player-dynamic-bg.patch

@@ -0,0 +1,55 @@
+--- a/com/tidal/android/feature/appscaffold/ui/composable/i.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/i.smali
+@@ -2334,6 +2334,12 @@
+ 
+     move-result-wide v3
+ 
++    const/4 v5, 0x0
++
++    invoke-static {v3, v4, v7, v5}, Lradiant/MiniPlayerBackground;->color(JLandroidx/compose/runtime/Composer;I)J # dynamic bg or fallback
++
++    move-result-wide v3
++
+     .line 150
+     sget-object v5, Lcom/tidal/android/feature/appscaffold/ui/composable/a;->c:Landroidx/compose/foundation/shape/RoundedCornerShape;
+ 
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
+@@ -1146,6 +1146,10 @@
+ 
+     iput-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->W:Lkotlinx/coroutines/flow/StateFlow;
+ 
++    iget-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->Q:Lkotlin/i;
++
++    invoke-interface {v1}, Lkotlin/i;->getValue()Ljava/lang/Object; # init player bg color
++
+     return-void
+ .end method
+ 
+@@ -1711,6 +1715,8 @@
+     :goto_6
+     invoke-interface {v9, v10}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
+ 
++    invoke-static {v10}, Lradiant/MiniPlayerBackground;->setHex(Ljava/lang/String;)V # store player bg hex
++
+     .line 267
+     .line 268
+     .line 269
+@@ -2410,6 +2416,8 @@
+     .line 602
+     invoke-interface {v1, v5}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
+ 
++    invoke-static {v5}, Lradiant/MiniPlayerBackground;->setHex(Ljava/lang/String;)V # clear bg color
++
+     .line 603
+     .line 604
+     .line 605
+@@ -2627,6 +2635,8 @@
+     .line 708
+     invoke-interface {v1, v5}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
+ 
++    invoke-static {v5}, Lradiant/MiniPlayerBackground;->setHex(Ljava/lang/String;)V # clear bg color
++
+     .line 709
+     .line 710
+     .line 711

patches/mini-player-floating-border.patch

@@ -0,0 +1,15 @@
+--- a/com/tidal/android/feature/appscaffold/ui/composable/i.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/i.smali
+@@ -2347,6 +2347,12 @@
+ 
+     move-result-object v2
+ 
++    sget-object v5, Lradiant/MiniSeekerFloating;->INSTANCE:Lradiant/MiniSeekerFloating;    # draw lambda
++
++    invoke-static {v2, v5}, Landroidx/compose/ui/draw/DrawModifierKt;->drawWithContent(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # overlay perimeter stroke
++
++    move-result-object v2    # updated modifier
++
+     .line 153
+     sget-object v3, Lkotlin/u;->a:Lkotlin/u;
+ 

patches/mini-player-floating.patch

@@ -1,15 +0,0 @@
---- a/com/tidal/android/feature/appscaffold/ui/composable/i.smali
-+++ b/com/tidal/android/feature/appscaffold/ui/composable/i.smali
-@@ -2829,6 +2829,12 @@
- 
-     move-result-object v0
- 
-+    sget-object v8, Lradiant/MiniSeekerFloating;->INSTANCE:Lradiant/MiniSeekerFloating;    # draw lambda
-+
-+    invoke-static {v0, v8}, Landroidx/compose/ui/draw/DrawModifierKt;->drawWithContent(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # overlay perimeter stroke
-+
-+    move-result-object v0    # updated modifier
-+
-     .line 150
-     sget-object v8, Lkotlin/u;->a:Lkotlin/u;
- 

patches/mini-player-gestures-left-right.patch

@@ -0,0 +1,126 @@
+--- a/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
+@@ -1215,6 +1215,10 @@
+ 
+     move-result-object v6
+ 
++    invoke-static {v6, v1}, Lradiant/MiniPlayerTrackGestures;->trackModifier(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # attach horizontal swipe listener
++
++    move-result-object v6
++
+     .line 38
+     sget-object v21, Landroidx/compose/ui/Alignment;->Companion:Landroidx/compose/ui/Alignment$Companion;
+ 
+@@ -1352,6 +1356,8 @@
+     .line 56
+     iget-object v11, v0, Lcom/tidal/android/feature/appscaffold/ui/t;->b:Lcom/tidal/android/feature/appscaffold/ui/q;
+ 
++    invoke-static {v11}, Lradiant/MiniPlayerTrackGestures;->onRenderedItem(Ljava/lang/Object;)V    # reset stale drag offset if track metadata changes mid-gesture
++
+     .line 57
+     invoke-virtual/range {v16 .. v16}, Lcom/squareup/ui/market/core/theme/MarketStylesheet;->getBorderRadii()Lcom/squareup/ui/market/core/theme/MarketStylesheet$b;
+ 
+@@ -1390,6 +1396,10 @@
+ 
+     move-result-object v6
+ 
++    invoke-static {v6}, Lradiant/MiniPlayerTrackGestures;->feedbackModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # move the whole cover container with horizontal swipe
++
++    move-result-object v6
++
+     .line 63
+     invoke-virtual/range {v22 .. v22}, Lcom/squareup/ui/market/core/theme/MarketStylesheet$c;->p0()Lf20/a;
+ 
+@@ -1501,6 +1511,10 @@
+ 
+     move-result-object v5
+ 
++    invoke-static {v5}, Lradiant/MiniPlayerTrackGestures;->textFeedbackModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # move title/artist
++
++    move-result-object v5
++
+     .line 72
+     invoke-virtual/range {v32 .. v32}, Landroidx/compose/foundation/layout/Arrangement;->getTop()Landroidx/compose/foundation/layout/Arrangement$Vertical;
+ 
+--- a/com/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel.smali
++++ b/com/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel.smali
+@@ -512,16 +512,16 @@
+     .line 110
+     invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+ 
+     .line 111
+     .line 112
+     .line 113
+-    move-result p1
++    move-result v0
+ 
+     .line 114
+-    if-eqz p1, :cond_f
++    if-eqz v0, :cond_f
+ 
+     .line 115
+     .line 116
+     invoke-interface {v3}, Lbi/e;->i()Z
+ 
+     .line 117
+@@ -695,12 +695,34 @@
+     .line 194
+     :cond_e
+     return-void
+ 
+     .line 195
+     :cond_f
++    sget-object v0, Lcom/tidal/android/feature/appscaffold/ui/r$c;->a:Lcom/tidal/android/feature/appscaffold/ui/r$c;    # our synthetic previous-track event
++
++    invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z    # is this the swipe-previous event?
++
++    move-result p1
++
++    if-eqz p1, :unknown_event
++
++    invoke-interface {v3}, Lbi/e;->canSkipToPreviousOrRewind()Z
++
++    move-result p1
++
++    if-eqz p1, :previous_done
++
++    const/4 p1, 0x0
++
++    invoke-interface {v3, p1}, Lbi/e;->h(Z)V    # false = previous/rewind
++
++    :previous_done
++    return-void
++
++    :unknown_event
+     invoke-static {}, Landroidx/navigation/f0;->a()V
+ 
+     .line 196
+     .line 197
+     .line 198
+     return-void
+--- a/com/tidal/android/feature/appscaffold/ui/composable/g.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/g.smali
+@@ -24,12 +24,23 @@
+ 
+ 
+ # virtual methods
+ .method public final invoke()Ljava/lang/Object;
+     .locals 2
+ 
++    invoke-static {}, Lradiant/MiniPlayerTrackGestures;->consumeTapOpenSuppression()Z    # skip open-player if a horizontal skip-swipe just happened
++
++    move-result v0
++
++    if-eqz v0, :rl_continue_open
++
++    sget-object v0, Lkotlin/u;->a:Lkotlin/u;
++
++    return-object v0
++
++    :rl_continue_open
+     .line 1
+     iget-object v0, p0, Lcom/tidal/android/feature/appscaffold/ui/composable/g;->a:Lam0/l;
+ 
+     .line 2
+     .line 3
+     sget-object v1, Lcom/tidal/android/feature/appscaffold/ui/b$b;->a:Lcom/tidal/android/feature/appscaffold/ui/b$b;

patches/mini-player-gestures.patch

@@ -0,0 +1,131 @@
+# rl-locals: com/tidal/android/feature/appscaffold/ui/composable/i.smali b( 52
+--- a/com/tidal/android/feature/appscaffold/ui/composable/i.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/i.smali
+@@ -1691,6 +1691,14 @@
+ 
+     move-result-object v24
+ 
++    move-object/from16 v49, p5    # gesture expand lambda (AppScaffold Function1 param)
++
++    move-object/from16 v50, v24    # SheetState
++
++    const/16 v51, __RL_MINI_PLAYER_SWIPE_UP_DRAG__    # Enable Drag option
++
++    invoke-static/range {v49 .. v51}, Lradiant/MiniPlayerGestures;->configure(Lam0/l;Landroidx/compose/material3/SheetState;Z)V    # wire swipe-up to expand the sheet
++
+     .line 69
+     invoke-static {}, Landroidx/compose/ui/platform/CompositionLocalsKt;->getLocalDensity()Landroidx/compose/runtime/ProvidableCompositionLocal;
+ 
+--- a/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
+@@ -712,6 +712,22 @@
+ 
+     iget-object v3, v0, Lcom/tidal/android/feature/appscaffold/ui/t;->c:Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;
+ 
++    iget-object v5, v0, Lcom/tidal/android/feature/appscaffold/ui/t;->a:Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$ItemType;    # currently rendered mini player media type
++
++    sget-object v6, Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$ItemType;->Unknown:Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$ItemType;    # Unknown = no media playing
++
++    if-ne v5, v6, :rl_has_media    # prevent swipe up when nothing playing
++
++    const/4 v5, 0x0
++
++    goto :rl_set_media
++
++    :rl_has_media
++    const/4 v5, 0x1
++
++    :rl_set_media
++    invoke-static {v5}, Lradiant/MiniPlayerGestures;->setHasMiniPlayerMedia(Z)V
++
+     invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+ 
+     const v4, -0x571456a1
+@@ -1215,6 +1231,10 @@
+ 
+     move-result-object v6
+ 
++    invoke-static {v6}, Lradiant/MiniPlayerGestures;->trackAreaModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # attach swipe up listener
++
++    move-result-object v6
++
+     .line 38
+     sget-object v21, Landroidx/compose/ui/Alignment;->Companion:Landroidx/compose/ui/Alignment$Companion;
+ 
+@@ -1390,6 +1410,10 @@
+ 
+     move-result-object v6
+ 
++    invoke-static {v6}, Lradiant/MiniPlayerGestures;->feedbackModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # move cover (swipe up feedback)
++
++    move-result-object v6
++
+     .line 63
+     invoke-virtual/range {v22 .. v22}, Lcom/squareup/ui/market/core/theme/MarketStylesheet$c;->p0()Lf20/a;
+ 
+@@ -1501,6 +1525,10 @@
+ 
+     move-result-object v5
+ 
++    invoke-static {v5}, Lradiant/MiniPlayerGestures;->feedbackModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # move title/artist (swipe up feedback)
++
++    move-result-object v5
++
+     .line 72
+     invoke-virtual/range {v32 .. v32}, Landroidx/compose/foundation/layout/Arrangement;->getTop()Landroidx/compose/foundation/layout/Arrangement$Vertical;
+ 
+--- a/androidx/compose/material3/ModalBottomSheetKt$ModalBottomSheet$4$1.smali
++++ b/androidx/compose/material3/ModalBottomSheetKt$ModalBottomSheet$4$1.smali
+@@ -212,6 +212,12 @@
+     .line 24
+     iget-object p1, p0, Landroidx/compose/material3/ModalBottomSheetKt$ModalBottomSheet$4$1;->$sheetState:Landroidx/compose/material3/SheetState;
+ 
++    invoke-static {p1}, Lradiant/MiniPlayerGestures;->suppressAutoShow(Landroidx/compose/material3/SheetState;)Z    # avoid Material3 show() taking over manual drag
++
++    move-result v1
++
++    if-nez v1, :skip_show
++
+     .line 25
+     .line 26
+     iput v2, p0, Landroidx/compose/material3/ModalBottomSheetKt$ModalBottomSheet$4$1;->label:I
+@@ -232,6 +238,7 @@
+     .line 34
+     return-object v0
+ 
++    :skip_show
+     .line 35
+     :cond_2
+     :goto_0
+--- a/androidx/compose/material3/ModalBottomSheetKt.smali
++++ b/androidx/compose/material3/ModalBottomSheetKt.smali
+@@ -1288,12 +1288,18 @@
+ 
+     .line 33
+     invoke-interface {v5, v12}, Landroidx/compose/runtime/Composer;->updateRememberedValue(Ljava/lang/Object;)V
+ 
+     .line 34
+     :cond_47
++    move-object v14, v12    # settle callback
++
++    check-cast v14, Lam0/l;    # to Function1
++
++    invoke-static {v13, v14}, Lradiant/MiniPlayerGestures;->setSettleCallback(Landroidx/compose/material3/SheetState;Lam0/l;)V    # reuse native settle animation on release
++
+     move-object/from16 v32, v12
+ 
+     check-cast v32, Lam0/l;
+ 
+     .line 35
+     invoke-interface {v5}, Landroidx/compose/runtime/Composer;->rememberedValue()Ljava/lang/Object;
+--- a/androidx/compose/material3/SheetDefaultsKt.smali
++++ b/androidx/compose/material3/SheetDefaultsKt.smali
+@@ -98,7 +98,7 @@
+     const/4 v2, 0x0
+ 
+     .line 16
+-    const/16 v3, 0x12c
++    const/16 v3, 0x64    # 100ms
+ 
+     .line 17
+     .line 18

patches/mini-player-grey.patch

@@ -20,37 +20,47 @@
      .line 71
 --- a/com/tidal/android/feature/appscaffold/ui/composable/i.smali
 +++ b/com/tidal/android/feature/appscaffold/ui/composable/i.smali
-@@ -2756,12 +2756,7 @@
-     invoke-static {v0, v8, v11, v12}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxWidth$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;
+@@ -2275,11 +2275,7 @@
  
-     move-result-object v0
+     move-result-object v2
+ 
+-    .line 143
+-    invoke-static {v2}, Landroidx/compose/foundation/layout/WindowInsetsPadding_androidKt;->navigationBarsPadding(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
 -
--    .line 140
--    invoke-static {v0}, Landroidx/compose/foundation/layout/WindowInsetsPadding_androidKt;->navigationBarsPadding(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
--
--    move-result-object v0
+-    move-result-object v2
 -
 +    # flush bottom; skip nav inset
-     .line 141
-     invoke-interface/range {v17 .. v17}, Landroidx/compose/runtime/State;->getValue()Ljava/lang/Object;
+     .line 144
+     invoke-interface/range {v21 .. v21}, Landroidx/compose/runtime/State;->getValue()Ljava/lang/Object;
  
-@@ -2773,6 +2768,8 @@
+@@ -2291,6 +2287,8 @@
  
-     move-result v10
+     move-result v4
  
-+    const/4 v10, 0x0    # zero horizontal padding
++    const/4 v4, 0x0    # zero horizontal padding
 +
-     const/4 v11, 0x2
+     const/4 v6, 0x2
  
-     .line 142
-@@ -2969,6 +2966,10 @@
+     .line 145
+@@ -2375,6 +2373,10 @@
  
-     invoke-static {v12, v0, v8}, Landroidx/compose/runtime/Updater;->set-impl(Landroidx/compose/runtime/Composer;Ljava/lang/Object;Lyl0/p;)V
+     move-result-object v2
+ 
++    invoke-static {v2}, Landroidx/compose/foundation/layout/WindowInsetsPadding_androidKt;->navigationBarsPadding(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;    # inset bar content above nav bar (Prevents Bleeding behind Nav Buttons)
++
++    move-result-object v2
++
+     .line 158
+     sget-object v3, Landroidx/compose/foundation/layout/Arrangement;->INSTANCE:Landroidx/compose/foundation/layout/Arrangement;
+ 
+@@ -2487,6 +2489,10 @@
+ 
+     invoke-static {v6, v2, v3}, Landroidx/compose/runtime/Updater;->set-impl(Landroidx/compose/runtime/Composer;Ljava/lang/Object;Lam0/p;)V
  
 +    const/4 v8, 0x0    # composer $changed flags
 +
-+    invoke-static {v15, v8}, Lradiant/MiniSeekerLine;->render(Landroidx/compose/runtime/Composer;I)V    # draw top-edge seeker
++    invoke-static {v7, v8}, Lradiant/MiniSeekerLine;->render(Landroidx/compose/runtime/Composer;I)V    # draw top-edge seeker
 +
-     .line 172
-     sget-object v0, Landroidx/compose/foundation/layout/ColumnScopeInstance;->INSTANCE:Landroidx/compose/foundation/layout/ColumnScopeInstance;
+     .line 175
+     sget-object v2, Landroidx/compose/foundation/layout/ColumnScopeInstance;->INSTANCE:Landroidx/compose/foundation/layout/ColumnScopeInstance;
  

patches/player-backdrop-animated.patch

@@ -0,0 +1,30 @@
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
+@@ -4433,6 +4433,14 @@
+ 
+     move-object/from16 v25, v10
+ 
++    sget-object v16, Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;->DARK_BLUR:Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;    # RL: force native Blur player background
++
++    const/16 v21, 0x1    # RL: isPlaying=true (Animated — always rotate)
++
++    const/16 v22, 0x0    # RL: isSeeking=false (Animated — ignore scrub)
++
++    invoke-static {}, Lradiant/HomeBackdrop;->setModeAnimated()V    # RL: mirror rotation to Cover Everywhere
++
+     .line 171
+     invoke-static/range {v16 .. v26}, Lcom/tidal/android/feature/playerscreen/ui/composables/p3;->b(Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;JILjava/lang/String;ZZLam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
+ 
+--- a/com/tidal/android/core/ui/composable/c0.smali
++++ b/com/tidal/android/core/ui/composable/c0.smali
+@@ -16,7 +16,9 @@
+     move-result p0
+ 
+     .line 5
+-    invoke-virtual {p2, p0}, Landroid/view/Window;->setNavigationBarColor(I)V
++    const/4 v3, 0x0    # RL: force transparent nav bar so the native blur backdrop shows through (was p0 = extracted BG color; luminance below still uses p0 for icon light/dark)
++
++    invoke-virtual {p2, v3}, Landroid/view/Window;->setNavigationBarColor(I)V
+ 
+     .line 6
+     .line 7

patches/player-backdrop-playback.patch

@@ -0,0 +1,26 @@
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
+@@ -4433,6 +4433,10 @@
+ 
+     move-object/from16 v25, v10
+ 
++    sget-object v16, Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;->DARK_BLUR:Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;    # RL: force native Blur player background
++
++    invoke-static {}, Lradiant/HomeBackdrop;->setModePlayback()V    # RL: mirror rotation to Cover Everywhere
++
+     .line 171
+     invoke-static/range {v16 .. v26}, Lcom/tidal/android/feature/playerscreen/ui/composables/p3;->b(Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;JILjava/lang/String;ZZLam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
+ 
+--- a/com/tidal/android/core/ui/composable/c0.smali
++++ b/com/tidal/android/core/ui/composable/c0.smali
+@@ -16,7 +16,9 @@
+     move-result p0
+ 
+     .line 5
+-    invoke-virtual {p2, p0}, Landroid/view/Window;->setNavigationBarColor(I)V
++    const/4 v3, 0x0    # RL: force transparent nav bar so the native blur backdrop shows through (was p0 = extracted BG color; luminance below still uses p0 for icon light/dark)
++
++    invoke-virtual {p2, v3}, Landroid/view/Window;->setNavigationBarColor(I)V
+ 
+     .line 6
+     .line 7

patches/player-backdrop-static.patch

@@ -0,0 +1,30 @@
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
+@@ -4433,6 +4433,14 @@
+ 
+     move-object/from16 v25, v10
+ 
++    sget-object v16, Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;->DARK_BLUR:Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;    # RL: force native Blur player background
++
++    const/16 v21, 0x0    # RL: isPlaying=false (Static — no rotation)
++
++    const/16 v22, 0x0    # RL: isSeeking=false (Static — no scrub rotation)
++
++    invoke-static {}, Lradiant/HomeBackdrop;->setModeStatic()V    # RL: mirror rotation to Cover Everywhere
++
+     .line 171
+     invoke-static/range {v16 .. v26}, Lcom/tidal/android/feature/playerscreen/ui/composables/p3;->b(Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;JILjava/lang/String;ZZLam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
+ 
+--- a/com/tidal/android/core/ui/composable/c0.smali
++++ b/com/tidal/android/core/ui/composable/c0.smali
+@@ -16,7 +16,9 @@
+     move-result p0
+ 
+     .line 5
+-    invoke-virtual {p2, p0}, Landroid/view/Window;->setNavigationBarColor(I)V
++    const/4 v3, 0x0    # RL: force transparent nav bar so the native blur backdrop shows through (was p0 = extracted BG color; luminance below still uses p0 for icon light/dark)
++
++    invoke-virtual {p2, v3}, Landroid/view/Window;->setNavigationBarColor(I)V
+ 
+     .line 6
+     .line 7

patches/player-backdrop.patch

@@ -1,137 +0,0 @@
-# rl-locals: com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali e( 71
---- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
-+++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
-@@ -4172,6 +4172,133 @@
-
-     invoke-static {v5, v3, v4}, Landroidx/compose/runtime/Updater;->set-impl(Landroidx/compose/runtime/Composer;Ljava/lang/Object;Lyl0/p;)V
-
-+    const v3, 0x52414449    # slot table key
-+
-+    invoke-interface {v10, v3}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V    # open group
-+
-+    move-object/from16 v3, p3    # player state
-+
-+    iget-object v3, v3, Lcom/tidal/android/feature/playerscreen/ui/r$a;->c:Lcom/tidal/android/feature/playerscreen/ui/d;    # cover pager
-+
-+    iget-object v4, v3, Lcom/tidal/android/feature/playerscreen/ui/d;->a:Ltn0/b;    # item list
-+
-+    iget v5, v3, Lcom/tidal/android/feature/playerscreen/ui/d;->b:I    # current index
-+
-+    invoke-interface {v4}, Ljava/util/List;->size()I    # list size
-+
-+    move-result v6    # size value
-+
-+    if-le v6, v5, :radiant_skip    # bounds check
-+
-+    if-ltz v5, :radiant_skip    # negative check
-+
-+    invoke-interface {v4, v5}, Ljava/util/List;->get(I)Ljava/lang/Object;    # current item
-+
-+    move-result-object v4    # current item
-+
-+    instance-of v6, v4, Lcom/tidal/android/feature/playerscreen/ui/c$a;    # only album covers
-+
-+    if-eqz v6, :radiant_skip    # skip non-albums
-+
-+    check-cast v4, Lcom/tidal/android/feature/playerscreen/ui/c$a;    # narrow type
-+
-+    iget v5, v4, Lcom/tidal/android/feature/playerscreen/ui/c$a;->b:I    # album id
-+
-+    iget-object v4, v4, Lcom/tidal/android/feature/playerscreen/ui/c$a;->c:Ljava/lang/String;    # cover uuid
-+
-+    new-instance v6, Lcom/tidal/android/feature/playerscreen/ui/composables/n0;    # cover request lambda
-+
-+    invoke-direct {v6, v5, v4}, Lcom/tidal/android/feature/playerscreen/ui/composables/n0;-><init>(ILjava/lang/String;)V    # build request
-+
-+    sget-object v5, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;    # base modifier
-+
-+    const/4 v7, 0x0    # fraction unused
-+
-+    const/4 v8, 0x1    # default fraction
-+
-+    const/4 v3, 0x0    # synthetic null
-+
-+    invoke-static {v5, v7, v8, v3}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxSize$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;    # fill the player root
-+
-+    move-result-object v5    # filled modifier
-+
-+    const/high16 v7, 0x42b40000    # 90f blur dp
-+
-+    invoke-static {v7}, Landroidx/compose/ui/unit/Dp;->constructor-impl(F)F    # to Dp
-+
-+    move-result v7    # blur dp value
-+
-+    sget-object v8, Landroidx/compose/ui/draw/BlurredEdgeTreatment;->Companion:Landroidx/compose/ui/draw/BlurredEdgeTreatment$Companion;    # blur edge companion
-+
-+    invoke-virtual {v8}, Landroidx/compose/ui/draw/BlurredEdgeTreatment$Companion;->getRectangle---Goahg()Landroidx/compose/ui/graphics/Shape;    # rectangle treatment
-+
-+    move-result-object v8    # edge shape
-+
-+    invoke-static {v5, v7, v8}, Landroidx/compose/ui/draw/BlurKt;->blur-F8QBwvs(Landroidx/compose/ui/Modifier;FLandroidx/compose/ui/graphics/Shape;)Landroidx/compose/ui/Modifier;    # apply blur
-+
-+    move-result-object v5    # blurred modifier
-+
-+    sget-object v7, Landroidx/compose/ui/layout/ContentScale;->Companion:Landroidx/compose/ui/layout/ContentScale$Companion;    # scale companion
-+
-+    invoke-virtual {v7}, Landroidx/compose/ui/layout/ContentScale$Companion;->getCrop()Landroidx/compose/ui/layout/ContentScale;    # cover-crop scaling
-+
-+    move-result-object v7    # crop scale
-+
-+    move-object/from16 v61, v6    # request
-+
-+    const/16 v62, 0x0    # contentDescription
-+
-+    move-object/from16 v63, v5    # blurred modifier
-+
-+    const/16 v64, 0x0    # colorFilter
-+
-+    move-object/from16 v65, v7    # contentScale
-+
-+    move-object/from16 v66, v4    # cover uuid
-+
-+    const/16 v67, 0x0    # null onError
-+
-+    move-object/from16 v68, v10    # composer
-+
-+    const/16 v69, 0x0    # changed flags
-+
-+    const/16 v70, 0x48    # default mask
-+
-+    invoke-static/range {v61 .. v70}, Lxd0/f;->a(Lyl0/l;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/graphics/ColorFilter;Landroidx/compose/ui/layout/ContentScale;Ljava/lang/Object;Lyl0/a;Landroidx/compose/runtime/Composer;II)V    # render blurred cover
-+
-+    sget-object v3, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;    # scrim chain start
-+
-+    const/4 v4, 0x0    # fraction unused
-+
-+    const/4 v5, 0x1    # default mask
-+
-+    const/4 v6, 0x0    # null obj
-+
-+    invoke-static {v3, v4, v5, v6}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxSize$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;    # fill screen
-+
-+    move-result-object v3    # fullscreen modifier
-+
-+    const v6, -0x80000000    # 50% black ARGB
-+
-+    invoke-static {v6}, Landroidx/compose/ui/graphics/ColorKt;->Color(I)J    # pack color long
-+
-+    move-result-wide v6    # color long
-+
-+    invoke-static {}, Landroidx/compose/ui/graphics/RectangleShapeKt;->getRectangleShape()Landroidx/compose/ui/graphics/Shape;    # rect shape
-+
-+    move-result-object v4    # rect shape
-+
-+    invoke-static {v3, v6, v7, v4}, Landroidx/compose/foundation/BackgroundKt;->background-bw27NRU(Landroidx/compose/ui/Modifier;JLandroidx/compose/ui/graphics/Shape;)Landroidx/compose/ui/Modifier;    # tint with scrim
-+
-+    move-result-object v3    # tinted modifier
-+
-+    const/4 v4, 0x0    # changed flags
-+
-+    invoke-static {v3, v10, v4}, Landroidx/compose/foundation/layout/SpacerKt;->Spacer(Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # draw scrim
-+
-+    :radiant_skip    # skip target
-+    invoke-interface {v10}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V    # close group
-+
-     .line 138
-     sget-object v3, Landroidx/compose/foundation/layout/BoxScopeInstance;->INSTANCE:Landroidx/compose/foundation/layout/BoxScopeInstance;
-

patches/player-favorite-heart.patch

@@ -0,0 +1,24 @@
+--- a/com/tidal/android/feature/playerscreen/ui/composables/c1.smali
++++ b/com/tidal/android/feature/playerscreen/ui/composables/c1.smali
+@@ -300,7 +300,7 @@
+ 
+     .line 128
+     .line 129
+-    sget v0, Lcom/tidal/android/feature/playerscreen/ui/R$drawable;->ic_circle_checked:I
++    sget v0, Lcom/tidal/android/feature/playerscreen/ui/R$drawable;->ic_shapes_heart_filled_medium:I    # favorited: filled heart (was circle-check)
+ 
+     .line 130
+     .line 131
+@@ -308,11 +308,7 @@
+ 
+     .line 132
+     :cond_5
+-    sget-object v0, La30/b;->O:La30/a;
+-
+-    .line 133
+-    .line 134
+-    iget v0, v0, La30/a;->a:I
++    sget v0, Lcom/tidal/android/feature/playerscreen/ui/R$drawable;->ic_shapes_heart_medium:I    # not favorited: outline heart (was market plus)
+ 
+     .line 135
+     .line 136

patches/player-hide-playing-from.patch

@@ -0,0 +1,11 @@
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
+@@ -5970,6 +5970,8 @@
+     .line 365
+     iget-object v3, v11, Lcom/tidal/android/feature/playerscreen/ui/s$a;->m:Lcom/tidal/android/feature/playerscreen/ui/p;
+ 
++    const/4 v3, 0x0    # Never show the "Playing from" source at the bottom (relocated above the title, or hidden when off)
++
+     if-nez v3, :cond_5a
+ 
+     const v3, 0x26ba353b

patches/player-move-playing-from.patch

@@ -0,0 +1,68 @@
+# rl-locals: com/tidal/android/feature/playerscreen/ui/composables/n2.smali a( 45
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
+@@ -5202,6 +5202,20 @@
+ 
+     .line 262
+     :goto_21
++    iget-object v7, v5, Lcom/tidal/android/feature/playerscreen/ui/s$a;->m:Lcom/tidal/android/feature/playerscreen/ui/p;    # RL move-playing-from: SourceLabel — published in BOTH cover & lyrics view (may be null)
++
++    if-eqz v7, :rl_pf_null    # no source -> clear
++
++    iget-object v7, v7, Lcom/tidal/android/feature/playerscreen/ui/p;->a:Ljava/lang/String;    # sourceName
++
++    goto :rl_pf_set
++
++    :rl_pf_null
++    const/4 v7, 0x0
++
++    :rl_pf_set
++    sput-object v7, Lradiant/PlayingFrom;->a:Ljava/lang/String;    # publish for n2 (rendered above the title)
++
+     iget-object v7, v5, Lcom/tidal/android/feature/playerscreen/ui/s$a;->c:Lcom/tidal/android/feature/playerscreen/ui/d;
+ 
+     .line 263
+--- a/com/tidal/android/feature/playerscreen/ui/composables/n2.smali
++++ b/com/tidal/android/feature/playerscreen/ui/composables/n2.smali
+@@ -674,6 +674,41 @@
+     :cond_1e
+     check-cast v3, Lq20/c2;
+ 
++    move-object/from16 v33, v1    # RL: composer held stable for the conditional group
++
++    const v34, 0x52414450    # RL group key
++
++    invoke-interface/range {v33 .. v34}, Landroidx/compose/runtime/Composer;->startReplaceGroup(I)V
++
++    sget-object v34, Lradiant/PlayingFrom;->a:Ljava/lang/String;    # RL: published "Playing from" source name
++
++    if-eqz v34, :rl_pf_skip    # no source -> render nothing above the title
++
++    sget-object v35, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;
++
++    const/16 v36, 0x1    # maxLines = 1
++
++    const/16 v37, 0x0
++
++    const/16 v38, 0x0
++
++    const/16 v39, 0x0
++
++    const/16 v40, 0x0
++
++    move-object/from16 v41, v3    # reuse the artist PARAGRAPH_30 style (same colour + size)
++
++    move-object/from16 v42, v1    # composer
++
++    const/16 v43, 0x0
++
++    const/16 v44, 0x78    # default-arg mask (matches the artist MarketLabel.e call)
++
++    invoke-static/range {v34 .. v44}, Lcom/squareup/ui/market/components/MarketLabelKt;->e(Ljava/lang/String;Landroidx/compose/ui/Modifier;IILcom/squareup/ui/market/text/a;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lam0/l;Lq20/c2;Landroidx/compose/runtime/Composer;II)V
++
++    :rl_pf_skip
++    invoke-interface/range {v33 .. v33}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V
++
+     .line 43
+     sget-object v17, Landroidx/compose/ui/Modifier;->Companion:Landroidx/compose/ui/Modifier$Companion;
+ 

patches/player-one-handed.patch

@@ -0,0 +1,33 @@
+# rl-locals: com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali e( 80
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerScreenKt.smali
+@@ -5755,6 +5755,20 @@
+ 
+     const/4 v8, 0x0
+ 
++    invoke-static {}, Landroidx/compose/ui/platform/CompositionLocalsKt;->getLocalLayoutDirection()Landroidx/compose/runtime/ProvidableCompositionLocal;    # layout-direction local
++
++    move-result-object v77    # the local
++
++    sget-object v78, Landroidx/compose/ui/unit/LayoutDirection;->Rtl:Landroidx/compose/ui/unit/LayoutDirection;    # right-to-left value
++
++    invoke-virtual/range {v77 .. v78}, Landroidx/compose/runtime/ProvidableCompositionLocal;->provides(Ljava/lang/Object;)Landroidx/compose/runtime/ProvidedValue;    # provide Rtl to local
++
++    move-result-object v77    # the provided value
++
++    move-object/from16 v76, v7    # composer
++
++    invoke-interface/range {v76 .. v77}, Landroidx/compose/runtime/Composer;->startProvider(Landroidx/compose/runtime/ProvidedValue;)V    # open Rtl scope (mirror row)
++
+     .line 335
+     invoke-static {v1, v8, v14, v3}, Landroidx/compose/foundation/layout/SizeKt;->fillMaxWidth$default(Landroidx/compose/ui/Modifier;FILjava/lang/Object;)Landroidx/compose/ui/Modifier;
+ 
+@@ -6221,6 +6235,8 @@
+     .line 393
+     invoke-interface {v7}, Landroidx/compose/runtime/Composer;->endNode()V
+ 
++    invoke-interface {v7}, Landroidx/compose/runtime/Composer;->endProvider()V    # close Rtl scope (end mirror)
++
+     .line 394
+     invoke-static/range {v41 .. v41}, Landroidx/compose/ui/unit/Dp;->constructor-impl(F)F
+ 

patches/player-quality-badge-colors.patch

@@ -0,0 +1,117 @@
+--- a/com/tidal/android/feature/playerscreen/ui/composables/SeekbarAndTimeKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/composables/SeekbarAndTimeKt.smali
+@@ -372,6 +372,10 @@
+     .line 158
+     sget v4, Lcom/tidal/android/feature/playerscreen/ui/composables/t4;->g:F
+ 
++    const/high16 v11, 0x40000000    # 2.0f
++
++    mul-float/2addr v4, v11  # scale atmos icon 2x as it is too small in stock app
++
+     .line 159
+     .line 160
+     invoke-static {v2, v4}, Landroidx/compose/foundation/layout/SizeKt;->height-3ABfNKs(Landroidx/compose/ui/Modifier;F)Landroidx/compose/ui/Modifier;
+@@ -461,6 +465,8 @@
+     .line 200
+     check-cast v3, Lcom/tidal/android/feature/playerscreen/ui/i$a;
+ 
++    iget v13, v3, Lcom/tidal/android/feature/playerscreen/ui/i$a;->b:I
++
+     .line 201
+     .line 202
+     iget-object v3, v3, Lcom/tidal/android/feature/playerscreen/ui/i$a;->a:Ljava/lang/String;
+@@ -481,6 +487,16 @@
+     .line 210
+     move-object v1, v3
+ 
++    invoke-static {v2, v13}, Lradiant/QualityBadge;->modifier(Landroidx/compose/ui/Modifier;I)Landroidx/compose/ui/Modifier;
++
++    move-result-object v2
++
++    move-object/from16 v3, p1
++
++    invoke-static {v13, v3}, Lradiant/QualityBadge;->style(ILq20/c2;)Lq20/c2;
++
++    move-result-object v8
++
+     .line 211
+     const/4 v3, 0x0
+ 
+--- a/com/tidal/android/feature/playerscreen/ui/i$a.smali
++++ b/com/tidal/android/feature/playerscreen/ui/i$a.smali
+@@ -21,9 +21,21 @@
+ # instance fields
+ .field public final a:Ljava/lang/String;
+ 
++.field public final b:I
++
+ 
+ # direct methods
+ .method public constructor <init>(Ljava/lang/String;)V
++    .locals 1
++
++    const/4 v0, 0x0
++
++    invoke-direct {p0, p1, v0}, Lcom/tidal/android/feature/playerscreen/ui/i$a;-><init>(Ljava/lang/String;I)V
++
++    return-void
++.end method
++
++.method public constructor <init>(Ljava/lang/String;I)V
+     .locals 0
+ 
+     .line 1
+@@ -34,6 +46,8 @@
+     .line 4
+     iput-object p1, p0, Lcom/tidal/android/feature/playerscreen/ui/i$a;->a:Ljava/lang/String;
+ 
++    iput p2, p0, Lcom/tidal/android/feature/playerscreen/ui/i$a;->b:I
++
+     .line 5
+     .line 6
+     return-void
+--- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel$special$$inlined$mapNotNull$1$2.smali
++++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel$special$$inlined$mapNotNull$1$2.smali
+@@ -1452,7 +1452,15 @@
+     .line 662
+     .line 663
+     .line 664
+-    move-result v8
++    move-result v8    # isCurrentStreamHiResLosslessQuality() result
++
++    const/16 v31, 0x0    # LOW / HIGH quality
++
++    if-eqz v8, :radiant_qbc_not_hires
++
++    const/16 v31, 0x2    # HI_RES_LOSSLESS quality
++
++    :radiant_qbc_not_hires
+ 
+     .line 665
+     if-nez v8, :cond_1f
+@@ -1464,7 +1472,13 @@
+     .line 668
+     .line 669
+     .line 670
+-    move-result v8
++    move-result v8    # isCurrentStreamLossless() result
++
++    if-eqz v8, :radiant_qbc_not_lossless
++
++    const/16 v31, 0x1    # LOSSLESS quality
++
++    :radiant_qbc_not_lossless
+ 
+     .line 671
+     if-eqz v8, :cond_1e
+@@ -1793,7 +1807,9 @@
+ 
+     .line 818
+     .line 819
+-    invoke-direct {v5, v4}, Lcom/tidal/android/feature/playerscreen/ui/i$a;-><init>(Ljava/lang/String;)V
++    move/from16 v9, v31    # quality
++
++    invoke-direct {v5, v4, v9}, Lcom/tidal/android/feature/playerscreen/ui/i$a;-><init>(Ljava/lang/String;I)V
+ 
+     .line 820
+     .line 821