From ad196c32283b770ad4a6ed3a311f974a5a66d108 Mon Sep 17 00:00:00 2001 From: Se7en-dev Date: Fri, 14 Aug 2026 15:52:44 +0200 Subject: [PATCH] feat(swipe to queue): queue collection playlists support --- .../app/src/main/assets/patches-manifest.json | 5 +- .../radiant/swipe/MyPlaylistsResolver.smali | 311 ++++++++++++++++++ .../radiant/swipe/QueueExecutor.smali | 82 +++++ patches/manifest.json | 5 +- patches/swipe-to-queue.patch | 11 + 5 files changed, 410 insertions(+), 4 deletions(-) create mode 100644 patches/extension/radiant/swipe/MyPlaylistsResolver.smali diff --git a/Manager/app/src/main/assets/patches-manifest.json b/Manager/app/src/main/assets/patches-manifest.json index 23b9419..a1a5ed1 100644 --- a/Manager/app/src/main/assets/patches-manifest.json +++ b/Manager/app/src/main/assets/patches-manifest.json @@ -436,10 +436,11 @@ "radiant/swipe/QueueExecutor.smali", "radiant/swipe/FavoriteTracksResolver.smali", "radiant/swipe/DynamicTrackResolver.smali", - "radiant/swipe/MyAlbumsResolver.smali" + "radiant/swipe/MyAlbumsResolver.smali", + "radiant/swipe/MyPlaylistsResolver.smali" ], "title": "Swipe to Queue", - "description": "Swipe on tracks/albums to add them to the play queue.", + "description": "Swipe on tracks/albums/playlists to add them to the play queue.", "default": false, "advancedOptions": [ { diff --git a/patches/extension/radiant/swipe/MyPlaylistsResolver.smali b/patches/extension/radiant/swipe/MyPlaylistsResolver.smali new file mode 100644 index 0000000..e938c6b --- /dev/null +++ b/patches/extension/radiant/swipe/MyPlaylistsResolver.smali @@ -0,0 +1,311 @@ +.class public final Lradiant/swipe/MyPlaylistsResolver; +.super Ljava/lang/Object; +.source "MyPlaylistsResolver.smali" + +# interfaces +.implements Lradiant/swipe/QueueRowResolver; + + +# instance fields +.field private final fragment:Ljava/lang/ref/WeakReference; + + +# direct methods +.method private constructor (Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;)V + .locals 1 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + new-instance v0, Ljava/lang/ref/WeakReference; + + invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;->(Ljava/lang/Object;)V + + iput-object v0, p0, Lradiant/swipe/MyPlaylistsResolver;->fragment:Ljava/lang/ref/WeakReference; + + return-void +.end method + +.method private current(Lradiant/swipe/QueueRequest;)Lcf/b; + .locals 6 + + if-eqz p1, :invalid + + iget-object v0, p1, Lradiant/swipe/QueueRequest;->media:Ljava/lang/Object; + + instance-of v1, v0, Lcom/aspiro/wamp/model/Playlist; + + if-eqz v1, :invalid + + check-cast v0, Lcom/aspiro/wamp/model/Playlist; + + iget-object v1, p0, Lradiant/swipe/MyPlaylistsResolver;->fragment:Ljava/lang/ref/WeakReference; + + invoke-virtual {v1}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView; + + if-eqz v1, :invalid + + iget-object v2, v1, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->j:Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/h; + + if-eqz v2, :invalid + + invoke-virtual {v1}, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->N()La50/d; + + move-result-object v1 + + invoke-virtual {v1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List; + + move-result-object v1 + + iget v2, p1, Lradiant/swipe/QueueRequest;->position:I + + if-gez v2, :check_size + + goto :invalid + + :check_size + invoke-interface {v1}, Ljava/util/List;->size()I + + move-result v3 + + if-lt v2, v3, :read_item + + goto :invalid + + :read_item + invoke-interface {v1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object; + + move-result-object v1 + + instance-of v2, v1, Lcf/b; + + if-eqz v2, :invalid + + check-cast v1, Lcf/b; + + iget-boolean v2, v1, Lcf/b;->h:Z + + if-eqz v2, :invalid + + iget-boolean v2, v1, Lcf/b;->f:Z + + if-eqz v2, :check_playlist + + const-string v2, "NOT_READY" + + iget-object v3, v1, Lcf/b;->g:Ljava/lang/String; + + invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v2 + + if-nez v2, :invalid + + :check_playlist + iget-object v2, v1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist; + + invoke-virtual {v2}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I + + move-result v3 + + if-lez v3, :invalid + + invoke-virtual {v2}, Lcom/aspiro/wamp/model/Playlist;->getUuid()Ljava/lang/String; + + move-result-object v2 + + invoke-virtual {v0}, Lcom/aspiro/wamp/model/Playlist;->getUuid()Ljava/lang/String; + + move-result-object v0 + + invoke-virtual {v2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :invalid + + return-object v1 + + :invalid + const/4 v0, 0x0 + + return-object v0 +.end method + +.method public static install(Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;Landroidx/recyclerview/widget/RecyclerView;)V + .locals 1 + + if-eqz p0, :done + + if-eqz p1, :done + + new-instance v0, Lradiant/swipe/MyPlaylistsResolver; + + invoke-direct {v0, p0}, Lradiant/swipe/MyPlaylistsResolver;->(Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;)V + + invoke-static {p1, v0}, Lradiant/SwipeToQueue;->install(Landroidx/recyclerview/widget/RecyclerView;Lradiant/swipe/QueueRowResolver;)V + + :done + return-void +.end method + + +# virtual methods +.method public execute(Lradiant/swipe/QueueRequest;)V + .locals 6 + + invoke-direct {p0, p1}, Lradiant/swipe/MyPlaylistsResolver;->current(Lradiant/swipe/QueueRequest;)Lcf/b; + + move-result-object p1 + + if-eqz p1, :done + + iget-object v0, p0, Lradiant/swipe/MyPlaylistsResolver;->fragment:Ljava/lang/ref/WeakReference; + + invoke-virtual {v0}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object; + + move-result-object v0 + + check-cast v0, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView; + + if-eqz v0, :done + + iget-object v1, v0, Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;->d:Lhf/c; + + if-eqz v1, :done + + invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context; + + move-result-object v2 + + iget-object v3, p1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist; + + iget-object v4, v1, Lhf/c;->e:Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata; + + iget-object v5, v1, Lhf/c;->d:Lcom/tidal/android/navigation/NavigationInfo; + + invoke-static {v2, v3, v4, v5}, Lradiant/swipe/QueueExecutor;->playlist(Landroid/content/Context;Lcom/aspiro/wamp/model/Playlist;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)V + + :done + return-void +.end method + +.method public isValid(Lradiant/swipe/QueueRequest;)Z + .locals 1 + + invoke-direct {p0, p1}, Lradiant/swipe/MyPlaylistsResolver;->current(Lradiant/swipe/QueueRequest;)Lcf/b; + + move-result-object p1 + + if-eqz p1, :invalid + + const/4 p1, 0x1 + + return p1 + + :invalid + const/4 p1, 0x0 + + return p1 +.end method + +.method public resolve(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Lradiant/swipe/QueueRequest; + .locals 5 + + instance-of v0, p2, Ldf/d$a; + + if-eqz v0, :invalid + + invoke-virtual {p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getBindingAdapterPosition()I + + move-result p2 + + const/4 v0, -0x1 + + if-ne p2, v0, :has_position + + goto :invalid + + :has_position + invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter; + + move-result-object p1 + + instance-of v0, p1, La50/d; + + if-eqz v0, :invalid + + check-cast p1, La50/d; + + invoke-virtual {p1}, Landroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List; + + move-result-object p1 + + invoke-interface {p1}, Ljava/util/List;->size()I + + move-result v0 + + if-lt p2, v0, :read_item + + goto :invalid + + :read_item + invoke-interface {p1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object; + + move-result-object p1 + + instance-of v0, p1, Lcf/b; + + if-eqz v0, :invalid + + check-cast p1, Lcf/b; + + iget-boolean v0, p1, Lcf/b;->h:Z + + if-eqz v0, :invalid + + iget-boolean v0, p1, Lcf/b;->f:Z + + if-eqz v0, :check_playlist + + const-string v0, "NOT_READY" + + iget-object v1, p1, Lcf/b;->g:Ljava/lang/String; + + invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v0 + + if-nez v0, :invalid + + :check_playlist + iget-object v0, p1, Lcf/b;->a:Lcom/aspiro/wamp/model/Playlist; + + invoke-virtual {v0}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I + + move-result v1 + + if-lez v1, :invalid + + invoke-virtual {v0}, Lcom/aspiro/wamp/model/Playlist;->getUuid()Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v1}, Ljava/lang/String;->hashCode()I + + move-result v2 + + new-instance v3, Lradiant/swipe/QueueRequest; + + invoke-direct {v3, p2, v0, v2}, Lradiant/swipe/QueueRequest;->(ILjava/lang/Object;I)V + + return-object v3 + + :invalid + const/4 p1, 0x0 + + return-object p1 +.end method diff --git a/patches/extension/radiant/swipe/QueueExecutor.smali b/patches/extension/radiant/swipe/QueueExecutor.smali index 34411d2..67fb25c 100644 --- a/patches/extension/radiant/swipe/QueueExecutor.smali +++ b/patches/extension/radiant/swipe/QueueExecutor.smali @@ -117,6 +117,88 @@ return v0 .end method +.method public static playlist(Landroid/content/Context;Lcom/aspiro/wamp/model/Playlist;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)V + .locals 4 + + if-eqz p0, :done + + if-eqz p1, :done + + invoke-virtual {p1}, Lcom/aspiro/wamp/model/Playlist;->getNumberOfItems()I + + move-result v0 + + if-lez v0, :done + + :unwrap_context + instance-of v0, p0, Landroidx/fragment/app/FragmentActivity; + + if-nez v0, :has_activity + + instance-of v0, p0, Landroid/content/ContextWrapper; + + if-eqz v0, :done + + move-object v0, p0 + + check-cast v0, Landroid/content/ContextWrapper; + + invoke-virtual {v0}, Landroid/content/ContextWrapper;->getBaseContext()Landroid/content/Context; + + move-result-object v0 + + if-eq v0, p0, :done + + move-object p0, v0 + + goto :unwrap_context + + :has_activity + invoke-static {}, Lcom/aspiro/wamp/App$a;->a()Lcom/aspiro/wamp/App; + + move-result-object v0 + + invoke-virtual {v0}, Lcom/aspiro/wamp/App;->e()Le5/c; + + move-result-object v0 + + check-cast v0, Le5/z$n2; + + invoke-static {}, Lradiant/swipe/QueueExecutor;->hasActiveQueue()Z + + move-result v1 + + if-eqz v1, :play + + iget-object v1, v0, Le5/z$n2;->w8:Ldagger/internal/f; + + invoke-interface {v1}, Lql0/a;->get()Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Lcom/aspiro/wamp/contextmenu/item/playlist/h$a; + + invoke-interface {v1, p1, p2, p3}, Lcom/aspiro/wamp/contextmenu/item/playlist/h$a;->a(Lcom/aspiro/wamp/model/Playlist;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/contextmenu/item/playlist/h; + + move-result-object p2 + + check-cast p0, Landroidx/fragment/app/FragmentActivity; + + invoke-virtual {p2, p0}, Lcom/aspiro/wamp/contextmenu/item/playlist/h;->b(Landroidx/fragment/app/FragmentActivity;)V + + goto :done + + :play + invoke-virtual {v0}, Le5/z$n2;->y3()Lcom/aspiro/wamp/playback/k0; + + move-result-object p0 + + invoke-virtual {p0, p1, p3}, Lcom/aspiro/wamp/playback/k0;->c(Lcom/aspiro/wamp/model/Playlist;Lcom/tidal/android/navigation/NavigationInfo;)V + + :done + return-void +.end method + .method public static track(Landroid/content/Context;Lcom/aspiro/wamp/model/Track;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/aspiro/wamp/playqueue/source/model/Source;)Z .locals 2 diff --git a/patches/manifest.json b/patches/manifest.json index 23b9419..2672623 100644 --- a/patches/manifest.json +++ b/patches/manifest.json @@ -436,10 +436,11 @@ "radiant/swipe/QueueExecutor.smali", "radiant/swipe/FavoriteTracksResolver.smali", "radiant/swipe/DynamicTrackResolver.smali", - "radiant/swipe/MyAlbumsResolver.smali" + "radiant/swipe/MyAlbumsResolver.smali", + "radiant/swipe/MyPlaylistsResolver.smali" ], "title": "Swipe to Queue", - "description": "Swipe on tracks/albums to add them to the play queue.", + "description": "Swipe on tracks/albums/playlists to add them to the play queue", "default": false, "advancedOptions": [ { diff --git a/patches/swipe-to-queue.patch b/patches/swipe-to-queue.patch index 568c489..84c8560 100644 --- a/patches/swipe-to-queue.patch +++ b/patches/swipe-to-queue.patch @@ -157,6 +157,17 @@ 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; + invoke-static {p0, p2}, Lradiant/swipe/MyAlbumsResolver;->install(Lcom/aspiro/wamp/mycollection/subpages/albums/myalbums/MyAlbumsView;Landroidx/recyclerview/widget/RecyclerView;)V ++ + .line 24 + .line 25 + .line 26 +--- a/com/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView.smali ++++ b/com/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView.smali +@@ -1297,6 +1297,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; + ++ invoke-static {p0, p2}, Lradiant/swipe/MyPlaylistsResolver;->install(Lcom/aspiro/wamp/mycollection/subpages/playlists/myplaylists/MyPlaylistsView;Landroidx/recyclerview/widget/RecyclerView;)V + .line 24 .line 25