Merge pull request #29 from meowarex/dev

New Patch: Mini-Player Redesign

Manager/app/src/main/kotlin/com/meowarex/rlmobile/updatechecker/UpdateCheckWorker.kt

@@ -7,6 +7,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.core.app.ActivityCompat
@@ -50,15 +51,15 @@ class UpdateCheckWorker(
             .maxByOrNull { it.first }
             ?: return Result.success()
 
-        val (version, _) = latestVersion
+        val (version, release) = latestVersion
         if (current >= version) return Result.success()
 
         Log.i(BuildConfig.TAG, "Update available: $version (installed $current)")
-        postUpdateNotification(version.toString())
+        postUpdateNotification(version.toString(), release.htmlUrl)
         return Result.success()
     }
 
-    private fun postUpdateNotification(version: String) {
+    private fun postUpdateNotification(version: String, releaseUrl: String) {
         val nm = applicationContext.getSystemService<NotificationManager>() ?: return
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -77,15 +78,10 @@ class UpdateCheckWorker(
             return
         }
 
-        val launchIntent = applicationContext.packageManager
-            .getLaunchIntentForPackage(applicationContext.packageName)
-            ?.apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
-            ?: return
-
         val pendingIntent = PendingIntent.getActivity(
             applicationContext,
             0,
-            launchIntent,
+            Intent(Intent.ACTION_VIEW, Uri.parse(releaseUrl)).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) },
             PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
         )
 

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

@@ -258,7 +258,7 @@
   <string name="patch_lyrics_progress_pill_desc">Restores the old Track Progress Pill in the top of the Lyrics screen!</string>
   <string name="patch_lyrics_replace_button_title">Replace Lyrics Button</string>
   <string name="patch_lyrics_replace_button_desc">Replaces the Lyrics button with the RL Sparkle!</string>
-  <string name="patch_lyrics_rl_api_title">Radiant Lyrics API - WIP</string>
+  <string name="patch_lyrics_rl_api_title">Radiant Lyrics API</string>
   <string name="patch_lyrics_rl_api_desc">Use Radiant Lyrics API to fetch Lyrics (Higher quality &amp; More providers)</string>
   <string name="patch_sticky_lyrics_title">Sticky Lyrics</string>
   <string name="patch_sticky_lyrics_desc">Always Forces the Lyrics page to be opened (aslong as the track has lyrics)</string>

patches/data.json

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

patches/extension/radiant/RLAPILyricsWorker.smali

@@ -344,7 +344,7 @@
 
     invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, "&platform=rl-mobile"
+    const-string v0, "&platform=Radiant%20Lyrics"
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 

patches/lyrics-replace-share-button.patch

@@ -30,13 +30,13 @@
 -    const/4 v2, 0x0
 -
 -    invoke-static {v13, v7, v2, v4}, Lcom/tidal/android/feature/playerscreen/ui/composables/x4;->a(ILandroidx/compose/runtime/Composer;Landroidx/compose/ui/Modifier;Lyl0/a;)V
-+    new-instance v4, Landroidx/navigation/fragment/k;    # connect click lambda factory
++    new-instance v4, Lcom/aspiro/wamp/tidalconnect/playback/i;    # connect click lambda factory
 +
 +    move-object/from16 v6, p5    # action dispatcher
 +
 +    const/4 v8, 0x1    # connect-clicked disc
 +
-+    invoke-direct {v4, v6, v8}, Landroidx/navigation/fragment/k;-><init>(Ljava/lang/Object;I)V    # build lambda
++    invoke-direct {v4, v6, v8}, Lcom/aspiro/wamp/tidalconnect/playback/i;-><init>(Ljava/lang/Object;I)V    # build lambda
 +
 +    invoke-interface {v7, v4}, Landroidx/compose/runtime/Composer;->updateRememberedValue(Ljava/lang/Object;)V    # cache lambda
 +