Add animated covers and crossfade features

Added features for animated covers and crossfade functionality.

.version

@@ -1 +1 @@
-1.1.7
+1.5.1

Manager/app/build.gradle.kts

@@ -31,8 +31,8 @@ android {
     defaultConfig {
         minSdk = 24
         targetSdk = 36
-        versionCode = 68
-        versionName = "1.1.7"
+        versionCode = 84
+        versionName = "1.5.1"
 
         vectorDrawables {
             useSupportLibrary = true
@@ -190,6 +190,7 @@ dependencies {
     implementation(libs.bundles.ktor)
     implementation(libs.bundles.shizuku)
     implementation(libs.bundles.voyager)
+    implementation(libs.pebblekit2.client)
 
     implementation(libs.compose.ui.tooling.preview)
     debugImplementation(libs.compose.ui.tooling)

Manager/app/src/main/AndroidManifest.xml

@@ -43,6 +43,22 @@
         android:name=".installers.pm.PMIntentReceiver"
         android:exported="false" />
 
+    <!-- Pebble relay, bound by patched TIDAL -->
+    <service
+        android:name=".pebble.PebbleRelayService"
+        android:exported="true"
+        tools:ignore="ExportedService" />
+
+    <!-- Pebble watch messages -->
+    <service
+        android:name=".pebble.PebbleWatchListenerService"
+        android:exported="true"
+        tools:ignore="ExportedService">
+      <intent-filter>
+        <action android:name="io.rebble.pebblekit2.RECEIVE_DATA_FROM_WATCH" />
+      </intent-filter>
+    </service>
+
     <provider
         android:name="androidx.core.content.FileProvider"
         android:authorities="${applicationId}.provider"

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

@@ -82,7 +82,13 @@
           "description": "[Only works with API results] - Generates Syllable timings from Line timings using a self trained AI model ",
           "default": false,
           "inline": true,
-          "token": "RL_SYNTHESIZE"
+          "token": "RL_SYNTHESIZE",
+          "fileNames": [
+            "lyrics-ai-indicator.patch"
+          ],
+          "extensionFiles": [
+            "radiant/AiSparkle.smali"
+          ]
         },
         {
           "type": "toggle",
@@ -378,17 +384,43 @@
           "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)",
+          "description": "Applies TIDAL's native blurred album-art backdrop to every Compose based page (Home, Collection, Search, Save For Later, Profile, Downloads & Settings)",
           "default": false,
           "inline": true,
           "fileNames": [
             "home-backdrop.patch",
             "collection-backdrop.patch",
+            "cover-everywhere-pages.patch",
             "cover-capture.patch"
           ]
         }
       ]
     },
+    {
+      "id": "AnimatedCovers",
+      "order": 34,
+      "fileNames": [
+        "animated-covers.patch"
+      ],
+      "title": "Animated Covers",
+      "description": "Replaces cover art with animated artwork when available",
+      "default": true,
+      "extensionFiles": [
+        "radiant/AnimatedCovers.smali",
+        "radiant/AnimatedCoverView.smali",
+        "radiant/RoundOutline.smali"
+      ]
+    },
+    {
+      "id": "PlayerCrossfade",
+      "order": 35,
+      "fileNames": [
+        "player-crossfade.patch"
+      ],
+      "title": "Audio Crossfade",
+      "description": "[Temporary Patch] - Unlocks TIDAL's crossfade between tracks. Set the duration in TIDAL Settings > Audio & Playback (enables the mf-player-crossfade feature flag)",
+      "default": true
+    },
     {
       "id": "QualityBadgeColors",
       "order": 36,
@@ -592,7 +624,7 @@
         "lyrics-sparkle-conditional-visibility.patch"
       ],
       "title": "Replace Lyrics Button",
-      "description": "Replaces the Lyrics button with the RL Sparkle!",
+      "description": "Replaces the Lyrics button with the RL Sparkle! Spins while lyrics load, and shows a greyed-out crossed note when a track has no lyrics",
       "default": true
     },
     {
@@ -780,6 +812,30 @@
         }
       ]
     },
+    {
+      "id": "PebbleIntegration",
+      "order": 91,
+      "category": "integration",
+      "fileNames": [
+        "integration-pebble-playback.patch",
+        "integration-pebble-lyrics.patch"
+      ],
+      "extensionFiles": [
+        "radiant/PebbleBridge.smali",
+        "radiant/PebbleBridge$1.smali",
+        "radiant/PebbleBridge$2.smali"
+      ],
+      "title": "Pebble Watch",
+      "description": "Shows synced lyrics on your Pebble Time 2 when listening, Everything is configured and managed in the Pebble App",
+      "default": false,
+      "requires": [
+        "LyricsRlApi"
+      ],
+      "companionApp": {
+        "storeId": "02b779dcf9084fecb0375df1",
+        "storeSource": "https://appstore-api.repebble.com/api"
+      }
+    },
     {
       "id": "DebugMenuUnlock",
       "order": 100,

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

@@ -29,6 +29,9 @@ class PatchManifestStep(private val options: PatchOptions) : Step() {
         val wazeDefault = container.getStep<SmaliPatchStep>().specs
             .firstOrNull { it.id == "WazeIntegration" }?.defaultEnabled ?: false
         val enableWazeIntegration = options.patchStates["WazeIntegration"] ?: wazeDefault
+        val pebbleDefault = container.getStep<SmaliPatchStep>().specs
+            .firstOrNull { it.id == "PebbleIntegration" }?.defaultEnabled ?: false
+        val enablePebbleIntegration = options.patchStates["PebbleIntegration"] ?: pebbleDefault
 
         val patchedManifest = ManifestPatcher.patchManifest(
             manifestBytes = manifest,
@@ -36,6 +39,7 @@ class PatchManifestStep(private val options: PatchOptions) : Step() {
             appName = options.appName,
             debuggable = options.debuggable,
             enableWazeIntegration = enableWazeIntegration,
+            enablePebbleIntegration = enablePebbleIntegration,
         )
 
         container.log("Repacking apk with patched manifest")

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

@@ -369,7 +369,8 @@ class SmaliPatchStep(
         if (matchesAt(target, sourceLines, hint)) return hint
 
         // Walk outward from the hint, alternating below/above, until finds a unique match.
-        val maxRadius = target.size
+        // Also reach hints past the end of the file
+        val maxRadius = maxOf(target.size, hint)
         for (offset in 1..maxRadius) {
             val below = hint + offset
             if (below + sourceLines.size <= target.size && matchesAt(target, sourceLines, below)) {

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

@@ -5,6 +5,7 @@ import android.content.pm.PackageManager.NameNotFoundException
 import com.meowarex.rlmobile.R
 import com.meowarex.rlmobile.installers.InstallerResult
 import com.meowarex.rlmobile.manager.InstallerManager
+import com.meowarex.rlmobile.manager.PathManager
 import com.meowarex.rlmobile.patcher.StepRunner
 import com.meowarex.rlmobile.patcher.steps.StepGroup
 import com.meowarex.rlmobile.patcher.steps.base.Step
@@ -21,6 +22,7 @@ import org.koin.core.component.inject
 class DowngradeCheckStep(private val options: PatchOptions) : Step(), KoinComponent {
     private val context: Application by inject()
     private val installers: InstallerManager by inject()
+    private val paths: PathManager by inject()
 
     override val group = StepGroup.Prepare
     override val localizedName = R.string.patch_step_downgrade_check
@@ -38,7 +40,9 @@ class DowngradeCheckStep(private val options: PatchOptions) : Step(), KoinCompon
         }
         container.log("Version of installed TIDAL app: $currentVersion")
 
-        val targetVersion = container
+        // Custom APK can be newer than data.json
+        val targetVersion = customApkVersionCode(container)
+            ?: container
                 .getStep<FetchInfoStep>()
                 .data.tidalVersionCode
 
@@ -59,4 +63,15 @@ class DowngradeCheckStep(private val options: PatchOptions) : Step(), KoinCompon
             }
         }
     }
+
+    private fun customApkVersionCode(container: StepRunner): Int? {
+        val file = options.customTidalApk?.getFile(paths)?.takeIf { it.exists() } ?: return null
+        return try {
+            @Suppress("DEPRECATION")
+            context.packageManager.getPackageArchiveInfo(file.absolutePath, 0)?.versionCode
+        } catch (t: Throwable) {
+            container.log("Failed to read custom TIDAL APK version: ${t.message}")
+            null
+        }
+    }
 }

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

@@ -21,6 +21,8 @@ object ManifestPatcher {
     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"
+    // Pebble bridge binds to the Manager
+    private const val MANAGER_PACKAGE = "com.meowarex.rlmobile"
 
     fun patchManifest(
         manifestBytes: ByteArray,
@@ -28,6 +30,7 @@ object ManifestPatcher {
         appName: String,
         debuggable: Boolean,
         enableWazeIntegration: Boolean,
+        enablePebbleIntegration: Boolean,
     ): ByteArray {
         // Extract original package name to rewrite every reference to it
         // (permissions, provider authorities) to the new packageName.
@@ -90,11 +93,12 @@ object ManifestPatcher {
                         return when (name) {
                             "queries" -> object : NodeVisitor(nv) {
                                 private var hasWazePackage = false
+                                private var hasManagerPackage = false
 
                                 override fun child(ns: String?, name: String): NodeVisitor {
                                     val visitor = super.child(ns, name)
 
-                                    return if (enableWazeIntegration && name == "package") {
+                                    return if ((enableWazeIntegration || enablePebbleIntegration) && name == "package") {
                                         object : NodeVisitor(visitor) {
                                             override fun attr(
                                                 ns: String?,
@@ -106,6 +110,9 @@ object ManifestPatcher {
                                                 if (name == "name" && value == WAZE_PACKAGE) {
                                                     hasWazePackage = true
                                                 }
+                                                if (name == "name" && value == MANAGER_PACKAGE) {
+                                                    hasManagerPackage = true
+                                                }
                                                 super.attr(ns, name, resourceId, type, value)
                                             }
                                         }
@@ -127,6 +134,18 @@ object ManifestPatcher {
                                             end()
                                         }
                                     }
+                                    if (enablePebbleIntegration && !hasManagerPackage) {
+                                        super.child(null, "package").apply {
+                                            attr(
+                                                ANDROID_NAMESPACE,
+                                                "name",
+                                                android.R.attr.name,
+                                                TYPE_STRING,
+                                                MANAGER_PACKAGE,
+                                            )
+                                            end()
+                                        }
+                                    }
                                     super.end()
                                 }
                             }

Manager/app/src/main/kotlin/com/meowarex/rlmobile/pebble/PebbleRelayService.kt

@@ -0,0 +1,483 @@
+package com.meowarex.rlmobile.pebble
+
+import android.app.Service
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.media.MediaMetadata
+import android.media.session.MediaController
+import android.media.session.MediaSession
+import android.media.session.PlaybackState
+import android.os.Build
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.os.Message
+import android.os.Messenger
+import android.os.SystemClock
+import android.util.Log
+import androidx.core.os.BundleCompat
+import com.meowarex.rlmobile.BuildConfig
+import io.rebble.pebblekit2.client.DefaultPebbleSender
+import io.rebble.pebblekit2.common.model.PebbleDictionary
+import io.rebble.pebblekit2.common.model.TransmissionResult
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import java.util.zip.CRC32
+import kotlin.math.abs
+
+// Relays patched TIDAL playback and lyrics to the watch
+class PebbleRelayService : Service() {
+    private val main = Handler(Looper.getMainLooper())
+    private val messenger = Messenger(Handler(Looper.getMainLooper()) { handleBridgeMessage(it); true })
+    private val scope = MainScope()
+    private val senderLazy = lazy { DefaultPebbleSender(this) }
+    private val sender by senderLazy
+
+    // Reported by the watchapp
+    private val prefs by lazy { getSharedPreferences("pebble_relay", MODE_PRIVATE) }
+    private var autoOpen: Boolean
+        get() = prefs.getBoolean(PREF_AUTO_OPEN, true)
+        set(value) = prefs.edit().putBoolean(PREF_AUTO_OPEN, value).apply()
+    private var tidalPackage: String? = null
+    private var controller: MediaController? = null
+
+    // Track
+    private var mediaId: String? = null
+    private var trackId = 0L
+    private var title = ""
+    private var artist = ""
+    private var durationMs = 0L
+    private var status = WatchProtocol.STATUS_IDLE
+    private var lines: List<WatchProtocol.Line> = emptyList()
+    private var openedFor: Long = -1
+
+    // May arrive before the metadata
+    private var lyrics: LyricsPayload? = null
+
+    // Playback
+    private var playing = false
+    private var sample: PositionSample? = null
+
+    // Watch
+    private var watchReady = true
+    private var watchConfirmed = false
+    private var inboxSize = 1024
+    private val queue = ArrayDeque<Outgoing>()
+    private var inFlight: Outgoing? = null
+
+    // Last clock sent to the watch
+    private var sentPosition = -1L
+    private var sentTime = 0L
+    private var sentPlaying = false
+
+    private class PositionSample(val mediaId: String?, val position: Long, val time: Long, val playing: Boolean)
+    private class LyricsPayload(val key: String, val title: String?, val body: String?, val failed: Boolean)
+
+    private class Outgoing(val kind: Int, val trackId: Long, val build: () -> PebbleDictionary) {
+        var attempts = 0
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        current = this
+        if (PebbleWatchListenerService.watchappOpen) {
+            watchConfirmed = true
+            watchReady = true
+        }
+    }
+
+    override fun onBind(intent: Intent?): IBinder = messenger.binder
+
+    override fun onUnbind(intent: Intent?): Boolean {
+        // TIDAL stopped
+        releaseController()
+        resetTrack()
+        if (autoOpen) {
+            closeWatchApp()
+        } else {
+            enqueue(Outgoing(WatchProtocol.CMD_STATUS, ANY_TRACK) { WatchProtocol.status(0, WatchProtocol.STATUS_IDLE) })
+        }
+        return false
+    }
+
+    override fun onDestroy() {
+        if (current === this) current = null
+        releaseController()
+        main.removeCallbacksAndMessages(null)
+        scope.cancel()
+        if (senderLazy.isInitialized()) sender.close()
+        super.onDestroy()
+    }
+
+    private fun handleBridgeMessage(msg: Message) {
+        val data = msg.data ?: return
+        data.classLoader = MediaSession.Token::class.java.classLoader
+        if (msg.what != MSG_SESSION && controller == null) return
+
+        when (msg.what) {
+            MSG_SESSION -> {
+                val pkg = data.getString("package") ?: return
+                if (!isTrustedTidal(pkg, msg)) {
+                    Log.w(BuildConfig.TAG, "Pebble relay: rejected session from $pkg")
+                    return
+                }
+                val token = BundleCompat.getParcelable(data, "token", MediaSession.Token::class.java) ?: return
+                attach(pkg, token)
+            }
+
+            MSG_POSITION -> {
+                val next = PositionSample(
+                    mediaId = data.getString("mediaId"),
+                    position = data.getLong("position"),
+                    time = data.getLong("elapsedRealtime"),
+                    playing = data.getBoolean("playing"),
+                )
+                if (next.mediaId != null && next.mediaId != mediaId) return
+                sample = next
+                playing = next.playing
+                syncWatchClock()
+            }
+
+            MSG_LYRICS -> {
+                val key = data.getString("key") ?: return
+                lyrics = LyricsPayload(key, data.getString("title"), data.getString("body"), data.getBoolean("failed"))
+                applyLyrics()
+            }
+        }
+    }
+
+    // Patched TIDAL only
+    private fun isTrustedTidal(pkg: String, msg: Message): Boolean = try {
+        val info = packageManager.getApplicationInfo(pkg, PackageManager.GET_META_DATA)
+        val patched = info.metaData?.containsKey("isRadiantLyrics") == true
+        val uidOk = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || msg.sendingUid == -1 || msg.sendingUid == info.uid
+        patched && uidOk
+    } catch (_: PackageManager.NameNotFoundException) {
+        false
+    }
+
+    private fun attach(pkg: String, token: MediaSession.Token) {
+        if (controller?.sessionToken == token && pkg == tidalPackage) return
+        releaseController()
+        tidalPackage = pkg
+        controller = MediaController(this, token).also {
+            it.registerCallback(controllerCallback, main)
+            onMetadata(it.metadata)
+            onPlaybackState(it.playbackState)
+        }
+    }
+
+    private fun releaseController() {
+        controller?.unregisterCallback(controllerCallback)
+        controller = null
+    }
+
+    private val controllerCallback = object : MediaController.Callback() {
+        override fun onMetadataChanged(metadata: MediaMetadata?) = onMetadata(metadata)
+        override fun onPlaybackStateChanged(state: PlaybackState?) = onPlaybackState(state)
+        override fun onSessionDestroyed() {
+            releaseController()
+        }
+    }
+
+    private fun resetTrack() {
+        main.removeCallbacks(lyricsTimeout)
+        mediaId = null
+        trackId = 0
+        title = ""
+        artist = ""
+        durationMs = 0
+        lines = emptyList()
+        status = WatchProtocol.STATUS_IDLE
+        playing = false
+        sample = null
+        sentPosition = -1
+    }
+
+    private fun onMetadata(metadata: MediaMetadata?) {
+        metadata ?: return
+        val newTitle = metadata.getString(MediaMetadata.METADATA_KEY_TITLE).orEmpty()
+        val newArtist = metadata.getString(MediaMetadata.METADATA_KEY_ARTIST)
+            ?: metadata.getString(MediaMetadata.METADATA_KEY_ALBUM_ARTIST).orEmpty()
+        val newDuration = metadata.getLong(MediaMetadata.METADATA_KEY_DURATION)
+        val id = metadata.getString(MediaMetadata.METADATA_KEY_MEDIA_ID) ?: "$newTitle\u0000$newArtist"
+        if (newTitle.isBlank()) return
+
+        if (id == mediaId) {
+            if (newDuration > 0 && newDuration != durationMs) {
+                durationMs = newDuration
+                sendTrack()
+            }
+            return
+        }
+
+        mediaId = id
+        trackId = CRC32().run { update(id.toByteArray()); value }.takeIf { it != 0L } ?: 1L
+        title = newTitle
+        artist = newArtist
+        durationMs = newDuration
+        lines = emptyList()
+        status = WatchProtocol.STATUS_LOADING
+        sample = null
+        sentPosition = -1
+        watchReady = true
+        queue.removeAll { it.trackId != ANY_TRACK }
+
+        sendTrack()
+        sendState()
+        if (!applyLyrics()) {
+            main.removeCallbacks(lyricsTimeout)
+            main.postDelayed(lyricsTimeout, LYRICS_TIMEOUT_MS)
+        }
+    }
+
+    // Apply lyrics if they match the track
+    private fun applyLyrics(): Boolean {
+        val payload = lyrics ?: return false
+        if (trackId == 0L) return false
+        val matches = payload.key == mediaId || (payload.title != null && payload.title.equals(title, ignoreCase = true))
+        if (!matches) return false
+
+        main.removeCallbacks(lyricsTimeout)
+        lines = payload.body?.let {
+            runCatching { WatchProtocol.shape(it) }
+                .onFailure { e -> Log.w(BuildConfig.TAG, "Pebble lyrics parse failed", e) }
+                .getOrNull()
+        }.orEmpty()
+        status = when {
+            payload.failed -> WatchProtocol.STATUS_ERROR
+            lines.isEmpty() -> WatchProtocol.STATUS_NO_LYRICS
+            else -> WatchProtocol.STATUS_READY
+        }
+        sendTrack()
+        sendLines()
+        sendState()
+        updateWatchApp()
+        return true
+    }
+
+    // Open with timed lyrics, close without
+    private fun updateWatchApp() {
+        if (!autoOpen || trackId == 0L) return
+        when (status) {
+            WatchProtocol.STATUS_READY -> if (openedFor != trackId) {
+                // Once per track so manual closes stick
+                openedFor = trackId
+                if (!watchConfirmed) scope.launch { sender.startAppOnTheWatch(WatchProtocol.APP_UUID) }
+            }
+
+            WatchProtocol.STATUS_NO_LYRICS, WatchProtocol.STATUS_ERROR -> closeWatchApp()
+        }
+    }
+
+    private fun closeWatchApp() {
+        if (!watchConfirmed) return
+        scope.launch { sender.stopAppOnTheWatch(WatchProtocol.APP_UUID) }
+        watchConfirmed = false
+        watchReady = false
+        queue.clear()
+    }
+
+    private val lyricsTimeout = Runnable {
+        if (status == WatchProtocol.STATUS_LOADING && trackId != 0L) {
+            // Lyrics worker never reported
+            status = WatchProtocol.STATUS_ERROR
+            sendTrack()
+            updateWatchApp()
+        }
+    }
+
+    private fun onPlaybackState(state: PlaybackState?) {
+        state ?: return
+        val nowPlaying = state.state == PlaybackState.STATE_PLAYING
+        if (nowPlaying == playing) return
+        playing = nowPlaying
+        syncWatchClock()
+    }
+
+    // Latest position and phone time, not extrapolated
+    private fun reference(): Pair<Long, Long> {
+        val now = SystemClock.elapsedRealtime()
+        val s = sample
+        if (s != null && (s.mediaId == null || s.mediaId == mediaId) && (!playing || now - s.time < SAMPLE_STALE_MS)) {
+            return s.position to s.time
+        }
+        // Casting has no player readings
+        val state = controller?.playbackState ?: return 0L to now
+        return state.position.coerceAtLeast(0) to (state.lastPositionUpdateTime.takeIf { it > 0 } ?: now)
+    }
+
+    // Resend state only on drift
+    private fun syncWatchClock() {
+        if (trackId == 0L) return
+        val (position, time) = reference()
+        val believed = if (sentPlaying) sentPosition + (time - sentTime) else sentPosition
+        if (sentPosition < 0 || sentPlaying != playing || abs(believed - position) > DRIFT_TOLERANCE_MS) {
+            sendState()
+        }
+    }
+
+    private fun sendTrack() {
+        if (trackId == 0L) return
+        val id = trackId
+        queue.removeAll { it.kind == WatchProtocol.CMD_TRACK }
+        enqueue(Outgoing(WatchProtocol.CMD_TRACK, id) {
+            WatchProtocol.track(
+                trackId = id,
+                title = title,
+                artist = artist,
+                durationMs = durationMs,
+                status = status,
+                lineCount = lines.size,
+            )
+        })
+    }
+
+    private fun sendLines() {
+        if (lines.isEmpty()) return
+        val id = trackId
+        queue.removeAll { it.kind == WatchProtocol.CMD_LINES }
+        val budget = (inboxSize - 64).coerceIn(256, 2000)
+        for ((first, blob) in WatchProtocol.chunks(lines, budget)) {
+            enqueue(Outgoing(WatchProtocol.CMD_LINES, id) { WatchProtocol.lines(id, first, blob) })
+        }
+    }
+
+    private fun sendState() {
+        if (trackId == 0L) return
+        queue.removeAll { it.kind == WatchProtocol.CMD_STATE }
+        val id = trackId
+        // Built at send time for freshness
+        enqueue(Outgoing(WatchProtocol.CMD_STATE, id) {
+            val (position, time) = reference()
+            sentPosition = position
+            sentTime = time
+            sentPlaying = playing
+            WatchProtocol.state(id, playing, position, time)
+        })
+    }
+
+    private fun enqueue(item: Outgoing, first: Boolean = false) {
+        if (first) queue.addFirst(item) else queue.addLast(item)
+        pump()
+    }
+
+    private fun pump() {
+        if (inFlight != null) return
+        if (!watchReady) {
+            queue.clear()
+            return
+        }
+        // Drop stale tracks
+        while (queue.firstOrNull()?.let { it.trackId != ANY_TRACK && it.trackId != trackId } == true) {
+            queue.removeFirst()
+        }
+        val item = queue.removeFirstOrNull() ?: return
+        inFlight = item
+        item.attempts++
+        scope.launch {
+            val results = runCatching { sender.sendDataToPebble(WatchProtocol.APP_UUID, item.build()) }
+                .onFailure { Log.w(BuildConfig.TAG, "Pebble send failed", it) }
+                .getOrNull()
+            onSent(item, results?.values.orEmpty())
+        }
+    }
+
+    private fun onSent(item: Outgoing, results: Collection<TransmissionResult>) {
+        inFlight = null
+        when {
+            results.any { it == TransmissionResult.Success } -> {
+                watchConfirmed = true
+                pump()
+            }
+
+            results.any { it == TransmissionResult.FailedWatchNacked || it == TransmissionResult.FailedTimeout } -> {
+                if (item.attempts < 3) {
+                    queue.addFirst(item)
+                } else if (item.kind == WatchProtocol.CMD_STATE) {
+                    sentPosition = -1
+                }
+                main.postDelayed({ pump() }, 150)
+            }
+
+            else -> {
+                // Watchapp not open, wait for it
+                if (item.kind == WatchProtocol.CMD_STATE) sentPosition = -1
+                watchReady = false
+                watchConfirmed = false
+                queue.clear()
+            }
+        }
+    }
+
+    fun onWatchappOpened() {
+        watchConfirmed = true
+        watchReady = true
+    }
+
+    fun onWatchappClosed() {
+        watchConfirmed = false
+        watchReady = false
+        queue.clear()
+    }
+
+    fun onWatchMessage(values: Map<Int, Long>, receivedAt: Long) {
+        watchConfirmed = true
+        watchReady = true
+        when (values[WatchProtocol.KEY_CMD]?.toInt()) {
+            WatchProtocol.CMD_SYNC_REQ -> {
+                val watchTime = values[WatchProtocol.KEY_WATCH_TIME] ?: return
+                // Front of queue, stamped at send
+                enqueue(Outgoing(WatchProtocol.CMD_SYNC, ANY_TRACK) {
+                    WatchProtocol.sync(watchTime, receivedAt, SystemClock.elapsedRealtime())
+                }, first = true)
+            }
+
+            WatchProtocol.CMD_SETTINGS -> {
+                values[WatchProtocol.KEY_SET_AUTO_OPEN]?.let { autoOpen = it != 0L }
+            }
+
+            WatchProtocol.CMD_HELLO -> {
+                values[WatchProtocol.KEY_SET_AUTO_OPEN]?.let { autoOpen = it != 0L }
+                values[WatchProtocol.KEY_INBOX_SIZE]?.let { inboxSize = it.toInt().coerceIn(256, 8192) }
+                queue.removeAll { it.kind != WatchProtocol.CMD_SYNC }
+                sentPosition = -1
+                if (trackId != 0L) {
+                    sendTrack()
+                    sendLines()
+                    sendState()
+                } else {
+                    enqueue(Outgoing(WatchProtocol.CMD_STATUS, ANY_TRACK) {
+                        WatchProtocol.status(0, WatchProtocol.STATUS_IDLE)
+                    })
+                }
+            }
+
+            WatchProtocol.CMD_PLAY_PAUSE -> controller?.transportControls?.let {
+                if (playing) it.pause() else it.play()
+            }
+
+            WatchProtocol.CMD_NEXT -> controller?.transportControls?.skipToNext()
+            WatchProtocol.CMD_PREV -> controller?.transportControls?.skipToPrevious()
+        }
+    }
+
+    companion object {
+        // Keep in sync with radiant.PebbleBridge
+        const val MSG_SESSION = 1
+        const val MSG_POSITION = 2
+        const val MSG_LYRICS = 3
+
+        // Used by PebbleWatchListenerService
+        @Volatile
+        var current: PebbleRelayService? = null
+            private set
+
+        private const val ANY_TRACK = -1L
+        private const val PREF_AUTO_OPEN = "auto_open"
+        private const val DRIFT_TOLERANCE_MS = 10L
+        private const val SAMPLE_STALE_MS = 8_000L
+        private const val LYRICS_TIMEOUT_MS = 90_000L
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/pebble/PebbleWatchListenerService.kt

@@ -0,0 +1,40 @@
+package com.meowarex.rlmobile.pebble
+
+import android.os.SystemClock
+import io.rebble.pebblekit2.client.BasePebbleListenerService
+import io.rebble.pebblekit2.common.model.PebbleDictionary
+import io.rebble.pebblekit2.common.model.ReceiveResult
+import io.rebble.pebblekit2.common.model.WatchIdentifier
+import java.util.UUID
+
+// Forwards watch events to the relay
+class PebbleWatchListenerService : BasePebbleListenerService() {
+    override suspend fun onMessageReceived(
+        watchappUUID: UUID,
+        data: PebbleDictionary,
+        watch: WatchIdentifier,
+    ): ReceiveResult {
+        val receivedAt = SystemClock.elapsedRealtime()
+        if (watchappUUID != WatchProtocol.APP_UUID) return ReceiveResult.Nack
+        PebbleRelayService.current?.onWatchMessage(WatchProtocol.ints(data), receivedAt)
+        return ReceiveResult.Ack
+    }
+
+    override fun onAppOpened(watchappUUID: UUID, watch: WatchIdentifier) {
+        if (watchappUUID != WatchProtocol.APP_UUID) return
+        watchappOpen = true
+        PebbleRelayService.current?.onWatchappOpened()
+    }
+
+    override fun onAppClosed(watchappUUID: UUID, watch: WatchIdentifier) {
+        if (watchappUUID != WatchProtocol.APP_UUID) return
+        watchappOpen = false
+        PebbleRelayService.current?.onWatchappClosed()
+    }
+
+    companion object {
+        @Volatile
+        var watchappOpen = false
+            private set
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/pebble/PebbleWatchapp.kt

@@ -0,0 +1,61 @@
+package com.meowarex.rlmobile.pebble
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.ui.screens.patchopts.CompanionAppSpec
+import com.meowarex.rlmobile.util.showToast
+import io.rebble.pebblekit2.client.DefaultPebbleSender
+import io.rebble.pebblekit2.common.model.TimelineResult
+
+// Watchapp install state and store links
+object PebbleWatchapp {
+    private const val PROBE_PIN_ID = "rl-install-probe"
+    private const val STORE_WEB = "https://apps.repebble.com/"
+    private const val APPS_TAB = "pebble://navbar/index"
+
+    enum class InstallState { Installed, NotInstalled, Unknown }
+
+    // Deleting a missing pin reveals install state
+    suspend fun installState(context: Context): InstallState = runCatching {
+        DefaultPebbleSender(context.applicationContext).use { sender ->
+            when (sender.deleteTimelinePin(WatchProtocol.APP_UUID, PROBE_PIN_ID)) {
+                TimelineResult.FailedUnknownPin, TimelineResult.Success -> InstallState.Installed
+                TimelineResult.FailedNoPermissions -> InstallState.NotInstalled
+                else -> InstallState.Unknown
+            }
+        }
+    }.getOrDefault(InstallState.Unknown)
+
+    fun canInstall(app: CompanionAppSpec): Boolean = !app.storeId.isNullOrBlank()
+
+    fun install(context: Context, app: CompanionAppSpec) = openStorePage(context, app)
+
+    // Apps tab, My Apps holds the settings
+    fun openSettings(context: Context) {
+        if (!start(context, Intent(Intent.ACTION_VIEW, Uri.parse(APPS_TAB)))) {
+            context.showToast(R.string.pebble_app_missing)
+        }
+    }
+
+    // Pebble app store page, else the web listing
+    private fun openStorePage(context: Context, app: CompanionAppSpec) {
+        val storeId = app.storeId?.takeIf { it.isNotBlank() } ?: return
+        val deepLink = Uri.Builder().scheme("pebble").authority("appstore").appendPath(storeId)
+            .apply { app.storeSource?.let { appendQueryParameter("source", it) } }
+            .build()
+        if (start(context, Intent(Intent.ACTION_VIEW, deepLink))) return
+        if (!start(context, Intent(Intent.ACTION_VIEW, Uri.parse(STORE_WEB + storeId)))) {
+            context.showToast(R.string.pebble_app_missing)
+        }
+    }
+
+    private fun start(context: Context, intent: Intent): Boolean = try {
+        context.startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+        true
+    } catch (_: ActivityNotFoundException) {
+        false
+    }
+}

Manager/app/src/main/kotlin/com/meowarex/rlmobile/pebble/WatchProtocol.kt

@@ -0,0 +1,265 @@
+package com.meowarex.rlmobile.pebble
+
+import io.rebble.pebblekit2.common.model.PebbleDictionary
+import io.rebble.pebblekit2.common.model.PebbleDictionaryItem
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.ByteArrayOutputStream
+import java.util.UUID
+import kotlin.math.roundToLong
+
+// Mirrors rl-pebble main.c and emu_driver.py
+object WatchProtocol {
+    val APP_UUID: UUID = UUID.fromString("79d7fe6a-b970-483a-b096-16da10af0433")
+
+    // package.json messageKeys order
+    const val KEY_CMD = 10000
+    const val KEY_TRACK_ID = 10001
+    const val KEY_TITLE = 10002
+    const val KEY_ARTIST = 10003
+    const val KEY_DURATION = 10004
+    const val KEY_STATUS = 10005
+    const val KEY_LINE_COUNT = 10006
+    const val KEY_CHUNK_INDEX = 10007
+    const val KEY_CHUNK = 10008
+    const val KEY_PLAYING = 10009
+    const val KEY_POSITION = 10010
+    const val KEY_INBOX_SIZE = 10011
+    const val KEY_PHONE_TIME = 10012
+    const val KEY_WATCH_TIME = 10013
+    const val KEY_PHONE_TIME_2 = 10014
+    const val KEY_SET_AUTO_OPEN = 10021
+
+    const val CMD_TRACK = 1
+    const val CMD_LINES = 2
+    const val CMD_STATE = 3
+    const val CMD_STATUS = 4
+    const val CMD_SYNC = 5
+    const val CMD_HELLO = 20
+    const val CMD_PLAY_PAUSE = 21
+    const val CMD_NEXT = 22
+    const val CMD_PREV = 23
+    const val CMD_SYNC_REQ = 24
+    const val CMD_SETTINGS = 25
+
+    const val STATUS_IDLE = 0
+    const val STATUS_LOADING = 1
+    const val STATUS_READY = 2
+    const val STATUS_NO_LYRICS = 3
+    const val STATUS_ERROR = 4
+
+    private const val SEG_BG = 1 shl 0
+    private const val SEG_SPACE = 1 shl 1
+    private const val LINE_RIGHT = 1 shl 0
+
+    private val WHITESPACE = Regex("\\s+")
+    private const val HOLD_FOREVER = Int.MAX_VALUE.toLong()
+    private const val LINE_ONLY_MS = 800L
+    private const val MAX_SEGMENTS = 120
+
+    class Segment(val time: Long, val duration: Long, val flags: Int, val text: String)
+
+    // end is when the line stops being lit
+    class Line(val start: Long, val end: Long, val segments: List<Segment>, val right: Boolean)
+
+    // Syllable level lines, lit until the next lead line.
+    fun shape(body: String): List<Line> {
+        val root = JSONObject(body)
+        val data = root.optJSONArray("data") ?: return emptyList()
+        val sides = singerSides(root, data)
+
+        class Raw(val start: Long, val end: Long, val allBackground: Boolean, val segments: List<Segment>, val right: Boolean)
+
+        val raws = ArrayList<Raw>(data.length())
+        for (i in 0 until data.length()) {
+            val item = data.optJSONObject(i) ?: continue
+            val syllabus = item.optJSONArray("syllabus")?.takeIf { it.length() > 0 }
+
+            val segments = ArrayList<Segment>()
+            val start: Long
+            val end: Long
+            var allBackground = false
+            if (syllabus != null) {
+                val first = syllabus.optJSONObject(0)
+                val last = syllabus.optJSONObject(syllabus.length() - 1)
+                start = first?.optLong("time") ?: 0
+                end = (last?.optLong("time") ?: 0) + (last?.optLong("duration") ?: 0)
+                allBackground = (0 until syllabus.length()).all {
+                    syllabus.optJSONObject(it)?.optBoolean("isBackground") == true
+                }
+                for (j in 0 until syllabus.length()) {
+                    val syllable = syllabus.optJSONObject(j) ?: continue
+                    val raw = text(syllable)
+                    val trimmed = raw.trim()
+                    if (trimmed.isEmpty()) continue
+                    var flags = if (syllable.optBoolean("isBackground")) SEG_BG else 0
+                    if (raw != raw.trimEnd()) flags = flags or SEG_SPACE
+                    segments += Segment(syllable.optLong("time"), syllable.optLong("duration"), flags, trimmed)
+                }
+            } else {
+                // Line timed only, one segment per word
+                start = (item.optDouble("startTime", 0.0) * 1000).roundToLong()
+                end = start + LINE_ONLY_MS
+                val words = text(item).split(WHITESPACE).filter { it.isNotEmpty() }
+                words.forEachIndexed { index, word ->
+                    segments += Segment(start, 0, if (index < words.lastIndex) SEG_SPACE else 0, word)
+                }
+            }
+            if (segments.isEmpty()) continue
+            raws += Raw(start, end, allBackground, segments.take(MAX_SEGMENTS), sides?.get(i) == 1)
+        }
+
+        return raws.mapIndexed { index, raw ->
+            val nextLead = (index + 1 until raws.size).firstOrNull { !raws[it].allBackground }?.let { raws[it].start }
+            Line(raw.start, (nextLead ?: HOLD_FOREVER).coerceAtLeast(raw.end), raw.segments, raw.right)
+        }
+    }
+
+    // RL Mobile duet sides, null for one side.
+    private fun singerSides(root: JSONObject, data: JSONArray): IntArray? {
+        val agents = root.optJSONObject("metadata")?.optJSONObject("agents")
+        fun singerOf(i: Int) = data.optJSONObject(i)?.optJSONObject("element")?.optString("singer")?.takeIf { it.isNotEmpty() }
+        fun typeOf(singer: String): String = agents?.optJSONObject(singer)?.optString("type", "person")
+            ?: when (singer) {
+                "v1000" -> "group"
+                "v2000" -> "other"
+                else -> "person"
+            }
+
+        // Groups left, second person right
+        val sideOf = HashMap<String, Int>()
+        var persons = 0
+        for (i in 0 until data.length()) {
+            val singer = singerOf(i) ?: continue
+            if (singer in sideOf) continue
+            sideOf[singer] = if (typeOf(singer) != "person") 0 else if (++persons == 2) 1 else 0
+        }
+
+        val sides = IntArray(data.length()) { i -> singerOf(i)?.let { sideOf[it] ?: 0 } ?: -1 }
+        val sided = sides.count { it >= 0 }
+        val right = sides.count { it == 1 }
+        // Nearly all right, swap
+        if (sided > 0 && right * 100 / sided >= 85) {
+            for (i in sides.indices) if (sides[i] >= 0) sides[i] = 1 - sides[i]
+        }
+        return if (sides.any { it == 0 } && sides.any { it == 1 }) sides else null
+    }
+
+    private fun text(obj: JSONObject): String =
+        obj.optString("romanized").takeIf { it.isNotBlank() } ?: obj.optString("text")
+
+    private fun encodeLine(line: Line): ByteArray {
+        val out = ByteArrayOutputStream()
+        out.u32(line.start)
+        out.u32(line.end)
+        out.write(line.segments.size)
+        out.write(if (line.right) LINE_RIGHT else 0)
+        for (segment in line.segments) {
+            val text = utf8Truncate(segment.text, 255)
+            out.u16((segment.time - line.start).coerceIn(0, 65535))
+            out.u16(segment.duration.coerceIn(0, 65535))
+            out.write(segment.flags)
+            out.write(text.size)
+            out.write(text)
+        }
+        return out.toByteArray()
+    }
+
+    // Whole lines per chunk, keyed by first index.
+    fun chunks(lines: List<Line>, budget: Int): List<Pair<Int, ByteArray>> {
+        val result = ArrayList<Pair<Int, ByteArray>>()
+        val buf = ByteArrayOutputStream()
+        var first = 0
+        lines.forEachIndexed { index, line ->
+            val encoded = encodeLine(line)
+            if (buf.size() > 0 && buf.size() + encoded.size > budget) {
+                result += first to buf.toByteArray()
+                buf.reset()
+                first = index
+            }
+            buf.write(encoded)
+        }
+        if (buf.size() > 0) result += first to buf.toByteArray()
+        return result
+    }
+
+    fun track(trackId: Long, title: String, artist: String, durationMs: Long, status: Int, lineCount: Int): PebbleDictionary =
+        mapOf(
+            key(KEY_CMD) to PebbleDictionaryItem.UInt8(CMD_TRACK),
+            key(KEY_TRACK_ID) to PebbleDictionaryItem.UInt32(trackId),
+            key(KEY_TITLE) to PebbleDictionaryItem.Text(String(utf8Truncate(title, 60))),
+            key(KEY_ARTIST) to PebbleDictionaryItem.Text(String(utf8Truncate(artist, 60))),
+            key(KEY_DURATION) to PebbleDictionaryItem.UInt32(durationMs.coerceIn(0, 0xFFFFFFFFL)),
+            key(KEY_STATUS) to PebbleDictionaryItem.UInt8(status),
+            key(KEY_LINE_COUNT) to PebbleDictionaryItem.UInt16(lineCount),
+        )
+
+    fun lines(trackId: Long, firstIndex: Int, blob: ByteArray): PebbleDictionary = mapOf(
+        key(KEY_CMD) to PebbleDictionaryItem.UInt8(CMD_LINES),
+        key(KEY_TRACK_ID) to PebbleDictionaryItem.UInt32(trackId),
+        key(KEY_CHUNK_INDEX) to PebbleDictionaryItem.UInt16(firstIndex),
+        key(KEY_CHUNK) to PebbleDictionaryItem.Bytes(blob),
+    )
+
+    // Position at a phone elapsedRealtime.
+    fun state(trackId: Long, playing: Boolean, positionMs: Long, phoneTimeMs: Long): PebbleDictionary = mapOf(
+        key(KEY_CMD) to PebbleDictionaryItem.UInt8(CMD_STATE),
+        key(KEY_TRACK_ID) to PebbleDictionaryItem.UInt32(trackId),
+        key(KEY_PLAYING) to PebbleDictionaryItem.UInt8(if (playing) 1 else 0),
+        key(KEY_POSITION) to PebbleDictionaryItem.Int32(positionMs.coerceIn(0, Int.MAX_VALUE.toLong()).toInt()),
+        key(KEY_PHONE_TIME) to PebbleDictionaryItem.UInt32(phoneTimeMs and 0xFFFFFFFFL),
+    )
+
+    fun sync(watchTime: Long, receivedAt: Long, sentAt: Long): PebbleDictionary = mapOf(
+        key(KEY_CMD) to PebbleDictionaryItem.UInt8(CMD_SYNC),
+        key(KEY_WATCH_TIME) to PebbleDictionaryItem.UInt32(watchTime and 0xFFFFFFFFL),
+        key(KEY_PHONE_TIME) to PebbleDictionaryItem.UInt32(receivedAt and 0xFFFFFFFFL),
+        key(KEY_PHONE_TIME_2) to PebbleDictionaryItem.UInt32(sentAt and 0xFFFFFFFFL),
+    )
+
+    fun status(trackId: Long, status: Int): PebbleDictionary = mapOf(
+        key(KEY_CMD) to PebbleDictionaryItem.UInt8(CMD_STATUS),
+        key(KEY_TRACK_ID) to PebbleDictionaryItem.UInt32(trackId),
+        key(KEY_STATUS) to PebbleDictionaryItem.UInt8(status),
+    )
+
+    // Integer tuples from the watch.
+    fun ints(data: PebbleDictionary): Map<Int, Long> = buildMap {
+        for ((k, item) in data) {
+            val value = when (item) {
+                is PebbleDictionaryItem.UInt32 -> item.value.toLong()
+                is PebbleDictionaryItem.Int32 -> item.value.toLong()
+                is PebbleDictionaryItem.UInt16 -> item.value.toLong()
+                is PebbleDictionaryItem.Int16 -> item.value.toLong()
+                is PebbleDictionaryItem.UInt8 -> item.value.toLong()
+                is PebbleDictionaryItem.Int8 -> item.value.toLong()
+                else -> continue
+            }
+            put(k.toInt(), value)
+        }
+    }
+
+    private fun key(key: Int) = key.toUInt()
+
+    private fun utf8Truncate(text: String, limit: Int): ByteArray {
+        val raw = text.toByteArray(Charsets.UTF_8)
+        if (raw.size <= limit) return raw
+        var end = limit
+        // Don't split a code point
+        while (end > 0 && (raw[end].toInt() and 0xC0) == 0x80) end--
+        return raw.copyOf(end)
+    }
+
+    private fun ByteArrayOutputStream.u16(value: Long) {
+        write((value and 0xFF).toInt())
+        write(((value shr 8) and 0xFF).toInt())
+    }
+
+    private fun ByteArrayOutputStream.u32(value: Long) {
+        val v = value.coerceIn(0, 0xFFFFFFFFL)
+        write((v and 0xFF).toInt())
+        write(((v shr 8) and 0xFF).toInt())
+        write(((v shr 16) and 0xFF).toInt())
+        write(((v shr 24) and 0xFF).toInt())
+    }
+}

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

@@ -22,13 +22,18 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.platform.LocalContext
 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.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import androidx.lifecycle.repeatOnLifecycle
 import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.pebble.PebbleWatchapp
 import com.meowarex.rlmobile.ui.screens.patchopts.OptionSpec
 import com.meowarex.rlmobile.ui.screens.patchopts.PatchLock
 import com.meowarex.rlmobile.ui.screens.patchopts.PatchOptionState
@@ -135,7 +140,9 @@ fun PatchSelectionAccordion(
 
                     val inlineOptions = patch.advancedOptions.filter { it.isInline }
                     val hasSheetOptions = patch.advancedOptions.any { !it.isInline }
-                    val hasSettings = patch.variants.isNotEmpty() || inlineOptions.isNotEmpty() || hasSheetOptions
+                    val companionApp = patch.companionApp
+                    val hasSettings = patch.variants.isNotEmpty() || inlineOptions.isNotEmpty() || hasSheetOptions ||
+                        companionApp != null
 
                     // When a patch is enabled and has settings show a carded view of the settings
                     val carded = checked && hasSettings
@@ -240,6 +247,56 @@ fun PatchSelectionAccordion(
                                             )
                                         }
                                     }
+
+                                    if (companionApp != null) {
+                                        val context = LocalContext.current
+                                        val lifecycleOwner = LocalLifecycleOwner.current
+                                        var installState by remember { mutableStateOf(PebbleWatchapp.InstallState.Unknown) }
+                                        // Recheck on resume
+                                        LaunchedEffect(lifecycleOwner) {
+                                            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                                                installState = PebbleWatchapp.installState(context)
+                                            }
+                                        }
+                                        val installed = installState == PebbleWatchapp.InstallState.Installed
+                                        Row(
+                                            horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
+                                            modifier = Modifier.fillMaxWidth(),
+                                        ) {
+                                            FilledTonalButton(
+                                                onClick = { PebbleWatchapp.install(context, companionApp) },
+                                                enabled = !installed && PebbleWatchapp.canInstall(companionApp),
+                                                modifier = Modifier.weight(1f),
+                                            ) {
+                                                Icon(
+                                                    painter = painterResource(if (installed) R.drawable.ic_check_circle else R.drawable.ic_download),
+                                                    contentDescription = null,
+                                                    modifier = Modifier.size(18.dp),
+                                                )
+                                                Spacer(Modifier.width(8.dp))
+                                                Text(
+                                                    if (installed) {
+                                                        stringResource(R.string.patchopts_companion_installed)
+                                                    } else {
+                                                        companionApp.installTitle.ifBlank { stringResource(R.string.patchopts_companion_install) }
+                                                    }
+                                                )
+                                            }
+                                            FilledTonalButton(
+                                                onClick = { PebbleWatchapp.openSettings(context) },
+                                                enabled = installed,
+                                                modifier = Modifier.weight(1f),
+                                            ) {
+                                                Icon(
+                                                    painter = painterResource(R.drawable.ic_tune),
+                                                    contentDescription = null,
+                                                    modifier = Modifier.size(18.dp),
+                                                )
+                                                Spacer(Modifier.width(8.dp))
+                                                Text(companionApp.customizeTitle.ifBlank { stringResource(R.string.patchopts_companion_customize) })
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }

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

@@ -34,6 +34,8 @@ data class PatchSpec(
     val advancedOptions: List<OptionSpec> = emptyList(),
     val category: String = CATEGORY_PATCH,
     val pathLocked: Boolean = false,
+    /** Watchapp shown under an integration. */
+    val companionApp: CompanionAppSpec? = null,
 ) {
     val isIntegration: Boolean get() = category == CATEGORY_INTEGRATION
 
@@ -43,6 +45,17 @@ data class PatchSpec(
     }
 }
 
+@Immutable
+@Serializable
+data class CompanionAppSpec(
+    val installTitle: String = "",
+    val customizeTitle: String = "",
+    /** Pebble appstore id. */
+    val storeId: String? = null,
+    /** Appstore feed url. */
+    val storeSource: String? = null,
+)
+
 @Immutable
 @Serializable
 data class VariantSpec(

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

@@ -19,13 +19,18 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.platform.LocalContext
 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.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import androidx.lifecycle.repeatOnLifecycle
 import com.meowarex.rlmobile.R
+import com.meowarex.rlmobile.pebble.PebbleWatchapp
 import com.meowarex.rlmobile.ui.components.radiant.RadiantButton
 import com.meowarex.rlmobile.ui.components.radiant.RadiantButtonSize
 import com.meowarex.rlmobile.ui.components.radiant.RadiantSwitch
@@ -138,7 +143,9 @@ fun PatchSelectionAccordion(
 
                     val inlineOptions = patch.advancedOptions.filter { it.isInline }
                     val hasSheetOptions = patch.advancedOptions.any { !it.isInline }
-                    val hasSettings = patch.variants.isNotEmpty() || inlineOptions.isNotEmpty() || hasSheetOptions
+                    val companionApp = patch.companionApp
+                    val hasSettings = patch.variants.isNotEmpty() || inlineOptions.isNotEmpty() || hasSheetOptions ||
+                        companionApp != null
 
                     // When a patch is enabled and has settings show a carded view of the settings
                     val carded = checked && hasSettings
@@ -238,6 +245,47 @@ fun PatchSelectionAccordion(
                                             )
                                         }
                                     }
+
+                                    if (companionApp != null) {
+                                        val context = LocalContext.current
+                                        val lifecycleOwner = LocalLifecycleOwner.current
+                                        var installState by remember { mutableStateOf(PebbleWatchapp.InstallState.Unknown) }
+                                        // Recheck on resume
+                                        LaunchedEffect(lifecycleOwner) {
+                                            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                                                installState = PebbleWatchapp.installState(context)
+                                            }
+                                        }
+                                        val installed = installState == PebbleWatchapp.InstallState.Installed
+                                        Row(
+                                            horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
+                                            modifier = Modifier.fillMaxWidth(),
+                                        ) {
+                                            RadiantButton(
+                                                text = if (installed) {
+                                                    stringResource(R.string.patchopts_companion_installed)
+                                                } else {
+                                                    companionApp.installTitle.ifBlank { stringResource(R.string.patchopts_companion_install) }
+                                                },
+                                                icon = painterResource(if (installed) R.drawable.ic_check_circle else R.drawable.ic_download),
+                                                onClick = { PebbleWatchapp.install(context, companionApp) },
+                                                enabled = !installed && PebbleWatchapp.canInstall(companionApp),
+                                                size = RadiantButtonSize.Small,
+                                                fillWidth = true,
+                                                modifier = Modifier.weight(1f),
+                                            )
+                                            RadiantButton(
+                                                text = companionApp.customizeTitle
+                                                    .ifBlank { stringResource(R.string.patchopts_companion_customize) },
+                                                icon = painterResource(R.drawable.ic_tune),
+                                                onClick = { PebbleWatchapp.openSettings(context) },
+                                                enabled = installed,
+                                                size = RadiantButtonSize.Small,
+                                                fillWidth = true,
+                                                modifier = Modifier.weight(1f),
+                                            )
+                                        }
+                                    }
                                 }
                             }
                         }

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

@@ -85,6 +85,10 @@
   <string name="settings_header_installation">Installation</string>
   <string name="settings_header_appearance">Appearance</string>
   <string name="settings_header_info">Info</string>
+  <string name="patchopts_companion_install">Install watchapp</string>
+  <string name="patchopts_companion_installed">Installed</string>
+  <string name="patchopts_companion_customize">Customize</string>
+  <string name="pebble_app_missing">Couldn\'t open the Pebble app. Is it installed?</string>
   <string name="setting_theme">Theme</string>
   <string name="setting_ui_style">UI style</string>
   <string name="setting_ui_style_desc">Want the old UI back?</string>

Manager/gradle/libs.versions.toml

@@ -32,6 +32,7 @@ kotlinx-serialization = "1.10.0"
 ktor = "3.4.0"
 libsu = "6.0.0"
 microg = "0.3.6.244735"
+pebblekit2 = "1.3.1"
 shimmer = "1.3.3"
 shizuku = "13.1.5"
 smali = "3.0.9"
@@ -115,6 +116,7 @@ hiddenApi-stub = { module = "dev.rikka.hidden:stub", version.ref = "hiddenApi-st
 microg = { module = "org.microg.gms:play-services-safetynet", version.ref = "microg" }
 desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugaring" }
 libsu = { module = "com.aliucord.libsu:core", version.ref = "libsu" }
+pebblekit2-client = { module = "io.rebble.pebblekit2:client", version.ref = "pebblekit2" }
 
 [bundles]
 accompanist = [

README.md

@@ -17,10 +17,13 @@ Every Patch & Integration can be disabled/enabled & adjusted exactly how you wan
 - Redesigned mini-player with gestures
 - Word Level Lyrics (Word by Word) <3
 - Syllable Level Lyrics (Syllable by Syllable) <3
+- Animated Covers
+- Crossfade (Unlocks hidden built in functionality)
 
 ### Integrations
 
 - Waze | Control TIDAL playback from Waze
+- Pebble Watch | Synced lyrics (Line, Word or Syllable) & playback controls on your Pebble
 
 ### Disclaimer
 
@@ -97,7 +100,7 @@ Each patch file targets a specific class via its `--- a/` header — the filenam
 ### The Kawarp extension (generated smali)
 
 `patches/extension/radiant/Kawarp.smali` and `patches/extension/dev/kawarp/KawarpEngine.smali`
-are **generated — don't hand-edit them**. The engine comes from the
+are **generated don't hand-edit them**. The engine comes from the
 [Kawarp-AGSL](https://github.com/meowarex/kawarp-agsl) library, which the build tooling expects
 cloned inside `tools/` (the clone is gitignored):
 
@@ -105,7 +108,7 @@ cloned inside `tools/` (the clone is gitignored):
 git clone https://github.com/meowarex/kawarp-agsl tools/kawarp-agsl
 ```
 
-To change the TIDAL glue, edit `tools/kawarp-build/src/radiant/Kawarp.java`; to change the
+To change the TIDAL hooks, edit `tools/kawarp-build/src/radiant/Kawarp.java`. to change the
 effect itself, PR the Kawarp-AGSL repo. Then regenerate and commit the refreshed smali:
 
 ```bash

patches/animated-covers.patch

@@ -0,0 +1,54 @@
+--- a/com/tidal/android/feature/appscaffold/ui/q.smali
++++ b/com/tidal/android/feature/appscaffold/ui/q.smali
+@@ -38,6 +38,8 @@
+     .line 1
+     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+ 
++    invoke-static {p1, p2, p3, p4}, Lradiant/AnimatedCovers;->onMediaState(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V    # Look up animated cover
++
+     .line 2
+     .line 3
+     .line 4
+--- a/com/tidal/android/feature/playerscreen/ui/composables/CoverPagerKt.smali
++++ b/com/tidal/android/feature/playerscreen/ui/composables/CoverPagerKt.smali
+@@ -633,5 +633,7 @@
+     .line 281
+     .line 282
+-    invoke-static/range {v4 .. v13}, Lsd0/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
++    move/from16 v14, p0    # Page album id
++
++    invoke-static/range {v4 .. v14}, Lradiant/AnimatedCovers;->cover(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;III)V    # Animated cover, else normal cover
+ 
+     .line 283
+--- a/com/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel.smali
++++ b/com/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel.smali
+@@ -92,4 +92,6 @@
+     iput-object v1, v0, Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel;->a:Lzh/e;
+ 
++    invoke-static {v1}, Lradiant/AnimatedCovers;->setQueue(Ljava/lang/Object;)V    # Keep play queue for album name
++
+     move-object/from16 v1, p2
+ 
+--- a/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
+@@ -278,6 +278,10 @@
+     move-object v5, p2
+ 
+     .line 9
+-    invoke-static/range {v0 .. v9}, Lsd0/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
++    move/from16 v10, p1    # Mini player album id
++
++    invoke-static/range {v0 .. v10}, Lradiant/AnimatedCovers;->cover(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;III)V    # Animated cover in mini player
++
++    move/from16 v10, p5    # Restore changed flags
+ 
+     invoke-static {}, Landroidx/compose/runtime/ComposerKt;->isTraceInProgress()Z
+--- a/com/aspiro/wamp/nowplaying/widgets/secondaryProgressView/SecondaryProgressView.smali
++++ b/com/aspiro/wamp/nowplaying/widgets/secondaryProgressView/SecondaryProgressView.smali
+@@ -649,4 +649,6 @@
+     :goto_3
+     invoke-static {v5, v6, v3, v2}, Lwd0/l;->a(Landroid/widget/ImageView;ILjava/lang/String;I)Lcom/tidal/android/image/coil/g;
+ 
++    invoke-static {v5, v6}, Lradiant/AnimatedCoverView;->attach(Landroid/widget/ImageView;I)V    # Animated cover on lyrics pill
++
+     .line 153

patches/cover-capture.patch

@@ -1,6 +1,6 @@
 --- a/com/tidal/android/feature/appscaffold/ui/q.smali
 +++ b/com/tidal/android/feature/appscaffold/ui/q.smali
-@@ -55,6 +55,8 @@
+@@ -57,6 +57,8 @@
      .line 10
      iput-object p4, p0, Lcom/tidal/android/feature/appscaffold/ui/q;->d:Ljava/lang/String;
  

patches/cover-everywhere-pages.patch

@@ -0,0 +1,49 @@
+--- a/com/tidal/wave/components/WaveScaffoldKt.smali
++++ b/com/tidal/wave/components/WaveScaffoldKt.smali
+@@ -647,4 +647,10 @@
+     move-result-wide v25
+ 
++    const-wide/16 v25, 0x0    # Transparent background for backdrop
++
++    const/4 v0, 0x0    # render $changed flag
++
++    invoke-static {v1, v0}, Lradiant/HomeBackdrop;->render(Landroidx/compose/runtime/Composer;I)V    # render album-art backdrop
++
+     .line 267
+     new-instance v0, Lcom/tidal/wave/components/WaveScaffoldKt$WaveScaffold$2;
+--- a/com/tidal/android/feature/saveforlater/ui/n.smali
++++ b/com/tidal/android/feature/saveforlater/ui/n.smali
+@@ -174,4 +174,10 @@
+     move-result-wide v7
+ 
++    const-wide/16 v7, 0x0    # Transparent background for backdrop
++
++    const/4 v5, 0x0    # render $changed flag
++
++    invoke-static {v13, v5}, Lradiant/HomeBackdrop;->render(Landroidx/compose/runtime/Composer;I)V    # render album-art backdrop
++
+     .line 66
+     new-instance v2, Lcom/tidal/android/feature/saveforlater/ui/p;
+--- a/com/tidal/android/feature/search/ui/composables/SearchScreenKt.smali
++++ b/com/tidal/android/feature/search/ui/composables/SearchScreenKt.smali
+@@ -396,6 +396,10 @@
+     :cond_9
+     check-cast v4, Lyl0/l;
+ 
++    const/4 v1, 0x0    # render $changed flag
++
++    invoke-static {v6, v1}, Lradiant/HomeBackdrop;->render(Landroidx/compose/runtime/Composer;I)V    # Backdrop behind Search
++
+     .line 177
+     .line 178
+     invoke-static {v0, v4, v6, v10}, Lcom/tidal/android/feature/search/ui/composables/SearchScreenKt;->b(Lcom/tidal/android/feature/search/ui/d;Lyl0/l;Landroidx/compose/runtime/Composer;I)V
+--- a/qa/b.smali
++++ b/qa/b.smali
+@@ -126,5 +126,7 @@
+     if-eqz p2, :cond_2
+ 
++    invoke-static {p1, v2}, Lradiant/HomeBackdrop;->render(Landroidx/compose/runtime/Composer;I)V    # Backdrop behind View All
++
+     .line 46
+     .line 47
+     invoke-static {p2, p1, v2}, Lcom/tidal/android/feature/viewall/ui/ViewAllScreenKt;->f(Lcom/tidal/android/feature/viewall/ui/g;Landroidx/compose/runtime/Composer;I)V

patches/data.json

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

patches/debug-menu-unlock.patch

@@ -8,7 +8,7 @@
 +    return v0    # bypass debug flag
 +
      .line 1
-     iget-object v0, p0, Lcom/tidal/android/core/debug/DebugFeatureInteractorDefault;->a:Lcom/tidal/android/featureflags/n;
+     iget-object v0, p0, Lcom/tidal/android/core/debug/DebugFeatureInteractorDefault;->a:Lcom/tidal/android/featureflags/m;
  
 @@ -99,6 +102,14 @@
          }
@@ -23,7 +23,7 @@
 +    return-object v0    # short-circuit b()
 +
      .line 1
-     sget-object v0, Lo50/a;->a:Ljava/lang/String;
+     sget-object v0, Lu40/a;->a:Ljava/lang/String;
  
 @@ -261,6 +272,9 @@
  .method public final c()Z
@@ -33,5 +33,5 @@
 +    return v0    # bypass debug flag
 +
      .line 1
-     sget-object v0, Lo50/a;->a:Ljava/lang/String;
+     sget-object v0, Lu40/a;->a:Ljava/lang/String;
  

patches/enable-legacy-ui.patch

@@ -1,5 +1,5 @@
---- a/hg/d.smali
-+++ b/hg/d.smali
+--- a/fg/e.smali
++++ b/fg/e.smali
 @@ -27,7 +27,7 @@
  
      .line 2

patches/extension/radiant/AiSparkle.smali

@@ -0,0 +1,652 @@
+.class public final Lradiant/AiSparkle;
+.super Landroidx/compose/ui/graphics/painter/Painter;
+
+# interfaces
+.implements Landroid/view/Choreographer$FrameCallback;
+.implements Ljava/lang/Runnable;
+
+
+# static fields
+.field private static final CYCLE_MS:J = 0x1770L
+
+.field private static final PALETTE:[I
+
+.field private static final POSTER:Lradiant/AiSparkle;
+
+.field private static final STOPS:[F
+
+.field private static final TAG:Ljava/lang/String; = "RLAiSparkle"
+
+.field static final aiState:Landroidx/compose/runtime/MutableState;
+
+.field private static cached:Lradiant/AiSparkle;
+
+.field private static frameScheduled:Z
+
+.field private static lastDrawMs:J
+
+.field private static volatile pending:Z
+
+.field static final tick:Landroidx/compose/runtime/MutableState;
+
+
+# instance fields
+.field private final base:Landroidx/compose/ui/graphics/painter/Painter;
+
+.field private final colors:[I
+
+.field private final fillPaint:Landroid/graphics/Paint;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .registers 5
+
+    const v0, -0xa11801
+
+    const v1, -0x587406
+
+    const v2, -0x9463
+
+    const/16 v3, -0x2e9a
+
+    filled-new-array {v2, v3, v0, v1}, [I
+
+    move-result-object v0
+
+    sput-object v0, Lradiant/AiSparkle;->PALETTE:[I
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [F
+
+    fill-array-data v0, :array_38
+
+    sput-object v0, Lradiant/AiSparkle;->STOPS:[F
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x2
+
+    invoke-static {v0, v1, v2, v1}, 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/AiSparkle;->aiState:Landroidx/compose/runtime/MutableState;
+
+    const-wide/16 v3, 0x0
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-static {v0, v1, v2, v1}, 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/AiSparkle;->tick:Landroidx/compose/runtime/MutableState;
+
+    new-instance v0, Lradiant/AiSparkle;
+
+    invoke-direct {v0, v1}, Lradiant/AiSparkle;-><init>(Landroidx/compose/ui/graphics/painter/Painter;)V
+
+    sput-object v0, Lradiant/AiSparkle;->POSTER:Lradiant/AiSparkle;
+
+    return-void
+
+    nop
+
+    :array_38
+    .array-data 4
+        0x0
+        0x3eb33333    # 0.35f
+        0x3f266666    # 0.65f
+        0x3f800000    # 1.0f
+    .end array-data
+.end method
+
+.method private constructor <init>(Landroidx/compose/ui/graphics/painter/Painter;)V
+    .registers 4
+
+    invoke-direct {p0}, Landroidx/compose/ui/graphics/painter/Painter;-><init>()V
+
+    new-instance v0, Landroid/graphics/Paint;
+
+    const/4 v1, 0x1
+
+    invoke-direct {v0, v1}, Landroid/graphics/Paint;-><init>(I)V
+
+    iput-object v0, p0, Lradiant/AiSparkle;->fillPaint:Landroid/graphics/Paint;
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [I
+
+    iput-object v0, p0, Lradiant/AiSparkle;->colors:[I
+
+    iput-object p1, p0, Lradiant/AiSparkle;->base:Landroidx/compose/ui/graphics/painter/Painter;
+
+    iget-object p1, p0, Lradiant/AiSparkle;->fillPaint:Landroid/graphics/Paint;
+
+    new-instance v0, Landroid/graphics/PorterDuffXfermode;
+
+    sget-object v1, Landroid/graphics/PorterDuff$Mode;->SRC_IN:Landroid/graphics/PorterDuff$Mode;
+
+    invoke-direct {v0, v1}, Landroid/graphics/PorterDuffXfermode;-><init>(Landroid/graphics/PorterDuff$Mode;)V
+
+    invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setXfermode(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;
+
+    return-void
+.end method
+
+.method private static lerpPalette(F)I
+    .registers 8
+
+    float-to-double v0, p0
+
+    invoke-static {v0, v1}, Ljava/lang/Math;->floor(D)D
+
+    move-result-wide v0
+
+    double-to-float v0, v0
+
+    sub-float/2addr p0, v0
+
+    const/high16 v0, 0x40800000    # 4.0f
+
+    mul-float/2addr p0, v0
+
+    float-to-int v0, p0
+
+    int-to-float v1, v0
+
+    sub-float/2addr p0, v1
+
+    sget-object v1, Lradiant/AiSparkle;->PALETTE:[I
+
+    and-int/lit8 v2, v0, 0x3
+
+    aget v1, v1, v2
+
+    sget-object v2, Lradiant/AiSparkle;->PALETTE:[I
+
+    add-int/lit8 v0, v0, 0x1
+
+    and-int/lit8 v0, v0, 0x3
+
+    aget v0, v2, v0
+
+    shr-int/lit8 v2, v1, 0x10
+
+    and-int/lit16 v2, v2, 0xff
+
+    shr-int/lit8 v3, v1, 0x8
+
+    and-int/lit16 v3, v3, 0xff
+
+    and-int/lit16 v1, v1, 0xff
+
+    shr-int/lit8 v4, v0, 0x10
+
+    and-int/lit16 v4, v4, 0xff
+
+    shr-int/lit8 v5, v0, 0x8
+
+    and-int/lit16 v5, v5, 0xff
+
+    and-int/lit16 v0, v0, 0xff
+
+    int-to-float v6, v2
+
+    sub-int/2addr v4, v2
+
+    int-to-float v2, v4
+
+    mul-float/2addr v2, p0
+
+    add-float/2addr v6, v2
+
+    float-to-int v2, v6
+
+    int-to-float v4, v3
+
+    sub-int/2addr v5, v3
+
+    int-to-float v3, v5
+
+    mul-float/2addr v3, p0
+
+    add-float/2addr v4, v3
+
+    float-to-int v3, v4
+
+    int-to-float v4, v1
+
+    sub-int/2addr v0, v1
+
+    int-to-float v0, v0
+
+    mul-float/2addr v0, p0
+
+    add-float/2addr v4, v0
+
+    float-to-int p0, v4
+
+    const/high16 v0, -0x1000000
+
+    shl-int/lit8 v1, v2, 0x10
+
+    or-int/2addr v0, v1
+
+    shl-int/lit8 v1, v3, 0x8
+
+    or-int/2addr v0, v1
+
+    or-int/2addr p0, v0
+
+    return p0
+.end method
+
+.method public static onResponse(Ljava/lang/String;)V
+    .registers 5
+
+    const/4 v0, 0x0
+
+    :try_start_1
+    new-instance v1, Lorg/json/JSONObject;
+
+    invoke-direct {v1, p0}, Lorg/json/JSONObject;-><init>(Ljava/lang/String;)V
+
+    const-string p0, "Word"
+
+    const-string v2, "type"
+
+    const-string v3, ""
+
+    invoke-virtual {v1, v2, v3}, Lorg/json/JSONObject;->optString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p0
+
+    if-eqz p0, :cond_22
+
+    const-string p0, "_synthesized"
+
+    invoke-virtual {v1, p0, v0}, Lorg/json/JSONObject;->optBoolean(Ljava/lang/String;Z)Z
+
+    move-result p0
+    :try_end_1c
+    .catchall {:try_start_1 .. :try_end_1c} :catchall_21
+
+    if-eqz p0, :cond_22
+
+    const/4 p0, 0x1
+
+    move v0, p0
+
+    goto :goto_22
+
+    :catchall_21
+    move-exception p0
+
+    :cond_22
+    :goto_22
+    invoke-static {v0}, Lradiant/AiSparkle;->post(Z)V
+
+    return-void
+.end method
+
+.method private static post(Z)V
+    .registers 2
+
+    sput-boolean p0, Lradiant/AiSparkle;->pending:Z
+
+    new-instance p0, Landroid/os/Handler;
+
+    invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+    move-result-object v0
+
+    invoke-direct {p0, v0}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
+
+    sget-object v0, Lradiant/AiSparkle;->POSTER:Lradiant/AiSparkle;
+
+    invoke-virtual {p0, v0}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
+
+.method public static reset()V
+    .registers 1
+
+    const/4 v0, 0x0
+
+    invoke-static {v0}, Lradiant/AiSparkle;->post(Z)V
+
+    return-void
+.end method
+
+.method public static wrap(Landroidx/compose/ui/graphics/painter/Painter;Landroidx/compose/runtime/Composer;)Landroidx/compose/ui/graphics/painter/Painter;
+    .registers 3
+
+    sget-object p1, Lradiant/AiSparkle;->aiState:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {p1}, Landroidx/compose/runtime/MutableState;->getValue()Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Boolean;
+
+    invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_21
+
+    if-nez p0, :cond_11
+
+    goto :goto_21
+
+    :cond_11
+    sget-object p1, Lradiant/AiSparkle;->cached:Lradiant/AiSparkle;
+
+    if-eqz p1, :cond_19
+
+    iget-object v0, p1, Lradiant/AiSparkle;->base:Landroidx/compose/ui/graphics/painter/Painter;
+
+    if-eq v0, p0, :cond_20
+
+    :cond_19
+    new-instance p1, Lradiant/AiSparkle;
+
+    invoke-direct {p1, p0}, Lradiant/AiSparkle;-><init>(Landroidx/compose/ui/graphics/painter/Painter;)V
+
+    sput-object p1, Lradiant/AiSparkle;->cached:Lradiant/AiSparkle;
+
+    :cond_20
+    return-object p1
+
+    :cond_21
+    :goto_21
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public applyColorFilter(Landroidx/compose/ui/graphics/ColorFilter;)Z
+    .registers 2
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public doFrame(J)V
+    .registers 7
+
+    invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
+
+    move-result-wide p1
+
+    sget-object v0, Lradiant/AiSparkle;->aiState:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {v0}, Landroidx/compose/runtime/MutableState;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2f
+
+    sget-wide v0, Lradiant/AiSparkle;->lastDrawMs:J
+
+    sub-long v0, p1, v0
+
+    const-wide/16 v2, 0x1f4
+
+    cmp-long v0, v0, v2
+
+    if-gez v0, :cond_2f
+
+    sget-object v0, Lradiant/AiSparkle;->tick:Landroidx/compose/runtime/MutableState;
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    invoke-interface {v0, p1}, Landroidx/compose/runtime/MutableState;->setValue(Ljava/lang/Object;)V
+
+    invoke-static {}, Landroid/view/Choreographer;->getInstance()Landroid/view/Choreographer;
+
+    move-result-object p1
+
+    sget-object p2, Lradiant/AiSparkle;->POSTER:Lradiant/AiSparkle;
+
+    invoke-virtual {p1, p2}, Landroid/view/Choreographer;->postFrameCallback(Landroid/view/Choreographer$FrameCallback;)V
+
+    goto :goto_32
+
+    :cond_2f
+    const/4 p1, 0x0
+
+    sput-boolean p1, Lradiant/AiSparkle;->frameScheduled:Z
+
+    :goto_32
+    return-void
+.end method
+
+.method public getIntrinsicSize-NH-jbRc()J
+    .registers 3
+
+    iget-object v0, p0, Lradiant/AiSparkle;->base:Landroidx/compose/ui/graphics/painter/Painter;
+
+    invoke-virtual {v0}, Landroidx/compose/ui/graphics/painter/Painter;->getIntrinsicSize-NH-jbRc()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public onDraw(Landroidx/compose/ui/graphics/drawscope/DrawScope;)V
+    .registers 19
+
+    move-object/from16 v0, p0
+
+    sget-object v1, Lradiant/AiSparkle;->tick:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {v1}, Landroidx/compose/runtime/MutableState;->getValue()Ljava/lang/Object;
+
+    invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
+
+    move-result-wide v1
+
+    sput-wide v1, Lradiant/AiSparkle;->lastDrawMs:J
+
+    sget-boolean v3, Lradiant/AiSparkle;->frameScheduled:Z
+
+    if-nez v3, :cond_1d
+
+    const/4 v3, 0x1
+
+    sput-boolean v3, Lradiant/AiSparkle;->frameScheduled:Z
+
+    invoke-static {}, Landroid/view/Choreographer;->getInstance()Landroid/view/Choreographer;
+
+    move-result-object v3
+
+    sget-object v4, Lradiant/AiSparkle;->POSTER:Lradiant/AiSparkle;
+
+    invoke-virtual {v3, v4}, Landroid/view/Choreographer;->postFrameCallback(Landroid/view/Choreographer$FrameCallback;)V
+
+    :cond_1d
+    invoke-interface/range {p1 .. p1}, Landroidx/compose/ui/graphics/drawscope/DrawScope;->getSize-NH-jbRc()J
+
+    move-result-wide v7
+
+    invoke-static {v7, v8}, Landroidx/compose/ui/geometry/Size;->getWidth-impl(J)F
+
+    move-result v12
+
+    invoke-static {v7, v8}, Landroidx/compose/ui/geometry/Size;->getHeight-impl(J)F
+
+    move-result v13
+
+    const/4 v3, 0x0
+
+    cmpg-float v4, v12, v3
+
+    if-lez v4, :cond_8b
+
+    cmpg-float v3, v13, v3
+
+    if-gtz v3, :cond_33
+
+    goto :goto_8b
+
+    :cond_33
+    invoke-interface/range {p1 .. p1}, Landroidx/compose/ui/graphics/drawscope/DrawScope;->getDrawContext()Landroidx/compose/ui/graphics/drawscope/DrawContext;
+
+    move-result-object v3
+
+    invoke-interface {v3}, Landroidx/compose/ui/graphics/drawscope/DrawContext;->getCanvas()Landroidx/compose/ui/graphics/Canvas;
+
+    move-result-object v3
+
+    invoke-static {v3}, Landroidx/compose/ui/graphics/AndroidCanvas_androidKt;->getNativeCanvas(Landroidx/compose/ui/graphics/Canvas;)Landroid/graphics/Canvas;
+
+    move-result-object v9
+
+    const-wide/16 v3, 0x1770
+
+    rem-long/2addr v1, v3
+
+    long-to-float v1, v1
+
+    const v2, 0x45bb8000    # 6000.0f
+
+    div-float/2addr v1, v2
+
+    const/4 v11, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v10, 0x0
+
+    invoke-virtual/range {v9 .. v14}, Landroid/graphics/Canvas;->saveLayer(FFFFLandroid/graphics/Paint;)I
+
+    move-result v2
+
+    move-object v3, v9
+
+    iget-object v5, v0, Lradiant/AiSparkle;->base:Landroidx/compose/ui/graphics/painter/Painter;
+
+    const/high16 v9, 0x3f800000    # 1.0f
+
+    const/4 v10, 0x0
+
+    move-object/from16 v6, p1
+
+    invoke-virtual/range {v5 .. v10}, Landroidx/compose/ui/graphics/painter/Painter;->draw-x_KDEd0(Landroidx/compose/ui/graphics/drawscope/DrawScope;JFLandroidx/compose/ui/graphics/ColorFilter;)V
+
+    const/4 v4, 0x0
+
+    :goto_5a
+    const/4 v5, 0x4
+
+    if-ge v4, v5, :cond_6d
+
+    iget-object v5, v0, Lradiant/AiSparkle;->colors:[I
+
+    int-to-float v6, v4
+
+    const/high16 v7, 0x3e800000    # 0.25f
+
+    mul-float/2addr v6, v7
+
+    add-float/2addr v6, v1
+
+    invoke-static {v6}, Lradiant/AiSparkle;->lerpPalette(F)I
+
+    move-result v6
+
+    aput v6, v5, v4
+
+    add-int/lit8 v4, v4, 0x1
+
+    goto :goto_5a
+
+    :cond_6d
+    iget-object v1, v0, Lradiant/AiSparkle;->fillPaint:Landroid/graphics/Paint;
+
+    new-instance v9, Landroid/graphics/LinearGradient;
+
+    iget-object v14, v0, Lradiant/AiSparkle;->colors:[I
+
+    sget-object v15, Lradiant/AiSparkle;->STOPS:[F
+
+    sget-object v16, Landroid/graphics/Shader$TileMode;->CLAMP:Landroid/graphics/Shader$TileMode;
+
+    const/4 v10, 0x0
+
+    move v11, v13
+
+    const/4 v13, 0x0
+
+    invoke-direct/range {v9 .. v16}, Landroid/graphics/LinearGradient;-><init>(FFFF[I[FLandroid/graphics/Shader$TileMode;)V
+
+    move v13, v11
+
+    invoke-virtual {v1, v9}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader;
+
+    const/4 v11, 0x0
+
+    iget-object v14, v0, Lradiant/AiSparkle;->fillPaint:Landroid/graphics/Paint;
+
+    move-object v9, v3
+
+    invoke-virtual/range {v9 .. v14}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
+
+    invoke-virtual {v9, v2}, Landroid/graphics/Canvas;->restoreToCount(I)V
+
+    :cond_8b
+    :goto_8b
+    return-void
+.end method
+
+.method public run()V
+    .registers 3
+
+    sget-boolean v0, Lradiant/AiSparkle;->pending:Z
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    sget-object v1, Lradiant/AiSparkle;->aiState:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {v1}, Landroidx/compose/runtime/MutableState;->getValue()Ljava/lang/Object;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/Boolean;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_17
+
+    sget-object v1, Lradiant/AiSparkle;->aiState:Landroidx/compose/runtime/MutableState;
+
+    invoke-interface {v1, v0}, Landroidx/compose/runtime/MutableState;->setValue(Ljava/lang/Object;)V
+
+    :cond_17
+    return-void
+.end method

patches/extension/radiant/AnimatedCoverView.smali

@@ -0,0 +1,845 @@
+.class public final Lradiant/AnimatedCoverView;
+.super Landroid/view/TextureView;
+
+# interfaces
+.implements Landroid/view/TextureView$SurfaceTextureListener;
+.implements Landroid/media/MediaPlayer$OnPreparedListener;
+.implements Landroid/media/MediaPlayer$OnInfoListener;
+.implements Landroid/media/MediaPlayer$OnErrorListener;
+.implements Landroid/view/View$OnLayoutChangeListener;
+.implements Landroid/view/View$OnAttachStateChangeListener;
+.implements Ljava/lang/Runnable;
+
+
+# static fields
+.field private static final live:Ljava/util/ArrayList;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayList<",
+            "Ljava/lang/ref/WeakReference<",
+            "Lradiant/AnimatedCoverView;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+
+# instance fields
+.field private albumId:I
+
+.field private final host:Landroid/view/ViewGroup;
+
+.field private outlined:Z
+
+.field private player:Landroid/media/MediaPlayer;
+
+.field private surface:Landroid/view/Surface;
+
+.field private final target:Landroid/widget/ImageView;
+
+.field private url:Ljava/lang/String;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .registers 1
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    sput-object v0, Lradiant/AnimatedCoverView;->live:Ljava/util/ArrayList;
+
+    return-void
+.end method
+
+.method private constructor <init>(Landroid/widget/ImageView;Landroid/view/ViewGroup;)V
+    .registers 4
+
+    invoke-virtual {p1}, Landroid/widget/ImageView;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-direct {p0, v0}, Landroid/view/TextureView;-><init>(Landroid/content/Context;)V
+
+    const/4 v0, -0x1
+
+    iput v0, p0, Lradiant/AnimatedCoverView;->albumId:I
+
+    iput-object p1, p0, Lradiant/AnimatedCoverView;->target:Landroid/widget/ImageView;
+
+    iput-object p2, p0, Lradiant/AnimatedCoverView;->host:Landroid/view/ViewGroup;
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lradiant/AnimatedCoverView;->setOpaque(Z)V
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lradiant/AnimatedCoverView;->setAlpha(F)V
+
+    const/4 p1, 0x4
+
+    invoke-virtual {p0, p1}, Lradiant/AnimatedCoverView;->setVisibility(I)V
+
+    invoke-virtual {p0, p0}, Lradiant/AnimatedCoverView;->setSurfaceTextureListener(Landroid/view/TextureView$SurfaceTextureListener;)V
+
+    const/4 p1, 0x2
+
+    invoke-virtual {p0, p1}, Lradiant/AnimatedCoverView;->setImportantForAccessibility(I)V
+
+    return-void
+.end method
+
+.method public static attach(Landroid/widget/ImageView;I)V
+    .registers 8
+
+    if-nez p0, :cond_3
+
+    return-void
+
+    :cond_3
+    :try_start_3
+    invoke-static {p0}, Lradiant/AnimatedCoverView;->find(Landroid/widget/ImageView;)Lradiant/AnimatedCoverView;
+
+    move-result-object v0
+
+    if-nez v0, :cond_60
+
+    invoke-static {p0}, Lradiant/AnimatedCoverView;->frameAncestor(Landroid/view/View;)Landroid/view/ViewGroup;
+
+    move-result-object v0
+
+    if-nez v0, :cond_10
+
+    return-void
+
+    :cond_10
+    new-instance v1, Lradiant/AnimatedCoverView;
+
+    invoke-direct {v1, p0, v0}, Lradiant/AnimatedCoverView;-><init>(Landroid/widget/ImageView;Landroid/view/ViewGroup;)V
+
+    invoke-static {}, Landroid/view/View;->generateViewId()I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Lradiant/AnimatedCoverView;->setId(I)V
+
+    new-instance v2, Landroid/view/ViewGroup$LayoutParams;
+
+    invoke-virtual {p0}, Landroid/widget/ImageView;->getWidth()I
+
+    move-result v3
+
+    const/4 v4, 0x1
+
+    invoke-static {v4, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v3
+
+    invoke-virtual {p0}, Landroid/widget/ImageView;->getHeight()I
+
+    move-result v5
+
+    invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I
+
+    move-result v4
+
+    invoke-direct {v2, v3, v4}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
+
+    invoke-virtual {v0, v1, v2}, Landroid/view/ViewGroup;->addView(Landroid/view/View;Landroid/view/ViewGroup$LayoutParams;)V
+
+    invoke-virtual {p0, v1}, Landroid/widget/ImageView;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
+
+    invoke-virtual {p0, v1}, Landroid/widget/ImageView;->addOnAttachStateChangeListener(Landroid/view/View$OnAttachStateChangeListener;)V
+
+    invoke-virtual {p0}, Landroid/widget/ImageView;->getParent()Landroid/view/ViewParent;
+
+    move-result-object v2
+
+    instance-of v2, v2, Landroid/view/View;
+
+    if-eqz v2, :cond_52
+
+    invoke-virtual {p0}, Landroid/widget/ImageView;->getParent()Landroid/view/ViewParent;
+
+    move-result-object v2
+
+    if-eq v2, v0, :cond_52
+
+    invoke-virtual {p0}, Landroid/widget/ImageView;->getParent()Landroid/view/ViewParent;
+
+    move-result-object p0
+
+    check-cast p0, Landroid/view/View;
+
+    invoke-virtual {p0, v1}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
+
+    :cond_52
+    sget-object p0, Lradiant/AnimatedCoverView;->live:Ljava/util/ArrayList;
+
+    new-instance v0, Ljava/lang/ref/WeakReference;
+
+    invoke-direct {v0, v1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
+
+    invoke-virtual {p0, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    invoke-direct {v1}, Lradiant/AnimatedCoverView;->sync()V
+
+    move-object v0, v1
+
+    :cond_60
+    iput p1, v0, Lradiant/AnimatedCoverView;->albumId:I
+
+    invoke-direct {v0}, Lradiant/AnimatedCoverView;->refresh()V
+    :try_end_65
+    .catchall {:try_start_3 .. :try_end_65} :catchall_66
+
+    goto :goto_67
+
+    :catchall_66
+    move-exception p0
+
+    :goto_67
+    return-void
+.end method
+
+.method private static find(Landroid/widget/ImageView;)Lradiant/AnimatedCoverView;
+    .registers 4
+
+    sget-object v0, Lradiant/AnimatedCoverView;->live:Ljava/util/ArrayList;
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :cond_6
+    :goto_6
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_23
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lradiant/AnimatedCoverView;
+
+    if-nez v1, :cond_1e
+
+    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
+
+    goto :goto_6
+
+    :cond_1e
+    iget-object v2, v1, Lradiant/AnimatedCoverView;->target:Landroid/widget/ImageView;
+
+    if-ne v2, p0, :cond_6
+
+    return-object v1
+
+    :cond_23
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method private static frameAncestor(Landroid/view/View;)Landroid/view/ViewGroup;
+    .registers 2
+
+    invoke-virtual {p0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+    move-result-object p0
+
+    :goto_4
+    instance-of v0, p0, Landroid/view/ViewGroup;
+
+    if-eqz v0, :cond_14
+
+    instance-of v0, p0, Landroid/widget/FrameLayout;
+
+    if-eqz v0, :cond_f
+
+    check-cast p0, Landroid/view/ViewGroup;
+
+    return-object p0
+
+    :cond_f
+    invoke-interface {p0}, Landroid/view/ViewParent;->getParent()Landroid/view/ViewParent;
+
+    move-result-object p0
+
+    goto :goto_4
+
+    :cond_14
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
+.method private refresh()V
+    .registers 3
+
+    iget v0, p0, Lradiant/AnimatedCoverView;->albumId:I
+
+    invoke-static {v0}, Lradiant/AnimatedCovers;->urlFor(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lradiant/AnimatedCoverView;->url:Ljava/lang/String;
+
+    if-nez v0, :cond_d
+
+    if-nez v1, :cond_14
+
+    goto :goto_13
+
+    :cond_d
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_14
+
+    :goto_13
+    return-void
+
+    :cond_14
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->release()V
+
+    iput-object v0, p0, Lradiant/AnimatedCoverView;->url:Ljava/lang/String;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {p0, v1}, Lradiant/AnimatedCoverView;->setAlpha(F)V
+
+    if-nez v0, :cond_24
+
+    const/4 v0, 0x4
+
+    invoke-virtual {p0, v0}, Lradiant/AnimatedCoverView;->setVisibility(I)V
+
+    return-void
+
+    :cond_24
+    const/4 v0, 0x0
+
+    invoke-virtual {p0, v0}, Lradiant/AnimatedCoverView;->setVisibility(I)V
+
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->start()V
+
+    return-void
+.end method
+
+.method static refreshAll()V
+    .registers 2
+
+    :try_start_0
+    sget-object v0, Lradiant/AnimatedCoverView;->live:Ljava/util/ArrayList;
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_6
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_23
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/ref/WeakReference;
+
+    invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lradiant/AnimatedCoverView;
+
+    if-nez v1, :cond_1e
+
+    invoke-interface {v0}, Ljava/util/Iterator;->remove()V
+
+    goto :goto_6
+
+    :cond_1e
+    invoke-direct {v1}, Lradiant/AnimatedCoverView;->refresh()V
+    :try_end_21
+    .catchall {:try_start_0 .. :try_end_21} :catchall_22
+
+    goto :goto_6
+
+    :catchall_22
+    move-exception v0
+
+    :cond_23
+    return-void
+.end method
+
+.method private release()V
+    .registers 3
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    const/4 v1, 0x0
+
+    iput-object v1, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    if-eqz v0, :cond_c
+
+    :try_start_7
+    invoke-virtual {v0}, Landroid/media/MediaPlayer;->release()V
+    :try_end_a
+    .catchall {:try_start_7 .. :try_end_a} :catchall_b
+
+    goto :goto_c
+
+    :catchall_b
+    move-exception v0
+
+    :cond_c
+    :goto_c
+    return-void
+.end method
+
+.method private start()V
+    .registers 3
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->url:Ljava/lang/String;
+
+    if-eqz v0, :cond_37
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->surface:Landroid/view/Surface;
+
+    if-eqz v0, :cond_37
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    if-eqz v0, :cond_d
+
+    goto :goto_37
+
+    :cond_d
+    :try_start_d
+    new-instance v0, Landroid/media/MediaPlayer;
+
+    invoke-direct {v0}, Landroid/media/MediaPlayer;-><init>()V
+
+    iput-object v0, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    iget-object v1, p0, Lradiant/AnimatedCoverView;->surface:Landroid/view/Surface;
+
+    invoke-virtual {v0, v1}, Landroid/media/MediaPlayer;->setSurface(Landroid/view/Surface;)V
+
+    invoke-virtual {v0, p0}, Landroid/media/MediaPlayer;->setOnPreparedListener(Landroid/media/MediaPlayer$OnPreparedListener;)V
+
+    invoke-virtual {v0, p0}, Landroid/media/MediaPlayer;->setOnInfoListener(Landroid/media/MediaPlayer$OnInfoListener;)V
+
+    invoke-virtual {v0, p0}, Landroid/media/MediaPlayer;->setOnErrorListener(Landroid/media/MediaPlayer$OnErrorListener;)V
+
+    const/4 v1, 0x1
+
+    invoke-virtual {v0, v1}, Landroid/media/MediaPlayer;->setLooping(Z)V
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1, v1}, Landroid/media/MediaPlayer;->setVolume(FF)V
+
+    iget-object v1, p0, Lradiant/AnimatedCoverView;->url:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Landroid/media/MediaPlayer;->prepareAsync()V
+    :try_end_32
+    .catchall {:try_start_d .. :try_end_32} :catchall_33
+
+    goto :goto_37
+
+    :catchall_33
+    move-exception v0
+
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->release()V
+
+    :cond_37
+    :goto_37
+    return-void
+.end method
+
+.method private sync()V
+    .registers 8
+
+    invoke-virtual {p0}, Lradiant/AnimatedCoverView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lradiant/AnimatedCoverView;->target:Landroid/widget/ImageView;
+
+    invoke-virtual {v1}, Landroid/widget/ImageView;->getWidth()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    invoke-static {v2, v1}, Ljava/lang/Math;->max(II)I
+
+    move-result v1
+
+    iget-object v3, p0, Lradiant/AnimatedCoverView;->target:Landroid/widget/ImageView;
+
+    invoke-virtual {v3}, Landroid/widget/ImageView;->getHeight()I
+
+    move-result v3
+
+    invoke-static {v2, v3}, Ljava/lang/Math;->max(II)I
+
+    move-result v3
+
+    if-eqz v0, :cond_2a
+
+    iget v4, v0, Landroid/view/ViewGroup$LayoutParams;->width:I
+
+    if-ne v4, v1, :cond_23
+
+    iget v4, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
+
+    if-eq v4, v3, :cond_2a
+
+    :cond_23
+    iput v1, v0, Landroid/view/ViewGroup$LayoutParams;->width:I
+
+    iput v3, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
+
+    invoke-virtual {p0, v0}, Lradiant/AnimatedCoverView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+    :cond_2a
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->target:Landroid/widget/ImageView;
+
+    const/4 v1, 0x0
+
+    move v3, v1
+
+    move v4, v3
+
+    :goto_2f
+    if-eqz v0, :cond_58
+
+    iget-object v5, p0, Lradiant/AnimatedCoverView;->host:Landroid/view/ViewGroup;
+
+    if-eq v0, v5, :cond_58
+
+    invoke-virtual {v0}, Landroid/view/View;->getLeft()I
+
+    move-result v5
+
+    int-to-float v5, v5
+
+    invoke-virtual {v0}, Landroid/view/View;->getTranslationX()F
+
+    move-result v6
+
+    add-float/2addr v5, v6
+
+    add-float/2addr v3, v5
+
+    invoke-virtual {v0}, Landroid/view/View;->getTop()I
+
+    move-result v5
+
+    int-to-float v5, v5
+
+    invoke-virtual {v0}, Landroid/view/View;->getTranslationY()F
+
+    move-result v6
+
+    add-float/2addr v5, v6
+
+    add-float/2addr v4, v5
+
+    invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+    move-result-object v0
+
+    instance-of v5, v0, Landroid/view/View;
+
+    if-eqz v5, :cond_56
+
+    check-cast v0, Landroid/view/View;
+
+    goto :goto_2f
+
+    :cond_56
+    const/4 v0, 0x0
+
+    goto :goto_2f
+
+    :cond_58
+    if-nez v0, :cond_5b
+
+    return-void
+
+    :cond_5b
+    invoke-virtual {p0}, Lradiant/AnimatedCoverView;->getLeft()I
+
+    move-result v0
+
+    int-to-float v0, v0
+
+    sub-float/2addr v3, v0
+
+    invoke-virtual {p0, v3}, Lradiant/AnimatedCoverView;->setTranslationX(F)V
+
+    invoke-virtual {p0}, Lradiant/AnimatedCoverView;->getTop()I
+
+    move-result v0
+
+    int-to-float v0, v0
+
+    sub-float/2addr v4, v0
+
+    invoke-virtual {p0, v4}, Lradiant/AnimatedCoverView;->setTranslationY(F)V
+
+    iget-boolean v0, p0, Lradiant/AnimatedCoverView;->outlined:Z
+
+    if-nez v0, :cond_8a
+
+    iput-boolean v2, p0, Lradiant/AnimatedCoverView;->outlined:Z
+
+    :try_start_73
+    invoke-virtual {p0}, Lradiant/AnimatedCoverView;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v0
+
+    sget v3, Lcom/aspiro/wamp/R$dimen;->image_header_corner_radius:I
+
+    invoke-virtual {v0, v3}, Landroid/content/res/Resources;->getDimension(I)F
+
+    move-result v1
+    :try_end_7d
+    .catchall {:try_start_73 .. :try_end_7d} :catchall_7e
+
+    goto :goto_7f
+
+    :catchall_7e
+    move-exception v0
+
+    :goto_7f
+    new-instance v0, Lradiant/RoundOutline;
+
+    invoke-direct {v0, v1}, Lradiant/RoundOutline;-><init>(F)V
+
+    invoke-virtual {p0, v0}, Lradiant/AnimatedCoverView;->setOutlineProvider(Landroid/view/ViewOutlineProvider;)V
+
+    invoke-virtual {p0, v2}, Lradiant/AnimatedCoverView;->setClipToOutline(Z)V
+
+    :cond_8a
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->target:Landroid/widget/ImageView;
+
+    invoke-virtual {v0}, Landroid/widget/ImageView;->getVisibility()I
+
+    move-result v0
+
+    if-eqz v0, :cond_9c
+
+    invoke-virtual {p0}, Lradiant/AnimatedCoverView;->getVisibility()I
+
+    move-result v0
+
+    if-nez v0, :cond_9c
+
+    const/4 v0, 0x4
+
+    invoke-virtual {p0, v0}, Lradiant/AnimatedCoverView;->setVisibility(I)V
+
+    :cond_9c
+    return-void
+.end method
+
+
+# virtual methods
+.method public onError(Landroid/media/MediaPlayer;II)Z
+    .registers 4
+
+    iget-object p2, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    if-ne p1, p2, :cond_f
+
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->release()V
+
+    const/4 p1, 0x0
+
+    invoke-virtual {p0, p1}, Lradiant/AnimatedCoverView;->setAlpha(F)V
+
+    const/4 p1, 0x4
+
+    invoke-virtual {p0, p1}, Lradiant/AnimatedCoverView;->setVisibility(I)V
+
+    :cond_f
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public onInfo(Landroid/media/MediaPlayer;II)Z
+    .registers 4
+
+    iget-object p3, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    if-ne p1, p3, :cond_1a
+
+    const/4 p1, 0x3
+
+    if-ne p2, p1, :cond_1a
+
+    invoke-virtual {p0}, Lradiant/AnimatedCoverView;->animate()Landroid/view/ViewPropertyAnimator;
+
+    move-result-object p1
+
+    const/high16 p2, 0x3f800000    # 1.0f
+
+    invoke-virtual {p1, p2}, Landroid/view/ViewPropertyAnimator;->alpha(F)Landroid/view/ViewPropertyAnimator;
+
+    move-result-object p1
+
+    const-wide/16 p2, 0x12c
+
+    invoke-virtual {p1, p2, p3}, Landroid/view/ViewPropertyAnimator;->setDuration(J)Landroid/view/ViewPropertyAnimator;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroid/view/ViewPropertyAnimator;->start()V
+
+    :cond_1a
+    const/4 p1, 0x0
+
+    return p1
+.end method
+
+.method public onLayoutChange(Landroid/view/View;IIIIIIII)V
+    .registers 10
+
+    invoke-virtual {p0, p0}, Lradiant/AnimatedCoverView;->post(Ljava/lang/Runnable;)Z
+
+    return-void
+.end method
+
+.method public onPrepared(Landroid/media/MediaPlayer;)V
+    .registers 3
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->player:Landroid/media/MediaPlayer;
+
+    if-ne p1, v0, :cond_7
+
+    invoke-virtual {p1}, Landroid/media/MediaPlayer;->start()V
+
+    :cond_7
+    return-void
+.end method
+
+.method public onSurfaceTextureAvailable(Landroid/graphics/SurfaceTexture;II)V
+    .registers 4
+
+    new-instance p2, Landroid/view/Surface;
+
+    invoke-direct {p2, p1}, Landroid/view/Surface;-><init>(Landroid/graphics/SurfaceTexture;)V
+
+    iput-object p2, p0, Lradiant/AnimatedCoverView;->surface:Landroid/view/Surface;
+
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->start()V
+
+    return-void
+.end method
+
+.method public onSurfaceTextureDestroyed(Landroid/graphics/SurfaceTexture;)Z
+    .registers 3
+
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->release()V
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lradiant/AnimatedCoverView;->url:Ljava/lang/String;
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->surface:Landroid/view/Surface;
+
+    if-eqz v0, :cond_f
+
+    iget-object v0, p0, Lradiant/AnimatedCoverView;->surface:Landroid/view/Surface;
+
+    invoke-virtual {v0}, Landroid/view/Surface;->release()V
+
+    :cond_f
+    iput-object p1, p0, Lradiant/AnimatedCoverView;->surface:Landroid/view/Surface;
+
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public onSurfaceTextureSizeChanged(Landroid/graphics/SurfaceTexture;II)V
+    .registers 4
+
+    return-void
+.end method
+
+.method public onSurfaceTextureUpdated(Landroid/graphics/SurfaceTexture;)V
+    .registers 2
+
+    return-void
+.end method
+
+.method public onViewAttachedToWindow(Landroid/view/View;)V
+    .registers 2
+
+    :try_start_0
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->refresh()V
+    :try_end_3
+    .catchall {:try_start_0 .. :try_end_3} :catchall_4
+
+    goto :goto_5
+
+    :catchall_4
+    move-exception p1
+
+    :goto_5
+    return-void
+.end method
+
+.method public onViewDetachedFromWindow(Landroid/view/View;)V
+    .registers 2
+
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->release()V
+
+    const/4 p1, 0x0
+
+    iput-object p1, p0, Lradiant/AnimatedCoverView;->url:Ljava/lang/String;
+
+    return-void
+.end method
+
+.method public run()V
+    .registers 2
+
+    :try_start_0
+    invoke-direct {p0}, Lradiant/AnimatedCoverView;->sync()V
+    :try_end_3
+    .catchall {:try_start_0 .. :try_end_3} :catchall_4
+
+    goto :goto_5
+
+    :catchall_4
+    move-exception v0
+
+    :goto_5
+    return-void
+.end method

patches/extension/radiant/HomeBackdrop.smali

@@ -362,7 +362,7 @@
 
     const/4 v15, 0x0    # v15 = changed flags
 
-    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
+    invoke-static/range {v8 .. v15}, Lcom/tidal/android/feature/playerscreen/ui/composables/e3;->a(ILjava/lang/String;ZZLyl0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V
 
     :skip
     invoke-interface {v0}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V

patches/extension/radiant/Kawarp.smali

@@ -2,10 +2,10 @@
 .super Ljava/lang/Object;
 
 # interfaces
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 .implements Ljava/lang/Runnable;
 .implements Landroid/view/Choreographer$FrameCallback;
-.implements Lb0/c;    # MARKER: R8 Lb0/c;
+.implements Lc0/c;    # MARKER: R8 Lc0/c;
 
 
 # static fields
@@ -31,7 +31,7 @@
 
 .field private static volatile loadToken:I
 
-.field private static volatile loader:Lcoil/f;    # MARKER: R8 Lcoil/f;
+.field private static volatile loader:Lcoil/e;    # MARKER: R8 Lcoil/e;
 
 .field private static volatile requestedUuid:Ljava/lang/String;
 
@@ -100,7 +100,7 @@
 .method private static attach(Landroidx/compose/runtime/Composer;)V
     .registers 3
 
-    sget-object v0, Lradiant/Kawarp;->loader:Lcoil/f;    # MARKER: R8 Lcoil/f;
+    sget-object v0, Lradiant/Kawarp;->loader:Lcoil/e;    # MARKER: R8 Lcoil/e;
 
     if-eqz v0, :cond_5
 
@@ -129,7 +129,7 @@
 
     move-result-object p0
 
-    instance-of v0, p0, Lce0/b$a;    # MARKER: R8 Lce0/b$a;
+    instance-of v0, p0, Lud0/b$a;    # MARKER: R8 Lud0/b$a;
 
     if-nez v0, :cond_1d
 
@@ -138,13 +138,13 @@
     :cond_1d
     move-object v0, p0
 
-    check-cast v0, Lce0/b$a;    # MARKER: R8 Lce0/b$a;
+    check-cast v0, Lud0/b$a;    # MARKER: R8 Lud0/b$a;
 
-    invoke-interface {v0}, Lce0/b$a;->a()Lce0/b;    # MARKER: R8 Lce0/b$a; Lce0/b; a
+    invoke-interface {v0}, Lud0/b$a;->a()Lud0/b;    # MARKER: R8 Lud0/b$a; Lud0/b; a
 
     move-result-object v0
 
-    invoke-interface {v0}, Lce0/b;->a()Lxd0/e;    # MARKER: R8 Lce0/b; Lxd0/e; a
+    invoke-interface {v0}, Lud0/b;->a()Lpd0/e;    # MARKER: R8 Lud0/b; Lpd0/e; a
 
     move-result-object v0
 
@@ -159,9 +159,9 @@
 
     check-cast v0, Lcom/tidal/android/image/coil/base/CoilImageLoader;
 
-    iget-object p0, v0, Lcom/tidal/android/image/coil/base/CoilImageLoader;->a:Lcoil/f;    # MARKER: R8 Lcoil/f; a
+    iget-object p0, v0, Lcom/tidal/android/image/coil/base/CoilImageLoader;->a:Lcoil/e;    # MARKER: R8 Lcoil/e; a
 
-    sput-object p0, Lradiant/Kawarp;->loader:Lcoil/f;    # MARKER: R8 Lcoil/f;
+    sput-object p0, Lradiant/Kawarp;->loader:Lcoil/e;    # MARKER: R8 Lcoil/e;
     :try_end_35
     .catchall {:try_start_5 .. :try_end_35} :catchall_36
 
@@ -174,7 +174,7 @@
     return-void
 .end method
 
-.method public static b(Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;JILjava/lang/String;ZZLam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # MARKER: R8 Lam0/a;
+.method public static b(Lcom/tidal/android/feature/playerscreen/ui/model/PlayerBackgroundStyle;JILjava/lang/String;ZZLyl0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # MARKER: R8 Lyl0/a;
     .registers 11
 
     invoke-static {p3, p4, p5, p8, p9}, Lradiant/Kawarp;->render(ILjava/lang/String;ZLandroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;)V
@@ -471,7 +471,7 @@
 
     sget-object p1, Lradiant/Kawarp;->DRAW:Lradiant/Kawarp;
 
-    invoke-static {p0, p1}, Landroidx/compose/ui/draw/DrawModifierKt;->drawBehind(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, p1}, Landroidx/compose/ui/draw/DrawModifierKt;->drawBehind(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
@@ -500,7 +500,7 @@
 
     move-object v6, p4
 
-    invoke-static/range {v0 .. v7}, Lcom/tidal/android/feature/playerscreen/ui/composables/p3;->a(ILjava/lang/String;ZZLam0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # MARKER: R8 Lcom/tidal/android/feature/playerscreen/ui/composables/p3; Lam0/a; a
+    invoke-static/range {v0 .. v7}, Lcom/tidal/android/feature/playerscreen/ui/composables/e3;->a(ILjava/lang/String;ZZLyl0/a;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V    # MARKER: R8 Lcom/tidal/android/feature/playerscreen/ui/composables/e3; Lyl0/a; a
 
     :goto_42
     invoke-interface {v6}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V
@@ -530,7 +530,7 @@
     goto :goto_28
 
     :cond_11
-    sget-object v0, Lradiant/Kawarp;->loader:Lcoil/f;    # MARKER: R8 Lcoil/f;
+    sget-object v0, Lradiant/Kawarp;->loader:Lcoil/e;    # MARKER: R8 Lcoil/e;
 
     if-nez v0, :cond_16
 
@@ -671,7 +671,7 @@
     return-void
 .end method
 
-.method public d(Landroid/graphics/drawable/Drawable;)V
+.method public c(Landroid/graphics/drawable/Drawable;)V
     .registers 2
 
     invoke-direct {p0}, Lradiant/Kawarp;->fail()V
@@ -734,7 +734,7 @@
     .registers 15
 
     :try_start_0
-    new-instance v0, Lxd0/g;    # MARKER: R8 Lxd0/g;
+    new-instance v0, Lpd0/g;    # MARKER: R8 Lpd0/g;
 
     sget-object v1, Lradiant/Kawarp;->appContext:Landroid/content/Context;
 
@@ -762,11 +762,11 @@
 
     const/4 v6, 0x0
 
-    invoke-direct/range {v0 .. v8}, Lxd0/g;-><init>(Landroid/content/Context;Lcom/tidal/android/image/core/b;Lcom/tidal/android/image/core/b$h$a;Lcom/tidal/android/image/core/b$h$a;ZLjava/util/List;Lxd0/f;Z)V    # MARKER: R8 Lxd0/g; Lcom/tidal/android/image/core/b; Lcom/tidal/android/image/core/b$h$a; Lxd0/f;
+    invoke-direct/range {v0 .. v8}, Lpd0/g;-><init>(Landroid/content/Context;Lcom/tidal/android/image/core/b;Lcom/tidal/android/image/core/b$h$a;Lcom/tidal/android/image/core/b$h$a;ZLjava/util/List;Lpd0/f;Z)V    # MARKER: R8 Lpd0/g; Lcom/tidal/android/image/core/b; Lcom/tidal/android/image/core/b$h$a; Lpd0/f;
 
     const/4 v1, 0x0
 
-    invoke-static {v0, v1}, Lcom/tidal/android/image/coil/c;->a(Lxd0/g;Landroidx/compose/ui/layout/ContentScale;)Lcoil/request/h;    # MARKER: R8 Lcom/tidal/android/image/coil/c; Lxd0/g; Lcoil/request/h; a
+    invoke-static {v0, v1}, Lcom/tidal/android/image/coil/c;->a(Lpd0/g;Landroidx/compose/ui/layout/ContentScale;)Lcoil/request/h;    # MARKER: R8 Lcom/tidal/android/image/coil/c; Lpd0/g; Lcoil/request/h; a
 
     move-result-object v0
 
@@ -786,7 +786,7 @@
 
     iget-object v6, v1, Lcoil/request/b;->d:Lkotlinx/coroutines/CoroutineDispatcher;    # MARKER: R8 Lcoil/request/b; d
 
-    iget-object v7, v1, Lcoil/request/b;->e:Ld0/c$a;    # MARKER: R8 Lcoil/request/b; Ld0/c$a; e
+    iget-object v7, v1, Lcoil/request/b;->e:Le0/c$a;    # MARKER: R8 Lcoil/request/b; Le0/c$a; e
 
     iget-object v8, v1, Lcoil/request/b;->f:Lcoil/size/Precision;    # MARKER: R8 Lcoil/request/b; f
 
@@ -800,19 +800,19 @@
 
     sget-object v13, Lcoil/request/CachePolicy;->DISABLED:Lcoil/request/CachePolicy;
 
-    invoke-direct/range {v2 .. v13}, Lcoil/request/b;-><init>(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlinx/coroutines/CoroutineDispatcher;Lkotlinx/coroutines/CoroutineDispatcher;Lkotlinx/coroutines/CoroutineDispatcher;Ld0/c$a;Lcoil/size/Precision;Landroid/graphics/Bitmap$Config;ZLcoil/request/CachePolicy;Lcoil/request/CachePolicy;Lcoil/request/CachePolicy;)V    # MARKER: R8 Lcoil/request/b; Ld0/c$a;
+    invoke-direct/range {v2 .. v13}, Lcoil/request/b;-><init>(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlinx/coroutines/CoroutineDispatcher;Lkotlinx/coroutines/CoroutineDispatcher;Lkotlinx/coroutines/CoroutineDispatcher;Le0/c$a;Lcoil/size/Precision;Landroid/graphics/Bitmap$Config;ZLcoil/request/CachePolicy;Lcoil/request/CachePolicy;Lcoil/request/CachePolicy;)V    # MARKER: R8 Lcoil/request/b; Le0/c$a;
 
     iput-object v2, v0, Lcoil/request/h$a;->b:Lcoil/request/b;    # MARKER: R8 Lcoil/request/h$a; Lcoil/request/b; b
 
-    iput-object p0, v0, Lcoil/request/h$a;->d:Lb0/c;    # MARKER: R8 Lcoil/request/h$a; Lb0/c; d
+    iput-object p0, v0, Lcoil/request/h$a;->d:Lc0/c;    # MARKER: R8 Lcoil/request/h$a; Lc0/c; d
 
-    sget-object v1, Lradiant/Kawarp;->loader:Lcoil/f;    # MARKER: R8 Lcoil/f;
+    sget-object v1, Lradiant/Kawarp;->loader:Lcoil/e;    # MARKER: R8 Lcoil/e;
 
     invoke-virtual {v0}, Lcoil/request/h$a;->a()Lcoil/request/h;    # MARKER: R8 Lcoil/request/h$a; Lcoil/request/h; a
 
     move-result-object v0
 
-    invoke-interface {v1, v0}, Lcoil/f;->b(Lcoil/request/h;)Lcoil/request/d;    # MARKER: R8 Lcoil/f; Lcoil/request/h; Lcoil/request/d; b
+    invoke-interface {v1, v0}, Lcoil/e;->b(Lcoil/request/h;)Lcoil/request/d;    # MARKER: R8 Lcoil/e; Lcoil/request/h; Lcoil/request/d; b
     :try_end_4d
     .catchall {:try_start_0 .. :try_end_4d} :catchall_4e
 

patches/extension/radiant/MiniPlayerBackground.smali

@@ -48,7 +48,7 @@
 
     const/4 v4, 0x1
 
-    invoke-static {v0, v1, p2, v3, v4}, Landroidx/compose/runtime/SnapshotStateKt;->collectAsState(Lkotlinx/coroutines/flow/StateFlow;Lkotlin/coroutines/h;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;    # MARKER: R8 Lkotlin/coroutines/h;
+    invoke-static {v0, v1, p2, v3, v4}, Landroidx/compose/runtime/SnapshotStateKt;->collectAsState(Lkotlinx/coroutines/flow/StateFlow;Lkotlin/coroutines/g;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;    # MARKER: R8 Lkotlin/coroutines/g;
 
     move-result-object v0
 
@@ -91,7 +91,7 @@
 
     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;    # MARKER: R8 Lam0/l;
+    invoke-static/range {v0 .. v7}, Landroidx/compose/animation/SingleValueAnimationKt;->animateColorAsState-euL9pac(JLandroidx/compose/animation/core/AnimationSpec;Ljava/lang/String;Lyl0/l;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;    # MARKER: R8 Lyl0/l;
 
     move-result-object v0
 

patches/extension/radiant/MiniSeekerFloating.smali

@@ -1,7 +1,7 @@
 .class public final Lradiant/MiniSeekerFloating;
 .super Ljava/lang/Object;
 
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/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:Lgh/j;    # MARKER: R8 Lgh/j;
+.field public static volatile vm:Leh/j;    # MARKER: R8 Leh/j;
 
 .field public static volatile sub:Lio/reactivex/disposables/Disposable;
 
@@ -57,7 +57,7 @@
 
     :start_block
     :try_start
-    sget-object v0, Lradiant/MiniSeekerLine;->vm:Lgh/j;    # cached vm  MARKER: R8 Lgh/j;
+    sget-object v0, Lradiant/MiniSeekerLine;->vm:Leh/j;    # cached vm  MARKER: R8 Leh/j;
 
     if-nez v0, :got_vm    # reuse if present
 
@@ -69,28 +69,28 @@
 
     move-result-object v0    # component
 
-    check-cast v0, Le5/z$n2;    # narrow type  MARKER: R8 Le5/z$n2;
+    check-cast v0, Le5/d0$t2;    # narrow type  MARKER: R8 Le5/d0$t2;
 
-    iget-object v0, v0, Le5/z$n2;->z0:Ldagger/internal/j;    # playqueue provider  MARKER: R8 Le5/z$n2; Ldagger/internal/j; z0
+    iget-object v0, v0, Le5/d0$t2;->e1:Ldagger/internal/j;    # playqueue provider  MARKER: R8 Le5/d0$t2; Ldagger/internal/j; z0
 
-    invoke-interface {v0}, Lql0/a;->get()Ljava/lang/Object;    # resolve  MARKER: R8 Lql0/a;
+    invoke-interface {v0}, Lol0/a;->get()Ljava/lang/Object;    # resolve  MARKER: R8 Lol0/a;
 
     move-result-object v0    # playqueue
 
-    check-cast v0, Lcom/aspiro/wamp/playqueue/d1;    # narrow type  MARKER: R8 Lcom/aspiro/wamp/playqueue/d1;
+    check-cast v0, Lcom/aspiro/wamp/playqueue/v0;    # narrow type  MARKER: R8 Lcom/aspiro/wamp/playqueue/v0;
 
-    new-instance v1, Lgh/j;    # build vm  MARKER: R8 Lgh/j;
+    new-instance v1, Leh/j;    # build vm  MARKER: R8 Leh/j;
 
-    invoke-direct {v1, v0}, Lgh/j;-><init>(Lcom/aspiro/wamp/playqueue/d1;)V    # ctor  MARKER: R8 Lgh/j; Lcom/aspiro/wamp/playqueue/d1;
+    invoke-direct {v1, v0}, Leh/j;-><init>(Lcom/aspiro/wamp/playqueue/v0;)V    # ctor  MARKER: R8 Leh/j; Lcom/aspiro/wamp/playqueue/v0;
 
-    sput-object v1, Lradiant/MiniSeekerLine;->vm:Lgh/j;    # cache  MARKER: R8 Lgh/j;
+    sput-object v1, Lradiant/MiniSeekerLine;->vm:Leh/j;    # cache  MARKER: R8 Leh/j;
 
     :got_vm
-    sget-object v0, Lradiant/MiniSeekerLine;->vm:Lgh/j;    # vm ref  MARKER: R8 Lgh/j;
+    sget-object v0, Lradiant/MiniSeekerLine;->vm:Leh/j;    # vm ref  MARKER: R8 Leh/j;
 
-    invoke-virtual {v0}, Lgh/j;->a()V    # activate emission  MARKER: R8 Lgh/j; a
+    invoke-virtual {v0}, Leh/j;->a()V    # activate emission  MARKER: R8 Leh/j; a
 
-    iget-object v0, v0, Lgh/j;->d:Lio/reactivex/subjects/BehaviorSubject;    # position subject  MARKER: R8 Lgh/j; d
+    iget-object v0, v0, Leh/j;->d:Lio/reactivex/subjects/BehaviorSubject;    # position subject  MARKER: R8 Leh/j; d
 
     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 Lam0/a;    # MARKER: R8 Lam0/a;
+.implements Lyl0/a;    # MARKER: R8 Lyl0/a;
 
 
 # static fields

patches/extension/radiant/PebbleBridge$1.smali

@@ -0,0 +1,56 @@
+.class Lradiant/PebbleBridge$1;
+.super Ljava/lang/Object;
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lradiant/PebbleBridge;->onPosition(J)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x0
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic val$at:J
+
+.field final synthetic val$position:J
+
+
+# direct methods
+.method constructor <init>(JJ)V
+    .registers 5
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    iput-wide p1, p0, Lradiant/PebbleBridge$1;->val$position:J
+
+    iput-wide p3, p0, Lradiant/PebbleBridge$1;->val$at:J
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .registers 5
+
+    iget-wide v0, p0, Lradiant/PebbleBridge$1;->val$position:J
+
+    iget-wide v2, p0, Lradiant/PebbleBridge$1;->val$at:J
+
+    # invokes: Lradiant/PebbleBridge;->onSample(JJ)V
+    invoke-static {v0, v1, v2, v3}, Lradiant/PebbleBridge;->access$000(JJ)V
+
+    return-void
+.end method

patches/extension/radiant/PebbleBridge$2.smali

@@ -0,0 +1,50 @@
+.class Lradiant/PebbleBridge$2;
+.super Ljava/lang/Object;
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lradiant/PebbleBridge;->onLyrics(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x0
+    name = null
+.end annotation
+
+
+# direct methods
+.method constructor <init>()V
+    .registers 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+    .registers 2
+
+    # getter for: Lradiant/PebbleBridge;->instance:Lradiant/PebbleBridge;
+    invoke-static {}, Lradiant/PebbleBridge;->access$100()Lradiant/PebbleBridge;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_d
+
+    # getter for: Lradiant/PebbleBridge;->instance:Lradiant/PebbleBridge;
+    invoke-static {}, Lradiant/PebbleBridge;->access$100()Lradiant/PebbleBridge;
+
+    move-result-object v0
+
+    # invokes: Lradiant/PebbleBridge;->sendLyrics()V
+    invoke-static {v0}, Lradiant/PebbleBridge;->access$200(Lradiant/PebbleBridge;)V
+
+    :cond_d
+    return-void
+.end method

patches/extension/radiant/PlayerAction.smali

@@ -0,0 +1,43 @@
+.class public final Lradiant/PlayerAction;
+.super Ljava/lang/Object;
+.implements Lyl0/a;    # MARKER: R8 Lyl0/a;
+
+# Click lambda that sends a player action
+
+
+# instance fields
+.field public final a:Lyl0/l;    # MARKER: R8 Lyl0/l;
+
+.field public final b:Ljava/lang/Object;
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    check-cast p1, Lyl0/l;    # MARKER: R8 Lyl0/l;
+
+    iput-object p1, p0, Lradiant/PlayerAction;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
+
+    iput-object p2, p0, Lradiant/PlayerAction;->b:Ljava/lang/Object;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final invoke()Ljava/lang/Object;
+    .locals 2
+
+    iget-object v0, p0, Lradiant/PlayerAction;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
+
+    iget-object v1, p0, Lradiant/PlayerAction;->b:Ljava/lang/Object;
+
+    invoke-interface {v0, v1}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
+
+    sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;
+
+    return-object v0
+.end method

patches/extension/radiant/QualityBadge.smali

@@ -85,15 +85,15 @@
     return-object p0
 .end method
 
-.method public static style(ILq20/c2;)Lq20/c2;    # MARKER: R8 Lq20/c2;
+.method public static style(ILw10/c2;)Lw10/c2;    # MARKER: R8 Lw10/c2;
     .registers 16
 
     invoke-static {p0}, Lradiant/QualityBadge;->textArgb(I)I
 
     move-result v0
-    new-instance v1, Lf20/a;    # MARKER: R8 Lf20/a;
-    invoke-direct {v1, v0}, Lf20/a;-><init>(I)V    # MARKER: R8 Lf20/a;
-    new-instance v0, Lf20/d;    # MARKER: R8 Lf20/d;
+    new-instance v1, Ll10/a;    # MARKER: R8 Ll10/a;
+    invoke-direct {v1, v0}, Ll10/a;-><init>(I)V    # MARKER: R8 Ll10/a;
+    new-instance v0, Ll10/d;    # MARKER: R8 Ll10/d;
     const/4 v2, 0x0
     const/4 v3, 0x0
     const/4 v4, 0x0
@@ -107,7 +107,7 @@
     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    # MARKER: R8 Lf20/d; Lf20/a;
+    invoke-direct/range {v0 .. v14}, Ll10/d;-><init>(Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;Ll10/a;ILkotlin/jvm/internal/DefaultConstructorMarker;)V    # MARKER: R8 Ll10/d; Ll10/a;
 
     move-object v9, v0
     move-object/from16 v0, p1
@@ -118,7 +118,7 @@
     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;    # MARKER: R8 Lq20/c2; Lq20/s4; Lf20/d; Lq20/r4; g
+    invoke-static/range {v0 .. v7}, Lw10/c2;->g(Lw10/c2;Lw10/s4;Ll10/d;Lcom/squareup/ui/market/core/text/MarketTextAlignment;Lcom/squareup/ui/market/core/text/MarketTextTransform;Lw10/r4;ILjava/lang/Object;)Lw10/c2;    # MARKER: R8 Lw10/c2; Lw10/s4; Ll10/d; Lw10/r4; g
     move-result-object p0
     return-object p0
 .end method

patches/extension/radiant/RLAPILyricsHook.smali

@@ -223,7 +223,7 @@
     return-void
 
     :rl_new_track
-    iget-object v5, p0, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
+    iget-object v5, p0, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->S:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
 
     invoke-interface {v5}, Lkotlinx/coroutines/flow/MutableStateFlow;->getValue()Ljava/lang/Object;
 
@@ -243,7 +243,7 @@
 
     if-eq p0, v6, :store_keep_open
 
-    iget-object v7, v6, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
+    iget-object v7, v6, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->S:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
 
     invoke-interface {v7}, Lkotlinx/coroutines/flow/MutableStateFlow;->getValue()Ljava/lang/Object;
 

patches/extension/radiant/RLAPILyricsWorker.smali

@@ -63,7 +63,7 @@
 
     iget-object v1, p0, Lradiant/RLAPILyricsWorker;->vm:Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;
 
-    iget-object v2, v1, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
+    iget-object v2, v1, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->S:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
 
     sget-object v3, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -82,15 +82,15 @@
 
     if-ne v0, v1, :not_current
 
-    iget-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->a:Lbi/e;    # MARKER: R8 Lbi/e; a
+    iget-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->a:Lzh/e;    # MARKER: R8 Lzh/e; a
 
-    invoke-interface {v1}, Lbi/e;->getCurrentItem()Lcom/aspiro/wamp/playqueue/u0;    # MARKER: R8 Lbi/e; Lcom/aspiro/wamp/playqueue/u0;
+    invoke-interface {v1}, Lzh/e;->getCurrentItem()Lcom/aspiro/wamp/playqueue/q0;    # MARKER: R8 Lzh/e; Lcom/aspiro/wamp/playqueue/q0;
 
     move-result-object v1
 
     if-eqz v1, :not_current
 
-    invoke-interface {v1}, Lcom/aspiro/wamp/playqueue/u0;->getMediaItem()Lcom/aspiro/wamp/model/MediaItem;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/u0;
+    invoke-interface {v1}, Lcom/aspiro/wamp/playqueue/q0;->getMediaItem()Lcom/aspiro/wamp/model/MediaItem;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/q0;
 
     move-result-object v1
 
@@ -855,9 +855,9 @@
 
     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;->O:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 O
+    iget-object v5, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->R:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 O
 
-    invoke-static {v3}, Lvn0/a;->c(Ljava/lang/Iterable;)Lvn0/b;    # MARKER: R8 Lvn0/a; Lvn0/b; c
+    invoke-static {v3}, Ltn0/a;->c(Ljava/lang/Iterable;)Ltn0/b;    # MARKER: R8 Ltn0/a; Ltn0/b; c
 
     move-result-object v6
 
@@ -874,7 +874,7 @@
 
     const/4 v10, 0x0
 
-    invoke-direct {v8, v7, v6, v9, v10}, Lcom/tidal/android/feature/playerscreen/ui/g$c;-><init>(Ljava/lang/String;Lvn0/b;IZ)V    # MARKER: R8 Lcom/tidal/android/feature/playerscreen/ui/g$c; Lvn0/b;
+    invoke-direct {v8, v7, v6, v9, v10}, Lcom/tidal/android/feature/playerscreen/ui/g$c;-><init>(Ljava/lang/String;Ltn0/b;IZ)V    # MARKER: R8 Lcom/tidal/android/feature/playerscreen/ui/g$c; Ltn0/b;
 
     const-string v6, "publishing g$c -> K=true (O=true if sticky) N=g$c"
 
@@ -886,7 +886,7 @@
 
     sput-boolean v6, Lradiant/RLAPILyricsHook;->isRlState:Z
 
-    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->K:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 K
+    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->N:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 K
 
     sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
@@ -902,7 +902,7 @@
 
     :open_lyrics
 
-    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->P:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
+    iget-object v6, v4, Lcom/tidal/android/feature/playerscreen/ui/PlayerViewModel;->S:Lkotlinx/coroutines/flow/MutableStateFlow;    # MARKER: R8 P
 
     invoke-interface {v6, v7}, Lkotlinx/coroutines/flow/MutableStateFlow;->setValue(Ljava/lang/Object;)V
 
@@ -921,17 +921,23 @@
 .method public run()V
     .locals 2
 
+    invoke-static {p0}, Lradiant/SparkleIcons;->rlBegin(Ljava/lang/Object;)V    # Spinner while fetching
+
     :try_start
     invoke-direct {p0}, Lradiant/RLAPILyricsWorker;->runImpl()V
 
     :try_end
     .catchall {:try_start .. :try_end} :catch_all
 
+    invoke-static {p0}, Lradiant/SparkleIcons;->rlEnd(Ljava/lang/Object;)V
+
     return-void
 
     :catch_all
     move-exception v0
 
+    invoke-static {p0}, Lradiant/SparkleIcons;->rlEnd(Ljava/lang/Object;)V
+
     invoke-virtual {v0}, Ljava/lang/Throwable;->toString()Ljava/lang/String;
 
     move-result-object v1

patches/extension/radiant/RoundOutline.smali

@@ -0,0 +1,44 @@
+.class public final Lradiant/RoundOutline;
+.super Landroid/view/ViewOutlineProvider;
+
+
+# instance fields
+.field private final radius:F
+
+
+# direct methods
+.method public constructor <init>(F)V
+    .registers 2
+
+    invoke-direct {p0}, Landroid/view/ViewOutlineProvider;-><init>()V
+
+    iput p1, p0, Lradiant/RoundOutline;->radius:F
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public getOutline(Landroid/view/View;Landroid/graphics/Outline;)V
+    .registers 9
+
+    invoke-virtual {p1}, Landroid/view/View;->getWidth()I
+
+    move-result v3
+
+    invoke-virtual {p1}, Landroid/view/View;->getHeight()I
+
+    move-result v4
+
+    iget v5, p0, Lradiant/RoundOutline;->radius:F
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    move-object v0, p2
+
+    invoke-virtual/range {v0 .. v5}, Landroid/graphics/Outline;->setRoundRect(IIIIF)V
+
+    return-void
+.end method

patches/extension/radiant/SeekerConsumer.smali

@@ -20,13 +20,13 @@
 
     if-eqz p1, :ret    # null guard
 
-    instance-of v0, p1, Lgh/b;    # type guard  MARKER: R8 Lgh/b;
+    instance-of v0, p1, Leh/b;    # type guard  MARKER: R8 Leh/b;
 
     if-eqz v0, :ret    # skip if wrong type
 
-    check-cast p1, Lgh/b;    # narrow type  MARKER: R8 Lgh/b;
+    check-cast p1, Leh/b;    # narrow type  MARKER: R8 Leh/b;
 
-    iget v0, p1, Lgh/b;->b:F    # raw progress  MARKER: R8 Lgh/b; b
+    iget v0, p1, Leh/b;->b:F    # raw progress  MARKER: R8 Leh/b; b
 
     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;Lam0/a;)V    # MARKER: R8 Lam0/a;
+.method public static final a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V    # MARKER: R8 Lyl0/a;
     .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/z;->t(Lcom/squareup/ui/market/core/theme/k$a;Landroidx/compose/runtime/Composer;I)Lcom/squareup/ui/market/core/theme/MarketStylesheet;    # MARKER: R8 Lcom/squareup/ui/market/core/theme/z; Lcom/squareup/ui/market/core/theme/k$a; t
+    invoke-static {v2, v11, v4}, Lcom/squareup/ui/market/core/theme/d0;->t(Lcom/squareup/ui/market/core/theme/k$a;Landroidx/compose/runtime/Composer;I)Lcom/squareup/ui/market/core/theme/MarketStylesheet;    # MARKER: R8 Lcom/squareup/ui/market/core/theme/d0; Lcom/squareup/ui/market/core/theme/k$a; t
 
     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;)Lq20/u1;    # MARKER: R8 Lq20/u1; P
+    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;)Lw10/u1;    # MARKER: R8 Lw10/u1; P
 
     move-result-object v4
 
@@ -140,7 +140,7 @@
     :cond_5
     move-object v9, v4
 
-    check-cast v9, Lq20/u1;    # MARKER: R8 Lq20/u1;
+    check-cast v9, Lw10/u1;    # MARKER: R8 Lw10/u1;
 
     sget v2, Lcom/tidal/android/feature/playerscreen/ui/R$string;->lyrics:I
 
@@ -160,19 +160,32 @@
 
     and-int/lit8 v12, v4, 0xe
 
-    const/16 v13, 0xf8
+    const/16 v13, 0xe8    # Pass enabled ourselves
 
     const/4 v4, 0x0
 
+    sget v5, Lradiant/SparkleIcons;->currentMode:I    # Sparkle mode from PlayerScreen
+
+    iput v5, v10, Lradiant/SparkleContent;->m:I
+
+    if-nez v5, :rl_disabled    # Grey out while loading or no lyrics
+
+    const/4 v5, 0x1    # enabled
+
+    goto :rl_enabled_set
+
+    :rl_disabled
     const/4 v5, 0x0
 
+    :rl_enabled_set
+
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
     const/4 v8, 0x0
 
-    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    # MARKER: R8 Lam0/a; Lcom/squareup/ui/market/components/n; Lq20/u1; Lam0/p; b
+    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;Lw10/u1;Lyl0/p;Landroidx/compose/runtime/Composer;II)V    # MARKER: R8 Lyl0/a; Lcom/squareup/ui/market/components/n; Lw10/u1; Lyl0/p; b
 
     invoke-static {}, Landroidx/compose/runtime/ComposerKt;->isTraceInProgress()Z
 

patches/extension/radiant/SparkleContent.smali

@@ -3,7 +3,11 @@
 .source "SourceFile"
 
 # interfaces
-.implements Lam0/p;    # MARKER: R8 Lam0/p;
+.implements Lyl0/p;    # MARKER: R8 Lyl0/p;
+
+
+# instance fields
+.field public m:I    # Sparkle mode
 
 
 # virtual methods
@@ -35,7 +39,7 @@
     invoke-static {v0, p2, v1, v2}, Landroidx/compose/runtime/ComposerKt;->traceEventStart(IIILjava/lang/String;)V
 
     :cond_0
-    const p2, 0x7f080522
+    sget p2, Lcom/aspiro/wamp/R$drawable;->ic_sparkle:I    # By name, ids change every build
 
     const/4 v0, 0x0
 
@@ -52,6 +56,12 @@
     invoke-static {}, Landroidx/compose/runtime/ComposerKt;->traceEventEnd()V
 
     :cond_1
+    iget v0, p0, Lradiant/SparkleContent;->m:I
+
+    invoke-static {p2, v0, p1}, Lradiant/SparkleIcons;->forMode(Landroidx/compose/ui/graphics/painter/Painter;ILandroidx/compose/runtime/Composer;)Landroidx/compose/ui/graphics/painter/Painter;
+
+    move-result-object p2
+
     invoke-interface {p1}, Landroidx/compose/runtime/Composer;->endReplaceGroup()V
 
     return-object p2

patches/extension/radiant/SpvFactory.smali

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

patches/extension/radiant/SylLayout.smali

@@ -2,7 +2,7 @@
 .super Ljava/lang/Object;
 
 # interfaces
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 # Remembers where each line's glyphs landed
 
@@ -31,7 +31,7 @@
 
 
 # One reusable callback per line
-.method public static cb(I)Lam0/l;    # MARKER: R8 Lam0/l;
+.method public static cb(I)Lyl0/l;    # MARKER: R8 Lyl0/l;
     .locals 5
 
     if-gez p0, :have_idx

patches/extension/radiant/gestures/miniplayer/MiniPlayerGestures$FeedbackLayer.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/miniplayer/MiniPlayerGestures$FeedbackLayer;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # annotations

patches/extension/radiant/gestures/miniplayer/MiniPlayerGestures$Gesture.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public final a:Lam0/l;    # MARKER: R8 Lam0/l;
+.field public final a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 # Y at ACTION_DOWN
 .field public b:F
@@ -43,12 +43,12 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Landroidx/compose/material3/SheetState;Z)V    # MARKER: R8 Lam0/l;
+.method public constructor <init>(Lyl0/l;Landroidx/compose/material3/SheetState;Z)V    # MARKER: R8 Lyl0/l;
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
 
@@ -90,9 +90,9 @@
 
     iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
 
-    iget-object v1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {v0, v1, p1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->finishDrag(Landroidx/compose/material3/SheetState;Lam0/l;F)V    # MARKER: R8 Lam0/l;
+    invoke-static {v0, v1, p1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->finishDrag(Landroidx/compose/material3/SheetState;Lyl0/l;F)V    # MARKER: R8 Lyl0/l;
 
     return-void
 .end method
@@ -100,11 +100,11 @@
 .method private openPlayer()V
     .locals 2
 
-    iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     sget-object v1, Lcom/tidal/android/feature/appscaffold/ui/b$b;->a:Lcom/tidal/android/feature/appscaffold/ui/b$b;    # MARKER: R8 Lcom/tidal/android/feature/appscaffold/ui/b$b; a
 
-    invoke-interface {v0, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v0, v1}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     return-void
 .end method
@@ -467,9 +467,9 @@
 
     move-result v0
 
-    iget-object v1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {v1, v0}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->completeSimpleSwipe(Lam0/l;F)Z    # MARKER: R8 Lam0/l;
+    invoke-static {v1, v0}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->completeSimpleSwipe(Lyl0/l;F)Z    # MARKER: R8 Lyl0/l;
 
     invoke-static {}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->animateSwipeFeedbackReset()V
 
@@ -489,9 +489,9 @@
 
     iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->f:Landroidx/compose/material3/SheetState;
 
-    iget-object v1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {v0, v1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->cancelDrag(Landroidx/compose/material3/SheetState;Lam0/l;)V    # MARKER: R8 Lam0/l;
+    invoke-static {v0, v1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->cancelDrag(Landroidx/compose/material3/SheetState;Lyl0/l;)V    # MARKER: R8 Lyl0/l;
 
     goto :cancel_reset
 

patches/extension/radiant/gestures/miniplayer/MiniPlayerGestures$RootGesture.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # annotations
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field public final a:Lam0/l;    # MARKER: R8 Lam0/l;
+.field public final a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field public final b:Landroidx/compose/material3/SheetState;
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Landroidx/compose/material3/SheetState;)V    # MARKER: R8 Lam0/l;
+.method public constructor <init>(Lyl0/l;Landroidx/compose/material3/SheetState;)V    # MARKER: R8 Lyl0/l;
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->b:Landroidx/compose/material3/SheetState;
 
@@ -100,9 +100,9 @@
 
     move-result v1
 
-    iget-object v2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {v2, v1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->completeSimpleSwipe(Lam0/l;F)Z    # MARKER: R8 Lam0/l;
+    invoke-static {v2, v1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->completeSimpleSwipe(Lyl0/l;F)Z    # MARKER: R8 Lyl0/l;
 
     invoke-static {}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->animateSwipeFeedbackReset()V
 
@@ -143,9 +143,9 @@
 
     move-result v1
 
-    iget-object v2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {v0, v2, v1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->finishDrag(Landroidx/compose/material3/SheetState;Lam0/l;F)V    # MARKER: R8 Lam0/l;
+    invoke-static {v0, v2, v1}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->finishDrag(Landroidx/compose/material3/SheetState;Lyl0/l;F)V    # MARKER: R8 Lyl0/l;
 
     invoke-static {}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->animateSwipeFeedbackReset()V
 
@@ -153,9 +153,9 @@
 
     # ACTION_CANCEL
     :cancel
-    iget-object v2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v2, p0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {v0, v2}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->cancelDrag(Landroidx/compose/material3/SheetState;Lam0/l;)V    # MARKER: R8 Lam0/l;
+    invoke-static {v0, v2}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->cancelDrag(Landroidx/compose/material3/SheetState;Lyl0/l;)V    # MARKER: R8 Lyl0/l;
 
     invoke-static {}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->animateSwipeFeedbackReset()V
 

patches/extension/radiant/gestures/miniplayer/MiniPlayerGestures.smali

@@ -23,7 +23,7 @@
 .field private static g:Landroidx/compose/material3/SheetState;
 
 # Material3 settle lambda
-.field private static h:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private static h:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 # Latest MotionEvent eventTime for drag updates
 .field private static i:J
@@ -51,7 +51,7 @@
 .field private static r:Z
 
 # AppScaffold context
-.field private static s:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private static s:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private static t:Landroidx/compose/material3/SheetState;
 
@@ -321,7 +321,7 @@
 
     sput-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->g:Landroidx/compose/material3/SheetState;
 
-    sput-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->h:Lam0/l;    # MARKER: R8 Lam0/l;
+    sput-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->h:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     sput v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->d:F
 
@@ -437,7 +437,7 @@
     return-void
 .end method
 
-.method public static cancelDrag(Landroidx/compose/material3/SheetState;Lam0/l;)V    # MARKER: R8 Lam0/l;
+.method public static cancelDrag(Landroidx/compose/material3/SheetState;Lyl0/l;)V    # MARKER: R8 Lyl0/l;
     .locals 1
 
     invoke-static {p0}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->isDragging(Landroidx/compose/material3/SheetState;)Z
@@ -450,13 +450,13 @@
 
     sget-object p0, Lcom/tidal/android/feature/appscaffold/ui/b$a;->a:Lcom/tidal/android/feature/appscaffold/ui/b$a;    # MARKER: R8 Lcom/tidal/android/feature/appscaffold/ui/b$a; a
 
-    invoke-interface {p1, p0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {p1, p0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     return-void
 .end method
 
-.method public static finishDrag(Landroidx/compose/material3/SheetState;Lam0/l;F)V    # MARKER: R8 Lam0/l;
+.method public static finishDrag(Landroidx/compose/material3/SheetState;Lyl0/l;F)V    # MARKER: R8 Lyl0/l;
     .locals 6
 
     invoke-static {p0}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->isDragging(Landroidx/compose/material3/SheetState;)Z
@@ -469,7 +469,7 @@
 
     if-ne v0, p0, :fallback_snap
 
-    sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->h:Lam0/l;    # MARKER: R8 Lam0/l;
+    sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->h:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v0, :fallback_snap
 
@@ -485,7 +485,7 @@
 
     move-result-object p0
 
-    invoke-interface {v0, p0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v0, p0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     goto/16 :done
 
@@ -589,7 +589,7 @@
 
     sget-object p0, Lcom/tidal/android/feature/appscaffold/ui/b$a;->a:Lcom/tidal/android/feature/appscaffold/ui/b$a;    # MARKER: R8 Lcom/tidal/android/feature/appscaffold/ui/b$a; a
 
-    invoke-interface {p1, p0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {p1, p0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     return-void
@@ -748,10 +748,10 @@
     return-void
 .end method
 
-.method public static configure(Lam0/l;Landroidx/compose/material3/SheetState;Z)V    # MARKER: R8 Lam0/l;
+.method public static configure(Lyl0/l;Landroidx/compose/material3/SheetState;Z)V    # MARKER: R8 Lyl0/l;
     .locals 0
 
-    sput-object p0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->s:Lam0/l;    # MARKER: R8 Lam0/l;
+    sput-object p0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->s:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     sput-object p1, Lradiant/gestures/miniplayer/MiniPlayerGestures;->t:Landroidx/compose/material3/SheetState;
 
@@ -798,7 +798,7 @@
 
     sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures$FeedbackLayer;->INSTANCE:Lradiant/gestures/miniplayer/MiniPlayerGestures$FeedbackLayer;
 
-    invoke-static {p0, v0}, Landroidx/compose/ui/graphics/GraphicsLayerModifierKt;->graphicsLayer(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0}, Landroidx/compose/ui/graphics/GraphicsLayerModifierKt;->graphicsLayer(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
@@ -848,14 +848,14 @@
     return p0
 .end method
 
-.method public static modifier(Landroidx/compose/ui/Modifier;Lam0/l;Landroidx/compose/material3/SheetState;Z)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+.method public static modifier(Landroidx/compose/ui/Modifier;Lyl0/l;Landroidx/compose/material3/SheetState;Z)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
     .locals 1
 
     new-instance v0, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;
 
-    invoke-direct {v0, p1, p2, p3}, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;-><init>(Lam0/l;Landroidx/compose/material3/SheetState;Z)V    # MARKER: R8 Lam0/l;
+    invoke-direct {v0, p1, p2, p3}, Lradiant/gestures/miniplayer/MiniPlayerGestures$Gesture;-><init>(Lyl0/l;Landroidx/compose/material3/SheetState;Z)V    # MARKER: R8 Lyl0/l;
 
-    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
@@ -865,7 +865,7 @@
 .method public static trackAreaModifier(Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
     .locals 3
 
-    sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->s:Lam0/l;    # MARKER: R8 Lam0/l;
+    sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->s:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v0, :done
 
@@ -875,7 +875,7 @@
 
     sget-boolean v2, Lradiant/gestures/miniplayer/MiniPlayerGestures;->u:Z
 
-    invoke-static {p0, v0, v1, v2}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->modifier(Landroidx/compose/ui/Modifier;Lam0/l;Landroidx/compose/material3/SheetState;Z)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0, v1, v2}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->modifier(Landroidx/compose/ui/Modifier;Lyl0/l;Landroidx/compose/material3/SheetState;Z)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
@@ -988,7 +988,7 @@
     return-void
 .end method
 
-.method public static completeSimpleSwipe(Lam0/l;F)Z    # MARKER: R8 Lam0/l;
+.method public static completeSimpleSwipe(Lyl0/l;F)Z    # MARKER: R8 Lyl0/l;
     .locals 4
 
     sget-boolean v0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->u:Z
@@ -1035,7 +1035,7 @@
 
     sget-object v0, Lcom/tidal/android/feature/appscaffold/ui/b$b;->a:Lcom/tidal/android/feature/appscaffold/ui/b$b;    # MARKER: R8 Lcom/tidal/android/feature/appscaffold/ui/b$b; a
 
-    invoke-interface {p0, v0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {p0, v0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     const/4 v0, 0x1
 
@@ -1307,26 +1307,26 @@
     return p0
 .end method
 
-.method public static rootModifier(Landroidx/compose/ui/Modifier;Lam0/l;Landroidx/compose/material3/SheetState;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+.method public static rootModifier(Landroidx/compose/ui/Modifier;Lyl0/l;Landroidx/compose/material3/SheetState;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
     .locals 1
 
     new-instance v0, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;
 
-    invoke-direct {v0, p1, p2}, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;-><init>(Lam0/l;Landroidx/compose/material3/SheetState;)V    # MARKER: R8 Lam0/l;
+    invoke-direct {v0, p1, p2}, Lradiant/gestures/miniplayer/MiniPlayerGestures$RootGesture;-><init>(Lyl0/l;Landroidx/compose/material3/SheetState;)V    # MARKER: R8 Lyl0/l;
 
-    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static setSettleCallback(Landroidx/compose/material3/SheetState;Lam0/l;)V    # MARKER: R8 Lam0/l;
+.method public static setSettleCallback(Landroidx/compose/material3/SheetState;Lyl0/l;)V    # MARKER: R8 Lyl0/l;
     .locals 0
 
     sput-object p0, Lradiant/gestures/miniplayer/MiniPlayerGestures;->g:Landroidx/compose/material3/SheetState;
 
-    sput-object p1, Lradiant/gestures/miniplayer/MiniPlayerGestures;->h:Lam0/l;    # MARKER: R8 Lam0/l;
+    sput-object p1, Lradiant/gestures/miniplayer/MiniPlayerGestures;->h:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     return-void
 .end method

patches/extension/radiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # annotations
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field public final a:Lam0/l;    # MARKER: R8 Lam0/l;
+.field public final a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;)V    # MARKER: R8 Lam0/l;
+.method public constructor <init>(Lyl0/l;)V    # MARKER: R8 Lyl0/l;
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     return-void
 .end method
@@ -32,11 +32,11 @@
 .method private nextTrack()V
     .locals 2
 
-    iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/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  MARKER: R8 Lcom/tidal/android/feature/appscaffold/ui/r$a; a
 
-    invoke-interface {v0, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v0, v1}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     return-void
 .end method
@@ -44,11 +44,11 @@
 .method private previousTrack()V
     .locals 2
 
-    iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;->a:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v0, p0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;->a:Lyl0/l;    # MARKER: R8 Lyl0/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  MARKER: R8 Lcom/tidal/android/feature/appscaffold/ui/r$c; a
 
-    invoke-interface {v0, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v0, v1}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     return-void
 .end method

patches/extension/radiant/gestures/miniplayer/MiniPlayerTrackGestures$OffsetLayer.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$OffsetLayer;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # annotations

patches/extension/radiant/gestures/miniplayer/MiniPlayerTrackGestures$TextDraw.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$TextDraw;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # annotations

patches/extension/radiant/gestures/miniplayer/MiniPlayerTrackGestures.smali

@@ -419,7 +419,7 @@
 
     sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$OffsetLayer;->INSTANCE:Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$OffsetLayer;
 
-    invoke-static {p0, v0}, Landroidx/compose/ui/graphics/GraphicsLayerModifierKt;->graphicsLayer(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0}, Landroidx/compose/ui/graphics/GraphicsLayerModifierKt;->graphicsLayer(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
@@ -431,7 +431,7 @@
 
     sget-object v0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$TextDraw;->INSTANCE:Lradiant/gestures/miniplayer/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;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0}, Landroidx/compose/ui/draw/DrawModifierKt;->drawWithContent(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 
@@ -590,14 +590,14 @@
     return-void
 .end method
 
-.method public static trackModifier(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+.method public static trackModifier(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
     .locals 1
 
     new-instance v0, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;
 
-    invoke-direct {v0, p1}, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;-><init>(Lam0/l;)V    # MARKER: R8 Lam0/l;
+    invoke-direct {v0, p1}, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures$Gesture;-><init>(Lyl0/l;)V    # MARKER: R8 Lyl0/l;
 
-    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v0}, Landroidx/compose/ui/input/pointer/PointerInteropFilter_androidKt;->motionEventSpy(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 

patches/extension/radiant/gestures/queue/AlbumItemQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lu5/b$a$a;    # MARKER: R8 Lu5/b$a$a;
+.field private final callback:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;
 
 .field private context:Landroid/content/Context;
 
@@ -17,22 +17,22 @@
 
 
 # direct methods
-.method public constructor <init>(Lu5/b$a;)V    # MARKER: R8 Lu5/b$a;
+.method public constructor <init>(Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;)V    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
     .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lu5/b$a;->a:Lu5/b$a$a;    # MARKER: R8 Lu5/b$a; Lu5/b$a$a; a
+    iget-object v0, p1, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->a:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a; a
 
-    iput-object v0, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->callback:Lu5/b$a$a;    # MARKER: R8 Lu5/b$a$a;
+    iput-object v0, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->callback:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;
 
-    iget-object v0, p1, Lu5/b$a;->c:Lu5/b$a$b;    # MARKER: R8 Lu5/b$a; Lu5/b$a$b; c
+    iget-object v0, p1, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->c:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; c
 
-    iget v1, v0, Lu5/b$a$b;->r:I    # MARKER: R8 Lu5/b$a$b; r
+    iget v1, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->s:I    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; r
 
     iput v1, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->mediaItemId:I
 
-    iget-object v0, v0, Lu5/b$a$b;->s:Ljava/lang/String;    # MARKER: R8 Lu5/b$a$b; s
+    iget-object v0, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->t:Ljava/lang/String;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; s
 
     iput-object v0, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->moduleId:Ljava/lang/String;
 
@@ -44,7 +44,7 @@
 .method public invoke(I)Ljava/lang/Object;
     .locals 10
 
-    iget-object v0, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->callback:Lu5/b$a$a;    # MARKER: R8 Lu5/b$a$a;
+    iget-object v0, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->callback:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;
 
     iget v1, p0, Lradiant/gestures/queue/AlbumItemQueueAction;->mediaItemId:I
 
@@ -60,7 +60,7 @@
 
     if-nez v3, :active_queue
 
-    invoke-interface {v0, v1, v2}, Lu5/b$a$a;->g(ILjava/lang/String;)V    # MARKER: R8 Lu5/b$a$a; g
+    invoke-interface {v0, v1, v2}, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;->g(ILjava/lang/String;)V    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a; g
 
     goto :done
 
@@ -69,11 +69,11 @@
 
     if-eqz v3, :done
 
-    instance-of v4, v0, Lu5/g;    # MARKER: R8 Lu5/g;
+    instance-of v4, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n;
 
     if-eqz v4, :done
 
-    check-cast v0, Lu5/g;    # MARKER: R8 Lu5/g;
+    check-cast v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n;
 
     invoke-virtual {v0, v2}, Lk5/f;->l(Ljava/lang/String;)Lcom/aspiro/wamp/dynamicpages/data/model/Module;    # MARKER: R8 Lk5/f; l
 
@@ -124,7 +124,7 @@
 
     check-cast v7, Lcom/aspiro/wamp/model/Track;
 
-    iget-object v8, v0, Lu5/g;->h:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lu5/g; h
+    iget-object v8, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n;->h:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n; h
 
     invoke-interface {v8, v7}, Lcom/aspiro/wamp/model/AvailabilityInteractor;->getAvailability(Lcom/aspiro/wamp/model/MediaItem;)Lcom/aspiro/wamp/model/Availability$MediaItem;
 
@@ -162,7 +162,7 @@
 
     if-eqz v6, :done
 
-    iget-object v8, v0, Lu5/g;->j:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lu5/g; j
+    iget-object v8, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n;->j:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/n; j
 
     invoke-static {v6, v8}, Lcom/aspiro/wamp/playqueue/source/model/b;->c(Lcom/aspiro/wamp/model/Album;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/AlbumSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; c
 

patches/extension/radiant/gestures/queue/ArtistTrackCreditsQueue.smali

@@ -39,17 +39,17 @@
 
     if-lez v4, :done
 
-    invoke-virtual {p0, v1}, Li60/c;->c(Ljava/lang/String;)Lc60/h;    # MARKER: R8 Li60/c; Lc60/h; c
+    invoke-virtual {p0, v1}, Lq50/c;->c(Ljava/lang/String;)Li50/j;    # MARKER: R8 Lq50/c; Li50/j; c
 
     move-result-object v4
 
-    instance-of v5, v4, Lc60/d;    # MARKER: R8 Lc60/d;
+    instance-of v5, v4, Li50/d;    # MARKER: R8 Li50/d;
 
     if-eqz v5, :done
 
-    check-cast v4, Lc60/d;    # MARKER: R8 Lc60/d;
+    check-cast v4, Li50/d;    # MARKER: R8 Li50/d;
 
-    iget-object v5, v4, Lc60/d;->b:Ljava/lang/String;    # MARKER: R8 Lc60/d; b
+    iget-object v5, v4, Li50/d;->b:Ljava/lang/String;    # MARKER: R8 Li50/d; b
 
     invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -57,7 +57,7 @@
 
     if-eqz v1, :done
 
-    iget-object v1, v4, Lc60/d;->f:Ljava/util/ArrayList;    # MARKER: R8 Lc60/d; f
+    iget-object v1, v4, Li50/d;->f:Ljava/util/ArrayList;    # MARKER: R8 Li50/d; f
 
     if-eqz v1, :done
 
@@ -76,21 +76,21 @@
 
     move-result-object v5
 
-    instance-of v6, v5, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    instance-of v6, v5, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
     if-eqz v6, :find_track
 
-    check-cast v5, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    check-cast v5, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
-    iget-object v5, v5, Lc60/r$b;->a:Lh40/n;    # MARKER: R8 Lc60/r$b; Lh40/n; a
+    iget-object v5, v5, Li50/u$b;->a:Ln30/o;    # MARKER: R8 Li50/u$b; Ln30/o; a
 
-    instance-of v6, v5, Lh40/p;    # MARKER: R8 Lh40/p;
+    instance-of v6, v5, Ln30/p;    # MARKER: R8 Ln30/p;
 
     if-eqz v6, :find_track
 
-    check-cast v5, Lh40/p;    # MARKER: R8 Lh40/p;
+    check-cast v5, Ln30/p;    # MARKER: R8 Ln30/p;
 
-    iget-wide v6, v5, Lh40/p;->a:J    # MARKER: R8 Lh40/p; a
+    iget-wide v6, v5, Ln30/p;->a:J    # MARKER: R8 Ln30/p; a
 
     cmp-long v6, v6, v2
 
@@ -112,19 +112,19 @@
 
     if-eqz v1, :done
 
-    invoke-static {v5}, Lie0/i;->a(Lh40/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lie0/i; Lh40/p; a
+    invoke-static {v5}, Lae0/i;->c(Ln30/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lae0/i; Ln30/p; a
 
     move-result-object v7
 
     if-eqz v7, :done
 
-    iget-object v2, v4, Lc60/d;->a:Ljava/lang/String;    # MARKER: R8 Lc60/d; a
+    iget-object v2, v4, Li50/d;->a:Ljava/lang/String;    # MARKER: R8 Li50/d; a
 
     if-eqz v2, :done
 
     new-instance v8, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
-    iget v3, v4, Lc60/d;->e:I    # MARKER: R8 Lc60/d; e
+    iget v3, v4, Li50/d;->e:I    # MARKER: R8 Li50/d; e
 
     invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -138,9 +138,9 @@
 
     move-result-object v2
 
-    iget-object v3, v4, Lc60/d;->c:Ljava/lang/String;    # MARKER: R8 Lc60/d; c
+    iget-object v3, v4, Li50/d;->c:Ljava/lang/String;    # MARKER: R8 Li50/d; c
 
-    iget-object v10, v4, Lc60/d;->g:Ljava/lang/String;    # MARKER: R8 Lc60/d; g
+    iget-object v10, v4, Li50/d;->g:Ljava/lang/String;    # MARKER: R8 Li50/d; g
 
     invoke-static {v10}, Lcom/aspiro/wamp/playqueue/source/model/ItemSource$NavigationType$a;->a(Ljava/lang/String;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource$NavigationType;    # MARKER: R8 a
 

patches/extension/radiant/gestures/queue/ArtistTrackCreditsQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -19,18 +19,18 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e$e;)V    # MARKER: R8 Lam0/l; Lm40/e$e;
+.method public constructor <init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e$e;)V    # MARKER: R8 Lyl0/l; Ls30/e$e;
     .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->pageId:Ljava/lang/String;
 
     iput-object p3, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->moduleUuid:Ljava/lang/String;
 
-    iget-wide v0, p4, Lm40/e$e;->a:J    # MARKER: R8 Lm40/e$e; a
+    iget-wide v0, p4, Ls30/e$e;->a:J    # MARKER: R8 Ls30/e$e; a
 
     iput-wide v0, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->trackId:J
 
@@ -60,7 +60,7 @@
 
     iget-object v4, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->moduleUuid:Ljava/lang/String;
 
-    invoke-direct {v0, v1, v2, v3, v4}, Lcom/tidal/android/dynamicpages/ui/modules/artisttrackcredits/b$a;-><init>(JLjava/lang/String;Ljava/lang/String;)V    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/modules/artisttrackcredits/b$a;
+    invoke-direct {v0, v3, v4, v1, v2}, Lcom/tidal/android/dynamicpages/ui/modules/artisttrackcredits/b$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/modules/artisttrackcredits/b$a;
 
     goto :emit
 
@@ -82,9 +82,9 @@
     invoke-direct/range {v0 .. v6}, Lradiant/gestures/queue/ArtistTrackCreditsQueueEvent;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;JI)V
 
     :emit
-    iget-object v7, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v7, p0, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-interface {v7, v0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v7, v0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/extension/radiant/gestures/queue/CompactGridMediaQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -21,24 +21,24 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e;)V    # MARKER: R8 Lam0/l; Lm40/e;
+.method public constructor <init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e;)V    # MARKER: R8 Lyl0/l; Ls30/e;
     .locals 3
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/CompactGridMediaQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/CompactGridMediaQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/queue/CompactGridMediaQueueAction;->pageId:Ljava/lang/String;
 
     iput-object p3, p0, Lradiant/gestures/queue/CompactGridMediaQueueAction;->moduleUuid:Ljava/lang/String;
 
-    instance-of v0, p4, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    instance-of v0, p4, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
     if-eqz v0, :mix
 
-    check-cast p4, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    check-cast p4, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
-    iget-wide v0, p4, Lm40/e$a;->a:J    # MARKER: R8 Lm40/e$a; a
+    iget-wide v0, p4, Ls30/e$a;->a:J    # MARKER: R8 Ls30/e$a; a
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -49,39 +49,39 @@
     goto :store
 
     :mix
-    instance-of v0, p4, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    instance-of v0, p4, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
     if-eqz v0, :playlist
 
-    check-cast p4, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    check-cast p4, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
-    iget-object v0, p4, Lm40/e$c;->a:Ljava/lang/String;    # MARKER: R8 Lm40/e$c; a
+    iget-object v0, p4, Ls30/e$c;->a:Ljava/lang/String;    # MARKER: R8 Ls30/e$c; a
 
     const/4 v1, 0x2
 
     goto :store
 
     :playlist
-    instance-of v0, p4, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    instance-of v0, p4, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
     if-eqz v0, :track
 
-    check-cast p4, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    check-cast p4, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
-    iget-object v0, p4, Lm40/e$d;->a:Ljava/lang/String;    # MARKER: R8 Lm40/e$d; a
+    iget-object v0, p4, Ls30/e$d;->a:Ljava/lang/String;    # MARKER: R8 Ls30/e$d; a
 
     const/4 v1, 0x3
 
     goto :store
 
     :track
-    instance-of v0, p4, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    instance-of v0, p4, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
     if-eqz v0, :unsupported
 
-    check-cast p4, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    check-cast p4, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
-    iget-wide v0, p4, Lm40/e$e;->a:J    # MARKER: R8 Lm40/e$e; a
+    iget-wide v0, p4, Ls30/e$e;->a:J    # MARKER: R8 Ls30/e$e; a
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -104,49 +104,49 @@
     return-void
 .end method
 
-.method public static isEligible(Lm40/e;)Z    # MARKER: R8 Lm40/e;
+.method public static isEligible(Ls30/e;)Z    # MARKER: R8 Ls30/e;
     .locals 1
 
-    instance-of v0, p0, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    instance-of v0, p0, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
     if-eqz v0, :mix
 
-    check-cast p0, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    check-cast p0, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
-    iget-boolean p0, p0, Lm40/e$a;->e:Z    # MARKER: R8 Lm40/e$a; e
+    iget-boolean p0, p0, Ls30/e$a;->e:Z    # MARKER: R8 Ls30/e$a; e
 
     return p0
 
     :mix
-    instance-of v0, p0, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    instance-of v0, p0, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
     if-eqz v0, :playlist
 
-    check-cast p0, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    check-cast p0, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
-    iget-boolean p0, p0, Lm40/e$c;->h:Z    # MARKER: R8 Lm40/e$c; h
+    iget-boolean p0, p0, Ls30/e$c;->h:Z    # MARKER: R8 Ls30/e$c; h
 
     return p0
 
     :playlist
-    instance-of v0, p0, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    instance-of v0, p0, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
     if-eqz v0, :track
 
-    check-cast p0, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    check-cast p0, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
-    iget-boolean p0, p0, Lm40/e$d;->g:Z    # MARKER: R8 Lm40/e$d; g
+    iget-boolean p0, p0, Ls30/e$d;->g:Z    # MARKER: R8 Ls30/e$d; g
 
     return p0
 
     :track
-    instance-of v0, p0, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    instance-of v0, p0, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
     if-eqz v0, :invalid
 
-    check-cast p0, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    check-cast p0, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
-    iget-boolean p0, p0, Lm40/e$e;->j:Z    # MARKER: R8 Lm40/e$e; j
+    iget-boolean p0, p0, Ls30/e$e;->j:Z    # MARKER: R8 Ls30/e$e; j
 
     return p0
 
@@ -161,7 +161,7 @@
 .method public invoke(I)Ljava/lang/Object;
     .locals 8
 
-    iget-object v7, p0, Lradiant/gestures/queue/CompactGridMediaQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v7, p0, Lradiant/gestures/queue/CompactGridMediaQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v7, :done
 
@@ -209,7 +209,7 @@
     move-object v1, v0
 
     :emit
-    invoke-interface {v7, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v7, v1}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/extension/radiant/gestures/queue/ComposeSearchQueue.smali

@@ -56,9 +56,9 @@
 
     move-result-object v1
 
-    check-cast v1, Lmb0/e;    # MARKER: R8 Lmb0/e;
+    check-cast v1, Leb0/e;    # MARKER: R8 Leb0/e;
 
-    invoke-static {v1}, Lmb0/f;->a(Lmb0/e;)Ljava/lang/String;    # MARKER: R8 Lmb0/f; Lmb0/e; a
+    invoke-static {v1}, Lcom/squareup/experiments/x;->c(Leb0/e;)Ljava/lang/String;    # MARKER: R8 Lmb0/f; Leb0/e; a
 
     move-result-object v9
 
@@ -68,19 +68,19 @@
 
     if-eqz v9, :find_row
 
-    instance-of v9, v1, Lmb0/a;    # MARKER: R8 Lmb0/a;
+    instance-of v9, v1, Leb0/a;    # MARKER: R8 Leb0/a;
 
     if-eqz v9, :find_row
 
-    check-cast v1, Lmb0/a;    # MARKER: R8 Lmb0/a;
+    check-cast v1, Leb0/a;    # MARKER: R8 Leb0/a;
 
-    iget-object v3, v1, Lmb0/a;->a:Lh40/n;    # MARKER: R8 Lmb0/a; Lh40/n; a
+    iget-object v3, v1, Leb0/a;->a:Ln30/o;    # MARKER: R8 Leb0/a; Ln30/o; a
 
     const/4 v9, 0x1
 
     if-ne v4, v9, :check_album
 
-    instance-of v9, v3, Lh40/p;    # MARKER: R8 Lh40/p;
+    instance-of v9, v3, Ln30/p;    # MARKER: R8 Ln30/p;
 
     if-eqz v9, :find_row
 
@@ -91,7 +91,7 @@
 
     if-ne v4, v9, :check_playlist
 
-    instance-of v9, v3, Lh40/a;    # MARKER: R8 Lh40/a;
+    instance-of v9, v3, Ln30/a;    # MARKER: R8 Ln30/a;
 
     if-eqz v9, :find_row
 
@@ -102,29 +102,29 @@
 
     if-ne v4, v9, :check_mix
 
-    instance-of v9, v3, Lh40/j;    # MARKER: R8 Lh40/j;
+    instance-of v9, v3, Ln30/k;    # MARKER: R8 Ln30/k;
 
     if-eqz v9, :find_row
 
     goto :recover_dependencies
 
     :check_mix
-    instance-of v9, v3, Lh40/i;    # MARKER: R8 Lh40/i;
+    instance-of v9, v3, Ln30/j;    # MARKER: R8 Ln30/j;
 
     if-eqz v9, :find_row
 
     :recover_dependencies
     iget-object v9, p0, Lcom/tidal/android/feature/search/ui/SearchScreenViewModel;->d:Lcom/tidal/android/feature/search/ui/e;    # MARKER: R8 Lcom/tidal/android/feature/search/ui/e; d
 
-    instance-of v0, v9, Lv9/e;    # MARKER: R8 Lv9/e;
+    instance-of v0, v9, Lu9/d;    # MARKER: R8 Lu9/d;
 
     if-eqz v0, :done
 
-    check-cast v9, Lv9/e;    # MARKER: R8 Lv9/e;
+    check-cast v9, Lu9/d;    # MARKER: R8 Lu9/d;
 
-    iget-object v5, v9, Lv9/e;->b:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lv9/e; b
+    iget-object v5, v9, Lu9/d;->b:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lu9/d; b
 
-    iget-object v9, v9, Lv9/e;->a:Lcom/aspiro/wamp/core/k;    # MARKER: R8 Lv9/e; Lcom/aspiro/wamp/core/k; a
+    iget-object v9, v9, Lu9/d;->a:Lcom/aspiro/wamp/core/l;    # MARKER: R8 Lu9/d; Lcom/aspiro/wamp/core/l; a
 
     const/4 v6, 0x0
 
@@ -138,13 +138,13 @@
 
     :recover_menu
 
-    instance-of v0, v9, Lh9/p1;    # MARKER: R8 Lh9/p1;
+    instance-of v0, v9, Lg9/u1;    # MARKER: R8 Lg9/u1;
 
     if-eqz v0, :done
 
-    check-cast v9, Lh9/p1;    # MARKER: R8 Lh9/p1;
+    check-cast v9, Lg9/u1;    # MARKER: R8 Lg9/u1;
 
-    iget-object v9, v9, Lh9/p1;->b:Lx40/a;    # MARKER: R8 Lh9/p1; Lx40/a; b
+    iget-object v9, v9, Lg9/u1;->b:Ld40/a;    # MARKER: R8 Lg9/u1; Ld40/a; b
 
     instance-of v0, v9, Lh4/a;    # MARKER: R8 Lh4/a;
 
@@ -166,7 +166,7 @@
 
     if-ne v4, v0, :album
 
-    check-cast v3, Lh40/p;    # MARKER: R8 Lh40/p;
+    check-cast v3, Ln30/p;    # MARKER: R8 Ln30/p;
 
     iget v0, p1, Lradiant/gestures/queue/ComposeSearchQueueEvent;->action:I
 
@@ -181,7 +181,7 @@
     if-eqz v0, :play_track
 
     :queue_track
-    invoke-static {v3}, Lie0/i;->a(Lh40/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lie0/i; Lh40/p; a
+    invoke-static {v3}, Lae0/i;->c(Ln30/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lae0/i; Ln30/p; a
 
     move-result-object v9
 
@@ -209,7 +209,7 @@
     move-result-object v1
 
     :track_navigation_ready
-    invoke-static {v2, v4, v1}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Ljava/lang/String;Ljava/lang/String;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
+    invoke-static {v1, v2, v4}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Lcom/tidal/android/navigation/NavigationInfo;Ljava/lang/String;Ljava/lang/String;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
 
     move-result-object v4
 
@@ -257,9 +257,9 @@
     :play_query_ready
     iget-object v9, p0, Lcom/tidal/android/feature/search/ui/SearchScreenViewModel;->f:Lcom/tidal/android/feature/search/ui/f;    # MARKER: R8 Lcom/tidal/android/feature/search/ui/f; f
 
-    iget-wide v0, v3, Lh40/p;->a:J    # MARKER: R8 Lh40/p; a
+    iget-wide v0, v3, Ln30/p;->a:J    # MARKER: R8 Ln30/p; a
 
-    invoke-interface {v9, v0, v1, v3, v5}, Lcom/tidal/android/feature/search/ui/f;->a(JLh40/p;Ljava/lang/String;)V    # MARKER: R8 Lcom/tidal/android/feature/search/ui/f; Lh40/p; a
+    invoke-interface {v9, v0, v1, v3, v5}, Lcom/tidal/android/feature/search/ui/f;->a(JLn30/p;Ljava/lang/String;)V    # MARKER: R8 Lcom/tidal/android/feature/search/ui/f; Ln30/p; a
 
     goto :done
 
@@ -268,9 +268,9 @@
 
     if-ne v4, v0, :playlist
 
-    check-cast v3, Lh40/a;    # MARKER: R8 Lh40/a;
+    check-cast v3, Ln30/a;    # MARKER: R8 Ln30/a;
 
-    invoke-static {v3}, Lie0/a;->a(Lh40/a;)Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lie0/a; Lh40/a; a
+    invoke-static {v3}, Lae0/a;->b(Ln30/a;)Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lae0/a; Ln30/a; a
 
     move-result-object v9
 
@@ -303,9 +303,9 @@
 
     if-ne v4, v0, :mix
 
-    check-cast v3, Lh40/j;    # MARKER: R8 Lh40/j;
+    check-cast v3, Ln30/k;    # MARKER: R8 Ln30/k;
 
-    invoke-static {v3}, Lie0/h;->a(Lh40/j;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lie0/h; Lh40/j; a
+    invoke-static {v3}, Lae0/h;->a(Ln30/k;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lae0/h; Ln30/k; a
 
     move-result-object v9
 
@@ -334,9 +334,9 @@
     goto :done
 
     :mix
-    check-cast v3, Lh40/i;    # MARKER: R8 Lh40/i;
+    check-cast v3, Ln30/j;    # MARKER: R8 Ln30/j;
 
-    invoke-static {v3}, Lie0/g;->b(Lh40/i;)Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lie0/g; Lh40/i; b
+    invoke-static {v3}, Lae0/g;->b(Ln30/j;)Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lae0/g; Ln30/j; b
 
     move-result-object v9
 

patches/extension/radiant/gestures/queue/ComposeSearchQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -17,20 +17,20 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Lpb0/b;)V    # MARKER: R8 Lam0/l; Lpb0/b;
+.method public constructor <init>(Lyl0/l;Lhb0/b;)V    # MARKER: R8 Lyl0/l; Lhb0/b;
     .locals 1
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/ComposeSearchQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/ComposeSearchQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-static {p2}, Lradiant/gestures/queue/ComposeSearchQueueAction;->key(Lpb0/b;)Ljava/lang/String;    # MARKER: R8 Lpb0/b;
+    invoke-static {p2}, Lradiant/gestures/queue/ComposeSearchQueueAction;->key(Lhb0/b;)Ljava/lang/String;    # MARKER: R8 Lhb0/b;
 
     move-result-object v0
 
     iput-object v0, p0, Lradiant/gestures/queue/ComposeSearchQueueAction;->id:Ljava/lang/String;
 
-    invoke-static {p2}, Lradiant/gestures/queue/ComposeSearchQueueAction;->type(Lpb0/b;)I    # MARKER: R8 Lpb0/b;
+    invoke-static {p2}, Lradiant/gestures/queue/ComposeSearchQueueAction;->type(Lhb0/b;)I    # MARKER: R8 Lhb0/b;
 
     move-result p1
 
@@ -39,16 +39,16 @@
     return-void
 .end method
 
-.method public static key(Lpb0/b;)Ljava/lang/String;    # MARKER: R8 Lpb0/b;
+.method public static key(Lhb0/b;)Ljava/lang/String;    # MARKER: R8 Lhb0/b;
     .locals 2
 
-    instance-of v0, p0, Lpb0/b$i;    # MARKER: R8 Lpb0/b$i;
+    instance-of v0, p0, Lhb0/b$i;    # MARKER: R8 Lhb0/b$i;
 
     if-eqz v0, :album
 
-    check-cast p0, Lpb0/b$i;    # MARKER: R8 Lpb0/b$i;
+    check-cast p0, Lhb0/b$i;    # MARKER: R8 Lhb0/b$i;
 
-    iget-wide v0, p0, Lpb0/b$i;->a:J    # MARKER: R8 Lpb0/b$i; a
+    iget-wide v0, p0, Lhb0/b$i;->a:J    # MARKER: R8 Lhb0/b$i; a
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -57,13 +57,13 @@
     return-object p0
 
     :album
-    instance-of v0, p0, Lpb0/b$a;    # MARKER: R8 Lpb0/b$a;
+    instance-of v0, p0, Lhb0/b$a;    # MARKER: R8 Lhb0/b$a;
 
     if-eqz v0, :playlist
 
-    check-cast p0, Lpb0/b$a;    # MARKER: R8 Lpb0/b$a;
+    check-cast p0, Lhb0/b$a;    # MARKER: R8 Lhb0/b$a;
 
-    iget-wide v0, p0, Lpb0/b$a;->a:J    # MARKER: R8 Lpb0/b$a; a
+    iget-wide v0, p0, Lhb0/b$a;->a:J    # MARKER: R8 Lhb0/b$a; a
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -72,24 +72,24 @@
     return-object p0
 
     :playlist
-    instance-of v0, p0, Lpb0/b$f;    # MARKER: R8 Lpb0/b$f;
+    instance-of v0, p0, Lhb0/b$f;    # MARKER: R8 Lhb0/b$f;
 
     if-eqz v0, :mix
 
-    check-cast p0, Lpb0/b$f;    # MARKER: R8 Lpb0/b$f;
+    check-cast p0, Lhb0/b$f;    # MARKER: R8 Lhb0/b$f;
 
-    iget-object p0, p0, Lpb0/b$f;->a:Ljava/lang/String;    # MARKER: R8 Lpb0/b$f; a
+    iget-object p0, p0, Lhb0/b$f;->a:Ljava/lang/String;    # MARKER: R8 Lhb0/b$f; a
 
     return-object p0
 
     :mix
-    instance-of v0, p0, Lpb0/b$e;    # MARKER: R8 Lpb0/b$e;
+    instance-of v0, p0, Lhb0/b$e;    # MARKER: R8 Lhb0/b$e;
 
     if-eqz v0, :invalid
 
-    check-cast p0, Lpb0/b$e;    # MARKER: R8 Lpb0/b$e;
+    check-cast p0, Lhb0/b$e;    # MARKER: R8 Lhb0/b$e;
 
-    iget-object p0, p0, Lpb0/b$e;->a:Ljava/lang/String;    # MARKER: R8 Lpb0/b$e; a
+    iget-object p0, p0, Lhb0/b$e;->a:Ljava/lang/String;    # MARKER: R8 Lhb0/b$e; a
 
     return-object p0
 
@@ -134,10 +134,10 @@
     return-object v0
 .end method
 
-.method private static type(Lpb0/b;)I    # MARKER: R8 Lpb0/b;
+.method private static type(Lhb0/b;)I    # MARKER: R8 Lhb0/b;
     .locals 1
 
-    instance-of v0, p0, Lpb0/b$i;    # MARKER: R8 Lpb0/b$i;
+    instance-of v0, p0, Lhb0/b$i;    # MARKER: R8 Lhb0/b$i;
 
     if-eqz v0, :album
 
@@ -146,7 +146,7 @@
     return p0
 
     :album
-    instance-of v0, p0, Lpb0/b$a;    # MARKER: R8 Lpb0/b$a;
+    instance-of v0, p0, Lhb0/b$a;    # MARKER: R8 Lhb0/b$a;
 
     if-eqz v0, :playlist
 
@@ -155,7 +155,7 @@
     return p0
 
     :playlist
-    instance-of v0, p0, Lpb0/b$f;    # MARKER: R8 Lpb0/b$f;
+    instance-of v0, p0, Lhb0/b$f;    # MARKER: R8 Lhb0/b$f;
 
     if-eqz v0, :mix
 
@@ -164,7 +164,7 @@
     return p0
 
     :mix
-    instance-of p0, p0, Lpb0/b$e;    # MARKER: R8 Lpb0/b$e;
+    instance-of p0, p0, Lhb0/b$e;    # MARKER: R8 Lhb0/b$e;
 
     if-eqz p0, :invalid
 
@@ -183,7 +183,7 @@
 .method public invoke(I)Ljava/lang/Object;
     .locals 4
 
-    iget-object v0, p0, Lradiant/gestures/queue/ComposeSearchQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v0, p0, Lradiant/gestures/queue/ComposeSearchQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v0, :done
 
@@ -203,7 +203,7 @@
 
     invoke-direct {p0, v1, v2, v3, p1}, Lradiant/gestures/queue/ComposeSearchQueueEvent;-><init>(Landroid/content/Context;Ljava/lang/String;II)V
 
-    invoke-interface {v0, p0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v0, p0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/extension/radiant/gestures/queue/ComposeSwipeAction.smali

@@ -3,7 +3,7 @@
 .source "ComposeSwipeAction.smali"
 
 # interfaces
-.implements Lam0/a;    # MARKER: R8 Lam0/a;
+.implements Lyl0/a;    # MARKER: R8 Lyl0/a;
 
 
 # virtual methods

patches/extension/radiant/gestures/queue/ComposeSwipeState$Draw.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/queue/ComposeSwipeState$Draw;
 .super Ljava/lang/Object;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 
 # annotations

patches/extension/radiant/gestures/queue/ComposeSwipeState$Gesture.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/queue/ComposeSwipeState$Gesture;
 .super Landroidx/compose/ui/input/pointer/PointerInputFilter;
-.implements Lam0/l;    # MARKER: R8 Lam0/l;
+.implements Lyl0/l;    # MARKER: R8 Lyl0/l;
 .implements Landroidx/compose/ui/input/pointer/PointerInputModifier;
 
 

patches/extension/radiant/gestures/queue/ComposeSwipeState.smali

@@ -126,7 +126,7 @@
 
     iget-object v1, v2, Lradiant/gestures/queue/ComposeSwipeState;->draw:Lradiant/gestures/queue/ComposeSwipeState$Draw;
 
-    invoke-static {p0, v1}, Landroidx/compose/ui/draw/DrawModifierKt;->drawWithContent(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lam0/l;
+    invoke-static {p0, v1}, Landroidx/compose/ui/draw/DrawModifierKt;->drawWithContent(Landroidx/compose/ui/Modifier;Lyl0/l;)Landroidx/compose/ui/Modifier;    # MARKER: R8 Lyl0/l;
 
     move-result-object p0
 

patches/extension/radiant/gestures/queue/ComposeTapGuard.smali

@@ -1,6 +1,6 @@
 .class public final Lradiant/gestures/queue/ComposeTapGuard;
 .super Ljava/lang/Object;
-.implements Lam0/a;    # MARKER: R8 Lam0/a;
+.implements Lyl0/a;    # MARKER: R8 Lyl0/a;
 
 
 # static fields
@@ -8,16 +8,16 @@
 
 
 # instance fields
-.field private final delegate:Lam0/a;    # MARKER: R8 Lam0/a;
+.field private final delegate:Lyl0/a;    # MARKER: R8 Lyl0/a;
 
 
 # direct methods
-.method public constructor <init>(Lam0/a;)V    # MARKER: R8 Lam0/a;
+.method public constructor <init>(Lyl0/a;)V    # MARKER: R8 Lyl0/a;
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/ComposeTapGuard;->delegate:Lam0/a;    # MARKER: R8 Lam0/a;
+    iput-object p1, p0, Lradiant/gestures/queue/ComposeTapGuard;->delegate:Lyl0/a;    # MARKER: R8 Lyl0/a;
 
     return-void
 .end method
@@ -61,12 +61,12 @@
     return-void
 .end method
 
-.method public static wrap(Lam0/a;)Lam0/a;    # MARKER: R8 Lam0/a;
+.method public static wrap(Lyl0/a;)Lyl0/a;    # MARKER: R8 Lyl0/a;
     .locals 1
 
     new-instance v0, Lradiant/gestures/queue/ComposeTapGuard;
 
-    invoke-direct {v0, p0}, Lradiant/gestures/queue/ComposeTapGuard;-><init>(Lam0/a;)V    # MARKER: R8 Lam0/a;
+    invoke-direct {v0, p0}, Lradiant/gestures/queue/ComposeTapGuard;-><init>(Lyl0/a;)V    # MARKER: R8 Lyl0/a;
 
     return-object v0
 .end method
@@ -87,9 +87,9 @@
     return-object v0
 
     :dispatch
-    iget-object v0, p0, Lradiant/gestures/queue/ComposeTapGuard;->delegate:Lam0/a;    # MARKER: R8 Lam0/a;
+    iget-object v0, p0, Lradiant/gestures/queue/ComposeTapGuard;->delegate:Lyl0/a;    # MARKER: R8 Lyl0/a;
 
-    invoke-interface {v0}, Lam0/a;->invoke()Ljava/lang/Object;    # MARKER: R8 Lam0/a;
+    invoke-interface {v0}, Lyl0/a;->invoke()Ljava/lang/Object;    # MARKER: R8 Lyl0/a;
 
     move-result-object v0
 

patches/extension/radiant/gestures/queue/DynamicMediaQueue.smali

@@ -43,17 +43,17 @@
 
     if-gt v3, v4, :done
 
-    invoke-virtual {p0, v1}, Li60/c;->c(Ljava/lang/String;)Lc60/h;    # MARKER: R8 Li60/c; Lc60/h; c
+    invoke-virtual {p0, v1}, Lq50/c;->c(Ljava/lang/String;)Li50/j;    # MARKER: R8 Lq50/c; Li50/j; c
 
     move-result-object v4
 
-    instance-of v5, v4, Lc60/f;    # MARKER: R8 Lc60/f;
+    instance-of v5, v4, Li50/f;    # MARKER: R8 Li50/f;
 
     if-eqz v5, :done
 
-    check-cast v4, Lc60/f;    # MARKER: R8 Lc60/f;
+    check-cast v4, Li50/f;    # MARKER: R8 Li50/f;
 
-    iget-object v5, v4, Lc60/f;->b:Ljava/lang/String;    # MARKER: R8 Lc60/f; b
+    iget-object v5, v4, Li50/f;->b:Ljava/lang/String;    # MARKER: R8 Li50/f; b
 
     invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -61,7 +61,7 @@
 
     if-eqz v1, :done
 
-    iget-object v1, v4, Lc60/f;->g:Ljava/util/ArrayList;    # MARKER: R8 Lc60/f; g
+    iget-object v1, v4, Li50/f;->g:Ljava/util/ArrayList;    # MARKER: R8 Li50/f; g
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -78,13 +78,13 @@
 
     move-result-object v6
 
-    instance-of v5, v6, Lc60/r;    # MARKER: R8 Lc60/r;
+    instance-of v5, v6, Li50/u;    # MARKER: R8 Li50/u;
 
     if-eqz v5, :find_media
 
-    check-cast v6, Lc60/r;    # MARKER: R8 Lc60/r;
+    check-cast v6, Li50/u;    # MARKER: R8 Li50/u;
 
-    invoke-static {v6}, Lc60/s;->a(Lc60/r;)Ljava/lang/String;    # MARKER: R8 Lc60/s; Lc60/r; a
+    invoke-static {v6}, Li50/v;->a(Li50/u;)Ljava/lang/String;    # MARKER: R8 Li50/v; Li50/u; a
 
     move-result-object v5
 
@@ -94,19 +94,19 @@
 
     if-eqz v5, :find_media
 
-    instance-of v5, v6, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    instance-of v5, v6, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
     if-eqz v5, :done
 
-    check-cast v6, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    check-cast v6, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
-    iget-object v7, v6, Lc60/r$b;->a:Lh40/n;    # MARKER: R8 Lc60/r$b; Lh40/n; a
+    iget-object v7, v6, Li50/u$b;->a:Ln30/o;    # MARKER: R8 Li50/u$b; Ln30/o; a
 
     const/4 v5, 0x1
 
     if-ne v3, v5, :check_mix
 
-    instance-of v5, v7, Lh40/a;    # MARKER: R8 Lh40/a;
+    instance-of v5, v7, Ln30/a;    # MARKER: R8 Ln30/a;
 
     if-eqz v5, :done
 
@@ -117,7 +117,7 @@
 
     if-ne v3, v5, :check_playlist
 
-    instance-of v5, v7, Lh40/i;    # MARKER: R8 Lh40/i;
+    instance-of v5, v7, Ln30/j;    # MARKER: R8 Ln30/j;
 
     if-eqz v5, :done
 
@@ -128,14 +128,14 @@
 
     if-ne v3, v5, :check_track
 
-    instance-of v5, v7, Lh40/j;    # MARKER: R8 Lh40/j;
+    instance-of v5, v7, Ln30/k;    # MARKER: R8 Ln30/k;
 
     if-eqz v5, :done
 
     goto :dependencies
 
     :check_track
-    instance-of v5, v7, Lh40/p;    # MARKER: R8 Lh40/p;
+    instance-of v5, v7, Ln30/p;    # MARKER: R8 Ln30/p;
 
     if-eqz v5, :done
 
@@ -156,9 +156,9 @@
 
     new-instance v10, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
-    iget-object v11, v4, Lc60/f;->a:Ljava/lang/String;    # MARKER: R8 Lc60/f; a
+    iget-object v11, v4, Li50/f;->a:Ljava/lang/String;    # MARKER: R8 Li50/f; a
 
-    iget v12, v4, Lc60/f;->d:I    # MARKER: R8 Lc60/f; d
+    iget v12, v4, Li50/f;->d:I    # MARKER: R8 Li50/f; d
 
     invoke-static {v12}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -170,9 +170,9 @@
 
     if-ne v3, v0, :mix
 
-    check-cast v7, Lh40/a;    # MARKER: R8 Lh40/a;
+    check-cast v7, Ln30/a;    # MARKER: R8 Ln30/a;
 
-    invoke-static {v7}, Lie0/a;->a(Lh40/a;)Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lie0/a; Lh40/a; a
+    invoke-static {v7}, Lae0/a;->b(Ln30/a;)Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lae0/a; Ln30/a; a
 
     move-result-object v12
 
@@ -211,9 +211,9 @@
 
     if-ne v3, v0, :playlist
 
-    check-cast v7, Lh40/i;    # MARKER: R8 Lh40/i;
+    check-cast v7, Ln30/j;    # MARKER: R8 Ln30/j;
 
-    invoke-static {v7}, Lie0/g;->b(Lh40/i;)Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lie0/g; Lh40/i; b
+    invoke-static {v7}, Lae0/g;->b(Ln30/j;)Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lae0/g; Ln30/j; b
 
     move-result-object v12
 
@@ -252,9 +252,9 @@
 
     if-ne v3, v0, :track
 
-    check-cast v7, Lh40/j;    # MARKER: R8 Lh40/j;
+    check-cast v7, Ln30/k;    # MARKER: R8 Ln30/k;
 
-    invoke-static {v7}, Lie0/h;->a(Lh40/j;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lie0/h; Lh40/j; a
+    invoke-static {v7}, Lae0/h;->a(Ln30/k;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lae0/h; Ln30/k; a
 
     move-result-object v12
 
@@ -283,9 +283,9 @@
     goto :done
 
     :track
-    check-cast v7, Lh40/p;    # MARKER: R8 Lh40/p;
+    check-cast v7, Ln30/p;    # MARKER: R8 Ln30/p;
 
-    invoke-static {v7}, Lie0/i;->a(Lh40/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lie0/i; Lh40/p; a
+    invoke-static {v7}, Lae0/i;->c(Ln30/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lae0/i; Ln30/p; a
 
     move-result-object v12
 
@@ -298,9 +298,9 @@
     move-result-object v6
 
     :navigation_ready
-    iget-object v0, v4, Lc60/f;->e:Ljava/lang/String;    # MARKER: R8 Lc60/f; e
+    iget-object v0, v4, Li50/f;->e:Ljava/lang/String;    # MARKER: R8 Li50/f; e
 
-    invoke-static {v2, v0, v6}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Ljava/lang/String;Ljava/lang/String;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
+    invoke-static {v6, v2, v0}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Lcom/tidal/android/navigation/NavigationInfo;Ljava/lang/String;Ljava/lang/String;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
 
     move-result-object v11
 
@@ -367,17 +367,17 @@
 
     if-eqz v2, :done
 
-    invoke-virtual {p0, v1}, Li60/c;->c(Ljava/lang/String;)Lc60/h;    # MARKER: R8 Li60/c; Lc60/h; c
+    invoke-virtual {p0, v1}, Lq50/c;->c(Ljava/lang/String;)Li50/j;    # MARKER: R8 Lq50/c; Li50/j; c
 
     move-result-object v3
 
-    instance-of v4, v3, Lc60/v;    # MARKER: R8 Lc60/v;
+    instance-of v4, v3, Li50/y;    # MARKER: R8 Li50/y;
 
     if-eqz v4, :done
 
-    check-cast v3, Lc60/v;    # MARKER: R8 Lc60/v;
+    check-cast v3, Li50/y;    # MARKER: R8 Li50/y;
 
-    iget-object v4, v3, Lc60/v;->b:Ljava/lang/String;    # MARKER: R8 Lc60/v; b
+    iget-object v4, v3, Li50/y;->b:Ljava/lang/String;    # MARKER: R8 Li50/y; b
 
     invoke-virtual {v1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -385,7 +385,7 @@
 
     if-eqz v1, :done
 
-    iget-object v1, v3, Lc60/v;->f:Ljava/util/ArrayList;    # MARKER: R8 Lc60/v; f
+    iget-object v1, v3, Li50/y;->f:Ljava/util/ArrayList;    # MARKER: R8 Li50/y; f
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -402,13 +402,13 @@
 
     move-result-object v4
 
-    instance-of v5, v4, Lc60/r;    # MARKER: R8 Lc60/r;
+    instance-of v5, v4, Li50/u;    # MARKER: R8 Li50/u;
 
     if-eqz v5, :find_playlist
 
-    check-cast v4, Lc60/r;    # MARKER: R8 Lc60/r;
+    check-cast v4, Li50/u;    # MARKER: R8 Li50/u;
 
-    invoke-static {v4}, Lc60/s;->a(Lc60/r;)Ljava/lang/String;    # MARKER: R8 Lc60/s; Lc60/r; a
+    invoke-static {v4}, Li50/v;->a(Li50/u;)Ljava/lang/String;    # MARKER: R8 Li50/v; Li50/u; a
 
     move-result-object v5
 
@@ -418,19 +418,19 @@
 
     if-eqz v5, :find_playlist
 
-    instance-of v5, v4, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    instance-of v5, v4, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
     if-eqz v5, :done
 
-    check-cast v4, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    check-cast v4, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
-    iget-object v4, v4, Lc60/r$b;->a:Lh40/n;    # MARKER: R8 Lc60/r$b; Lh40/n; a
+    iget-object v4, v4, Li50/u$b;->a:Ln30/o;    # MARKER: R8 Li50/u$b; Ln30/o; a
 
-    instance-of v5, v4, Lh40/j;    # MARKER: R8 Lh40/j;
+    instance-of v5, v4, Ln30/k;    # MARKER: R8 Ln30/k;
 
     if-eqz v5, :done
 
-    check-cast v4, Lh40/j;    # MARKER: R8 Lh40/j;
+    check-cast v4, Ln30/k;    # MARKER: R8 Ln30/k;
 
     iget-object v5, p0, Lcom/tidal/android/dynamicpages/ui/modules/publicplaylistlist/PublicPlaylistListModuleManager;->f:Lcom/tidal/android/dynamicpages/ui/b;    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/b; f
 
@@ -448,9 +448,9 @@
 
     new-instance v8, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
-    iget-object v9, v3, Lc60/v;->a:Ljava/lang/String;    # MARKER: R8 Lc60/v; a
+    iget-object v9, v3, Li50/y;->a:Ljava/lang/String;    # MARKER: R8 Li50/y; a
 
-    iget v10, v3, Lc60/v;->e:I    # MARKER: R8 Lc60/v; e
+    iget v10, v3, Li50/y;->e:I    # MARKER: R8 Li50/y; e
 
     invoke-static {v10}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -458,7 +458,7 @@
 
     invoke-direct {v8, v0, v9, v10}, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-static {v4}, Lie0/h;->a(Lh40/j;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lie0/h; Lh40/j; a
+    invoke-static {v4}, Lae0/h;->a(Ln30/k;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lae0/h; Ln30/k; a
 
     move-result-object v4
 
@@ -527,17 +527,17 @@
 
     if-gt v3, v4, :done
 
-    invoke-virtual {p0, v1}, Li60/c;->c(Ljava/lang/String;)Lc60/h;    # MARKER: R8 Li60/c; Lc60/h; c
+    invoke-virtual {p0, v1}, Lq50/c;->c(Ljava/lang/String;)Li50/j;    # MARKER: R8 Lq50/c; Li50/j; c
 
     move-result-object v4
 
-    instance-of v5, v4, Lc60/c0;    # MARKER: R8 Lc60/c0;
+    instance-of v5, v4, Li50/f0;    # MARKER: R8 Li50/f0;
 
     if-eqz v5, :done
 
-    check-cast v4, Lc60/c0;    # MARKER: R8 Lc60/c0;
+    check-cast v4, Li50/f0;    # MARKER: R8 Li50/f0;
 
-    iget-object v5, v4, Lc60/c0;->b:Ljava/lang/String;    # MARKER: R8 Lc60/c0; b
+    iget-object v5, v4, Li50/f0;->b:Ljava/lang/String;    # MARKER: R8 Li50/f0; b
 
     invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -545,7 +545,7 @@
 
     if-eqz v1, :done
 
-    iget-object v1, v4, Lc60/c0;->g:Ljava/util/ArrayList;    # MARKER: R8 Lc60/c0; g
+    iget-object v1, v4, Li50/f0;->g:Ljava/util/ArrayList;    # MARKER: R8 Li50/f0; g
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -562,13 +562,13 @@
 
     move-result-object v6
 
-    instance-of v5, v6, Lc60/r;    # MARKER: R8 Lc60/r;
+    instance-of v5, v6, Li50/u;    # MARKER: R8 Li50/u;
 
     if-eqz v5, :find_media
 
-    check-cast v6, Lc60/r;    # MARKER: R8 Lc60/r;
+    check-cast v6, Li50/u;    # MARKER: R8 Li50/u;
 
-    invoke-static {v6}, Lc60/s;->a(Lc60/r;)Ljava/lang/String;    # MARKER: R8 Lc60/s; Lc60/r; a
+    invoke-static {v6}, Li50/v;->a(Li50/u;)Ljava/lang/String;    # MARKER: R8 Li50/v; Li50/u; a
 
     move-result-object v5
 
@@ -578,19 +578,19 @@
 
     if-eqz v5, :find_media
 
-    instance-of v5, v6, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    instance-of v5, v6, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
     if-eqz v5, :done
 
-    check-cast v6, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    check-cast v6, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
-    iget-object v7, v6, Lc60/r$b;->a:Lh40/n;    # MARKER: R8 Lc60/r$b; Lh40/n; a
+    iget-object v7, v6, Li50/u$b;->a:Ln30/o;    # MARKER: R8 Li50/u$b; Ln30/o; a
 
     const/4 v5, 0x1
 
     if-ne v3, v5, :check_mix
 
-    instance-of v5, v7, Lh40/a;    # MARKER: R8 Lh40/a;
+    instance-of v5, v7, Ln30/a;    # MARKER: R8 Ln30/a;
 
     if-eqz v5, :done
 
@@ -601,7 +601,7 @@
 
     if-ne v3, v5, :check_playlist
 
-    instance-of v5, v7, Lh40/i;    # MARKER: R8 Lh40/i;
+    instance-of v5, v7, Ln30/j;    # MARKER: R8 Ln30/j;
 
     if-eqz v5, :done
 
@@ -612,14 +612,14 @@
 
     if-ne v3, v5, :check_track
 
-    instance-of v5, v7, Lh40/j;    # MARKER: R8 Lh40/j;
+    instance-of v5, v7, Ln30/k;    # MARKER: R8 Ln30/k;
 
     if-eqz v5, :done
 
     goto :dependencies
 
     :check_track
-    instance-of v5, v7, Lh40/p;    # MARKER: R8 Lh40/p;
+    instance-of v5, v7, Ln30/p;    # MARKER: R8 Ln30/p;
 
     if-eqz v5, :done
 
@@ -640,9 +640,9 @@
 
     new-instance v10, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
-    iget-object v11, v4, Lc60/c0;->a:Ljava/lang/String;    # MARKER: R8 Lc60/c0; a
+    iget-object v11, v4, Li50/f0;->a:Ljava/lang/String;    # MARKER: R8 Li50/f0; a
 
-    iget v12, v4, Lc60/c0;->f:I    # MARKER: R8 Lc60/c0; f
+    iget v12, v4, Li50/f0;->f:I    # MARKER: R8 Li50/f0; f
 
     invoke-static {v12}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -654,9 +654,9 @@
 
     if-ne v3, v0, :mix
 
-    check-cast v7, Lh40/a;    # MARKER: R8 Lh40/a;
+    check-cast v7, Ln30/a;    # MARKER: R8 Ln30/a;
 
-    invoke-static {v7}, Lie0/a;->a(Lh40/a;)Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lie0/a; Lh40/a; a
+    invoke-static {v7}, Lae0/a;->b(Ln30/a;)Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lae0/a; Ln30/a; a
 
     move-result-object v12
 
@@ -695,9 +695,9 @@
 
     if-ne v3, v0, :playlist
 
-    check-cast v7, Lh40/i;    # MARKER: R8 Lh40/i;
+    check-cast v7, Ln30/j;    # MARKER: R8 Ln30/j;
 
-    invoke-static {v7}, Lie0/g;->b(Lh40/i;)Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lie0/g; Lh40/i; b
+    invoke-static {v7}, Lae0/g;->b(Ln30/j;)Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lae0/g; Ln30/j; b
 
     move-result-object v12
 
@@ -736,9 +736,9 @@
 
     if-ne v3, v0, :track
 
-    check-cast v7, Lh40/j;    # MARKER: R8 Lh40/j;
+    check-cast v7, Ln30/k;    # MARKER: R8 Ln30/k;
 
-    invoke-static {v7}, Lie0/h;->a(Lh40/j;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lie0/h; Lh40/j; a
+    invoke-static {v7}, Lae0/h;->a(Ln30/k;)Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lae0/h; Ln30/k; a
 
     move-result-object v12
 
@@ -767,9 +767,9 @@
     goto :done
 
     :track
-    check-cast v7, Lh40/p;    # MARKER: R8 Lh40/p;
+    check-cast v7, Ln30/p;    # MARKER: R8 Ln30/p;
 
-    invoke-static {v7}, Lie0/i;->a(Lh40/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lie0/i; Lh40/p; a
+    invoke-static {v7}, Lae0/i;->c(Ln30/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lae0/i; Ln30/p; a
 
     move-result-object v12
 
@@ -782,9 +782,9 @@
     move-result-object v6
 
     :navigation_ready
-    iget-object v0, v4, Lc60/c0;->c:Ljava/lang/String;    # MARKER: R8 Lc60/c0; c
+    iget-object v0, v4, Li50/f0;->c:Ljava/lang/String;    # MARKER: R8 Li50/f0; c
 
-    invoke-static {v2, v0, v6}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Ljava/lang/String;Ljava/lang/String;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
+    invoke-static {v6, v2, v0}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Lcom/tidal/android/navigation/NavigationInfo;Ljava/lang/String;Ljava/lang/String;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
 
     move-result-object v11
 
@@ -819,15 +819,15 @@
 .method private static menu(Lcom/tidal/android/dynamicpages/ui/c;)Lh4/a;    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/c; Lh4/a;
     .locals 2
 
-    iget-object v0, p0, Lcom/tidal/android/dynamicpages/ui/c;->a:Lcom/aspiro/wamp/core/k;    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/c; Lcom/aspiro/wamp/core/k; a
+    iget-object v0, p0, Lcom/tidal/android/dynamicpages/ui/c;->a:Lcom/aspiro/wamp/core/l;    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/c; Lcom/aspiro/wamp/core/l; a
 
-    instance-of v1, v0, Lh9/p1;    # MARKER: R8 Lh9/p1;
+    instance-of v1, v0, Lg9/u1;    # MARKER: R8 Lg9/u1;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lh9/p1;    # MARKER: R8 Lh9/p1;
+    check-cast v0, Lg9/u1;    # MARKER: R8 Lg9/u1;
 
-    iget-object v0, v0, Lh9/p1;->b:Lx40/a;    # MARKER: R8 Lh9/p1; Lx40/a; b
+    iget-object v0, v0, Lg9/u1;->b:Ld40/a;    # MARKER: R8 Lg9/u1; Ld40/a; b
 
     instance-of v1, v0, Lh4/a;    # MARKER: R8 Lh4/a;
 

patches/extension/radiant/gestures/queue/DynamicTrackQueue.smali

@@ -39,17 +39,17 @@
 
     if-lez v4, :done
 
-    invoke-virtual {p0, v1}, Li60/c;->c(Ljava/lang/String;)Lc60/h;    # MARKER: R8 Li60/c; Lc60/h; c
+    invoke-virtual {p0, v1}, Lq50/c;->c(Ljava/lang/String;)Li50/j;    # MARKER: R8 Lq50/c; Li50/j; c
 
     move-result-object v4
 
-    instance-of v5, v4, Lc60/b0;    # MARKER: R8 Lc60/b0;
+    instance-of v5, v4, Li50/e0;    # MARKER: R8 Li50/e0;
 
     if-eqz v5, :done
 
-    check-cast v4, Lc60/b0;    # MARKER: R8 Lc60/b0;
+    check-cast v4, Li50/e0;    # MARKER: R8 Li50/e0;
 
-    iget-object v5, v4, Lc60/b0;->b:Ljava/lang/String;    # MARKER: R8 Lc60/b0; b
+    iget-object v5, v4, Li50/e0;->b:Ljava/lang/String;    # MARKER: R8 Li50/e0; b
 
     invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -57,7 +57,7 @@
 
     if-eqz v1, :done
 
-    iget-object v1, v4, Lc60/b0;->f:Ljava/util/ArrayList;    # MARKER: R8 Lc60/b0; f
+    iget-object v1, v4, Li50/e0;->f:Ljava/util/ArrayList;    # MARKER: R8 Li50/e0; f
 
     if-eqz v1, :done
 
@@ -76,21 +76,21 @@
 
     move-result-object v5
 
-    instance-of v6, v5, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    instance-of v6, v5, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
     if-eqz v6, :find_track
 
-    check-cast v5, Lc60/r$b;    # MARKER: R8 Lc60/r$b;
+    check-cast v5, Li50/u$b;    # MARKER: R8 Li50/u$b;
 
-    iget-object v5, v5, Lc60/r$b;->a:Lh40/n;    # MARKER: R8 Lc60/r$b; Lh40/n; a
+    iget-object v5, v5, Li50/u$b;->a:Ln30/o;    # MARKER: R8 Li50/u$b; Ln30/o; a
 
-    instance-of v6, v5, Lh40/p;    # MARKER: R8 Lh40/p;
+    instance-of v6, v5, Ln30/p;    # MARKER: R8 Ln30/p;
 
     if-eqz v6, :find_track
 
-    check-cast v5, Lh40/p;    # MARKER: R8 Lh40/p;
+    check-cast v5, Ln30/p;    # MARKER: R8 Ln30/p;
 
-    iget-wide v6, v5, Lh40/p;->a:J    # MARKER: R8 Lh40/p; a
+    iget-wide v6, v5, Ln30/p;->a:J    # MARKER: R8 Ln30/p; a
 
     cmp-long v6, v6, v2
 
@@ -112,13 +112,13 @@
 
     if-eqz v1, :done
 
-    invoke-static {v5}, Lie0/i;->a(Lh40/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lie0/i; Lh40/p; a
+    invoke-static {v5}, Lae0/i;->c(Ln30/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lae0/i; Ln30/p; a
 
     move-result-object v7
 
     if-eqz v7, :done
 
-    iget-object v2, v4, Lc60/b0;->a:Ljava/lang/String;    # MARKER: R8 Lc60/b0; a
+    iget-object v2, v4, Li50/e0;->a:Ljava/lang/String;    # MARKER: R8 Li50/e0; a
 
     if-eqz v2, :done
 
@@ -130,7 +130,7 @@
 
     new-instance v8, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
-    iget v3, v4, Lc60/b0;->e:I    # MARKER: R8 Lc60/b0; e
+    iget v3, v4, Li50/e0;->e:I    # MARKER: R8 Li50/e0; e
 
     invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -144,11 +144,11 @@
 
     move-result-object v2
 
-    iget-object v3, v4, Lc60/b0;->c:Ljava/lang/String;    # MARKER: R8 Lc60/b0; c
+    iget-object v3, v4, Li50/e0;->c:Ljava/lang/String;    # MARKER: R8 Li50/e0; c
 
     if-eqz v3, :done
 
-    iget-object v10, v4, Lc60/b0;->g:Ljava/lang/String;    # MARKER: R8 Lc60/b0; g
+    iget-object v10, v4, Li50/e0;->g:Ljava/lang/String;    # MARKER: R8 Li50/e0; g
 
     invoke-static {v10}, Lcom/aspiro/wamp/playqueue/source/model/ItemSource$NavigationType$a;->a(Ljava/lang/String;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource$NavigationType;    # MARKER: R8 a
 

patches/extension/radiant/gestures/queue/DynamicTrackQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -19,18 +19,18 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e$e;)V    # MARKER: R8 Lam0/l; Lm40/e$e;
+.method public constructor <init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e$e;)V    # MARKER: R8 Lyl0/l; Ls30/e$e;
     .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->pageId:Ljava/lang/String;
 
     iput-object p3, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->moduleUuid:Ljava/lang/String;
 
-    iget-wide v0, p4, Lm40/e$e;->a:J    # MARKER: R8 Lm40/e$e; a
+    iget-wide v0, p4, Ls30/e$e;->a:J    # MARKER: R8 Ls30/e$e; a
 
     iput-wide v0, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->trackId:J
 
@@ -60,7 +60,7 @@
 
     iget-object v4, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->moduleUuid:Ljava/lang/String;
 
-    invoke-direct {v0, v1, v2, v3, v4}, Lcom/tidal/android/dynamicpages/ui/modules/tracklist/b$a;-><init>(JLjava/lang/String;Ljava/lang/String;)V    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/modules/tracklist/b$a;
+    invoke-direct {v0, v3, v4, v1, v2}, Lcom/tidal/android/dynamicpages/ui/modules/tracklist/b$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V    # MARKER: R8 Lcom/tidal/android/dynamicpages/ui/modules/tracklist/b$a;
 
     goto :emit
 
@@ -82,9 +82,9 @@
     invoke-direct/range {v0 .. v6}, Lradiant/gestures/queue/DynamicTrackQueueEvent;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;JI)V
 
     :emit
-    iget-object v7, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v7, p0, Lradiant/gestures/queue/DynamicTrackQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-interface {v7, v0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v7, v0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/extension/radiant/gestures/queue/DynamicTrackResolver.smali

@@ -11,18 +11,18 @@
 
 
 # direct methods
-.method private currentAlbumRow(Lradiant/gestures/queue/QueueRequest;)Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+.method private currentAlbumRow(Lradiant/gestures/queue/QueueRequest;)Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
     .locals 9
 
     if-eqz p1, :invalid
 
     iget-object v0, p1, Lradiant/gestures/queue/QueueRequest;->media:Ljava/lang/Object;
 
-    instance-of v1, v0, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    instance-of v1, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    check-cast v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     iget-object v1, p0, Lradiant/gestures/queue/DynamicTrackResolver;->recycler:Ljava/lang/ref/WeakReference;
 
@@ -68,37 +68,37 @@
 
     move-result-object v2
 
-    instance-of v3, v2, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    instance-of v3, v2, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     if-eqz v3, :invalid
 
-    check-cast v2, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    check-cast v2, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
-    iget-object v3, v0, Lu5/b$a;->a:Lu5/b$a$a;    # MARKER: R8 Lu5/b$a; Lu5/b$a$a; a
+    iget-object v3, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->a:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a; a
 
-    iget-object v4, v2, Lu5/b$a;->a:Lu5/b$a$a;    # MARKER: R8 Lu5/b$a; Lu5/b$a$a; a
+    iget-object v4, v2, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->a:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$a; a
 
     if-ne v3, v4, :invalid
 
-    iget-wide v3, v0, Lu5/b$a;->b:J    # MARKER: R8 Lu5/b$a; b
+    iget-wide v3, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->b:J    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; b
 
-    iget-wide v5, v2, Lu5/b$a;->b:J    # MARKER: R8 Lu5/b$a; b
+    iget-wide v5, v2, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->b:J    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; b
 
     cmp-long v7, v3, v5
 
     if-nez v7, :invalid
 
-    iget-object v3, v0, Lu5/b$a;->c:Lu5/b$a$b;    # MARKER: R8 Lu5/b$a; Lu5/b$a$b; c
+    iget-object v3, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->c:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; c
 
-    iget-object v4, v2, Lu5/b$a;->c:Lu5/b$a$b;    # MARKER: R8 Lu5/b$a; Lu5/b$a$b; c
+    iget-object v4, v2, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->c:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; c
 
     if-eqz v3, :invalid
 
     if-eqz v4, :invalid
 
-    iget v5, v3, Lu5/b$a$b;->r:I    # MARKER: R8 Lu5/b$a$b; r
+    iget v5, v3, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->s:I    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; r
 
-    iget v6, v4, Lu5/b$a$b;->r:I    # MARKER: R8 Lu5/b$a$b; r
+    iget v6, v4, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->s:I    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; r
 
     iget v7, p1, Lradiant/gestures/queue/QueueRequest;->id:I
 
@@ -106,9 +106,9 @@
 
     if-ne v6, v7, :invalid
 
-    iget-object v5, v3, Lu5/b$a$b;->s:Ljava/lang/String;    # MARKER: R8 Lu5/b$a$b; s
+    iget-object v5, v3, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->t:Ljava/lang/String;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; s
 
-    iget-object v6, v4, Lu5/b$a$b;->s:Ljava/lang/String;    # MARKER: R8 Lu5/b$a$b; s
+    iget-object v6, v4, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->t:Ljava/lang/String;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; s
 
     if-eq v5, v6, :module_valid
 
@@ -121,7 +121,7 @@
     if-eqz v5, :invalid
 
     :module_valid
-    iget-object v5, v4, Lu5/b$a$b;->g:Lcom/aspiro/wamp/model/Availability;    # MARKER: R8 Lu5/b$a$b; g
+    iget-object v5, v4, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->g:Lcom/aspiro/wamp/model/Availability;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; g
 
     invoke-interface {v5}, Lcom/aspiro/wamp/model/Availability;->isAvailable()Z
 
@@ -129,7 +129,7 @@
 
     if-eqz v5, :invalid
 
-    iget-boolean v5, v4, Lu5/b$a$b;->p:Z    # MARKER: R8 Lu5/b$a$b; p
+    iget-boolean v5, v4, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->q:Z    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; p
 
     if-nez v5, :invalid
 
@@ -155,18 +155,18 @@
     return-void
 .end method
 
-.method private currentRow(Lradiant/gestures/queue/QueueRequest;)Lo6/b;    # MARKER: R8 Lo6/b;
+.method private currentRow(Lradiant/gestures/queue/QueueRequest;)Ln6/b;    # MARKER: R8 Ln6/b;
     .locals 8
 
     if-eqz p1, :invalid
 
     iget-object v0, p1, Lradiant/gestures/queue/QueueRequest;->media:Ljava/lang/Object;
 
-    instance-of v1, v0, Lo6/b;    # MARKER: R8 Lo6/b;
+    instance-of v1, v0, Ln6/b;    # MARKER: R8 Ln6/b;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lo6/b;    # MARKER: R8 Lo6/b;
+    check-cast v0, Ln6/b;    # MARKER: R8 Ln6/b;
 
     iget-object v1, p0, Lradiant/gestures/queue/DynamicTrackResolver;->recycler:Ljava/lang/ref/WeakReference;
 
@@ -212,37 +212,37 @@
 
     move-result-object v2
 
-    instance-of v3, v2, Lo6/b;    # MARKER: R8 Lo6/b;
+    instance-of v3, v2, Ln6/b;    # MARKER: R8 Ln6/b;
 
     if-eqz v3, :invalid
 
-    check-cast v2, Lo6/b;    # MARKER: R8 Lo6/b;
+    check-cast v2, Ln6/b;    # MARKER: R8 Ln6/b;
 
-    iget-object v3, v0, Lo6/b;->a:Lo6/i;    # MARKER: R8 Lo6/b; Lo6/i; a
+    iget-object v3, v0, Ln6/b;->a:Ln6/g;    # MARKER: R8 Ln6/b; Ln6/g; a
 
-    iget-object v4, v2, Lo6/b;->a:Lo6/i;    # MARKER: R8 Lo6/b; Lo6/i; a
+    iget-object v4, v2, Ln6/b;->a:Ln6/g;    # MARKER: R8 Ln6/b; Ln6/g; a
 
     if-ne v3, v4, :invalid
 
-    iget-wide v3, v0, Lo6/b;->b:J    # MARKER: R8 Lo6/b; b
+    iget-wide v3, v0, Ln6/b;->b:J    # MARKER: R8 Ln6/b; b
 
-    iget-wide v5, v2, Lo6/b;->b:J    # MARKER: R8 Lo6/b; b
+    iget-wide v5, v2, Ln6/b;->b:J    # MARKER: R8 Ln6/b; b
 
     cmp-long v7, v3, v5
 
     if-nez v7, :invalid
 
-    iget-object v3, v0, Lo6/b;->c:Lo6/b$a;    # MARKER: R8 Lo6/b; Lo6/b$a; c
+    iget-object v3, v0, Ln6/b;->c:Ln6/b$a;    # MARKER: R8 Ln6/b; Ln6/b$a; c
 
-    iget-object v4, v2, Lo6/b;->c:Lo6/b$a;    # MARKER: R8 Lo6/b; Lo6/b$a; c
+    iget-object v4, v2, Ln6/b;->c:Ln6/b$a;    # MARKER: R8 Ln6/b; Ln6/b$a; c
 
     if-eqz v3, :invalid
 
     if-eqz v4, :invalid
 
-    iget v5, v3, Lo6/b$a;->d:I    # MARKER: R8 Lo6/b$a; d
+    iget v5, v3, Ln6/b$a;->d:I    # MARKER: R8 Ln6/b$a; d
 
-    iget v6, v4, Lo6/b$a;->d:I    # MARKER: R8 Lo6/b$a; d
+    iget v6, v4, Ln6/b$a;->d:I    # MARKER: R8 Ln6/b$a; d
 
     iget v7, p1, Lradiant/gestures/queue/QueueRequest;->id:I
 
@@ -250,15 +250,15 @@
 
     if-ne v6, v7, :invalid
 
-    iget v5, v3, Lo6/b$a;->o:I    # MARKER: R8 Lo6/b$a; o
+    iget v5, v3, Ln6/b$a;->o:I    # MARKER: R8 Ln6/b$a; o
 
-    iget v6, v4, Lo6/b$a;->o:I    # MARKER: R8 Lo6/b$a; o
+    iget v6, v4, Ln6/b$a;->o:I    # MARKER: R8 Ln6/b$a; o
 
     if-ne v5, v6, :invalid
 
-    iget-object v5, v3, Lo6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Lo6/b$a; q
+    iget-object v5, v3, Ln6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Ln6/b$a; q
 
-    iget-object v6, v4, Lo6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Lo6/b$a; q
+    iget-object v6, v4, Ln6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Ln6/b$a; q
 
     if-eq v5, v6, :valid
 
@@ -282,19 +282,19 @@
 .method private currentTrack(Lradiant/gestures/queue/QueueRequest;)Lcom/aspiro/wamp/model/Track;
     .locals 7
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/DynamicTrackResolver;->currentRow(Lradiant/gestures/queue/QueueRequest;)Lo6/b;    # MARKER: R8 Lo6/b;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/DynamicTrackResolver;->currentRow(Lradiant/gestures/queue/QueueRequest;)Ln6/b;    # MARKER: R8 Ln6/b;
 
     move-result-object v0
 
     if-eqz v0, :invalid
 
-    iget-object v1, v0, Lo6/b;->a:Lo6/i;    # MARKER: R8 Lo6/b; Lo6/i; a
+    iget-object v1, v0, Ln6/b;->a:Ln6/g;    # MARKER: R8 Ln6/b; Ln6/g; a
 
-    iget-object v2, v0, Lo6/b;->c:Lo6/b$a;    # MARKER: R8 Lo6/b; Lo6/b$a; c
+    iget-object v2, v0, Ln6/b;->c:Ln6/b$a;    # MARKER: R8 Ln6/b; Ln6/b$a; c
 
-    iget-object v3, v1, Lo6/i;->p:Ljava/util/LinkedHashMap;    # MARKER: R8 Lo6/i; p
+    iget-object v3, v1, Ln6/g;->p:Ljava/util/LinkedHashMap;    # MARKER: R8 Ln6/g; p
 
-    iget-object v4, v2, Lo6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Lo6/b$a; q
+    iget-object v4, v2, Ln6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Ln6/b$a; q
 
     invoke-virtual {v3, v4}, Ljava/util/LinkedHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -310,7 +310,7 @@
 
     move-result-object v3
 
-    iget v4, v2, Lo6/b$a;->o:I    # MARKER: R8 Lo6/b$a; o
+    iget v4, v2, Ln6/b$a;->o:I    # MARKER: R8 Ln6/b$a; o
 
     if-gez v4, :check_size
 
@@ -344,7 +344,7 @@
 
     if-ne v4, v5, :invalid
 
-    iget-object v1, v1, Lo6/i;->g:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lo6/i; g
+    iget-object v1, v1, Ln6/g;->g:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Ln6/g; g
 
     invoke-interface {v1, v3}, Lcom/aspiro/wamp/model/AvailabilityInteractor;->getAvailability(Lcom/aspiro/wamp/model/MediaItem;)Lcom/aspiro/wamp/model/Availability$MediaItem;
 
@@ -418,17 +418,17 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    instance-of v0, p1, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    check-cast p1, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
-    iget-object v0, p1, Lu5/b$a;->c:Lu5/b$a$b;    # MARKER: R8 Lu5/b$a; Lu5/b$a$b; c
+    iget-object v0, p1, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;->c:Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a; Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; c
 
     if-eqz v0, :invalid
 
-    iget-object v1, v0, Lu5/b$a$b;->g:Lcom/aspiro/wamp/model/Availability;    # MARKER: R8 Lu5/b$a$b; g
+    iget-object v1, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->g:Lcom/aspiro/wamp/model/Availability;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; g
 
     invoke-interface {v1}, Lcom/aspiro/wamp/model/Availability;->isAvailable()Z
 
@@ -436,11 +436,11 @@
 
     if-eqz v1, :invalid
 
-    iget-boolean v1, v0, Lu5/b$a$b;->p:Z    # MARKER: R8 Lu5/b$a$b; p
+    iget-boolean v1, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->q:Z    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; p
 
     if-nez v1, :invalid
 
-    iget v0, v0, Lu5/b$a$b;->r:I    # MARKER: R8 Lu5/b$a$b; r
+    iget v0, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b;->s:I    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a$b; r
 
     new-instance v1, Lradiant/gestures/queue/QueueRequest;
 
@@ -478,11 +478,11 @@
 
     iget-object v0, p1, Lradiant/gestures/queue/QueueRequest;->media:Ljava/lang/Object;
 
-    instance-of v1, v0, Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    instance-of v1, v0, Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     if-eqz v1, :dynamic_track
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/DynamicTrackResolver;->currentAlbumRow(Lradiant/gestures/queue/QueueRequest;)Lu5/b$a;    # MARKER: R8 Lu5/b$a;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/DynamicTrackResolver;->currentAlbumRow(Lradiant/gestures/queue/QueueRequest;)Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     move-result-object v0
 
@@ -490,7 +490,7 @@
 
     new-instance v1, Lradiant/gestures/queue/AlbumItemQueueAction;
 
-    invoke-direct {v1, v0}, Lradiant/gestures/queue/AlbumItemQueueAction;-><init>(Lu5/b$a;)V    # MARKER: R8 Lu5/b$a;
+    invoke-direct {v1, v0}, Lradiant/gestures/queue/AlbumItemQueueAction;-><init>(Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;)V    # MARKER: R8 Lcom/aspiro/wamp/dynamicpages/modules/albumitemcollection/b$a;
 
     iget-object v2, p0, Lradiant/gestures/queue/DynamicTrackResolver;->recycler:Ljava/lang/ref/WeakReference;
 
@@ -513,7 +513,7 @@
     return-void
 
     :dynamic_track
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/DynamicTrackResolver;->currentRow(Lradiant/gestures/queue/QueueRequest;)Lo6/b;    # MARKER: R8 Lo6/b;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/DynamicTrackResolver;->currentRow(Lradiant/gestures/queue/QueueRequest;)Ln6/b;    # MARKER: R8 Ln6/b;
 
     move-result-object v0
 
@@ -535,30 +535,30 @@
 
     if-nez v2, :append
 
-    iget-object v2, v0, Lo6/b;->a:Lo6/i;    # MARKER: R8 Lo6/b; Lo6/i; a
+    iget-object v2, v0, Ln6/b;->a:Ln6/g;    # MARKER: R8 Ln6/b; Ln6/g; a
 
-    iget-object v3, v0, Lo6/b;->c:Lo6/b$a;    # MARKER: R8 Lo6/b; Lo6/b$a; c
+    iget-object v3, v0, Ln6/b;->c:Ln6/b$a;    # MARKER: R8 Ln6/b; Ln6/b$a; c
 
-    iget v4, v3, Lo6/b$a;->o:I    # MARKER: R8 Lo6/b$a; o
+    iget v4, v3, Ln6/b$a;->o:I    # MARKER: R8 Ln6/b$a; o
 
-    iget-object v5, v3, Lo6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Lo6/b$a; q
+    iget-object v5, v3, Ln6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Ln6/b$a; q
 
-    invoke-virtual {v2, v4, v5}, Lo6/i;->e(ILjava/lang/String;)V    # MARKER: R8 Lo6/i; e
+    invoke-virtual {v2, v4, v5}, Ln6/g;->e(ILjava/lang/String;)V    # MARKER: R8 Ln6/g; e
 
     goto :done
 
     :append
-    iget-object v0, v0, Lo6/b;->a:Lo6/i;    # MARKER: R8 Lo6/b; Lo6/i; a
+    iget-object v0, v0, Ln6/b;->a:Ln6/g;    # MARKER: R8 Ln6/b; Ln6/g; a
 
-    iget-object v2, v0, Lo6/i;->p:Ljava/util/LinkedHashMap;    # MARKER: R8 Lo6/i; p
+    iget-object v2, v0, Ln6/g;->p:Ljava/util/LinkedHashMap;    # MARKER: R8 Ln6/g; p
 
     iget-object v3, p1, Lradiant/gestures/queue/QueueRequest;->media:Ljava/lang/Object;
 
-    check-cast v3, Lo6/b;    # MARKER: R8 Lo6/b;
+    check-cast v3, Ln6/b;    # MARKER: R8 Ln6/b;
 
-    iget-object v3, v3, Lo6/b;->c:Lo6/b$a;    # MARKER: R8 Lo6/b; Lo6/b$a; c
+    iget-object v3, v3, Ln6/b;->c:Ln6/b$a;    # MARKER: R8 Ln6/b; Ln6/b$a; c
 
-    iget-object v3, v3, Lo6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Lo6/b$a; q
+    iget-object v3, v3, Ln6/b$a;->q:Ljava/lang/String;    # MARKER: R8 Ln6/b$a; q
 
     invoke-virtual {v2, v3}, Ljava/util/LinkedHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -598,7 +598,7 @@
 
     move-result-object v5
 
-    iget-object v6, v0, Lo6/i;->m:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lo6/i; m
+    iget-object v6, v0, Ln6/g;->m:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Ln6/g; m
 
     invoke-virtual {v2}, Lcom/aspiro/wamp/dynamicpages/data/model/Module;->getSelfLink()Ljava/lang/String;
 
@@ -655,7 +655,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 5
 
-    instance-of v0, p2, Lv6/e$a;    # MARKER: R8 Lv6/e$a;
+    instance-of v0, p2, Lu6/e$a;    # MARKER: R8 Lu6/e$a;
 
     if-eqz v0, :dynamic_holder
 
@@ -666,7 +666,7 @@
     return-object p1
 
     :dynamic_holder
-    instance-of v0, p2, Lp7/a$a;    # MARKER: R8 Lp7/a$a;
+    instance-of v0, p2, Lo7/a$a;    # MARKER: R8 Lo7/a$a;
 
     if-eqz v0, :invalid
 
@@ -721,17 +721,17 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lo6/b;    # MARKER: R8 Lo6/b;
+    instance-of v0, p1, Ln6/b;    # MARKER: R8 Ln6/b;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lo6/b;    # MARKER: R8 Lo6/b;
+    check-cast p1, Ln6/b;    # MARKER: R8 Ln6/b;
 
-    iget-object v0, p1, Lo6/b;->c:Lo6/b$a;    # MARKER: R8 Lo6/b; Lo6/b$a; c
+    iget-object v0, p1, Ln6/b;->c:Ln6/b$a;    # MARKER: R8 Ln6/b; Ln6/b$a; c
 
     if-eqz v0, :invalid
 
-    iget v0, v0, Lo6/b$a;->d:I    # MARKER: R8 Lo6/b$a; d
+    iget v0, v0, Ln6/b$a;->d:I    # MARKER: R8 Ln6/b$a; d
 
     new-instance v1, Lradiant/gestures/queue/QueueRequest;
 

patches/extension/radiant/gestures/queue/FavoriteTracksResolver.smali

@@ -74,7 +74,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 5
 
-    instance-of p1, p2, Ln8/d;    # MARKER: R8 Ln8/d;
+    instance-of p1, p2, Lm8/d;    # MARKER: R8 Lm8/d;
 
     if-eqz p1, :invalid
 
@@ -89,9 +89,9 @@
     goto :invalid
 
     :has_position
-    check-cast p2, Ln8/d;    # MARKER: R8 Ln8/d;
+    check-cast p2, Lm8/d;    # MARKER: R8 Lm8/d;
 
-    iget-object p2, p2, Ln8/d;->f:Lcom/aspiro/wamp/model/MediaItem;    # MARKER: R8 Ln8/d; f
+    iget-object p2, p2, Lm8/d;->f:Lcom/aspiro/wamp/model/MediaItem;    # MARKER: R8 Lm8/d; f
 
     instance-of v0, p2, Lcom/aspiro/wamp/model/FavoriteTrack;
 

patches/extension/radiant/gestures/queue/FeedResolver.smali

@@ -46,7 +46,7 @@
 
     if-eqz v0, :invalid
 
-    iget-object v0, v0, Lcom/tidal/android/feature/feed/ui/FeedView;->d:Lv70/b;    # MARKER: R8 Lv70/b; d
+    iget-object v0, v0, Lcom/tidal/android/feature/feed/ui/FeedView;->d:Lg70/b;    # MARKER: R8 Lg70/b; d
 
     instance-of v1, v0, Lcom/tidal/android/feature/feed/ui/c;    # MARKER: R8 Lcom/tidal/android/feature/feed/ui/c;
 
@@ -54,11 +54,11 @@
 
     check-cast v0, Lcom/tidal/android/feature/feed/ui/c;    # MARKER: R8 Lcom/tidal/android/feature/feed/ui/c;
 
-    iget-object v0, v0, Lcom/tidal/android/feature/feed/ui/c;->c:Lz70/a;    # MARKER: R8 Lcom/tidal/android/feature/feed/ui/c; Lz70/a; c
+    iget-object v0, v0, Lcom/tidal/android/feature/feed/ui/c;->c:Lk70/a;    # MARKER: R8 Lcom/tidal/android/feature/feed/ui/c; Lk70/a; c
 
     if-eqz v0, :invalid
 
-    iget-object v0, v0, Lz70/a;->c:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lz70/a; c
+    iget-object v0, v0, Lk70/a;->c:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lk70/a; c
 
     return-object v0
 
@@ -99,13 +99,13 @@
 
     move-result-object v2
 
-    instance-of v3, v2, La50/b;    # MARKER: R8 La50/b;
+    instance-of v3, v2, Lg40/b;    # MARKER: R8 Lg40/b;
 
     if-eqz v3, :invalid
 
-    check-cast v2, La50/b;    # MARKER: R8 La50/b;
+    check-cast v2, Lg40/b;    # MARKER: R8 Lg40/b;
 
-    iget-object v2, v2, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    iget-object v2, v2, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
 
     iget v3, p1, Lradiant/gestures/queue/QueueRequest;->position:I
 
@@ -133,7 +133,7 @@
 
     if-eqz v4, :invalid
 
-    instance-of v3, v2, Lb80/a;    # MARKER: R8 Lb80/a;
+    instance-of v3, v2, Lm70/a;    # MARKER: R8 Lm70/a;
 
     if-eqz v3, :mix
 
@@ -141,15 +141,15 @@
 
     if-eqz v3, :invalid
 
-    check-cast v2, Lb80/a;    # MARKER: R8 Lb80/a;
+    check-cast v2, Lm70/a;    # MARKER: R8 Lm70/a;
 
-    iget-boolean v3, v2, Lb80/a;->c:Z    # MARKER: R8 Lb80/a; c
+    iget-boolean v3, v2, Lm70/a;->c:Z    # MARKER: R8 Lm70/a; c
 
     if-eqz v3, :invalid
 
     check-cast v8, Lcom/aspiro/wamp/model/Album;
 
-    iget-object v5, v2, Lb80/a;->a:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lb80/a; a
+    iget-object v5, v2, Lm70/a;->a:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lm70/a; a
 
     invoke-virtual {v8}, Lcom/aspiro/wamp/model/Album;->getId()I
 
@@ -178,7 +178,7 @@
     return-object v2
 
     :mix
-    instance-of v3, v2, Lb80/c;    # MARKER: R8 Lb80/c;
+    instance-of v3, v2, Lm70/c;    # MARKER: R8 Lm70/c;
 
     if-eqz v3, :playlist
 
@@ -186,11 +186,11 @@
 
     if-eqz v3, :invalid
 
-    check-cast v2, Lb80/c;    # MARKER: R8 Lb80/c;
+    check-cast v2, Lm70/c;    # MARKER: R8 Lm70/c;
 
     check-cast v8, Lcom/aspiro/wamp/mix/model/Mix;
 
-    iget-object v5, v2, Lb80/c;->a:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lb80/c; a
+    iget-object v5, v2, Lm70/c;->a:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lm70/c; a
 
     invoke-virtual {v8}, Lcom/aspiro/wamp/mix/model/Mix;->getId()Ljava/lang/String;
 
@@ -227,7 +227,7 @@
     return-object v2
 
     :playlist
-    instance-of v3, v2, Lb80/d;    # MARKER: R8 Lb80/d;
+    instance-of v3, v2, Lm70/d;    # MARKER: R8 Lm70/d;
 
     if-eqz v3, :invalid
 
@@ -235,11 +235,11 @@
 
     if-eqz v3, :invalid
 
-    check-cast v2, Lb80/d;    # MARKER: R8 Lb80/d;
+    check-cast v2, Lm70/d;    # MARKER: R8 Lm70/d;
 
     check-cast v8, Lcom/aspiro/wamp/model/Playlist;
 
-    iget-object v5, v2, Lb80/d;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lb80/d; a
+    iget-object v5, v2, Lm70/d;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lm70/d; a
 
     invoke-virtual {v8}, Lcom/aspiro/wamp/model/Playlist;->getUuid()Ljava/lang/String;
 
@@ -349,45 +349,45 @@
 
     if-eqz v3, :done
 
-    iget-object v2, v1, Lcom/tidal/android/feature/feed/ui/FeedView;->c:La80/c;    # MARKER: R8 La80/c; c
+    iget-object v2, v1, Lcom/tidal/android/feature/feed/ui/FeedView;->c:Ll70/c;    # MARKER: R8 Ll70/c; c
 
     if-eqz v2, :done
 
-    instance-of v4, v0, Lb80/a;    # MARKER: R8 Lb80/a;
+    instance-of v4, v0, Lm70/a;    # MARKER: R8 Lm70/a;
 
     if-eqz v4, :mix
 
-    check-cast v0, Lb80/a;    # MARKER: R8 Lb80/a;
+    check-cast v0, Lm70/a;    # MARKER: R8 Lm70/a;
 
-    iget-object v7, v0, Lb80/a;->a:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lb80/a; a
+    iget-object v7, v0, Lm70/a;->a:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lm70/a; a
 
-    iget v8, v0, Lb80/a;->g:I    # MARKER: R8 Lb80/a; g
+    iget v8, v0, Lm70/a;->g:I    # MARKER: R8 Lm70/a; g
 
     const/4 v4, 0x1
 
     goto :metadata
 
     :mix
-    instance-of v4, v0, Lb80/c;    # MARKER: R8 Lb80/c;
+    instance-of v4, v0, Lm70/c;    # MARKER: R8 Lm70/c;
 
     if-eqz v4, :playlist
 
-    check-cast v0, Lb80/c;    # MARKER: R8 Lb80/c;
+    check-cast v0, Lm70/c;    # MARKER: R8 Lm70/c;
 
-    iget-object v7, v0, Lb80/c;->a:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lb80/c; a
+    iget-object v7, v0, Lm70/c;->a:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lm70/c; a
 
-    iget v8, v0, Lb80/c;->c:I    # MARKER: R8 Lb80/c; c
+    iget v8, v0, Lm70/c;->c:I    # MARKER: R8 Lm70/c; c
 
     const/4 v4, 0x2
 
     goto :metadata
 
     :playlist
-    check-cast v0, Lb80/d;    # MARKER: R8 Lb80/d;
+    check-cast v0, Lm70/d;    # MARKER: R8 Lm70/d;
 
-    iget-object v7, v0, Lb80/d;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lb80/d; a
+    iget-object v7, v0, Lm70/d;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lm70/d; a
 
-    iget v8, v0, Lb80/d;->c:I    # MARKER: R8 Lb80/d; c
+    iget v8, v0, Lm70/d;->c:I    # MARKER: R8 Lm70/d; c
 
     const/4 v4, 0x3
 
@@ -396,13 +396,13 @@
 
     move-result-object v8
 
-    iget-object v0, v2, La80/c;->a:Ljava/lang/String;    # MARKER: R8 La80/c; a
+    iget-object v0, v2, Ll70/c;->a:Ljava/lang/String;    # MARKER: R8 Ll70/c; a
 
     new-instance p1, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
     invoke-direct {p1, v0, v8}, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v5, v2, La80/c;->e:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 La80/c; e
+    iget-object v5, v2, Ll70/c;->e:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Ll70/c; e
 
     const/4 v0, 0x3
 
@@ -433,7 +433,7 @@
     goto :done
 
     :collection
-    iget-object v6, v2, La80/c;->b:Lx40/a;    # MARKER: R8 La80/c; Lx40/a; b
+    iget-object v6, v2, Ll70/c;->b:Ld40/a;    # MARKER: R8 Ll70/c; Ld40/a; b
 
     instance-of v0, v6, Lh4/a;    # MARKER: R8 Lh4/a;
 
@@ -524,7 +524,7 @@
 
     if-ne v0, p1, :invalid
 
-    instance-of v0, p2, Lw70/c$a;    # MARKER: R8 Lw70/c$a;
+    instance-of v0, p2, Lh70/c$a;    # MARKER: R8 Lh70/c$a;
 
     if-eqz v0, :mix_holder
 
@@ -534,7 +534,7 @@
 
     :mix_holder
 
-    instance-of v0, p2, Lw70/h$a;    # MARKER: R8 Lw70/h$a;
+    instance-of v0, p2, Lh70/h$a;    # MARKER: R8 Lh70/h$a;
 
     if-eqz v0, :playlist_holder
 
@@ -544,7 +544,7 @@
 
     :playlist_holder
 
-    instance-of v0, p2, Lw70/k$a;    # MARKER: R8 Lw70/k$a;
+    instance-of v0, p2, Lh70/l$a;    # MARKER: R8 Lh70/l$a;
 
     if-eqz v0, :invalid
 
@@ -564,13 +564,13 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/b;    # MARKER: R8 La50/b;
+    instance-of v0, p1, Lg40/b;    # MARKER: R8 Lg40/b;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/b;    # MARKER: R8 La50/b;
+    check-cast p1, Lg40/b;    # MARKER: R8 Lg40/b;
 
-    iget-object p1, p1, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    iget-object p1, p1, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
@@ -585,7 +585,7 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lb80/a;    # MARKER: R8 Lb80/a;
+    instance-of v0, p1, Lm70/a;    # MARKER: R8 Lm70/a;
 
     if-eqz v0, :mix
 
@@ -593,9 +593,9 @@
 
     if-ne v5, v0, :invalid
 
-    check-cast p1, Lb80/a;    # MARKER: R8 Lb80/a;
+    check-cast p1, Lm70/a;    # MARKER: R8 Lm70/a;
 
-    iget-object v1, p1, Lb80/a;->a:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lb80/a; a
+    iget-object v1, p1, Lm70/a;->a:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lm70/a; a
 
     invoke-virtual {v1}, Lcom/aspiro/wamp/model/Album;->getId()I
 
@@ -604,7 +604,7 @@
     goto :request
 
     :mix
-    instance-of v0, p1, Lb80/c;    # MARKER: R8 Lb80/c;
+    instance-of v0, p1, Lm70/c;    # MARKER: R8 Lm70/c;
 
     if-eqz v0, :playlist
 
@@ -612,9 +612,9 @@
 
     if-ne v5, v0, :invalid
 
-    check-cast p1, Lb80/c;    # MARKER: R8 Lb80/c;
+    check-cast p1, Lm70/c;    # MARKER: R8 Lm70/c;
 
-    iget-object v1, p1, Lb80/c;->a:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lb80/c; a
+    iget-object v1, p1, Lm70/c;->a:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lm70/c; a
 
     invoke-virtual {v1}, Lcom/aspiro/wamp/mix/model/Mix;->getId()Ljava/lang/String;
 
@@ -627,7 +627,7 @@
     goto :request
 
     :playlist
-    instance-of v0, p1, Lb80/d;    # MARKER: R8 Lb80/d;
+    instance-of v0, p1, Lm70/d;    # MARKER: R8 Lm70/d;
 
     if-eqz v0, :invalid
 
@@ -635,9 +635,9 @@
 
     if-ne v5, v0, :invalid
 
-    check-cast p1, Lb80/d;    # MARKER: R8 Lb80/d;
+    check-cast p1, Lm70/d;    # MARKER: R8 Lm70/d;
 
-    iget-object v1, p1, Lb80/d;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lb80/d; a
+    iget-object v1, p1, Lm70/d;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lm70/d; a
 
     invoke-virtual {v1}, Lcom/aspiro/wamp/model/Playlist;->getUuid()Ljava/lang/String;
 

patches/extension/radiant/gestures/queue/MyAlbumsResolver.smali

@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method private current(Lradiant/gestures/queue/QueueRequest;)Lzc/a;    # MARKER: R8 Lzc/a;
+.method private current(Lradiant/gestures/queue/QueueRequest;)Lxc/a;    # MARKER: R8 Lxc/a;
     .locals 7
 
     if-eqz p1, :invalid
@@ -40,11 +40,11 @@
 
     if-eqz v0, :invalid
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;->h:Lad/f;    # MARKER: R8 Lad/f; h
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;->h:Lyc/f;    # MARKER: R8 Lyc/f; h
 
     if-eqz v1, :invalid
 
-    invoke-virtual {v0}, Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;->N()La50/d;    # MARKER: R8 La50/d; N
+    invoke-virtual {v0}, Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;->N()Lg40/d;    # MARKER: R8 Lg40/d; N
 
     move-result-object v0
 
@@ -72,17 +72,17 @@
 
     move-result-object v0
 
-    instance-of v1, v0, Lzc/a;    # MARKER: R8 Lzc/a;
+    instance-of v1, v0, Lxc/a;    # MARKER: R8 Lxc/a;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lzc/a;    # MARKER: R8 Lzc/a;
+    check-cast v0, Lxc/a;    # MARKER: R8 Lxc/a;
 
-    iget-boolean v1, v0, Lzc/a;->k:Z    # MARKER: R8 Lzc/a; k
+    iget-boolean v1, v0, Lxc/a;->k:Z    # MARKER: R8 Lxc/a; k
 
     if-eqz v1, :invalid
 
-    iget-object v1, v0, Lzc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lzc/a; b
+    iget-object v1, v0, Lxc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lxc/a; b
 
     invoke-virtual {v1}, Lcom/aspiro/wamp/model/Album;->getId()I
 
@@ -124,7 +124,7 @@
 
     iget v6, p1, Lradiant/gestures/queue/QueueRequest;->action:I
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/MyAlbumsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lzc/a;    # MARKER: R8 Lzc/a;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/MyAlbumsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lxc/a;    # MARKER: R8 Lxc/a;
 
     move-result-object p1
 
@@ -140,11 +140,11 @@
 
     if-eqz v0, :done
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;->c:Lfd/c;    # MARKER: R8 Lfd/c; c
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;->c:Ldd/c;    # MARKER: R8 Ldd/c; c
 
     if-eqz v1, :done
 
-    iget-object v2, v1, Lfd/c;->a:Lx40/a;    # MARKER: R8 Lfd/c; Lx40/a; a
+    iget-object v2, v1, Ldd/c;->a:Ld40/a;    # MARKER: R8 Ldd/c; Ld40/a; a
 
     instance-of v3, v2, Lh4/a;    # MARKER: R8 Lh4/a;
 
@@ -156,11 +156,11 @@
 
     move-result-object v3
 
-    iget-object v4, p1, Lzc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lzc/a; b
+    iget-object v4, p1, Lxc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lxc/a; b
 
-    iget-object v5, v1, Lfd/c;->d:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Lfd/c; d
+    iget-object v5, v1, Ldd/c;->d:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Ldd/c; d
 
-    iget-object p0, v1, Lfd/c;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lfd/c; c
+    iget-object p0, v1, Ldd/c;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Ldd/c; c
 
     const/4 v1, 0x3
 
@@ -202,7 +202,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 6
 
-    instance-of v0, p2, Lbd/d$a;    # MARKER: R8 Lbd/d$a;
+    instance-of v0, p2, Lzc/d$a;    # MARKER: R8 Lzc/d$a;
 
     if-eqz v0, :invalid
 
@@ -221,11 +221,11 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v0, p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/d;    # MARKER: R8 La50/d;
+    check-cast p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
 
@@ -244,17 +244,17 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lzc/a;    # MARKER: R8 Lzc/a;
+    instance-of v0, p1, Lxc/a;    # MARKER: R8 Lxc/a;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lzc/a;    # MARKER: R8 Lzc/a;
+    check-cast p1, Lxc/a;    # MARKER: R8 Lxc/a;
 
-    iget-boolean v0, p1, Lzc/a;->k:Z    # MARKER: R8 Lzc/a; k
+    iget-boolean v0, p1, Lxc/a;->k:Z    # MARKER: R8 Lxc/a; k
 
     if-eqz v0, :invalid
 
-    iget-object v0, p1, Lzc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lzc/a; b
+    iget-object v0, p1, Lxc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lxc/a; b
 
     invoke-virtual {v0}, Lcom/aspiro/wamp/model/Album;->getId()I
 

patches/extension/radiant/gestures/queue/MyMixesAndRadioResolver.smali

@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method private current(Lradiant/gestures/queue/QueueRequest;)Lve/a;    # MARKER: R8 Lve/a;
+.method private current(Lradiant/gestures/queue/QueueRequest;)Lte/a;    # MARKER: R8 Lte/a;
     .locals 6
 
     if-eqz p1, :invalid
@@ -48,11 +48,11 @@
 
     if-eqz v1, :invalid
 
-    iget-object v2, v1, Lcom/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView;->c:Lpe/f;    # MARKER: R8 Lpe/f; c
+    iget-object v2, v1, Lcom/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView;->c:Lne/f;    # MARKER: R8 Lne/f; c
 
     if-eqz v2, :invalid
 
-    invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView;->N()La50/d;    # MARKER: R8 La50/d; N
+    invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView;->N()Lg40/d;    # MARKER: R8 Lg40/d; N
 
     move-result-object v1
 
@@ -80,17 +80,17 @@
 
     move-result-object v1
 
-    instance-of v2, v1, Lve/a;    # MARKER: R8 Lve/a;
+    instance-of v2, v1, Lte/a;    # MARKER: R8 Lte/a;
 
     if-eqz v2, :invalid
 
-    check-cast v1, Lve/a;    # MARKER: R8 Lve/a;
+    check-cast v1, Lte/a;    # MARKER: R8 Lte/a;
 
-    iget-boolean v2, v1, Lve/a;->f:Z    # MARKER: R8 Lve/a; f
+    iget-boolean v2, v1, Lte/a;->f:Z    # MARKER: R8 Lte/a; f
 
     if-eqz v2, :invalid
 
-    iget-object v2, v1, Lve/a;->c:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lve/a; c
+    iget-object v2, v1, Lte/a;->c:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lte/a; c
 
     if-eqz v2, :invalid
 
@@ -98,7 +98,7 @@
 
     move-result-object v0
 
-    iget-object v3, v1, Lve/a;->a:Ljava/lang/String;    # MARKER: R8 Lve/a; a
+    iget-object v3, v1, Lte/a;->a:Ljava/lang/String;    # MARKER: R8 Lte/a; a
 
     invoke-virtual {v3, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -156,7 +156,7 @@
 
     iget v7, p1, Lradiant/gestures/queue/QueueRequest;->action:I
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/MyMixesAndRadioResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lve/a;    # MARKER: R8 Lve/a;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/MyMixesAndRadioResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lte/a;    # MARKER: R8 Lte/a;
 
     move-result-object p1
 
@@ -172,11 +172,11 @@
 
     if-eqz v0, :done
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView;->c:Lpe/f;    # MARKER: R8 Lpe/f; c
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView;->c:Lne/f;    # MARKER: R8 Lne/f; c
 
     if-eqz v1, :done
 
-    iget-object v2, v1, Lpe/f;->a:Lx40/a;    # MARKER: R8 Lpe/f; Lx40/a; a
+    iget-object v2, v1, Lne/f;->a:Ld40/a;    # MARKER: R8 Lne/f; Ld40/a; a
 
     instance-of v3, v2, Lh4/a;    # MARKER: R8 Lh4/a;
 
@@ -188,7 +188,7 @@
 
     move-result-object v3
 
-    iget-object v4, p1, Lve/a;->c:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lve/a; c
+    iget-object v4, p1, Lte/a;->c:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lte/a; c
 
     new-instance v5, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
@@ -196,7 +196,7 @@
 
     invoke-direct {v5, v6}, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;-><init>(Ljava/lang/String;)V
 
-    iget-object p0, v1, Lpe/f;->b:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lpe/f; b
+    iget-object p0, v1, Lne/f;->b:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lne/f; b
 
     const/4 v1, 0x3
 
@@ -238,7 +238,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 5
 
-    instance-of v0, p2, Lqe/c$a;    # MARKER: R8 Lqe/c$a;
+    instance-of v0, p2, Loe/d$a;    # MARKER: R8 Loe/d$a;
 
     if-eqz v0, :invalid
 
@@ -257,11 +257,11 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v0, p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/d;    # MARKER: R8 La50/d;
+    check-cast p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
 
@@ -285,21 +285,21 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lve/a;    # MARKER: R8 Lve/a;
+    instance-of v0, p1, Lte/a;    # MARKER: R8 Lte/a;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lve/a;    # MARKER: R8 Lve/a;
+    check-cast p1, Lte/a;    # MARKER: R8 Lte/a;
 
-    iget-boolean v0, p1, Lve/a;->f:Z    # MARKER: R8 Lve/a; f
+    iget-boolean v0, p1, Lte/a;->f:Z    # MARKER: R8 Lte/a; f
 
     if-eqz v0, :invalid
 
-    iget-object v0, p1, Lve/a;->c:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lve/a; c
+    iget-object v0, p1, Lte/a;->c:Lcom/aspiro/wamp/mix/model/Mix;    # MARKER: R8 Lte/a; c
 
     if-eqz v0, :invalid
 
-    iget-object v1, p1, Lve/a;->a:Ljava/lang/String;    # MARKER: R8 Lve/a; a
+    iget-object v1, p1, Lte/a;->a:Ljava/lang/String;    # MARKER: R8 Lte/a; a
 
     invoke-virtual {v0}, Lcom/aspiro/wamp/mix/model/Mix;->getId()Ljava/lang/String;
 

patches/extension/radiant/gestures/queue/MyPlaylistsResolver.smali

@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method private current(Lradiant/gestures/queue/QueueRequest;)Lcf/b;    # MARKER: R8 Lcf/b;
+.method private current(Lradiant/gestures/queue/QueueRequest;)Laf/b;    # MARKER: R8 Laf/b;
     .locals 6
 
     if-eqz p1, :invalid
@@ -52,7 +52,7 @@
 
     if-eqz v2, :invalid
 
-    invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->N()La50/d;    # MARKER: R8 La50/d; N
+    invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->N()Lg40/d;    # MARKER: R8 Lg40/d; N
 
     move-result-object v1
 
@@ -80,23 +80,23 @@
 
     move-result-object v1
 
-    instance-of v2, v1, Lcf/b;    # MARKER: R8 Lcf/b;
+    instance-of v2, v1, Laf/b;    # MARKER: R8 Laf/b;
 
     if-eqz v2, :invalid
 
-    check-cast v1, Lcf/b;    # MARKER: R8 Lcf/b;
+    check-cast v1, Laf/b;    # MARKER: R8 Laf/b;
 
-    iget-boolean v2, v1, Lcf/b;->h:Z    # MARKER: R8 Lcf/b; h
+    iget-boolean v2, v1, Laf/b;->h:Z    # MARKER: R8 Laf/b; h
 
     if-eqz v2, :invalid
 
-    iget-boolean v2, v1, Lcf/b;->f:Z    # MARKER: R8 Lcf/b; f
+    iget-boolean v2, v1, Laf/b;->f:Z    # MARKER: R8 Laf/b; f
 
     if-eqz v2, :check_playlist
 
     const-string v2, "NOT_READY"
 
-    iget-object v3, v1, Lcf/b;->g:Ljava/lang/String;    # MARKER: R8 Lcf/b; g
+    iget-object v3, v1, Laf/b;->g:Ljava/lang/String;    # MARKER: R8 Laf/b; g
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -105,7 +105,7 @@
     if-nez v2, :invalid
 
     :check_playlist
-    iget-object v2, v1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lcf/b; a
+    iget-object v2, v1, Laf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Laf/b; a
 
     invoke-virtual {v2}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I
 
@@ -159,7 +159,7 @@
 
     iget v5, p1, Lradiant/gestures/queue/QueueRequest;->action:I
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/MyPlaylistsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lcf/b;    # MARKER: R8 Lcf/b;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/MyPlaylistsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Laf/b;    # MARKER: R8 Laf/b;
 
     move-result-object p1
 
@@ -175,7 +175,7 @@
 
     if-eqz v0, :done
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->d:Lhf/c;    # MARKER: R8 Lhf/c; d
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->d:Lff/c;    # MARKER: R8 Lff/c; d
 
     if-eqz v1, :done
 
@@ -183,11 +183,11 @@
 
     move-result-object v2
 
-    iget-object v3, p1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lcf/b; a
+    iget-object v3, p1, Laf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Laf/b; a
 
-    iget-object v4, v1, Lhf/c;->e:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Lhf/c; e
+    iget-object v4, v1, Lff/c;->e:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Lff/c; e
 
-    iget-object p0, v1, Lhf/c;->d:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lhf/c; d
+    iget-object p0, v1, Lff/c;->d:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lff/c; d
 
     const/4 v0, 0x3
 
@@ -216,7 +216,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 5
 
-    instance-of v0, p2, Ldf/d$a;    # MARKER: R8 Ldf/d$a;
+    instance-of v0, p2, Lbf/d$a;    # MARKER: R8 Lbf/d$a;
 
     if-eqz v0, :invalid
 
@@ -235,11 +235,11 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v0, p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/d;    # MARKER: R8 La50/d;
+    check-cast p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
 
@@ -258,23 +258,23 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lcf/b;    # MARKER: R8 Lcf/b;
+    instance-of v0, p1, Laf/b;    # MARKER: R8 Laf/b;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lcf/b;    # MARKER: R8 Lcf/b;
+    check-cast p1, Laf/b;    # MARKER: R8 Laf/b;
 
-    iget-boolean v0, p1, Lcf/b;->h:Z    # MARKER: R8 Lcf/b; h
+    iget-boolean v0, p1, Laf/b;->h:Z    # MARKER: R8 Laf/b; h
 
     if-eqz v0, :invalid
 
-    iget-boolean v0, p1, Lcf/b;->f:Z    # MARKER: R8 Lcf/b; f
+    iget-boolean v0, p1, Laf/b;->f:Z    # MARKER: R8 Laf/b; f
 
     if-eqz v0, :check_playlist
 
     const-string v0, "NOT_READY"
 
-    iget-object v1, p1, Lcf/b;->g:Ljava/lang/String;    # MARKER: R8 Lcf/b; g
+    iget-object v1, p1, Laf/b;->g:Ljava/lang/String;    # MARKER: R8 Laf/b; g
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -283,7 +283,7 @@
     if-nez v0, :invalid
 
     :check_playlist
-    iget-object v0, p1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lcf/b; a
+    iget-object v0, p1, Laf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Laf/b; a
 
     invoke-virtual {v0}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I
 

patches/extension/radiant/gestures/queue/PlaylistItemsResolver.smali

@@ -36,10 +36,10 @@
 
     invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
     move-result-object v2
-    instance-of v3, v2, La50/b;    # MARKER: R8 La50/b;
+    instance-of v3, v2, Lg40/b;    # MARKER: R8 Lg40/b;
     if-eqz v3, :invalid
-    check-cast v2, La50/b;    # MARKER: R8 La50/b;
-    iget-object v2, v2, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    check-cast v2, Lg40/b;    # MARKER: R8 Lg40/b;
+    iget-object v2, v2, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
 
     iget v3, p1, Lradiant/gestures/queue/QueueRequest;->position:I
     if-gez v3, :check_size
@@ -176,10 +176,10 @@
 
     invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
     move-result-object v0
-    instance-of v1, v0, La50/b;    # MARKER: R8 La50/b;
+    instance-of v1, v0, Lg40/b;    # MARKER: R8 Lg40/b;
     if-eqz v1, :invalid
-    check-cast v0, La50/b;    # MARKER: R8 La50/b;
-    iget-object v0, v0, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    check-cast v0, Lg40/b;    # MARKER: R8 Lg40/b;
+    iget-object v0, v0, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
 
     iget v1, p1, Lradiant/gestures/queue/QueueRequest;->position:I
     const/4 v2, 0x0
@@ -277,7 +277,7 @@
     invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
     move-result-object v3
     sget v4, Lcom/aspiro/wamp/R$string;->recommended_tracks:I
-    invoke-static {v4}, Lcom/aspiro/wamp/util/h0;->c(I)Ljava/lang/String;    # MARKER: R8 Lcom/aspiro/wamp/util/h0; c
+    invoke-static {v4}, Lcom/aspiro/wamp/util/a0;->c(I)Ljava/lang/String;    # MARKER: R8 Lcom/aspiro/wamp/util/a0; c
     move-result-object v4
     iget-object v5, v2, Lcom/aspiro/wamp/playlist/ui/items/PlaylistItemCollectionView;->h:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 h
     sget-object v6, Lcom/aspiro/wamp/playqueue/source/model/ItemSource$NavigationType$None;->INSTANCE:Lcom/aspiro/wamp/playqueue/source/model/ItemSource$NavigationType$None;
@@ -290,7 +290,7 @@
     :append_member
     iget-object v3, v2, Lcom/aspiro/wamp/playlist/ui/items/PlaylistItemCollectionView;->c:Lcom/aspiro/wamp/playlist/ui/items/a;    # MARKER: R8 Lcom/aspiro/wamp/playlist/ui/items/a; c
     if-eqz v3, :done
-    invoke-interface {v3}, Lcom/aspiro/wamp/playlist/ui/items/a;->k()Lcom/aspiro/wamp/playlist/viewmodel/PlaylistCollectionViewModel;    # MARKER: R8 Lcom/aspiro/wamp/playlist/ui/items/a; k
+    invoke-interface {v3}, Lcom/aspiro/wamp/playlist/ui/items/a;->l()Lcom/aspiro/wamp/playlist/viewmodel/PlaylistCollectionViewModel;    # MARKER: R8 Lcom/aspiro/wamp/playlist/ui/items/a; k
     move-result-object v3
     invoke-virtual {v3}, Lcom/aspiro/wamp/playlist/viewmodel/PlaylistCollectionViewModel;->getPlaylist()Lcom/aspiro/wamp/model/Playlist;
     move-result-object v3
@@ -342,7 +342,7 @@
     if-gez v0, :start_member
     goto :done
     :start_member
-    invoke-interface {v3, v0}, Lcom/aspiro/wamp/playlist/ui/items/a;->i(I)V    # MARKER: R8 Lcom/aspiro/wamp/playlist/ui/items/a; i
+    invoke-interface {v3, v0}, Lcom/aspiro/wamp/playlist/ui/items/a;->j(I)V    # MARKER: R8 Lcom/aspiro/wamp/playlist/ui/items/a; i
 
     :done
     return-void
@@ -365,10 +365,10 @@
     :has_position
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
     move-result-object p1
-    instance-of v1, p1, La50/b;    # MARKER: R8 La50/b;
+    instance-of v1, p1, Lg40/b;    # MARKER: R8 Lg40/b;
     if-eqz v1, :invalid
-    check-cast p1, La50/b;    # MARKER: R8 La50/b;
-    iget-object p1, p1, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    check-cast p1, Lg40/b;    # MARKER: R8 Lg40/b;
+    iget-object p1, p1, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
     move-result v1
     if-lt v0, v1, :read_item
@@ -378,21 +378,21 @@
     invoke-virtual {p1, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
     move-result-object p1
 
-    instance-of v1, p2, Lij/q$a;    # MARKER: R8 Lij/q$a;
+    instance-of v1, p2, Lgj/r$a;    # MARKER: R8 Lgj/r$a;
     if-eqz v1, :podcast_holder
     instance-of v1, p1, Lcom/aspiro/wamp/playlist/viewmodel/item/TrackViewModel;
     if-eqz v1, :invalid
     goto :create
 
     :podcast_holder
-    instance-of v1, p2, Lij/a0$a;    # MARKER: R8 Lij/a0$a;
+    instance-of v1, p2, Lgj/b0$a;    # MARKER: R8 Lgj/b0$a;
     if-eqz v1, :suggestion_holder
     instance-of v1, p1, Lcom/aspiro/wamp/playlist/viewmodel/item/PodcastTrackViewModel;
     if-eqz v1, :invalid
     goto :create
 
     :suggestion_holder
-    instance-of p2, p2, Lij/j0$a;    # MARKER: R8 Lij/j0$a;
+    instance-of p2, p2, Lgj/l0$a;    # MARKER: R8 Lgj/l0$a;
     if-eqz p2, :invalid
     instance-of p2, p1, Lcom/aspiro/wamp/playlist/viewmodel/item/SuggestedTrackViewModel;
     if-eqz p2, :invalid

patches/extension/radiant/gestures/queue/PublicPlaylistQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -19,18 +19,18 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e$d;)V    # MARKER: R8 Lam0/l; Lm40/e$d;
+.method public constructor <init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e$d;)V    # MARKER: R8 Lyl0/l; Ls30/e$d;
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->pageId:Ljava/lang/String;
 
     iput-object p3, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->moduleUuid:Ljava/lang/String;
 
-    iget-object p1, p4, Lm40/e$d;->a:Ljava/lang/String;    # MARKER: R8 Lm40/e$d; a
+    iget-object p1, p4, Ls30/e$d;->a:Ljava/lang/String;    # MARKER: R8 Ls30/e$d; a
 
     iput-object p1, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->itemId:Ljava/lang/String;
 
@@ -42,7 +42,7 @@
 .method public invoke(I)Ljava/lang/Object;
     .locals 7
 
-    iget-object v0, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v0, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v0, :done
 
@@ -66,9 +66,9 @@
 
     invoke-direct/range {v0 .. v6}, Lradiant/gestures/queue/DynamicMediaQueueEvent;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V
 
-    iget-object v1, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v1, p0, Lradiant/gestures/queue/PublicPlaylistQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    invoke-interface {v1, v0}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v1, v0}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/extension/radiant/gestures/queue/QueueExecutor.smali

@@ -64,15 +64,15 @@
 
     if-eqz v0, :done
 
-    iget-object v0, v0, Lo3/a;->l:Lcom/aspiro/wamp/module/album/AlbumProvider;    # MARKER: R8 Lo3/a; l
+    iget-object v0, v0, Lo3/a;->m:Lcom/aspiro/wamp/module/album/AlbumProvider;    # MARKER: R8 Lo3/a; l
 
     if-eqz v0, :done
 
-    new-instance v1, Lc3/h;    # MARKER: R8 Lc3/h;
+    new-instance v1, Ld3/f;    # MARKER: R8 Ld3/f;
 
-    invoke-direct {v1, p1, v0, p2, p3}, Lc3/h;-><init>(Lcom/aspiro/wamp/model/Album;Lcom/aspiro/wamp/module/album/AlbumProvider;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)V    # MARKER: R8 Lc3/h;
+    invoke-direct {v1, p1, v0, p2, p3}, Ld3/f;-><init>(Lcom/aspiro/wamp/model/Album;Lcom/aspiro/wamp/module/album/AlbumProvider;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)V    # MARKER: R8 Ld3/f;
 
-    invoke-virtual {v1, p0}, Lc3/h;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lc3/h; b
+    invoke-virtual {v1, p0}, Ld3/f;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Ld3/f; b
 
     :done
     return-void
@@ -103,17 +103,17 @@
 
     if-eqz v0, :done
 
-    iget-object v0, v0, Lu3/a;->j:Lj3/k$a;    # MARKER: R8 Lu3/a; Lj3/k$a; j
+    iget-object v0, v0, Lu3/a;->j:Lk3/m$a;    # MARKER: R8 Lu3/a; Lk3/m$a; j
 
     if-eqz v0, :done
 
-    invoke-interface {v0, p1, p2, p3}, Lj3/k$a;->a(Lcom/aspiro/wamp/mix/model/Mix;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lj3/k;    # MARKER: R8 Lj3/k$a; Lj3/k; a
+    invoke-interface {v0, p1, p2, p3}, Lk3/m$a;->a(Lcom/aspiro/wamp/mix/model/Mix;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lk3/m;    # MARKER: R8 Lk3/m$a; Lk3/m; a
 
     move-result-object v0
 
     if-eqz v0, :done
 
-    invoke-virtual {v0, p0}, Lj3/k;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lj3/k; b
+    invoke-virtual {v0, p0}, Lk3/m;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lk3/m; b
 
     :done
     return-void
@@ -180,17 +180,17 @@
 
     move-result-object v1
 
-    check-cast v1, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast v1, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
-    invoke-virtual {v1}, Le5/z$n2;->r2()Lcom/aspiro/wamp/playqueue/g1;    # MARKER: R8 Le5/z$n2; Lcom/aspiro/wamp/playqueue/g1; r2
+    invoke-virtual {v1}, Le5/d0$t2;->A2()Lcom/aspiro/wamp/playqueue/x0;    # MARKER: R8 Le5/d0$t2; Lcom/aspiro/wamp/playqueue/x0; r2
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/aspiro/wamp/playqueue/g1;->a()Lcom/aspiro/wamp/player/d;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/g1; Lcom/aspiro/wamp/player/d; a
+    invoke-virtual {v2}, Lcom/aspiro/wamp/playqueue/x0;->a()Lcom/aspiro/wamp/player/c;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/x0; Lcom/aspiro/wamp/player/c; a
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/aspiro/wamp/player/d;->b()Lcom/aspiro/wamp/model/MediaItemParent;    # MARKER: R8 Lcom/aspiro/wamp/player/d; b
+    invoke-virtual {v2}, Lcom/aspiro/wamp/player/c;->b()Lcom/aspiro/wamp/model/MediaItemParent;    # MARKER: R8 Lcom/aspiro/wamp/player/c; b
 
     move-result-object v2
 
@@ -229,20 +229,20 @@
 
     move-result-object v2
 
-    iget-object v2, v2, Lo3/a;->e:Lc3/i$a;    # MARKER: R8 Lo3/a; Lc3/i$a; e
+    iget-object v2, v2, Lo3/a;->f:Ld3/g$a;    # MARKER: R8 Lo3/a; Ld3/g$a; e
 
-    invoke-interface {v2, p1, p2, p3}, Lc3/i$a;->a(Lcom/aspiro/wamp/model/Album;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lc3/i;    # MARKER: R8 Lc3/i$a; Lc3/i; a
+    invoke-interface {v2, p1, p2, p3}, Ld3/g$a;->a(Lcom/aspiro/wamp/model/Album;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Ld3/g;    # MARKER: R8 Ld3/g$a; Ld3/g; a
 
     move-result-object p1
 
     check-cast p0, Landroidx/fragment/app/FragmentActivity;
 
-    invoke-virtual {p1, p0}, Lc3/i;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lc3/i; b
+    invoke-virtual {p1, p0}, Ld3/g;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Ld3/g; b
 
     goto :done
 
     :play
-    invoke-virtual {v1}, Le5/z$n2;->u3()Lcom/aspiro/wamp/playback/f;    # MARKER: R8 Le5/z$n2; Lcom/aspiro/wamp/playback/f; u3
+    invoke-virtual {v1}, Le5/d0$t2;->F3()Lcom/aspiro/wamp/playback/e;    # MARKER: R8 Le5/d0$t2; Lcom/aspiro/wamp/playback/e; u3
 
     move-result-object p0
 
@@ -252,7 +252,7 @@
 
     const/4 p2, 0x1
 
-    invoke-virtual {p0, p1, p3, p2, v0}, Lcom/aspiro/wamp/playback/f;->a(ILcom/tidal/android/navigation/NavigationInfo;ZLjava/lang/String;)Lhu/akarnokd/rxjava/interop/f;    # MARKER: R8 Lcom/aspiro/wamp/playback/f; Lhu/akarnokd/rxjava/interop/f; a
+    invoke-virtual {p0, p1, p3, p2, v0}, Lcom/aspiro/wamp/playback/e;->a(ILcom/tidal/android/navigation/NavigationInfo;ZLjava/lang/String;)Lhu/akarnokd/rxjava/interop/f;    # MARKER: R8 Lcom/aspiro/wamp/playback/e; Lhu/akarnokd/rxjava/interop/f; a
 
     move-result-object v0
 
@@ -271,17 +271,17 @@
 
     move-result-object v0
 
-    check-cast v0, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast v0, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
-    invoke-virtual {v0}, Le5/z$n2;->r2()Lcom/aspiro/wamp/playqueue/g1;    # MARKER: R8 Le5/z$n2; Lcom/aspiro/wamp/playqueue/g1; r2
+    invoke-virtual {v0}, Le5/d0$t2;->A2()Lcom/aspiro/wamp/playqueue/x0;    # MARKER: R8 Le5/d0$t2; Lcom/aspiro/wamp/playqueue/x0; r2
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/aspiro/wamp/playqueue/g1;->a()Lcom/aspiro/wamp/player/d;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/g1; Lcom/aspiro/wamp/player/d; a
+    invoke-virtual {v0}, Lcom/aspiro/wamp/playqueue/x0;->a()Lcom/aspiro/wamp/player/c;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/x0; Lcom/aspiro/wamp/player/c; a
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/aspiro/wamp/player/d;->b()Lcom/aspiro/wamp/model/MediaItemParent;    # MARKER: R8 Lcom/aspiro/wamp/player/d; b
+    invoke-virtual {v0}, Lcom/aspiro/wamp/player/c;->b()Lcom/aspiro/wamp/model/MediaItemParent;    # MARKER: R8 Lcom/aspiro/wamp/player/c; b
 
     move-result-object v0
 
@@ -343,15 +343,15 @@
 
     move-result-object v1
 
-    iget-object v1, v1, Lu3/a;->e:Lj3/n$a;    # MARKER: R8 Lu3/a; Lj3/n$a; e
+    iget-object v1, v1, Lu3/a;->e:Lk3/p$a;    # MARKER: R8 Lu3/a; Lk3/p$a; e
 
-    invoke-interface {v1, p1, p2, p3}, Lj3/n$a;->a(Lcom/aspiro/wamp/mix/model/Mix;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lj3/n;    # MARKER: R8 Lj3/n$a; Lj3/n; a
+    invoke-interface {v1, p1, p2, p3}, Lk3/p$a;->a(Lcom/aspiro/wamp/mix/model/Mix;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lk3/p;    # MARKER: R8 Lk3/p$a; Lk3/p; a
 
     move-result-object p1
 
     check-cast p0, Landroidx/fragment/app/FragmentActivity;
 
-    invoke-virtual {p1, p0}, Lj3/n;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lj3/n; b
+    invoke-virtual {p1, p0}, Lk3/p;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lk3/p; b
 
     goto :done
 
@@ -364,9 +364,9 @@
 
     move-result-object p0
 
-    check-cast p0, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast p0, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
-    invoke-virtual {p0}, Le5/z$n2;->x3()Lcom/aspiro/wamp/playback/e0;    # MARKER: R8 Le5/z$n2; Lcom/aspiro/wamp/playback/e0; x3
+    invoke-virtual {p0}, Le5/d0$t2;->I3()Lcom/aspiro/wamp/playback/e0;    # MARKER: R8 Le5/d0$t2; Lcom/aspiro/wamp/playback/e0; x3
 
     move-result-object p0
 
@@ -403,7 +403,7 @@
 
     move-result-object v0
 
-    check-cast v0, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast v0, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
     invoke-static {}, Lradiant/gestures/queue/QueueExecutor;->hasActiveQueue()Z
 
@@ -436,9 +436,9 @@
 
     :has_activity
 
-    iget-object v1, v0, Le5/z$n2;->w8:Ldagger/internal/f;    # MARKER: R8 Le5/z$n2; Ldagger/internal/f; w8
+    iget-object v1, v0, Le5/d0$t2;->e9:Ldagger/internal/f;    # MARKER: R8 Le5/d0$t2; Ldagger/internal/f; w8
 
-    invoke-interface {v1}, Lql0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lql0/a;
+    invoke-interface {v1}, Lol0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lol0/a;
 
     move-result-object v1
 
@@ -455,7 +455,7 @@
     goto :done
 
     :play
-    invoke-virtual {v0}, Le5/z$n2;->y3()Lcom/aspiro/wamp/playback/k0;    # MARKER: R8 Le5/z$n2; Lcom/aspiro/wamp/playback/k0; y3
+    invoke-virtual {v0}, Le5/d0$t2;->J3()Lcom/aspiro/wamp/playback/k0;    # MARKER: R8 Le5/d0$t2; Lcom/aspiro/wamp/playback/k0; y3
 
     move-result-object p0
 
@@ -492,13 +492,13 @@
 
     move-result-object v1
 
-    iget-object v1, v1, Lo3/a;->d:Lc3/l$a;    # MARKER: R8 Lo3/a; Lc3/l$a; d
+    iget-object v1, v1, Lo3/a;->e:Ld3/j$a;    # MARKER: R8 Lo3/a; Ld3/j$a; d
 
-    invoke-interface {v1, p1, p2, p3}, Lc3/l$a;->a(Lcom/aspiro/wamp/model/Album;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lc3/l;    # MARKER: R8 Lc3/l$a; Lc3/l; a
+    invoke-interface {v1, p1, p2, p3}, Ld3/j$a;->a(Lcom/aspiro/wamp/model/Album;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Ld3/j;    # MARKER: R8 Ld3/j$a; Ld3/j; a
 
     move-result-object p1
 
-    invoke-virtual {p1, p0}, Lc3/l;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lc3/l; b
+    invoke-virtual {p1, p0}, Ld3/j;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Ld3/j; b
 
     goto :done
 
@@ -538,13 +538,13 @@
 
     move-result-object v1
 
-    iget-object v1, v1, Lu3/a;->d:Lj3/q$a;    # MARKER: R8 Lu3/a; Lj3/q$a; d
+    iget-object v1, v1, Lu3/a;->d:Lk3/s$a;    # MARKER: R8 Lu3/a; Lk3/s$a; d
 
-    invoke-interface {v1, p1, p2, p3}, Lj3/q$a;->a(Lcom/aspiro/wamp/mix/model/Mix;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lj3/q;    # MARKER: R8 Lj3/q$a; Lj3/q; a
+    invoke-interface {v1, p1, p2, p3}, Lk3/s$a;->a(Lcom/aspiro/wamp/mix/model/Mix;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lk3/s;    # MARKER: R8 Lk3/s$a; Lk3/s; a
 
     move-result-object p1
 
-    invoke-virtual {p1, p0}, Lj3/q;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lj3/q; b
+    invoke-virtual {p1, p0}, Lk3/s;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lk3/s; b
 
     goto :done
 
@@ -588,21 +588,21 @@
 
     move-result-object v0
 
-    check-cast v0, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast v0, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
-    iget-object v0, v0, Le5/z$n2;->v8:Ldagger/internal/f;    # MARKER: R8 Le5/z$n2; Ldagger/internal/f; v8
+    iget-object v0, v0, Le5/d0$t2;->d9:Ldagger/internal/f;    # MARKER: R8 Le5/d0$t2; Ldagger/internal/f; v8
 
-    invoke-interface {v0}, Lql0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lql0/a;
+    invoke-interface {v0}, Lol0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lol0/a;
 
     move-result-object v0
 
-    check-cast v0, Lcom/aspiro/wamp/contextmenu/item/playlist/u$a;    # MARKER: R8 Lcom/aspiro/wamp/contextmenu/item/playlist/u$a;
+    check-cast v0, Lcom/aspiro/wamp/contextmenu/item/playlist/z$a;    # MARKER: R8 Lcom/aspiro/wamp/contextmenu/item/playlist/z$a;
 
-    invoke-interface {v0, p1, p2, p3}, Lcom/aspiro/wamp/contextmenu/item/playlist/u$a;->a(Lcom/aspiro/wamp/model/Playlist;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/contextmenu/item/playlist/u;    # MARKER: R8 Lcom/aspiro/wamp/contextmenu/item/playlist/u$a; Lcom/aspiro/wamp/contextmenu/item/playlist/u; a
+    invoke-interface {v0, p1, p2, p3}, Lcom/aspiro/wamp/contextmenu/item/playlist/z$a;->a(Lcom/aspiro/wamp/model/Playlist;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/contextmenu/item/playlist/z;    # MARKER: R8 Lcom/aspiro/wamp/contextmenu/item/playlist/z$a; Lcom/aspiro/wamp/contextmenu/item/playlist/z; a
 
     move-result-object p1
 
-    invoke-virtual {p1, p0}, Lcom/aspiro/wamp/contextmenu/item/playlist/u;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lcom/aspiro/wamp/contextmenu/item/playlist/u; b
+    invoke-virtual {p1, p0}, Lcom/aspiro/wamp/contextmenu/item/playlist/z;->b(Landroidx/fragment/app/FragmentActivity;)V    # MARKER: R8 Lcom/aspiro/wamp/contextmenu/item/playlist/z; b
 
     goto :done
 
@@ -640,11 +640,11 @@
 
     move-result-object v1
 
-    check-cast v1, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast v1, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
-    iget-object v1, v1, Le5/z$n2;->K9:Ldagger/internal/f;    # MARKER: R8 Le5/z$n2; Ldagger/internal/f; K9
+    iget-object v1, v1, Le5/d0$t2;->ga:Ldagger/internal/f;    # MARKER: R8 Le5/d0$t2; Ldagger/internal/f; K9
 
-    invoke-interface {v1}, Lql0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lql0/a;
+    invoke-interface {v1}, Lol0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lol0/a;
 
     move-result-object v1
 
@@ -707,11 +707,11 @@
 
     move-result-object v1
 
-    check-cast v1, Le5/z$n2;    # MARKER: R8 Le5/z$n2;
+    check-cast v1, Le5/d0$t2;    # MARKER: R8 Le5/d0$t2;
 
-    iget-object v1, v1, Le5/z$n2;->k9:Ldagger/internal/f;    # MARKER: R8 Le5/z$n2; Ldagger/internal/f; k9
+    iget-object v1, v1, Le5/d0$t2;->Z9:Ldagger/internal/f;    # MARKER: R8 Le5/d0$t2; Ldagger/internal/f; k9
 
-    invoke-interface {v1}, Lql0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lql0/a;
+    invoke-interface {v1}, Lol0/a;->get()Ljava/lang/Object;    # MARKER: R8 Lol0/a;
 
     move-result-object v1
 

patches/extension/radiant/gestures/queue/SearchAlbumsResolver.smali

@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method private current(Lradiant/gestures/queue/QueueRequest;)Lzc/a;    # MARKER: R8 Lzc/a;
+.method private current(Lradiant/gestures/queue/QueueRequest;)Lxc/a;    # MARKER: R8 Lxc/a;
     .locals 5
 
     if-eqz p1, :invalid
@@ -40,11 +40,11 @@
 
     if-eqz v0, :invalid
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView;->f:Lid/e;    # MARKER: R8 Lid/e; f
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView;->f:Lgd/e;    # MARKER: R8 Lgd/e; f
 
     if-eqz v1, :invalid
 
-    invoke-virtual {v0}, Lcom/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView;->N()La50/d;    # MARKER: R8 La50/d; N
+    invoke-virtual {v0}, Lcom/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView;->N()Lg40/d;    # MARKER: R8 Lg40/d; N
 
     move-result-object v0
 
@@ -72,17 +72,17 @@
 
     move-result-object v0
 
-    instance-of v1, v0, Lzc/a;    # MARKER: R8 Lzc/a;
+    instance-of v1, v0, Lxc/a;    # MARKER: R8 Lxc/a;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lzc/a;    # MARKER: R8 Lzc/a;
+    check-cast v0, Lxc/a;    # MARKER: R8 Lxc/a;
 
-    iget-boolean v1, v0, Lzc/a;->k:Z    # MARKER: R8 Lzc/a; k
+    iget-boolean v1, v0, Lxc/a;->k:Z    # MARKER: R8 Lxc/a; k
 
     if-eqz v1, :invalid
 
-    iget-object v1, v0, Lzc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lzc/a; b
+    iget-object v1, v0, Lxc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lxc/a; b
 
     invoke-virtual {v1}, Lcom/aspiro/wamp/model/Album;->getId()I
 
@@ -124,7 +124,7 @@
 
     iget v6, p1, Lradiant/gestures/queue/QueueRequest;->action:I
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/SearchAlbumsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lzc/a;    # MARKER: R8 Lzc/a;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/SearchAlbumsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lxc/a;    # MARKER: R8 Lxc/a;
 
     move-result-object p1
 
@@ -140,11 +140,11 @@
 
     if-eqz v0, :done
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView;->c:Lld/c;    # MARKER: R8 Lld/c; c
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView;->c:Ljd/b;    # MARKER: R8 Ljd/b; c
 
     if-eqz v1, :done
 
-    iget-object v2, v1, Lld/c;->a:Lx40/a;    # MARKER: R8 Lld/c; Lx40/a; a
+    iget-object v2, v1, Ljd/b;->a:Ld40/a;    # MARKER: R8 Ljd/b; Ld40/a; a
 
     instance-of v3, v2, Lh4/a;    # MARKER: R8 Lh4/a;
 
@@ -156,11 +156,11 @@
 
     move-result-object v3
 
-    iget-object v4, p1, Lzc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lzc/a; b
+    iget-object v4, p1, Lxc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lxc/a; b
 
-    iget-object v5, v1, Lld/c;->d:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Lld/c; d
+    iget-object v5, v1, Ljd/b;->d:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Ljd/b; d
 
-    iget-object p0, v1, Lld/c;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lld/c; c
+    iget-object p0, v1, Ljd/b;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Ljd/b; c
 
     const/4 v1, 0x3
 
@@ -202,7 +202,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 5
 
-    instance-of v0, p2, Ljd/d$a;    # MARKER: R8 Ljd/d$a;
+    instance-of v0, p2, Lhd/d$a;    # MARKER: R8 Lhd/d$a;
 
     if-eqz v0, :invalid
 
@@ -221,11 +221,11 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v0, p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/d;    # MARKER: R8 La50/d;
+    check-cast p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
 
@@ -244,17 +244,17 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lzc/a;    # MARKER: R8 Lzc/a;
+    instance-of v0, p1, Lxc/a;    # MARKER: R8 Lxc/a;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lzc/a;    # MARKER: R8 Lzc/a;
+    check-cast p1, Lxc/a;    # MARKER: R8 Lxc/a;
 
-    iget-boolean v0, p1, Lzc/a;->k:Z    # MARKER: R8 Lzc/a; k
+    iget-boolean v0, p1, Lxc/a;->k:Z    # MARKER: R8 Lxc/a; k
 
     if-eqz v0, :invalid
 
-    iget-object v0, p1, Lzc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lzc/a; b
+    iget-object v0, p1, Lxc/a;->b:Lcom/aspiro/wamp/model/Album;    # MARKER: R8 Lxc/a; b
 
     invoke-virtual {v0}, Lcom/aspiro/wamp/model/Album;->getId()I
 

patches/extension/radiant/gestures/queue/SearchPlaylistsResolver.smali

@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method private current(Lradiant/gestures/queue/QueueRequest;)Lcf/b;    # MARKER: R8 Lcf/b;
+.method private current(Lradiant/gestures/queue/QueueRequest;)Laf/b;    # MARKER: R8 Laf/b;
     .locals 6
 
     if-eqz p1, :invalid
@@ -48,11 +48,11 @@
 
     if-eqz v1, :invalid
 
-    iget-object v2, v1, Lcom/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView;->g:Lwf/d;    # MARKER: R8 Lwf/d; g
+    iget-object v2, v1, Lcom/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView;->g:Luf/d;    # MARKER: R8 Luf/d; g
 
     if-eqz v2, :invalid
 
-    invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView;->N()La50/d;    # MARKER: R8 La50/d; N
+    invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView;->N()Lg40/d;    # MARKER: R8 Lg40/d; N
 
     move-result-object v1
 
@@ -80,23 +80,23 @@
 
     move-result-object v1
 
-    instance-of v2, v1, Lcf/b;    # MARKER: R8 Lcf/b;
+    instance-of v2, v1, Laf/b;    # MARKER: R8 Laf/b;
 
     if-eqz v2, :invalid
 
-    check-cast v1, Lcf/b;    # MARKER: R8 Lcf/b;
+    check-cast v1, Laf/b;    # MARKER: R8 Laf/b;
 
-    iget-boolean v2, v1, Lcf/b;->h:Z    # MARKER: R8 Lcf/b; h
+    iget-boolean v2, v1, Laf/b;->h:Z    # MARKER: R8 Laf/b; h
 
     if-eqz v2, :invalid
 
-    iget-boolean v2, v1, Lcf/b;->f:Z    # MARKER: R8 Lcf/b; f
+    iget-boolean v2, v1, Laf/b;->f:Z    # MARKER: R8 Laf/b; f
 
     if-eqz v2, :check_playlist
 
     const-string v2, "NOT_READY"
 
-    iget-object v3, v1, Lcf/b;->g:Ljava/lang/String;    # MARKER: R8 Lcf/b; g
+    iget-object v3, v1, Laf/b;->g:Ljava/lang/String;    # MARKER: R8 Laf/b; g
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -105,7 +105,7 @@
     if-nez v2, :invalid
 
     :check_playlist
-    iget-object v2, v1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lcf/b; a
+    iget-object v2, v1, Laf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Laf/b; a
 
     invoke-virtual {v2}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I
 
@@ -159,7 +159,7 @@
 
     iget v6, p1, Lradiant/gestures/queue/QueueRequest;->action:I
 
-    invoke-direct {p0, p1}, Lradiant/gestures/queue/SearchPlaylistsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Lcf/b;    # MARKER: R8 Lcf/b;
+    invoke-direct {p0, p1}, Lradiant/gestures/queue/SearchPlaylistsResolver;->current(Lradiant/gestures/queue/QueueRequest;)Laf/b;    # MARKER: R8 Laf/b;
 
     move-result-object p1
 
@@ -175,7 +175,7 @@
 
     if-eqz v0, :done
 
-    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView;->c:Lzf/c;    # MARKER: R8 Lzf/c; c
+    iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView;->c:Lxf/c;    # MARKER: R8 Lxf/c; c
 
     if-eqz v1, :done
 
@@ -183,7 +183,7 @@
 
     move-result-object v2
 
-    iget-object v3, p1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lcf/b; a
+    iget-object v3, p1, Laf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Laf/b; a
 
     new-instance v4, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 
@@ -191,7 +191,7 @@
 
     invoke-direct {v4, v5}, Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;-><init>(Ljava/lang/String;)V
 
-    iget-object p0, v1, Lzf/c;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lzf/c; c
+    iget-object p0, v1, Lxf/c;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lxf/c; c
 
     const/4 v0, 0x3
 
@@ -220,7 +220,7 @@
 .method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/gestures/queue/QueueRequest;
     .locals 5
 
-    instance-of v0, p2, Lxf/d$a;    # MARKER: R8 Lxf/d$a;
+    instance-of v0, p2, Lvf/c$a;    # MARKER: R8 Lvf/c$a;
 
     if-eqz v0, :invalid
 
@@ -239,11 +239,11 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v0, p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/d;    # MARKER: R8 La50/d;
+    check-cast p1, Lg40/d;    # MARKER: R8 Lg40/d;
 
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
 
@@ -262,23 +262,23 @@
 
     move-result-object p1
 
-    instance-of v0, p1, Lcf/b;    # MARKER: R8 Lcf/b;
+    instance-of v0, p1, Laf/b;    # MARKER: R8 Laf/b;
 
     if-eqz v0, :invalid
 
-    check-cast p1, Lcf/b;    # MARKER: R8 Lcf/b;
+    check-cast p1, Laf/b;    # MARKER: R8 Laf/b;
 
-    iget-boolean v0, p1, Lcf/b;->h:Z    # MARKER: R8 Lcf/b; h
+    iget-boolean v0, p1, Laf/b;->h:Z    # MARKER: R8 Laf/b; h
 
     if-eqz v0, :invalid
 
-    iget-boolean v0, p1, Lcf/b;->f:Z    # MARKER: R8 Lcf/b; f
+    iget-boolean v0, p1, Laf/b;->f:Z    # MARKER: R8 Laf/b; f
 
     if-eqz v0, :check_playlist
 
     const-string v0, "NOT_READY"
 
-    iget-object v1, p1, Lcf/b;->g:Ljava/lang/String;    # MARKER: R8 Lcf/b; g
+    iget-object v1, p1, Laf/b;->g:Ljava/lang/String;    # MARKER: R8 Laf/b; g
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -287,7 +287,7 @@
     if-nez v0, :invalid
 
     :check_playlist
-    iget-object v0, p1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Lcf/b; a
+    iget-object v0, p1, Laf/b;->a:Lcom/aspiro/wamp/model/Playlist;    # MARKER: R8 Laf/b; a
 
     invoke-virtual {v0}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I
 

patches/extension/radiant/gestures/queue/SuggestionsResolver.smali

@@ -78,13 +78,13 @@
 
     move-result-object v2
 
-    instance-of v3, v2, La50/b;    # MARKER: R8 La50/b;
+    instance-of v3, v2, Lg40/b;    # MARKER: R8 Lg40/b;
 
     if-eqz v3, :invalid
 
-    check-cast v2, La50/b;    # MARKER: R8 La50/b;
+    check-cast v2, Lg40/b;    # MARKER: R8 Lg40/b;
 
-    iget-object v2, v2, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    iget-object v2, v2, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
 
     iget v3, p1, Lradiant/gestures/queue/QueueRequest;->position:I
 
@@ -160,17 +160,17 @@
 
     if-eqz v4, :invalid
 
-    invoke-direct {p0}, Lradiant/gestures/queue/SuggestionsResolver;->viewModel()Lcom/aspiro/wamp/nowplaying/view/suggestions/l;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/l;
+    invoke-direct {p0}, Lradiant/gestures/queue/SuggestionsResolver;->viewModel()Lcom/aspiro/wamp/nowplaying/view/suggestions/m;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/m;
 
     move-result-object v1
 
-    instance-of v4, v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;
+    instance-of v4, v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;
 
     if-eqz v4, :invalid
 
-    check-cast v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;
+    check-cast v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;
 
-    iget-object v1, v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;->o:Ljava/lang/Object;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/a1; o
+    iget-object v1, v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;->o:Ljava/lang/Object;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/e1; o
 
     instance-of v4, v1, Ljava/util/List;
 
@@ -220,24 +220,24 @@
 
     move-result-object v0
 
-    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/h;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/h;
+    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/i;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i;
 
     if-eqz v1, :dialog
 
-    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/h;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/h;
+    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/i;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i;
 
-    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/h;->d:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/h; d
+    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/i;->d:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i; d
 
     return-object v0
 
     :dialog
-    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;
+    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;
+    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;
 
-    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;->d:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/o0; d
+    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;->d:Lcom/aspiro/wamp/model/AvailabilityInteractor;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/q0; d
 
     return-object v0
 
@@ -264,7 +264,7 @@
     return-void
 .end method
 
-.method private viewModel()Lcom/aspiro/wamp/nowplaying/view/suggestions/l;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/l;
+.method private viewModel()Lcom/aspiro/wamp/nowplaying/view/suggestions/m;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/m;
     .locals 2
 
     iget-object v0, p0, Lradiant/gestures/queue/SuggestionsResolver;->host:Ljava/lang/ref/WeakReference;
@@ -273,24 +273,24 @@
 
     move-result-object v0
 
-    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/h;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/h;
+    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/i;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i;
 
     if-eqz v1, :dialog
 
-    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/h;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/h;
+    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/i;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i;
 
-    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/h;->c:Lcom/aspiro/wamp/nowplaying/view/suggestions/l;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/h; Lcom/aspiro/wamp/nowplaying/view/suggestions/l; c
+    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/i;->c:Lcom/aspiro/wamp/nowplaying/view/suggestions/m;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i; Lcom/aspiro/wamp/nowplaying/view/suggestions/m; c
 
     return-object v0
 
     :dialog
-    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;
+    instance-of v1, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;
 
     if-eqz v1, :invalid
 
-    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;
+    check-cast v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;
 
-    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;->c:Lcom/aspiro/wamp/nowplaying/view/suggestions/l;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/o0; Lcom/aspiro/wamp/nowplaying/view/suggestions/l; c
+    iget-object v0, v0, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;->c:Lcom/aspiro/wamp/nowplaying/view/suggestions/m;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/q0; Lcom/aspiro/wamp/nowplaying/view/suggestions/m; c
 
     return-object v0
 
@@ -311,7 +311,7 @@
 
     if-eqz v0, :done
 
-    invoke-direct {p0}, Lradiant/gestures/queue/SuggestionsResolver;->viewModel()Lcom/aspiro/wamp/nowplaying/view/suggestions/l;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/l;
+    invoke-direct {p0}, Lradiant/gestures/queue/SuggestionsResolver;->viewModel()Lcom/aspiro/wamp/nowplaying/view/suggestions/m;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/m;
 
     move-result-object v1
 
@@ -354,9 +354,9 @@
 
     move-result-object v4
 
-    check-cast v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;
+    check-cast v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;
 
-    iget-object v5, v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/a1;->j:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/a1; j
+    iget-object v5, v1, Lcom/aspiro/wamp/nowplaying/view/suggestions/e1;->j:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/e1; j
 
     invoke-static {v3, v4, v5}, Lcom/aspiro/wamp/playqueue/source/model/b;->p(Ljava/lang/String;Ljava/util/List;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; p
 
@@ -404,19 +404,19 @@
 
     if-eqz v2, :empty_queue
 
-    new-instance v2, Lcom/aspiro/wamp/nowplaying/view/suggestions/i$a;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i$a;
+    new-instance v2, Lcom/aspiro/wamp/nowplaying/view/suggestions/j$a;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/j$a;
 
-    invoke-direct {v2, p1}, Lcom/aspiro/wamp/nowplaying/view/suggestions/i$a;-><init>(I)V    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i$a;
+    invoke-direct {v2, p1}, Lcom/aspiro/wamp/nowplaying/view/suggestions/j$a;-><init>(I)V    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/j$a;
 
     goto :emit
 
     :empty_queue
-    new-instance v2, Lcom/aspiro/wamp/nowplaying/view/suggestions/i$e;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i$e;
+    new-instance v2, Lcom/aspiro/wamp/nowplaying/view/suggestions/j$e;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/j$e;
 
-    invoke-direct {v2, p1}, Lcom/aspiro/wamp/nowplaying/view/suggestions/i$e;-><init>(I)V    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/i$e;
+    invoke-direct {v2, p1}, Lcom/aspiro/wamp/nowplaying/view/suggestions/j$e;-><init>(I)V    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/j$e;
 
     :emit
-    invoke-interface {v1, v2}, Lcom/aspiro/wamp/nowplaying/view/suggestions/j;->a(Lcom/aspiro/wamp/nowplaying/view/suggestions/i;)V    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/j; Lcom/aspiro/wamp/nowplaying/view/suggestions/i; a
+    invoke-interface {v1, v2}, Lcom/aspiro/wamp/nowplaying/view/suggestions/k;->a(Lcom/aspiro/wamp/nowplaying/view/suggestions/j;)V    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/k; Lcom/aspiro/wamp/nowplaying/view/suggestions/j; a
 
     :done
     return-void
@@ -433,7 +433,7 @@
 
     if-ne v0, p1, :invalid
 
-    instance-of v0, p2, Lcom/aspiro/wamp/nowplaying/view/suggestions/y$a;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/y$a;
+    instance-of v0, p2, Lcom/aspiro/wamp/nowplaying/view/suggestions/z$a;    # MARKER: R8 Lcom/aspiro/wamp/nowplaying/view/suggestions/z$a;
 
     if-eqz v0, :invalid
 
@@ -450,13 +450,13 @@
 
     move-result-object p1
 
-    instance-of v0, p1, La50/b;    # MARKER: R8 La50/b;
+    instance-of v0, p1, Lg40/b;    # MARKER: R8 Lg40/b;
 
     if-eqz v0, :invalid
 
-    check-cast p1, La50/b;    # MARKER: R8 La50/b;
+    check-cast p1, Lg40/b;    # MARKER: R8 Lg40/b;
 
-    iget-object p1, p1, La50/b;->b:Ljava/util/ArrayList;    # MARKER: R8 La50/b; b
+    iget-object p1, p1, Lg40/b;->b:Ljava/util/ArrayList;    # MARKER: R8 Lg40/b; b
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 

patches/extension/radiant/gestures/queue/UnifiedSearchResolver.smali

@@ -36,9 +36,9 @@
     if-eqz v1, :invalid
     invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
     move-result-object v1
-    instance-of v2, v1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v2, v1, Lg40/d;    # MARKER: R8 Lg40/d;
     if-eqz v2, :invalid
-    check-cast v1, La50/d;    # MARKER: R8 La50/d;
+    check-cast v1, Lg40/d;    # MARKER: R8 Lg40/d;
     invoke-virtual {v1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
     move-result-object v1
 
@@ -138,7 +138,7 @@
     move-result-object v2
     check-cast v2, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;
     if-eqz v2, :invalid
-    invoke-virtual {v2}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/h;    # MARKER: R8 Ltl/h; N
+    invoke-virtual {v2}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/j;    # MARKER: R8 Ltl/j; N
     move-result-object v2
     instance-of v4, v2, Lcom/aspiro/wamp/search/v2/d;    # MARKER: R8 Lcom/aspiro/wamp/search/v2/d;
     if-eqz v4, :invalid
@@ -181,7 +181,7 @@
     move-result-object v2
     check-cast v2, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;
     if-eqz v2, :invalid
-    invoke-virtual {v2}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/h;    # MARKER: R8 Ltl/h; N
+    invoke-virtual {v2}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/j;    # MARKER: R8 Ltl/j; N
     move-result-object v2
     instance-of v4, v2, Lcom/aspiro/wamp/search/v2/d;    # MARKER: R8 Lcom/aspiro/wamp/search/v2/d;
     if-eqz v4, :invalid
@@ -225,12 +225,12 @@
     move-result-object v1
     check-cast v1, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;
     if-eqz v1, :done
-    iget-object v2, v1, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->c:Ltl/q;    # MARKER: R8 Ltl/q; c
+    iget-object v2, v1, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->c:Ltl/r;    # MARKER: R8 Ltl/r; c
     if-eqz v2, :done
 
     invoke-static {v0}, Lbm/i;->a(Lbm/h;)Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;    # MARKER: R8 Lbm/i; Lbm/h; a
     move-result-object v3
-    iget-object v4, v2, Ltl/q;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Ltl/q; c
+    iget-object v4, v2, Ltl/r;->c:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Ltl/r; c
 
     instance-of v5, v0, Lbm/k;    # MARKER: R8 Lbm/k;
     if-eqz v5, :album
@@ -245,9 +245,9 @@
     new-instance v2, Lcom/aspiro/wamp/search/v2/a$g;    # MARKER: R8 Lcom/aspiro/wamp/search/v2/a$g;
     iget v3, p1, Lradiant/gestures/queue/QueueRequest;->position:I
     invoke-direct {v2, v0, v3}, Lcom/aspiro/wamp/search/v2/a$g;-><init>(Lbm/h;I)V    # MARKER: R8 Lcom/aspiro/wamp/search/v2/a$g; Lbm/h;
-    invoke-virtual {v1}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/h;    # MARKER: R8 Ltl/h; N
+    invoke-virtual {v1}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/j;    # MARKER: R8 Ltl/j; N
     move-result-object v0
-    invoke-interface {v0, v2}, Ltl/f;->e(Lcom/aspiro/wamp/search/v2/a;)V    # MARKER: R8 Ltl/f; Lcom/aspiro/wamp/search/v2/a; e
+    invoke-interface {v0, v2}, Ltl/h;->e(Lcom/aspiro/wamp/search/v2/a;)V    # MARKER: R8 Ltl/h; Lcom/aspiro/wamp/search/v2/a; e
     goto :done
 
     :append_track
@@ -255,9 +255,9 @@
     iget-object p1, v5, Lbm/k;->n:Lcom/aspiro/wamp/search/SearchDataSource;    # MARKER: R8 Lbm/k; n
     sget-object v0, Lcom/aspiro/wamp/search/SearchDataSource;->REMOTE:Lcom/aspiro/wamp/search/SearchDataSource;
     if-ne p1, v0, :query_ready
-    invoke-virtual {v1}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/h;    # MARKER: R8 Ltl/h; N
+    invoke-virtual {v1}, Lcom/aspiro/wamp/search/v2/UnifiedSearchView;->N()Ltl/j;    # MARKER: R8 Ltl/j; N
     move-result-object p1
-    invoke-interface {p1}, Ltl/h;->c()Lcom/aspiro/wamp/search/v2/model/UnifiedSearchQuery;    # MARKER: R8 Ltl/h; c
+    invoke-interface {p1}, Ltl/j;->c()Lcom/aspiro/wamp/search/v2/model/UnifiedSearchQuery;    # MARKER: R8 Ltl/j; c
     move-result-object p1
     iget-object v7, p1, Lcom/aspiro/wamp/search/v2/model/UnifiedSearchQuery;->a:Ljava/lang/String;    # MARKER: R8 a
     :query_ready
@@ -270,7 +270,7 @@
     invoke-static {v4}, Lcom/tidal/android/navigation/a;->b(Lcom/tidal/android/navigation/NavigationInfo;)Lcom/tidal/android/navigation/NavigationInfo$Node;    # MARKER: R8 Lcom/tidal/android/navigation/a; b
     move-result-object v0
     :nav_ready
-    invoke-static {p1, v7, v0}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Ljava/lang/String;Ljava/lang/String;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
+    invoke-static {v0, p1, v7}, Lcom/aspiro/wamp/playqueue/source/model/b;->o(Lcom/tidal/android/navigation/NavigationInfo;Ljava/lang/String;Ljava/lang/String;)Lcom/aspiro/wamp/playqueue/source/model/ItemSource;    # MARKER: R8 Lcom/aspiro/wamp/playqueue/source/model/b; o
     move-result-object p1
     invoke-virtual {p1, v6}, Lcom/aspiro/wamp/playqueue/source/model/Source;->addSourceItem(Lcom/aspiro/wamp/model/MediaItem;)V
     invoke-virtual {v1}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context;
@@ -298,7 +298,7 @@
     :album
     instance-of v5, v0, Lbm/a;    # MARKER: R8 Lbm/a;
     if-eqz v5, :playlist
-    iget-object v5, v2, Ltl/q;->a:Lx40/a;    # MARKER: R8 Ltl/q; Lx40/a; a
+    iget-object v5, v2, Ltl/r;->a:Ld40/a;    # MARKER: R8 Ltl/r; Ld40/a; a
     instance-of v6, v5, Lh4/a;    # MARKER: R8 Lh4/a;
     if-eqz v6, :done
     check-cast v5, Lh4/a;    # MARKER: R8 Lh4/a;
@@ -360,7 +360,7 @@
     :mix
     instance-of v5, v0, Lbm/f;    # MARKER: R8 Lbm/f;
     if-eqz v5, :done
-    iget-object v5, v2, Ltl/q;->a:Lx40/a;    # MARKER: R8 Ltl/q; Lx40/a; a
+    iget-object v5, v2, Ltl/r;->a:Ld40/a;    # MARKER: R8 Ltl/r; Ld40/a; a
     instance-of v6, v5, Lh4/a;    # MARKER: R8 Lh4/a;
     if-eqz v6, :done
     check-cast v5, Lh4/a;    # MARKER: R8 Lh4/a;
@@ -412,9 +412,9 @@
     :has_position
     invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
     move-result-object p1
-    instance-of v1, p1, La50/d;    # MARKER: R8 La50/d;
+    instance-of v1, p1, Lg40/d;    # MARKER: R8 Lg40/d;
     if-eqz v1, :invalid
-    check-cast p1, La50/d;    # MARKER: R8 La50/d;
+    check-cast p1, Lg40/d;    # MARKER: R8 Lg40/d;
     invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
     move-result-object p1
     invoke-interface {p1}, Ljava/util/List;->size()I
@@ -425,7 +425,7 @@
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
     move-result-object p1
 
-    instance-of v1, p2, Lul/n0$a;    # MARKER: R8 Lul/n0$a;
+    instance-of v1, p2, Lul/j0$a;    # MARKER: R8 Lul/j0$a;
     if-eqz v1, :album_holder
     instance-of v1, p1, Lbm/k;    # MARKER: R8 Lbm/k;
     if-eqz v1, :invalid
@@ -449,7 +449,7 @@
     goto :create
 
     :playlist_holder
-    instance-of v1, p2, Lul/a0$a;    # MARKER: R8 Lul/a0$a;
+    instance-of v1, p2, Lul/x$a;    # MARKER: R8 Lul/x$a;
     if-eqz v1, :mix_holder
     instance-of v1, p1, Lbm/g;    # MARKER: R8 Lbm/g;
     if-eqz v1, :invalid
@@ -463,7 +463,7 @@
     goto :create
 
     :mix_holder
-    instance-of p2, p2, Lul/w$a;    # MARKER: R8 Lul/w$a;
+    instance-of p2, p2, Lul/t$a;    # MARKER: R8 Lul/t$a;
     if-eqz p2, :invalid
     instance-of p2, p1, Lbm/f;    # MARKER: R8 Lbm/f;
     if-eqz p2, :invalid

patches/extension/radiant/gestures/queue/VerticalMediaQueueAction.smali

@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -31,24 +31,24 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e;)V    # MARKER: R8 Lam0/l; Lm40/e;
+.method public constructor <init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e;)V    # MARKER: R8 Lyl0/l; Ls30/e;
     .locals 3
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/VerticalMediaQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/VerticalMediaQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     iput-object p2, p0, Lradiant/gestures/queue/VerticalMediaQueueAction;->pageId:Ljava/lang/String;
 
     iput-object p3, p0, Lradiant/gestures/queue/VerticalMediaQueueAction;->moduleUuid:Ljava/lang/String;
 
-    instance-of v0, p4, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    instance-of v0, p4, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
     if-eqz v0, :mix
 
-    check-cast p4, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    check-cast p4, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
-    iget-wide v0, p4, Lm40/e$a;->a:J    # MARKER: R8 Lm40/e$a; a
+    iget-wide v0, p4, Ls30/e$a;->a:J    # MARKER: R8 Ls30/e$a; a
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -59,39 +59,39 @@
     goto :store
 
     :mix
-    instance-of v0, p4, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    instance-of v0, p4, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
     if-eqz v0, :playlist
 
-    check-cast p4, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    check-cast p4, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
-    iget-object v0, p4, Lm40/e$c;->a:Ljava/lang/String;    # MARKER: R8 Lm40/e$c; a
+    iget-object v0, p4, Ls30/e$c;->a:Ljava/lang/String;    # MARKER: R8 Ls30/e$c; a
 
     const/4 v1, 0x2
 
     goto :store
 
     :playlist
-    instance-of v0, p4, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    instance-of v0, p4, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
     if-eqz v0, :track
 
-    check-cast p4, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    check-cast p4, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
-    iget-object v0, p4, Lm40/e$d;->a:Ljava/lang/String;    # MARKER: R8 Lm40/e$d; a
+    iget-object v0, p4, Ls30/e$d;->a:Ljava/lang/String;    # MARKER: R8 Ls30/e$d; a
 
     const/4 v1, 0x3
 
     goto :store
 
     :track
-    instance-of v0, p4, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    instance-of v0, p4, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
     if-eqz v0, :unsupported
 
-    check-cast p4, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    check-cast p4, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
-    iget-wide v0, p4, Lm40/e$e;->a:J    # MARKER: R8 Lm40/e$e; a
+    iget-wide v0, p4, Ls30/e$e;->a:J    # MARKER: R8 Ls30/e$e; a
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -114,49 +114,49 @@
     return-void
 .end method
 
-.method public static isEligible(Lm40/e;)Z    # MARKER: R8 Lm40/e;
+.method public static isEligible(Ls30/e;)Z    # MARKER: R8 Ls30/e;
     .locals 1
 
-    instance-of v0, p0, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    instance-of v0, p0, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
     if-eqz v0, :mix
 
-    check-cast p0, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    check-cast p0, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
-    iget-boolean p0, p0, Lm40/e$a;->e:Z    # MARKER: R8 Lm40/e$a; e
+    iget-boolean p0, p0, Ls30/e$a;->e:Z    # MARKER: R8 Ls30/e$a; e
 
     return p0
 
     :mix
-    instance-of v0, p0, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    instance-of v0, p0, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
     if-eqz v0, :playlist
 
-    check-cast p0, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    check-cast p0, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
-    iget-boolean p0, p0, Lm40/e$c;->h:Z    # MARKER: R8 Lm40/e$c; h
+    iget-boolean p0, p0, Ls30/e$c;->h:Z    # MARKER: R8 Ls30/e$c; h
 
     return p0
 
     :playlist
-    instance-of v0, p0, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    instance-of v0, p0, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
     if-eqz v0, :track
 
-    check-cast p0, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    check-cast p0, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
-    iget-boolean p0, p0, Lm40/e$d;->g:Z    # MARKER: R8 Lm40/e$d; g
+    iget-boolean p0, p0, Ls30/e$d;->g:Z    # MARKER: R8 Ls30/e$d; g
 
     return p0
 
     :track
-    instance-of v0, p0, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    instance-of v0, p0, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
     if-eqz v0, :invalid
 
-    check-cast p0, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    check-cast p0, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
-    iget-boolean p0, p0, Lm40/e$e;->j:Z    # MARKER: R8 Lm40/e$e; j
+    iget-boolean p0, p0, Ls30/e$e;->j:Z    # MARKER: R8 Ls30/e$e; j
 
     return p0
 
@@ -166,22 +166,22 @@
     return p0
 .end method
 
-.method public static isSupported(Lm40/e;)Z    # MARKER: R8 Lm40/e;
+.method public static isSupported(Ls30/e;)Z    # MARKER: R8 Ls30/e;
     .locals 1
 
-    instance-of v0, p0, Lm40/e$a;    # MARKER: R8 Lm40/e$a;
+    instance-of v0, p0, Ls30/e$a;    # MARKER: R8 Ls30/e$a;
 
     if-nez v0, :supported
 
-    instance-of v0, p0, Lm40/e$c;    # MARKER: R8 Lm40/e$c;
+    instance-of v0, p0, Ls30/e$c;    # MARKER: R8 Ls30/e$c;
 
     if-nez v0, :supported
 
-    instance-of v0, p0, Lm40/e$d;    # MARKER: R8 Lm40/e$d;
+    instance-of v0, p0, Ls30/e$d;    # MARKER: R8 Ls30/e$d;
 
     if-nez v0, :supported
 
-    instance-of v0, p0, Lm40/e$e;    # MARKER: R8 Lm40/e$e;
+    instance-of v0, p0, Ls30/e$e;    # MARKER: R8 Ls30/e$e;
 
     if-eqz v0, :invalid
 
@@ -201,7 +201,7 @@
 .method public invoke(I)Ljava/lang/Object;
     .locals 8
 
-    iget-object v7, p0, Lradiant/gestures/queue/VerticalMediaQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v7, p0, Lradiant/gestures/queue/VerticalMediaQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v7, :done
 
@@ -256,7 +256,7 @@
     move-object v1, v0
 
     :emit
-    invoke-interface {v7, v1}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v7, v1}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/extension/radiant/gestures/queue/ViewAllTrackQueue.smali

@@ -21,9 +21,13 @@
 
     if-lez v2, :done
 
-    iget-object v0, p0, Lcom/tidal/android/feature/viewall/ui/ViewAllScreenViewModel;->n:Lcom/tidal/android/feature/viewall/ui/c;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/c; n
+    iget-object v0, p0, Lcom/tidal/android/feature/viewall/ui/ViewAllScreenViewModel;->r:Lcom/tidal/android/feature/viewall/ui/OffsetPagingEngine;    # MARKER: R8 r
 
-    iget-object v0, v0, Lcom/tidal/android/feature/viewall/ui/c;->f:Ljava/util/ArrayList;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/c; f
+    if-eqz v0, :done
+
+    iget-object v0, v0, Lcom/tidal/android/feature/viewall/ui/OffsetPagingEngine;->g:Ljava/util/ArrayList;    # MARKER: R8 g
+
+    if-eqz v0, :done
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -40,37 +44,37 @@
 
     move-result-object v1
 
-    instance-of v2, v1, Lpd0/a;    # MARKER: R8 Lpd0/a;
+    instance-of v2, v1, Lhd0/a;    # MARKER: R8 Lhd0/a;
 
     if-eqz v2, :find_track
 
-    check-cast v1, Lpd0/a;    # MARKER: R8 Lpd0/a;
+    check-cast v1, Lhd0/a;    # MARKER: R8 Lhd0/a;
 
-    iget-object v1, v1, Lpd0/a;->a:Lh40/n;    # MARKER: R8 Lpd0/a; Lh40/n; a
+    iget-object v1, v1, Lhd0/a;->a:Ln30/o;    # MARKER: R8 Lhd0/a; Ln30/o; a
 
-    instance-of v2, v1, Lh40/p;    # MARKER: R8 Lh40/p;
+    instance-of v2, v1, Ln30/p;    # MARKER: R8 Ln30/p;
 
     if-eqz v2, :find_track
 
-    check-cast v1, Lh40/p;    # MARKER: R8 Lh40/p;
+    check-cast v1, Ln30/p;    # MARKER: R8 Ln30/p;
 
-    iget-wide v3, v1, Lh40/p;->a:J    # MARKER: R8 Lh40/p; a
+    iget-wide v3, v1, Ln30/p;->a:J    # MARKER: R8 Ln30/p; a
 
     cmp-long v2, v3, p2
 
     if-nez v2, :find_track
 
-    iget-object v0, p0, Lcom/tidal/android/feature/viewall/ui/ViewAllScreenViewModel;->f:Lcom/tidal/android/feature/viewall/ui/u;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/u; f
+    iget-object v0, p0, Lcom/tidal/android/feature/viewall/ui/ViewAllScreenViewModel;->f:Lcom/tidal/android/feature/viewall/ui/y;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/y; f
 
-    instance-of v2, v0, Lra/d;    # MARKER: R8 Lra/d;
+    instance-of v2, v0, Lqa/d;    # MARKER: R8 Lqa/d;
 
     if-eqz v2, :done
 
-    check-cast v0, Lra/d;    # MARKER: R8 Lra/d;
+    check-cast v0, Lqa/d;    # MARKER: R8 Lqa/d;
 
-    iget-object v2, v0, Lra/d;->b:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lra/d; b
+    iget-object v2, v0, Lqa/d;->b:Lcom/tidal/android/navigation/NavigationInfo;    # MARKER: R8 Lqa/d; b
 
-    invoke-static {v1}, Lie0/i;->a(Lh40/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lie0/i; Lh40/p; a
+    invoke-static {v1}, Lae0/i;->c(Ln30/p;)Lcom/aspiro/wamp/model/Track;    # MARKER: R8 Lae0/i; Ln30/p; a
 
     move-result-object v3
 
@@ -128,13 +132,13 @@
 .method public static handleEvent(Lcom/tidal/android/feature/viewall/ui/ViewAllScreenViewModel;Lcom/tidal/android/feature/viewall/ui/e;)Z    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e;
     .locals 6
 
-    instance-of v0, p1, Lcom/tidal/android/feature/viewall/ui/e$c;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e$c;
+    instance-of v0, p1, Lcom/tidal/android/feature/viewall/ui/e$d;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e$d;
 
     if-eqz v0, :not_handled
 
-    check-cast p1, Lcom/tidal/android/feature/viewall/ui/e$c;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e$c;
+    check-cast p1, Lcom/tidal/android/feature/viewall/ui/e$d;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e$d;
 
-    iget-object v0, p1, Lcom/tidal/android/feature/viewall/ui/e$c;->a:Ljava/lang/Object;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e$c; a
+    iget-object v0, p1, Lcom/tidal/android/feature/viewall/ui/e$d;->a:Ljava/lang/Object;    # MARKER: R8 Lcom/tidal/android/feature/viewall/ui/e$d; a
 
     instance-of v1, v0, Ljava/lang/String;
 

patches/extension/radiant/gestures/queue/ViewAllTrackQueueAction.smali

@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final callback:Lam0/l;    # MARKER: R8 Lam0/l;
+.field private final callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
 .field private context:Landroid/content/Context;
 
@@ -15,14 +15,14 @@
 
 
 # direct methods
-.method public constructor <init>(Lam0/l;Lm40/e$e;)V    # MARKER: R8 Lam0/l; Lm40/e$e;
+.method public constructor <init>(Lyl0/l;Ls30/e$e;)V    # MARKER: R8 Lyl0/l; Ls30/e$e;
     .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lradiant/gestures/queue/ViewAllTrackQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iput-object p1, p0, Lradiant/gestures/queue/ViewAllTrackQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
-    iget-wide v0, p2, Lm40/e$e;->a:J    # MARKER: R8 Lm40/e$e; a
+    iget-wide v0, p2, Ls30/e$e;->a:J    # MARKER: R8 Ls30/e$e; a
 
     iput-wide v0, p0, Lradiant/gestures/queue/ViewAllTrackQueueAction;->trackId:J
 
@@ -34,7 +34,7 @@
 .method public invoke(I)Ljava/lang/Object;
     .locals 5
 
-    iget-object v0, p0, Lradiant/gestures/queue/ViewAllTrackQueueAction;->callback:Lam0/l;    # MARKER: R8 Lam0/l;
+    iget-object v0, p0, Lradiant/gestures/queue/ViewAllTrackQueueAction;->callback:Lyl0/l;    # MARKER: R8 Lyl0/l;
 
     if-eqz v0, :done
 
@@ -61,9 +61,9 @@
 
     move-result-object v3
 
-    new-instance v4, Li40/c$b;    # MARKER: R8 Li40/c$b;
+    new-instance v4, Lo30/c$b;    # MARKER: R8 Lo30/c$b;
 
-    invoke-direct {v4, v3}, Li40/c$b;-><init>(Ljava/lang/Object;)V    # MARKER: R8 Li40/c$b;
+    invoke-direct {v4, v3}, Lo30/c$b;-><init>(Ljava/lang/Object;)V    # MARKER: R8 Lo30/c$b;
 
     goto :emit
 
@@ -72,12 +72,12 @@
 
     move-result-object v3
 
-    new-instance v4, Li40/c$b;    # MARKER: R8 Li40/c$b;
+    new-instance v4, Lo30/c$b;    # MARKER: R8 Lo30/c$b;
 
-    invoke-direct {v4, v3}, Li40/c$b;-><init>(Ljava/lang/Object;)V    # MARKER: R8 Li40/c$b;
+    invoke-direct {v4, v3}, Lo30/c$b;-><init>(Ljava/lang/Object;)V    # MARKER: R8 Lo30/c$b;
 
     :emit
-    invoke-interface {v0, v4}, Lam0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lam0/l;
+    invoke-interface {v0, v4}, Lyl0/l;->invoke(Ljava/lang/Object;)Ljava/lang/Object;    # MARKER: R8 Lyl0/l;
 
     :done
     sget-object v0, Lkotlin/u;->a:Lkotlin/u;    # MARKER: R8 Lkotlin/u;

patches/gestures/lyrics/lyrics-gesture-scroll-guard.patch

@@ -1,6 +1,6 @@
 --- a/com/tidal/android/feature/playerscreen/ui/composables/LyricsKt.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/composables/LyricsKt.smali
-@@ -6107,6 +6107,10 @@
+@@ -3856,6 +3856,10 @@
  
      move-object v15, v10
  
@@ -9,5 +9,5 @@
 +    move-result-object v15
 +
      .line 61
-     invoke-static/range {v15 .. v27}, Landroidx/compose/foundation/lazy/LazyDslKt;->LazyColumn(Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/lazy/LazyListState;Landroidx/compose/foundation/layout/PaddingValues;ZLandroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/foundation/gestures/FlingBehavior;ZLandroidx/compose/foundation/OverscrollEffect;Lam0/l;Landroidx/compose/runtime/Composer;II)V
+     invoke-static/range {v15 .. v27}, Landroidx/compose/foundation/lazy/LazyDslKt;->LazyColumn(Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/lazy/LazyListState;Landroidx/compose/foundation/layout/PaddingValues;ZLandroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/foundation/gestures/FlingBehavior;ZLandroidx/compose/foundation/OverscrollEffect;Lyl0/l;Landroidx/compose/runtime/Composer;II)V
  

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

@@ -1,17 +1,17 @@
 --- a/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
 +++ b/com/tidal/android/feature/appscaffold/ui/composable/MiniPlayerKt.smali
-@@ -1215,6 +1215,10 @@
+@@ -1219,6 +1219,10 @@
  
      move-result-object v6
  
-+    invoke-static {v6, v1}, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures;->trackModifier(Landroidx/compose/ui/Modifier;Lam0/l;)Landroidx/compose/ui/Modifier;    # attach horizontal swipe listener
++    invoke-static {v6, v1}, Lradiant/gestures/miniplayer/MiniPlayerTrackGestures;->trackModifier(Landroidx/compose/ui/Modifier;Lyl0/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 @@
+@@ -1356,6 +1360,8 @@
      .line 56
      iget-object v11, v0, Lcom/tidal/android/feature/appscaffold/ui/t;->b:Lcom/tidal/android/feature/appscaffold/ui/q;
  
@@ -20,7 +20,7 @@
      .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 @@
+@@ -1394,6 +1400,10 @@
  
      move-result-object v6
  
@@ -29,9 +29,9 @@
 +    move-result-object v6
 +
      .line 63
-     invoke-virtual/range {v22 .. v22}, Lcom/squareup/ui/market/core/theme/MarketStylesheet$c;->p0()Lf20/a;
+     invoke-virtual/range {v22 .. v22}, Lcom/squareup/ui/market/core/theme/MarketStylesheet$c;->p0()Ll10/a;
  
-@@ -1501,6 +1511,10 @@
+@@ -1505,6 +1515,10 @@
  
      move-result-object v5
  
@@ -44,7 +44,7 @@
  
 --- a/com/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel.smali
 +++ b/com/tidal/android/feature/appscaffold/ui/MiniPlayerViewModel.smali
-@@ -512,16 +512,16 @@
+@@ -514,16 +514,16 @@
      .line 110
      invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
  
@@ -60,10 +60,10 @@
  
      .line 115
      .line 116
-     invoke-interface {v3}, Lbi/e;->i()Z
+     invoke-interface {v3}, Lzh/e;->i()Z
  
      .line 117
-@@ -695,12 +695,34 @@
+@@ -697,12 +697,34 @@
      .line 194
      :cond_e
      return-void
@@ -78,7 +78,7 @@
 +
 +    if-eqz p1, :unknown_event
 +
-+    invoke-interface {v3}, Lbi/e;->canSkipToPreviousOrRewind()Z
++    invoke-interface {v3}, Lzh/e;->canSkipToPreviousOrRewind()Z
 +
 +    move-result p1
 +
@@ -86,13 +86,13 @@
 +
 +    const/4 p1, 0x0
 +
-+    invoke-interface {v3, p1}, Lbi/e;->h(Z)V    # false = previous/rewind
++    invoke-interface {v3, p1}, Lzh/e;->h(Z)V    # false = previous/rewind
 +
 +    :previous_done
 +    return-void
 +
 +    :unknown_event
-     invoke-static {}, Landroidx/navigation/f0;->a()V
+     invoke-static {}, Lx/f0;->a()V
  
      .line 196
      .line 197
@@ -119,7 +119,7 @@
 +
 +    :rl_continue_open
      .line 1
-     iget-object v0, p0, Lcom/tidal/android/feature/appscaffold/ui/composable/g;->a:Lam0/l;
+     iget-object v0, p0, Lcom/tidal/android/feature/appscaffold/ui/composable/g;->a:Lyl0/l;
  
      .line 2
      .line 3

patches/gestures/mini-player/mini-player-up-gesture.patch

@@ -1,6 +1,6 @@
-# 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
+# rl-locals: com/tidal/android/feature/appscaffold/ui/composable/k.smali b( 52
+--- a/com/tidal/android/feature/appscaffold/ui/composable/k.smali
++++ b/com/tidal/android/feature/appscaffold/ui/composable/k.smali
 @@ -1691,6 +1691,14 @@
  
      move-result-object v24
@@ -11,14 +11,14 @@
 +
 +    const/16 v51, __RL_MINI_PLAYER_SWIPE_UP_DRAG__    # Enable Drag option
 +
-+    invoke-static/range {v49 .. v51}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->configure(Lam0/l;Landroidx/compose/material3/SheetState;Z)V    # wire swipe-up to expand the sheet
++    invoke-static/range {v49 .. v51}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->configure(Lyl0/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 @@
+@@ -716,6 +716,22 @@
  
      iget-object v3, v0, Lcom/tidal/android/feature/appscaffold/ui/t;->c:Lcom/tidal/android/feature/appscaffold/ui/MiniPlayerContract$PlayState;
  
@@ -41,7 +41,7 @@
      invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
  
      const v4, -0x571456a1
-@@ -1215,6 +1231,10 @@
+@@ -1223,6 +1239,10 @@
  
      move-result-object v6
  
@@ -52,7 +52,7 @@
      .line 38
      sget-object v21, Landroidx/compose/ui/Alignment;->Companion:Landroidx/compose/ui/Alignment$Companion;
  
-@@ -1390,6 +1410,10 @@
+@@ -1404,6 +1424,10 @@
  
      move-result-object v6
  
@@ -61,9 +61,9 @@
 +    move-result-object v6
 +
      .line 63
-     invoke-virtual/range {v22 .. v22}, Lcom/squareup/ui/market/core/theme/MarketStylesheet$c;->p0()Lf20/a;
+     invoke-virtual/range {v22 .. v22}, Lcom/squareup/ui/market/core/theme/MarketStylesheet$c;->p0()Ll10/a;
  
-@@ -1501,6 +1525,10 @@
+@@ -1519,6 +1543,10 @@
  
      move-result-object v5
  

patches/gestures/player/player-swipe-gesture.patch

@@ -32,13 +32,13 @@
      :cond_47
 +    move-object v14, v12    # settle callback
 +
-+    check-cast v14, Lam0/l;    # to Function1
++    check-cast v14, Lyl0/l;    # to Function1
 +
-+    invoke-static {v13, v14}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->setSettleCallback(Landroidx/compose/material3/SheetState;Lam0/l;)V    # reuse native settle animation on release
++    invoke-static {v13, v14}, Lradiant/gestures/miniplayer/MiniPlayerGestures;->setSettleCallback(Landroidx/compose/material3/SheetState;Lyl0/l;)V    # reuse native settle animation on release
 +
      move-object/from16 v32, v12
  
-     check-cast v32, Lam0/l;
+     check-cast v32, Lyl0/l;
  
      .line 35
      invoke-interface {v5}, Landroidx/compose/runtime/Composer;->rememberedValue()Ljava/lang/Object;

patches/gestures/queue/swipe-to-queue-compose.patch

@@ -1,21 +1,21 @@
---- a/com/tidal/android/dynamicpages/ui/composables/verticaltracklist/j.smali
-+++ b/com/tidal/android/dynamicpages/ui/composables/verticaltracklist/j.smali
-@@ -1791,6 +1791,10 @@
+--- a/com/tidal/android/dynamicpages/ui/composables/verticaltracklist/i.smali
++++ b/com/tidal/android/dynamicpages/ui/composables/verticaltracklist/i.smali
+@@ -1346,6 +1346,10 @@
      .line 391
-     check-cast v34, Lam0/a;
+     check-cast v34, Lyl0/a;
  
-+    invoke-static/range {v34 .. v34}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static/range {v34 .. v34}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v34
 +
      .line 392
      .line 393
      const/16 v35, 0x6f
-@@ -1832,6 +1836,22 @@
+@@ -1387,6 +1391,22 @@
      .line 412
      move-result-object v0
  
-+    iget-wide v14, v3, Lm40/e$e;->a:J
++    iget-wide v14, v3, Ls30/e$e;->a:J
 +
 +    invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 +
@@ -23,9 +23,9 @@
 +
 +    new-instance v15, Lradiant/gestures/queue/DynamicTrackQueueAction;
 +
-+    invoke-direct {v15, v4, v1, v2, v3}, Lradiant/gestures/queue/DynamicTrackQueueAction;-><init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e$e;)V
++    invoke-direct {v15, v4, v1, v2, v3}, Lradiant/gestures/queue/DynamicTrackQueueAction;-><init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e$e;)V
 +
-+    iget-boolean v5, v3, Lm40/e$e;->j:Z
++    iget-boolean v5, v3, Ls30/e$e;->j:Z
 +
 +    invoke-static {v0, v14, v15, v5, v11}, Lradiant/gestures/queue/ComposeSwipeState;->attach(Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lradiant/gestures/queue/ComposeSwipeAction;ZLandroidx/compose/runtime/Composer;)Landroidx/compose/ui/Modifier;
 +
@@ -36,7 +36,7 @@
  
 --- a/com/tidal/android/dynamicpages/ui/modules/tracklist/TrackListModuleManager$createModuleViewState$3.smali
 +++ b/com/tidal/android/dynamicpages/ui/modules/tracklist/TrackListModuleManager$createModuleViewState$3.smali
-@@ -601,6 +601,17 @@
+@@ -600,6 +600,17 @@
  
      .line 248
      :cond_c
@@ -48,16 +48,16 @@
 +
 +    invoke-static {v0, p1}, Lradiant/gestures/queue/DynamicTrackQueue;->handle(Lcom/tidal/android/dynamicpages/ui/modules/tracklist/TrackListModuleManager;Lradiant/gestures/queue/DynamicTrackQueueEvent;)V
 +
-+    goto :goto_4
++    goto :goto_3
 +
 +    :cond_d
-     invoke-static {}, Landroidx/navigation/f0;->a()V
+     invoke-static {}, Lx/f0;->a()V
  
      .line 249
 --- a/com/tidal/android/dynamicpages/ui/composables/compactgridcard/CompactGridCardModuleRowKt.smali
 +++ b/com/tidal/android/dynamicpages/ui/composables/compactgridcard/CompactGridCardModuleRowKt.smali
-@@ -872,1 +872,26 @@
-+    invoke-static {v10}, Lradiant/gestures/queue/CompactGridMediaQueueAction;->isEligible(Lm40/e;)Z
+@@ -1101,1 +1101,26 @@
++    invoke-static {v10}, Lradiant/gestures/queue/CompactGridMediaQueueAction;->isEligible(Ls30/e;)Z
 +
 +    move-result v11
 +
@@ -69,7 +69,7 @@
 +
 +    move-object/from16 v14, p1
 +
-+    invoke-direct {v11, v4, v12, v14, v10}, Lradiant/gestures/queue/CompactGridMediaQueueAction;-><init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e;)V
++    invoke-direct {v11, v4, v12, v14, v10}, Lradiant/gestures/queue/CompactGridMediaQueueAction;-><init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e;)V
 +
 +    invoke-virtual {v11}, Lradiant/gestures/queue/CompactGridMediaQueueAction;->stableKey()Ljava/lang/String;
 +
@@ -92,7 +92,7 @@
 +
 +    iget-object v0, p0, Lcom/tidal/android/dynamicpages/ui/composables/compactgridcard/d;->b:Lcom/tidal/android/dynamicpages/ui/modules/compactgridcard/c;
 +
-+    iget-object v1, v0, Lcom/tidal/android/dynamicpages/ui/modules/compactgridcard/c;->f:Lam0/q;
++    iget-object v1, v0, Lcom/tidal/android/dynamicpages/ui/modules/compactgridcard/c;->f:Lyl0/q;
 +
 +    iget-object v2, p0, Lcom/tidal/android/dynamicpages/ui/composables/compactgridcard/d;->c:Ljava/lang/String;
 +
@@ -100,7 +100,7 @@
 +
 +    const/4 v4, 0x0
 +
-+    invoke-interface {v1, v2, v3, p1, v4}, Lam0/q;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
++    invoke-interface {v1, v2, v3, p1, v4}, Lyl0/q;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 +
 +    sget-object p1, Lkotlin/u;->a:Lkotlin/u;
 +
@@ -134,7 +134,7 @@
      .line 1
 --- a/com/tidal/android/feature/search/ui/SearchScreenViewModel.smali
 +++ b/com/tidal/android/feature/search/ui/SearchScreenViewModel.smali
-@@ -926,6 +926,17 @@
+@@ -508,6 +508,17 @@
  
      .line 4
      .line 5
@@ -152,25 +152,25 @@
      invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
  
      .line 6
---- a/com/tidal/android/feature/search/ui/composables/u0.smali
-+++ b/com/tidal/android/feature/search/ui/composables/u0.smali
+--- a/com/tidal/android/feature/search/ui/composables/s0.smali
++++ b/com/tidal/android/feature/search/ui/composables/s0.smali
 @@ -243,6 +243,24 @@
  
-     check-cast v2, Lam0/a;
+     check-cast v2, Lyl0/a;
  
-+    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v1
 +
 +    new-instance v6, Lradiant/gestures/queue/ComposeSearchQueueAction;
 +
-+    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lam0/l;Lpb0/b;)V
++    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lyl0/l;Lhb0/b;)V
 +
 +    invoke-virtual {v6}, Lradiant/gestures/queue/ComposeSearchQueueAction;->stableKey()Ljava/lang/String;
 +
 +    move-result-object v7
 +
-+    iget-boolean p1, v0, Lpb0/b$a;->f:Z
++    iget-boolean p1, v0, Lhb0/b$a;->f:Z
 +
 +    invoke-static {v3, v7, v6, p1, v4}, Lradiant/gestures/queue/ComposeSwipeState;->attach(Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lradiant/gestures/queue/ComposeSwipeAction;ZLandroidx/compose/runtime/Composer;)Landroidx/compose/ui/Modifier;
 +
@@ -179,18 +179,18 @@
      const/4 v5, 0x0
  
      .line 20
-@@ -467,7 +485,25 @@
+@@ -469,7 +487,25 @@
  
      const/4 v5, 0x0
  
 -    const/4 v2, 0x0
-+    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v1
 +
 +    new-instance v6, Lradiant/gestures/queue/ComposeSearchQueueAction;
 +
-+    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lam0/l;Lpb0/b;)V
++    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lyl0/l;Lhb0/b;)V
 +
 +    invoke-virtual {v6}, Lradiant/gestures/queue/ComposeSearchQueueAction;->stableKey()Ljava/lang/String;
 +
@@ -205,24 +205,24 @@
 +    move-result-object v2
  
      .line 52
-     invoke-static/range {v0 .. v5}, Lob0/w;->a(Lpb0/b$f;Lam0/a;Landroidx/compose/ui/Modifier;Lam0/a;Landroidx/compose/runtime/Composer;I)V
-@@ -593,6 +629,24 @@
+     invoke-static/range {v0 .. v5}, Lgb0/d0;->a(Lhb0/b$f;Lyl0/a;Landroidx/compose/ui/Modifier;Lyl0/a;Landroidx/compose/runtime/Composer;I)V
+@@ -595,6 +631,24 @@
  
-     check-cast v3, Lam0/a;
+     check-cast v3, Lyl0/a;
  
-+    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v1
 +
 +    new-instance v6, Lradiant/gestures/queue/ComposeSearchQueueAction;
 +
-+    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lam0/l;Lpb0/b;)V
++    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lyl0/l;Lhb0/b;)V
 +
 +    invoke-virtual {v6}, Lradiant/gestures/queue/ComposeSearchQueueAction;->stableKey()Ljava/lang/String;
 +
 +    move-result-object v7
 +
-+    iget-boolean p1, v0, Lpb0/b$i;->i:Z
++    iget-boolean p1, v0, Lhb0/b$i;->i:Z
 +
 +    invoke-static {v2, v7, v6, p1, v4}, Lradiant/gestures/queue/ComposeSwipeState;->attach(Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lradiant/gestures/queue/ComposeSwipeAction;ZLandroidx/compose/runtime/Composer;)Landroidx/compose/ui/Modifier;
 +
@@ -231,18 +231,18 @@
      const/4 v5, 0x0
  
      .line 70
-@@ -828,7 +882,25 @@
+@@ -832,7 +886,25 @@
  
      const/4 v5, 0x0
  
 -    const/4 v2, 0x0
-+    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static {v1}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v1
 +
 +    new-instance v6, Lradiant/gestures/queue/ComposeSearchQueueAction;
 +
-+    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lam0/l;Lpb0/b;)V
++    invoke-direct {v6, p3, v0}, Lradiant/gestures/queue/ComposeSearchQueueAction;-><init>(Lyl0/l;Lhb0/b;)V
 +
 +    invoke-virtual {v6}, Lradiant/gestures/queue/ComposeSearchQueueAction;->stableKey()Ljava/lang/String;
 +
@@ -257,22 +257,22 @@
 +    move-result-object v2
  
      .line 104
-     invoke-static/range {v0 .. v5}, Lob0/q;->a(Lpb0/b$e;Lam0/a;Landroidx/compose/ui/Modifier;Lam0/a;Landroidx/compose/runtime/Composer;I)V
---- a/com/tidal/android/feature/viewall/ui/l.smali
-+++ b/com/tidal/android/feature/viewall/ui/l.smali
+     invoke-static/range {v0 .. v5}, Lgb0/x;->a(Lhb0/b$e;Lyl0/a;Landroidx/compose/ui/Modifier;Lyl0/a;Landroidx/compose/runtime/Composer;I)V
+--- a/com/tidal/android/feature/viewall/ui/s.smali
++++ b/com/tidal/android/feature/viewall/ui/s.smali
 @@ -317,6 +317,31 @@
      .line 132
-     check-cast v3, Lam0/l;
+     check-cast v3, Lyl0/l;
  
-+    instance-of p1, v2, Lm40/e$e;
++    instance-of p1, v2, Ls30/e$e;
 +
 +    if-eqz p1, :rl_viewall_swipe_attached
 +
 +    move-object p1, v2
 +
-+    check-cast p1, Lm40/e$e;
++    check-cast p1, Ls30/e$e;
 +
-+    iget-wide p2, p1, Lm40/e$e;->a:J
++    iget-wide p2, p1, Ls30/e$e;->a:J
 +
 +    invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 +
@@ -280,9 +280,9 @@
 +
 +    new-instance p3, Lradiant/gestures/queue/ViewAllTrackQueueAction;
 +
-+    invoke-direct {p3, v3, p1}, Lradiant/gestures/queue/ViewAllTrackQueueAction;-><init>(Lam0/l;Lm40/e$e;)V
++    invoke-direct {p3, v3, p1}, Lradiant/gestures/queue/ViewAllTrackQueueAction;-><init>(Lyl0/l;Ls30/e$e;)V
 +
-+    iget-boolean p1, p1, Lm40/e$e;->j:Z
++    iget-boolean p1, p1, Ls30/e$e;->j:Z
 +
 +    invoke-static {v1, p2, p3, p1, v5}, Lradiant/gestures/queue/ComposeSwipeState;->attach(Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lradiant/gestures/queue/ComposeSwipeAction;ZLandroidx/compose/runtime/Composer;)Landroidx/compose/ui/Modifier;
 +
@@ -292,28 +292,27 @@
      .line 133
      .line 134
      const/4 v6, 0x0
---- a/j40/p2.smali
-+++ b/j40/p2.smali
-@@ -3240,5 +3240,14 @@
+--- a/p30/t2.smali
++++ b/p30/t2.smali
+@@ -3228,5 +3228,14 @@
      move-object/from16 v16, v1
  
-+    instance-of v3, v14, Lcom/tidal/android/feature/viewall/ui/n;
++    instance-of v3, v14, Lcom/tidal/android/feature/viewall/ui/w;
 +
 +    if-eqz v3, :rl_viewall_tap_guard_done
 +
-+    invoke-static/range {v24 .. v24}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static/range {v24 .. v24}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v24
 +
 +    :rl_viewall_tap_guard_done
-     .line 718
-     .line 719
+     .line 716
+     .line 717
      move-object/from16 v25, v9
 --- a/com/tidal/android/feature/viewall/ui/ViewAllScreenViewModel.smali
 +++ b/com/tidal/android/feature/viewall/ui/ViewAllScreenViewModel.smali
-@@ -1717,5 +1717,16 @@
-         }
-     .end annotation
+@@ -632,4 +632,15 @@
+     .locals 14
  
 +    invoke-static {p0, p1}, Lradiant/gestures/queue/ViewAllTrackQueue;->handleEvent(Lcom/tidal/android/feature/viewall/ui/ViewAllScreenViewModel;Lcom/tidal/android/feature/viewall/ui/e;)Z
 +
@@ -331,14 +330,14 @@
 --- a/com/tidal/android/dynamicpages/ui/composables/artisttrackcredits/h.smali
 +++ b/com/tidal/android/dynamicpages/ui/composables/artisttrackcredits/h.smali
 @@ -929,1 +929,5 @@
-     check-cast v34, Lam0/a;
-+    invoke-static/range {v34 .. v34}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
+     check-cast v34, Lyl0/a;
++    invoke-static/range {v34 .. v34}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v34
 +
 @@ -970,1 +974,17 @@
      move-result-object v0
-+    iget-wide v14, v3, Lm40/e$e;->a:J
++    iget-wide v14, v3, Ls30/e$e;->a:J
 +
 +    invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 +
@@ -346,9 +345,9 @@
 +
 +    new-instance v15, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;
 +
-+    invoke-direct {v15, v4, v1, v2, v3}, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;-><init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e$e;)V
++    invoke-direct {v15, v4, v1, v2, v3}, Lradiant/gestures/queue/ArtistTrackCreditsQueueAction;-><init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e$e;)V
 +
-+    iget-boolean v5, v3, Lm40/e$e;->j:Z
++    iget-boolean v5, v3, Ls30/e$e;->j:Z
 +
 +    invoke-static {v0, v14, v15, v5, v11}, Lradiant/gestures/queue/ComposeSwipeState;->attach(Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lradiant/gestures/queue/ComposeSwipeAction;ZLandroidx/compose/runtime/Composer;)Landroidx/compose/ui/Modifier;
 +
@@ -356,7 +355,7 @@
 +
 --- a/com/tidal/android/dynamicpages/ui/modules/artisttrackcredits/ArtistTrackCreditsModuleManager$createModuleViewState$3.smali
 +++ b/com/tidal/android/dynamicpages/ui/modules/artisttrackcredits/ArtistTrackCreditsModuleManager$createModuleViewState$3.smali
-@@ -603,1 +603,12 @@
+@@ -602,1 +602,12 @@
      :cond_c
 +    instance-of p2, p1, Lradiant/gestures/queue/ArtistTrackCreditsQueueEvent;
 +
@@ -366,14 +365,19 @@
 +
 +    invoke-static {v0, p1}, Lradiant/gestures/queue/ArtistTrackCreditsQueue;->handle(Lcom/tidal/android/dynamicpages/ui/modules/artisttrackcredits/ArtistTrackCreditsModuleManager;Lradiant/gestures/queue/ArtistTrackCreditsQueueEvent;)V
 +
-+    goto :goto_4
++    goto :goto_3
 +
 +    :rl_artist_credits_queue_unhandled
 --- a/com/tidal/android/dynamicpages/ui/composables/verticallistcard/VerticalListCardKt.smali
 +++ b/com/tidal/android/dynamicpages/ui/composables/verticallistcard/VerticalListCardKt.smali
-@@ -3648,1 +3648,24 @@
+@@ -1429,6 +1429,29 @@
+     invoke-static {v12, v0, v9, v7}, Ln40/c;->a(Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/MutableState;Lyl0/a;I)Landroidx/compose/ui/Modifier;
+ 
+     .line 203
+     .line 204
+     .line 205
      move-result-object v0
-+    invoke-static {v10}, Lradiant/gestures/queue/VerticalMediaQueueAction;->isSupported(Lm40/e;)Z
++    invoke-static {v10}, Lradiant/gestures/queue/VerticalMediaQueueAction;->isSupported(Ls30/e;)Z
 +
 +    move-result v7
 +
@@ -381,13 +385,13 @@
 +
 +    new-instance v7, Lradiant/gestures/queue/VerticalMediaQueueAction;
 +
-+    invoke-direct {v7, v4, v1, v2, v10}, Lradiant/gestures/queue/VerticalMediaQueueAction;-><init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e;)V
++    invoke-direct {v7, v4, v1, v2, v10}, Lradiant/gestures/queue/VerticalMediaQueueAction;-><init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e;)V
 +
 +    invoke-virtual {v7}, Lradiant/gestures/queue/VerticalMediaQueueAction;->stableKey()Ljava/lang/String;
 +
 +    move-result-object v9
 +
-+    invoke-static {v10}, Lradiant/gestures/queue/VerticalMediaQueueAction;->isEligible(Lm40/e;)Z
++    invoke-static {v10}, Lradiant/gestures/queue/VerticalMediaQueueAction;->isEligible(Ls30/e;)Z
 +
 +    move-result v12
 +
@@ -396,52 +400,57 @@
 +    move-result-object v0
 +
 +    :rl_vertical_swipe_done
---- a/j40/e4.smali
-+++ b/j40/e4.smali
+--- a/p30/h4.smali
++++ b/p30/h4.smali
 @@ -310,1 +310,24 @@
-     check-cast v11, Lam0/a;
+     check-cast v11, Lyl0/a;
 +    instance-of v8, v6, Lcom/tidal/android/dynamicpages/ui/composables/verticallistcard/m;
 +
 +    if-eqz v8, :rl_vertical_tap_guard_done
 +
-+    instance-of v8, v5, Lm40/e;
++    instance-of v8, v5, Ls30/e;
 +
 +    if-eqz v8, :rl_vertical_tap_guard_done
 +
 +    move-object v8, v5
 +
-+    check-cast v8, Lm40/e;
++    check-cast v8, Ls30/e;
 +
-+    invoke-static {v8}, Lradiant/gestures/queue/VerticalMediaQueueAction;->isSupported(Lm40/e;)Z
++    invoke-static {v8}, Lradiant/gestures/queue/VerticalMediaQueueAction;->isSupported(Ls30/e;)Z
 +
 +    move-result v8
 +
 +    if-eqz v8, :rl_vertical_tap_guard_done
 +
-+    invoke-static {v11}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
++    invoke-static {v11}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v11
 +
 +    :rl_vertical_tap_guard_done
---- a/com/tidal/android/dynamicpages/ui/composables/publicplaylistlist/i.smali
-+++ b/com/tidal/android/dynamicpages/ui/composables/publicplaylistlist/i.smali
-@@ -2120,1 +2120,5 @@
-     check-cast v34, Lam0/a;
-+    invoke-static/range {v34 .. v34}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lam0/a;)Lam0/a;
+--- a/com/tidal/android/dynamicpages/ui/composables/publicplaylistlist/j.smali
++++ b/com/tidal/android/dynamicpages/ui/composables/publicplaylistlist/j.smali
+@@ -1308,1 +1308,5 @@
+     check-cast v34, Lyl0/a;
++    invoke-static/range {v34 .. v34}, Lradiant/gestures/queue/ComposeTapGuard;->wrap(Lyl0/a;)Lyl0/a;
 +
 +    move-result-object v34
 +
-@@ -2161,1 +2165,15 @@
+@@ -1344,6 +1348,20 @@
+     invoke-static/range {v26 .. v36}, Landroidx/compose/foundation/ClickableKt;->combinedClickable-f5TDLPQ$default(Landroidx/compose/ui/Modifier;ZLjava/lang/String;Landroidx/compose/ui/semantics/Role;Ljava/lang/String;Lyl0/a;Lyl0/a;ZLyl0/a;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
+ 
+     .line 410
+     .line 411
+     .line 412
      move-result-object v0
 +    new-instance v5, Lradiant/gestures/queue/PublicPlaylistQueueAction;
 +
-+    invoke-direct {v5, v4, v1, v2, v3}, Lradiant/gestures/queue/PublicPlaylistQueueAction;-><init>(Lam0/l;Ljava/lang/String;Ljava/lang/String;Lm40/e$d;)V
++    invoke-direct {v5, v4, v1, v2, v3}, Lradiant/gestures/queue/PublicPlaylistQueueAction;-><init>(Lyl0/l;Ljava/lang/String;Ljava/lang/String;Ls30/e$d;)V
 +
 +    invoke-virtual {v5}, Lradiant/gestures/queue/PublicPlaylistQueueAction;->stableKey()Ljava/lang/String;
 +
 +    move-result-object v7
 +
-+    iget-boolean v9, v3, Lm40/e$d;->g:Z
++    iget-boolean v9, v3, Ls30/e$d;->g:Z
 +
 +    invoke-static {v0, v7, v5, v9, v11}, Lradiant/gestures/queue/ComposeSwipeState;->attach(Landroidx/compose/ui/Modifier;Ljava/lang/Object;Lradiant/gestures/queue/ComposeSwipeAction;ZLandroidx/compose/runtime/Composer;)Landroidx/compose/ui/Modifier;
 +
@@ -449,7 +458,7 @@
 +
 --- a/com/tidal/android/dynamicpages/ui/modules/verticallistcard/VerticalListCardModuleManager$createModuleViewState$3.smali
 +++ b/com/tidal/android/dynamicpages/ui/modules/verticallistcard/VerticalListCardModuleManager$createModuleViewState$3.smali
-@@ -830,1 +830,12 @@
+@@ -835,1 +835,12 @@
      :cond_15
 +    instance-of v2, v0, Lradiant/gestures/queue/DynamicMediaQueueEvent;
 +
@@ -477,4 +486,4 @@
 +    goto :goto_1
 +
 +    :rl_public_queue_continue
-     invoke-static {}, Landroidx/navigation/f0;->a()V
+     invoke-static {}, Lx/f0;->a()V

patches/gestures/queue/swipe-to-queue.patch

@@ -86,7 +86,7 @@
 +
 +    iget-object v3, p1, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/g0;->k:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;
 +
-+    iget-object v0, p0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->b:Lx40/a;
++    iget-object v0, p0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->b:Ld40/a;
 +
 +    instance-of p1, v0, Lh4/a;
 +
@@ -145,7 +145,7 @@
 +
 +    iget-object v0, v0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/m;->f:Landroidx/recyclerview/widget/RecyclerView;
 +
-+    invoke-virtual {p0, v0, v5, v0}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->w(Landroidx/recyclerview/widget/RecyclerView;ILandroid/view/View;)V
++    invoke-virtual {p0, v0, v5, v0}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->x(Landroidx/recyclerview/widget/RecyclerView;ILandroid/view/View;)V
 +
 +    :done
 +    return-void
@@ -153,9 +153,9 @@
 +
 +
  # virtual methods
- .method public final M()Ln8/b;
+ .method public final M()Lm8/b;
      .locals 1
-@@ -2265,9 +2448,16 @@
+@@ -2108,9 +2256,16 @@
      iput-object p0, p1, Lo4/g;->e:Lo4/g$e;
 
      .line 224
@@ -172,8 +172,8 @@
      .line 226
      .line 227
      invoke-virtual {p0}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->N()Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/n;
---- a/p7/a.smali
-+++ b/p7/a.smali
+--- a/o7/a.smali
++++ b/o7/a.smali
 @@ -33,3 +33,11 @@
  .end method
  
@@ -186,9 +186,9 @@
 +.end method
 +
  .method public final c(Ljava/lang/Object;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
---- a/v6/e.smali
-+++ b/v6/e.smali
-@@ -62,3 +62,11 @@
+--- a/u6/e.smali
++++ b/u6/e.smali
+@@ -34,3 +34,11 @@
  .end method
  
 +.method public b(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -202,7 +202,7 @@
  .method public final c(Ljava/lang/Object;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 --- a/com/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView.smali
 +++ b/com/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView.smali
-@@ -559,6 +559,8 @@
+@@ -560,6 +560,8 @@
      .line 23
      invoke-static {v0, p2}, Lcom/tidal/android/feature/appscaffold/ui/recyclerview/b;->a(Landroidx/lifecycle/LifecycleOwner;Landroidx/recyclerview/widget/RecyclerView;)Lcom/tidal/android/feature/appscaffold/ui/recyclerview/a;
 
@@ -213,7 +213,7 @@
      .line 26
 --- a/com/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView.smali
 +++ b/com/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView.smali
-@@ -581,6 +581,8 @@
+@@ -582,6 +582,8 @@
      .line 23
      invoke-static {p1, p2}, Lcom/tidal/android/feature/appscaffold/ui/recyclerview/b;->a(Landroidx/lifecycle/LifecycleOwner;Landroidx/recyclerview/widget/RecyclerView;)Lcom/tidal/android/feature/appscaffold/ui/recyclerview/a;
 
@@ -224,7 +224,7 @@
      .line 26
 --- a/com/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView.smali
 +++ b/com/aspiro/wamp/mycollection/subpages/mixesandradios/MyMixesAndRadioView.smali
-@@ -556,6 +556,8 @@
+@@ -557,6 +557,8 @@
      .line 22
      .line 23
      invoke-static {p1, p2}, Lcom/tidal/android/feature/appscaffold/ui/recyclerview/b;->a(Landroidx/lifecycle/LifecycleOwner;Landroidx/recyclerview/widget/RecyclerView;)Lcom/tidal/android/feature/appscaffold/ui/recyclerview/a;
@@ -236,7 +236,7 @@
      .line 26
 --- a/androidx/recyclerview/widget/ItemTouchHelper$2.smali
 +++ b/androidx/recyclerview/widget/ItemTouchHelper$2.smali
-@@ -773,7 +773,11 @@
+@@ -555,7 +555,11 @@
      const/4 v5, 0x1
 
      .line 54
@@ -249,7 +249,7 @@
 
      .line 55
      .line 56
-@@ -867,6 +871,9 @@
+@@ -649,6 +653,9 @@
 
      .line 97
      :cond_6
@@ -261,21 +261,21 @@
      .line 98
 --- a/h4/a.smali
 +++ b/h4/a.smali
-@@ -931,1 +931,46 @@
+@@ -921,1 +921,46 @@
  .end method
 +
 +.method public final q(Landroidx/fragment/app/FragmentActivity;Lcom/aspiro/wamp/model/Track;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/aspiro/wamp/playqueue/source/model/Source;)Z
 +    .locals 3
 +
-+    iget-object v0, p0, Lh4/a;->n:Lcom/aspiro/wamp/contextmenu/menu/track/TrackContextMenu$a;
++    iget-object v0, p0, Lh4/a;->m:Lz3/a$a;
 +
-+    check-cast v0, Lcom/aspiro/wamp/contextmenu/menu/track/d;
++    check-cast v0, Lz3/c;
 +
-+    iget-object v1, v0, Lcom/aspiro/wamp/contextmenu/menu/track/d;->a:Lcom/aspiro/wamp/contextmenu/menu/track/c;
++    iget-object v1, v0, Lz3/c;->a:Lz3/b;
 +
-+    iget-object v0, v1, Lcom/aspiro/wamp/contextmenu/menu/track/c;->b:Ldagger/internal/j;
++    iget-object v0, v1, Lz3/b;->b:Ldagger/internal/j;
 +
-+    invoke-interface {v0}, Lql0/a;->get()Ljava/lang/Object;
++    invoke-interface {v0}, Lol0/a;->get()Ljava/lang/Object;
 +
 +    move-result-object v0
 +
@@ -285,13 +285,13 @@
 +
 +    move-result-object v0
 +
-+    iget-object v2, v0, Lm3/f;->j:Lcom/aspiro/wamp/playqueue/g1;
++    iget-object v2, v0, Lm3/f;->j:Lcom/aspiro/wamp/playqueue/x0;
 +
-+    invoke-virtual {v2}, Lcom/aspiro/wamp/playqueue/g1;->a()Lcom/aspiro/wamp/player/d;
++    invoke-virtual {v2}, Lcom/aspiro/wamp/playqueue/x0;->a()Lcom/aspiro/wamp/player/c;
 +
 +    move-result-object v2
 +
-+    invoke-virtual {v2}, Lcom/aspiro/wamp/player/d;->b()Lcom/aspiro/wamp/model/MediaItemParent;
++    invoke-virtual {v2}, Lcom/aspiro/wamp/player/c;->b()Lcom/aspiro/wamp/model/MediaItemParent;
 +
 +    move-result-object v2
 +
@@ -320,7 +320,7 @@
 +
  
  # direct methods
- .method public constructor <init>(Landroid/content/Context;Lcom/aspiro/wamp/nowplaying/view/playqueue/touchmanagement/a;Lcom/aspiro/wamp/nowplaying/view/playqueue/l;)V
+ .method public constructor <init>(Landroid/content/Context;Lcom/aspiro/wamp/nowplaying/view/playqueue/touchmanagement/a;Lcom/aspiro/wamp/nowplaying/view/playqueue/n;)V
 @@ -55,6 +59,26 @@
  
      .line 10
@@ -348,7 +348,7 @@
      new-instance p2, Landroid/graphics/drawable/ColorDrawable;
  
      .line 12
-@@ -377,6 +401,10 @@
+@@ -175,6 +199,10 @@
      .line 5
      .line 6
      .line 7
@@ -359,7 +359,7 @@
      iget-object v0, p0, Lcom/aspiro/wamp/nowplaying/view/playqueue/touchmanagement/ItemTouchHelperCallbackImpl;->d:Lcom/aspiro/wamp/nowplaying/view/playqueue/touchmanagement/ItemTouchHelperCallbackImpl$ActionType;
  
      .line 8
-@@ -844,7 +872,7 @@
+@@ -374,7 +402,7 @@
  
      .line 32
      .line 33
@@ -368,7 +368,7 @@
  
      .line 34
      :cond_1
-@@ -896,7 +924,23 @@
+@@ -398,7 +426,23 @@
  .end method
  
 +.method public getSwipeEscapeVelocity(F)F
@@ -393,7 +393,7 @@
  
      .line 1
      invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-@@ -916,6 +960,16 @@
+@@ -418,6 +462,16 @@
      .line 10
      invoke-super/range {p0 .. p7}, Landroidx/recyclerview/widget/ItemTouchHelper$Callback;->onChildDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;FFIZ)V
  
@@ -410,9 +410,9 @@
      .line 11
      .line 12
      .line 13
---- a/com/aspiro/wamp/nowplaying/view/playqueue/l.smali
-+++ b/com/aspiro/wamp/nowplaying/view/playqueue/l.smali
-@@ -983,6 +983,8 @@
+--- a/com/aspiro/wamp/nowplaying/view/playqueue/n.smali
++++ b/com/aspiro/wamp/nowplaying/view/playqueue/n.smali
+@@ -719,6 +719,8 @@
      .line 121
      move-result-object p1
  
@@ -423,7 +423,7 @@
  
 --- a/com/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView.smali
 +++ b/com/aspiro/wamp/mycollection/subpages/albums/search/SearchAlbumsView.smali
-@@ -1176,8 +1176,10 @@
+@@ -579,8 +579,10 @@
      .line 69
      .line 70
      .line 71
@@ -436,20 +436,18 @@
      .line 74
 --- a/com/aspiro/wamp/playlist/ui/fragment/PlaylistFragment.smali
 +++ b/com/aspiro/wamp/playlist/ui/fragment/PlaylistFragment.smali
-@@ -5193,8 +5193,10 @@
-     .line 127
-     .line 128
-     .line 129
+@@ -3125,6 +3125,8 @@
+     invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
      invoke-static {v1, p1}, Lcom/tidal/android/feature/appscaffold/ui/recyclerview/b;->a(Landroidx/lifecycle/LifecycleOwner;Landroidx/recyclerview/widget/RecyclerView;)Lcom/tidal/android/feature/appscaffold/ui/recyclerview/a;
 
 +    invoke-static {p1}, Lradiant/gestures/queue/PlaylistItemsResolver;->install(Lcom/aspiro/wamp/playlist/ui/items/PlaylistItemCollectionView;)V
 +
-     .line 130
-     .line 131
-     .line 132
+     .line 31
+     iget-object p1, p0, Lcom/aspiro/wamp/playlist/ui/fragment/PlaylistFragment;->s:Lcom/aspiro/wamp/playlist/ui/fragment/p;
 --- a/com/aspiro/wamp/search/v2/UnifiedSearchView.smali
 +++ b/com/aspiro/wamp/search/v2/UnifiedSearchView.smali
-@@ -1596,8 +1596,10 @@
+@@ -881,8 +881,10 @@
      .line 60
      .line 61
      .line 62
@@ -462,7 +460,7 @@
      .line 65
 --- a/com/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView.smali
 +++ b/com/aspiro/wamp/mycollection/subpages/playlists/searchplaylists/SearchPlaylistsView.smali
-@@ -1204,8 +1204,10 @@
+@@ -638,8 +638,10 @@
      .line 69
      .line 70
      .line 71
@@ -486,21 +484,21 @@
      .line 39
      .line 40
      .line 41
---- a/com/aspiro/wamp/nowplaying/view/suggestions/o0.smali
-+++ b/com/aspiro/wamp/nowplaying/view/suggestions/o0.smali
-@@ -876,7 +876,9 @@
-     .line 96
+--- a/com/aspiro/wamp/nowplaying/view/suggestions/q0.smali
++++ b/com/aspiro/wamp/nowplaying/view/suggestions/q0.smali
+@@ -875,7 +875,9 @@
+     .line 97
      invoke-virtual {v0, p2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
  
 +    invoke-static {p0, v0}, Lradiant/gestures/queue/SuggestionsResolver;->install(Landroidx/fragment/app/Fragment;Landroidx/recyclerview/widget/RecyclerView;)V
 +
-     .line 97
      .line 98
      .line 99
-     invoke-virtual {p0}, Lcom/aspiro/wamp/nowplaying/view/suggestions/o0;->M()Lcom/aspiro/wamp/nowplaying/view/suggestions/l;
---- a/com/aspiro/wamp/nowplaying/view/suggestions/h.smali
-+++ b/com/aspiro/wamp/nowplaying/view/suggestions/h.smali
-@@ -674,1 +674,3 @@
+     .line 100
+     invoke-virtual {p0}, Lcom/aspiro/wamp/nowplaying/view/suggestions/q0;->M()Lcom/aspiro/wamp/nowplaying/view/suggestions/m;
+--- a/com/aspiro/wamp/nowplaying/view/suggestions/i.smali
++++ b/com/aspiro/wamp/nowplaying/view/suggestions/i.smali
+@@ -670,1 +670,3 @@
      invoke-virtual {v3, p2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 +    invoke-static {p0, v3}, Lradiant/gestures/queue/SuggestionsResolver;->install(Landroidx/fragment/app/Fragment;Landroidx/recyclerview/widget/RecyclerView;)V
 +

patches/home-backdrop.patch

@@ -1,16 +1,16 @@
---- a/com/tidal/android/feature/home/ui/k.smali
-+++ b/com/tidal/android/feature/home/ui/k.smali
-@@ -424,7 +424,7 @@
+--- a/com/tidal/android/feature/home/ui/j.smali
++++ b/com/tidal/android/feature/home/ui/j.smali
+@@ -427,7 +427,7 @@
      const/4 v6, 0x0
  
-     .line 181
--    move-wide v7, v8
+     .line 182
+-    move-wide v7, v9
 +    const-wide/16 v7, 0x0    # transparent containerColor
  
-     .line 182
+     .line 183
      const-wide/16 v9, 0x0
---- a/com/tidal/android/feature/home/ui/o.smali
-+++ b/com/tidal/android/feature/home/ui/o.smali
+--- a/com/tidal/android/feature/home/ui/m.smali
++++ b/com/tidal/android/feature/home/ui/m.smali
 @@ -187,6 +187,10 @@
      .line 61
      .line 62
@@ -22,8 +22,8 @@
      invoke-interface {p1}, Landroidx/compose/foundation/layout/PaddingValues;->calculateTopPadding-D9Ej5fM()F
  
      .line 63
---- a/com/tidal/android/feature/home/ui/composables/g.smali
-+++ b/com/tidal/android/feature/home/ui/composables/g.smali
+--- a/com/tidal/android/feature/home/ui/composables/f.smali
++++ b/com/tidal/android/feature/home/ui/composables/f.smali
 @@ -790,6 +790,8 @@
      .line 104
      move-result-wide v14

patches/integration-pebble-lyrics.patch

@@ -0,0 +1,30 @@
+--- a/radiant/RLAPILyricsWorker.smali
++++ b/radiant/RLAPILyricsWorker.smali
+@@ -794,6 +794,12 @@
+     :got_body
+     move-object v11, v3
+ 
++    iget-object v4, p0, Lradiant/RLAPILyricsWorker;->key:Ljava/lang/String;
++
++    iget-object v5, p0, Lradiant/RLAPILyricsWorker;->title:Ljava/lang/String;
++
++    invoke-static {v4, v5, v3}, Lradiant/PebbleBridge;->onLyrics(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
++
+     invoke-static {v3}, Lradiant/RLAPILyricsWorker;->parseLines(Ljava/lang/String;)Ljava/util/ArrayList;
+ 
+     move-result-object v3
+@@ -911,6 +917,14 @@
+     return-void
+ 
+     :request_failed
++    iget-object v0, p0, Lradiant/RLAPILyricsWorker;->key:Ljava/lang/String;
++
++    iget-object v1, p0, Lradiant/RLAPILyricsWorker;->title:Ljava/lang/String;
++
++    const/4 v2, 0x0
++
++    invoke-static {v0, v1, v2}, Lradiant/PebbleBridge;->onLyrics(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
++
+     invoke-direct {p0}, Lradiant/RLAPILyricsWorker;->failCurrent()V
+ 
+     return-void

patches/integration-pebble-playback.patch

@@ -0,0 +1,31 @@
+--- a/com/aspiro/wamp/player/MusicService.smali
++++ b/com/aspiro/wamp/player/MusicService.smali
+@@ -1492,6 +1492,8 @@
+     .line 36
+     invoke-virtual {p1, v0}, Landroid/support/v4/media/session/MediaSessionCompat;->setPlaybackState(Landroid/support/v4/media/session/PlaybackStateCompat;)V
+ 
++    invoke-static {p0, p1}, Lradiant/PebbleBridge;->onState(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat;)V
++
+     .line 37
+     .line 38
+     .line 39
+@@ -2666,6 +2668,8 @@
+     .line 1
+     invoke-super {p0}, Landroidx/media/MediaBrowserServiceCompat;->onDestroy()V
+ 
++    invoke-static {}, Lradiant/PebbleBridge;->onDestroy()V
++
+     .line 2
+     .line 3
+     .line 4
+--- a/yj0/e.smali
++++ b/yj0/e.smali
+@@ -56,6 +56,8 @@
+     .line 6
+     move-result-wide v0
+ 
++    invoke-static {v0, v1}, Lradiant/PebbleBridge;->onPosition(J)V
++
+     .line 7
+     iget-object v2, p0, Lyj0/e;->a:Lyj0/d;
+ 

patches/integration-waze-playback.patch

@@ -1,5 +1,5 @@
---- a/mb/f.smali
-+++ b/mb/f.smali
+--- a/kb/f.smali
++++ b/kb/f.smali
 @@ -613,6 +613,25 @@
  
      .line 236
@@ -52,4 +52,4 @@
 +
      .line 306
      .line 307
-     iget-object v1, v0, Lmb/f;->c:Ljava/util/Map;
+     iget-object v1, v0, Lkb/f;->c:Ljava/util/Map;

patches/lyrics-ai-indicator.patch

@@ -0,0 +1,28 @@
+--- a/radiant/RLAPILyricsWorker.smali
++++ b/radiant/RLAPILyricsWorker.smali
+@@ -683,6 +683,8 @@
+ .method private runImpl()V
+     .locals 13
+ 
++    invoke-static {}, Lradiant/AiSparkle;->reset()V    # Reset AI sparkle
++
+     iget-object v0, p0, Lradiant/RLAPILyricsWorker;->title:Ljava/lang/String;
+ 
+     invoke-static {v0}, Lradiant/RLAPILyricsWorker;->uric(Ljava/lang/String;)Ljava/lang/String;
+@@ -859,3 +861,5 @@
+     :key_ok
++    invoke-static {v11}, Lradiant/AiSparkle;->onResponse(Ljava/lang/String;)V    # Rainbow sparkle for AI syllables
++
+     invoke-static {v11}, Lradiant/WordLyrics;->ingest(Ljava/lang/String;)V
+ 
+--- a/radiant/SparkleContent.smali
++++ b/radiant/SparkleContent.smali
+@@ -47,4 +47,8 @@
+ 
+     move-result-object p2
+ 
++    invoke-static {p2, p1}, Lradiant/AiSparkle;->wrap(Landroidx/compose/ui/graphics/painter/Painter;Landroidx/compose/runtime/Composer;)Landroidx/compose/ui/graphics/painter/Painter;    # Rainbow sparkle when AI
++
++    move-result-object p2
++
+     invoke-static {}, Landroidx/compose/runtime/ComposerKt;->isTraceInProgress()Z

patches/lyrics-disable-cover.patch

@@ -1,5 +1,5 @@
---- a/com/tidal/android/feature/playerscreen/ui/b0.smali
-+++ b/com/tidal/android/feature/playerscreen/ui/b0.smali
+--- a/com/tidal/android/feature/playerscreen/ui/i0.smali
++++ b/com/tidal/android/feature/playerscreen/ui/i0.smali
 @@ -669,8 +669,23 @@
      move-object v5, v1
  
@@ -8,7 +8,7 @@
 +
 +    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/b0;->b:Lcom/tidal/android/feature/playerscreen/ui/s$a;    # player state
++    iget-object v1, v0, Lcom/tidal/android/feature/playerscreen/ui/i0;->b:Lcom/tidal/android/feature/playerscreen/ui/s$a;    # player state
 +
 +    iget-object v1, v1, Lcom/tidal/android/feature/playerscreen/ui/s$a;->j:Lcom/tidal/android/feature/playerscreen/ui/g;    # current view mode
 +
@@ -16,7 +16,7 @@
 +
 +    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;Lam0/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;Lyl0/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,10 +1,10 @@
---- a/com/tidal/android/feature/playerscreen/ui/composables/o1.smali
-+++ b/com/tidal/android/feature/playerscreen/ui/composables/o1.smali
+--- a/com/tidal/android/feature/playerscreen/ui/composables/f1.smali
++++ b/com/tidal/android/feature/playerscreen/ui/composables/f1.smali
 @@ -64,7 +64,7 @@
  
      .line 16
      .line 17
--    iget v2, p0, Lcom/tidal/android/feature/playerscreen/ui/composables/o1;->a:F
+-    iget v2, p0, Lcom/tidal/android/feature/playerscreen/ui/composables/f1;->a:F
 +    const/high16 v2, 0x43200000    # 160f start dp
  
      .line 18

patches/lyrics-keep-controls-visible.patch

@@ -11,7 +11,7 @@
      .line 28
 --- a/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/PlayerViewModel.smali
-@@ -1382,6 +1382,19 @@
+@@ -1467,6 +1467,19 @@
      .line 109
      .line 110
      move-result v1