Offline Repatch + Force Incompatible (Dev Option)

patches/manifest.json

@@ -103,8 +103,21 @@
       "default": true
     },
     {
-      "id": "PlayerOneHanded",
+      "id": "PlayerMovePlayingFrom",
       "order": 37,
+      "fileNames": [
+        "player-move-playing-from.patch"
+      ],
+      "extensionFiles": [
+        "radiant/PlayingFrom.smali"
+      ],
+      "title": "Playing From",
+      "description": "Shows the source name (playlist/album/mix) above the track title",
+      "default": true
+    },
+    {
+      "id": "PlayerOneHanded",
+      "order": 38,
       "fileNames": [
         "player-one-handed.patch"
       ],
@@ -159,19 +172,6 @@
       "description": "Replaces the share button with the Tidal Connect button from the top of the screen. (it's in the menu already)",
       "default": true
     },
-    {
-      "id": "PlayerMovePlayingFrom",
-      "order": 44,
-      "fileNames": [
-        "player-move-playing-from.patch"
-      ],
-      "extensionFiles": [
-        "radiant/PlayingFrom.smali"
-      ],
-      "title": "Move Playing From",
-      "description": "Shows the source name (e.g. the playlist or album you're playing from) just above the track title, in the artist text style, instead of at the bottom of the player.",
-      "default": false
-    },
     {
       "id": "MiniPlayerRedesign",
       "order": 50,
@@ -307,7 +307,7 @@
       "category": "integration",
       "pathLocked": true,
       "fileNames": [
-        "waze-media-browser.patch"
+        "integration-waze-playback.patch"
       ],
       "extensionFiles": [
         "radiant/WazeInitReceiver.smali",
@@ -354,4 +354,4 @@
       "default": false
     }
   ]
-}
+}

patches/player-hide-playing-from.patch

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

patches/player-move-playing-from.patch

@@ -22,15 +22,6 @@
      iget-object v0, v3, Lcom/tidal/android/feature/playerscreen/ui/s$a;->c:Lcom/tidal/android/feature/playerscreen/ui/d;
 
      .line 234
-@@ -5794,6 +5814,8 @@
-     .line 336
-     iget-object v3, v10, Lcom/tidal/android/feature/playerscreen/ui/s$a;->l:Lcom/tidal/android/feature/playerscreen/ui/p;
-
-+    const/4 v3, 0x0    # RL move-playing-from: force null -> hide source at bottom (rendered above the title instead)
-+
-     if-nez v3, :cond_52
-
-     const v3, 0x26ba353b
 --- a/com/tidal/android/feature/playerscreen/ui/composables/k2.smali
 +++ b/com/tidal/android/feature/playerscreen/ui/composables/k2.smali
 @@ -632,6 +632,39 @@