feat(wip): swipe left to queue library tracks

This commit is contained in:
Se7en-dev committed 2026-08-20 22:22:10 +02:00
1 parent c24add1d46
commit 9543953794
4 files changed
+647

No files matched your search

@@ -422,6 +422,19 @@
"description": "Mirrors the bottom player buttons left-to-right for easier one-handed reach.",
"default": false
},
{
"id": "SwipeToQueue",
"order": 39,
"fileNames": [
"swipe-to-queue.patch"
],
"extensionFiles": [
"radiant/SwipeToQueue.smali"
],
"title": "Swipe to Queue",
"description": "Swipe (left only for now) on tracks (in library/my tracks only for now) to add them to the play queue.",
"default": false
},
{
"id": "LyricsProgressPill",
"order": 40,
@@ -0,0 +1,464 @@
.class public final Lradiant/SwipeToQueue;
.super Landroidx/recyclerview/widget/ItemTouchHelper$SimpleCallback;
.source "SwipeToQueue.smali"
# static fields
.field private static final installed:Ljava/util/WeakHashMap;
# instance fields
.field private final background:Landroid/graphics/drawable/ColorDrawable;
.field private final fragment:Ljava/lang/ref/WeakReference;
.field private final icon:Landroid/graphics/drawable/Drawable;
.field private pendingPosition:I
.field private pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
# direct methods
.method static constructor <clinit>()V
.locals 1
new-instance v0, Ljava/util/WeakHashMap;
invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
sput-object v0, Lradiant/SwipeToQueue;->installed:Ljava/util/WeakHashMap;
return-void
.end method
.method private constructor <init>(Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;Landroidx/recyclerview/widget/RecyclerView;)V
.locals 3
const/4 v0, 0x0
# ItemTouchHelper.LEFT
const/4 v1, 0x4
invoke-direct {p0, v0, v1}, Landroidx/recyclerview/widget/ItemTouchHelper$SimpleCallback;-><init>(II)V
new-instance v0, Ljava/lang/ref/WeakReference;
invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
iput-object v0, p0, Lradiant/SwipeToQueue;->fragment:Ljava/lang/ref/WeakReference;
invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
move-result-object v0
new-instance v1, Landroid/graphics/drawable/ColorDrawable;
sget v2, Lcom/aspiro/wamp/R$color;->green:I
invoke-virtual {v0, v2}, Landroid/content/Context;->getColor(I)I
move-result v2
invoke-direct {v1, v2}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
iput-object v1, p0, Lradiant/SwipeToQueue;->background:Landroid/graphics/drawable/ColorDrawable;
sget v1, Lcom/aspiro/wamp/R$drawable;->ic_add_to_queue_last:I
invoke-virtual {v0, v1}, Landroid/content/Context;->getDrawable(I)Landroid/graphics/drawable/Drawable;
move-result-object v0
if-eqz v0, :store_icon
invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
move-result-object v0
const/4 v1, -0x1
invoke-virtual {v0, v1}, Landroid/graphics/drawable/Drawable;->setTint(I)V
:store_icon
iput-object v0, p0, Lradiant/SwipeToQueue;->icon:Landroid/graphics/drawable/Drawable;
return-void
.end method
.method public static install(Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;Landroidx/recyclerview/widget/RecyclerView;)V
.locals 4
if-eqz p0, :done
if-eqz p1, :done
sget-object v0, Lradiant/SwipeToQueue;->installed:Ljava/util/WeakHashMap;
invoke-virtual {v0, p1}, Ljava/util/WeakHashMap;->containsKey(Ljava/lang/Object;)Z
move-result v1
if-nez v1, :done
sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
invoke-virtual {v0, p1, v1}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
new-instance v0, Lradiant/SwipeToQueue;
invoke-direct {v0, p0, p1}, Lradiant/SwipeToQueue;-><init>(Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;Landroidx/recyclerview/widget/RecyclerView;)V
new-instance v1, Landroidx/recyclerview/widget/ItemTouchHelper;
invoke-direct {v1, v0}, Landroidx/recyclerview/widget/ItemTouchHelper;-><init>(Landroidx/recyclerview/widget/ItemTouchHelper$Callback;)V
invoke-virtual {v1, p1}, Landroidx/recyclerview/widget/ItemTouchHelper;->attachToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
:done
return-void
.end method
# virtual methods
.method public getSwipeDirs(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
.locals 4
iget-object v0, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
if-nez v0, :not_swipeable
instance-of v0, p2, Ln8/d;
if-eqz v0, :not_swipeable
invoke-virtual {p2}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getBindingAdapterPosition()I
move-result v0
const/4 v1, -0x1
if-ne v0, v1, :has_position
const/4 v0, 0x0
return v0
:has_position
check-cast p2, Ln8/d;
iget-object v1, p2, Ln8/d;->f:Lcom/aspiro/wamp/model/MediaItem;
instance-of v2, v1, Lcom/aspiro/wamp/model/FavoriteTrack;
if-eqz v2, :not_swipeable
iget-object v2, p0, Lradiant/SwipeToQueue;->fragment:Ljava/lang/ref/WeakReference;
invoke-virtual {v2}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
move-result-object v2
check-cast v2, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;
if-eqz v2, :not_swipeable
check-cast v1, Lcom/aspiro/wamp/model/FavoriteTrack;
invoke-virtual {v2, v0, v1}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->Y(ILcom/aspiro/wamp/model/FavoriteTrack;)Z
move-result v0
if-eqz v0, :not_swipeable
const/4 v0, 0x4
return v0
:not_swipeable
const/4 v0, 0x0
return v0
.end method
.method public onChildDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;FFIZ)V
.locals 12
invoke-super/range {p0 .. p7}, Landroidx/recyclerview/widget/ItemTouchHelper$SimpleCallback;->onChildDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;FFIZ)V
move/from16 v10, p6
move/from16 v11, p4
const/4 v0, 0x1
if-ne v10, v0, :done
const/4 v0, 0x0
int-to-float v0, v0
cmpg-float v0, v11, v0
if-gez v0, :not_left
goto :clear_active
:not_left
if-eqz p7, :done
const/4 v0, 0x0
iput-object v0, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
goto :done
:clear_active
iget-object v0, p3, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
invoke-virtual {v0}, Landroid/view/View;->getRight()I
move-result v1
float-to-int v2, v11
add-int/2addr v2, v1
invoke-virtual {v0}, Landroid/view/View;->getTop()I
move-result v3
invoke-virtual {v0}, Landroid/view/View;->getBottom()I
move-result v4
sub-int v5, v1, v2
if-lez v5, :done
iget-object v6, p0, Lradiant/SwipeToQueue;->background:Landroid/graphics/drawable/ColorDrawable;
invoke-virtual {v6, v2, v3, v1, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
invoke-virtual {v0}, Landroid/view/View;->getWidth()I
move-result v7
if-eqz p7, :draw_alpha
# 30% threshold
mul-int/lit8 v8, v7, 0x3
div-int/lit8 v8, v8, 0xa
if-lt v5, v8, :disarm
const/4 v8, 0x1
invoke-virtual {p3}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getBindingAdapterPosition()I
move-result v8
const/4 v9, -0x1
if-ne v8, v9, :resolve_action
goto :draw_alpha
:resolve_action
move-object v9, p3
check-cast v9, Ln8/d;
iget-object v10, v9, Ln8/d;->f:Lcom/aspiro/wamp/model/MediaItem;
instance-of v11, v10, Lcom/aspiro/wamp/model/FavoriteTrack;
if-eqz v11, :draw_alpha
check-cast v10, Lcom/aspiro/wamp/model/FavoriteTrack;
iput v8, p0, Lradiant/SwipeToQueue;->pendingPosition:I
iput-object v10, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
goto :draw_alpha
:disarm
const/4 v8, 0x0
iput-object v8, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
goto :draw_alpha
:draw_alpha
if-lez v7, :draw_background
const/16 v8, 0xf8
mul-int/2addr v8, v5
div-int/2addr v8, v7
const/16 v9, 0x1f
invoke-static {v8, v9}, Ljava/lang/Math;->min(II)I
move-result v8
add-int/lit16 v8, v8, 0xe0
invoke-virtual {v6, v8}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
:draw_background
invoke-virtual {v6, p1}, Landroid/graphics/drawable/ColorDrawable;->draw(Landroid/graphics/Canvas;)V
iget-object v6, p0, Lradiant/SwipeToQueue;->icon:Landroid/graphics/drawable/Drawable;
if-eqz v6, :done
invoke-virtual {v6}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
move-result v7
invoke-virtual {v6}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
move-result v8
if-lez v7, :done
if-lez v8, :done
# center icon until fixed inset
sub-int v9, v4, v3
sub-int/2addr v9, v8
div-int/lit8 v9, v9, 0x2
sub-int v10, v1, v9
sub-int v11, v10, v7
add-int v10, v5, v7
div-int/lit8 v10, v10, 0x2
sub-int v10, v1, v10
invoke-static {v10, v11}, Ljava/lang/Math;->max(II)I
move-result v10
add-int v11, v10, v7
invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
move-result v7
invoke-virtual {p1, v2, v3, v1, v4}, Landroid/graphics/Canvas;->clipRect(IIII)Z
add-int v2, v3, v9
add-int v5, v2, v8
invoke-virtual {v6, v10, v2, v11, v5}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
const/16 v8, 0xff
invoke-virtual {v6, v8}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
invoke-virtual {v6, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
invoke-virtual {p1, v7}, Landroid/graphics/Canvas;->restoreToCount(I)V
:done
return-void
.end method
.method public onMove(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
.locals 0
const/4 p1, 0x0
return p1
.end method
.method public getSwipeEscapeVelocity(F)F
.locals 1
# Float.MAX_VALUE
const v0, 0x7f7fffff
return v0
.end method
.method public getSwipeThreshold(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)F
.locals 1
# 2.0f
const/high16 v0, 0x40000000
return v0
.end method
.method public onSelectedChanged(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
.locals 3
const/4 v0, 0x1
if-ne p2, v0, :release
if-eqz p1, :dispatch
const/4 v0, 0x0
iput-object v0, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
goto :dispatch
:release
if-nez p2, :dispatch
iget v0, p0, Lradiant/SwipeToQueue;->pendingPosition:I
iget-object v1, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
const/4 v2, 0x0
iput-object v2, p0, Lradiant/SwipeToQueue;->pendingTrack:Lcom/aspiro/wamp/model/FavoriteTrack;
if-eqz v1, :dispatch
iget-object v2, p0, Lradiant/SwipeToQueue;->fragment:Ljava/lang/ref/WeakReference;
invoke-virtual {v2}, Ljava/lang/ref/Reference;->get()Ljava/lang/Object;
move-result-object v2
check-cast v2, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;
if-eqz v2, :dispatch
invoke-virtual {v2, v0, v1}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->Z(ILcom/aspiro/wamp/model/FavoriteTrack;)V
:dispatch
invoke-super {p0, p1, p2}, Landroidx/recyclerview/widget/ItemTouchHelper$SimpleCallback;->onSelectedChanged(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
return-void
.end method
.method public onSwiped(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
.locals 1
# fallback
iget-object p1, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
const/4 p2, 0x0
int-to-float v0, p2
invoke-virtual {p1, v0}, Landroid/view/View;->setTranslationX(F)V
return-void
.end method
+13
View File
@@ -422,6 +422,19 @@
"description": "Mirrors the bottom player buttons left-to-right for easier one-handed reach.",
"default": false
},
{
"id": "SwipeToQueue",
"order": 39,
"fileNames": [
"swipe-to-queue.patch"
],
"extensionFiles": [
"radiant/SwipeToQueue.smali"
],
"title": "Swipe to Queue",
"description": "Swipe (left only for now) on tracks (in library/my tracks only for now) to add them to the play queue.",
"default": false
},
{
"id": "LyricsProgressPill",
"order": 40,
+157
View File
@@ -0,0 +1,157 @@
--- a/com/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment.smali
+++ b/com/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment.smali
@@ -107,6 +107,104 @@
.end method
+.method public final Y(ILcom/aspiro/wamp/model/FavoriteTrack;)Z
+ .locals 3
+
+ # reject unavailable tracks
+ if-eqz p2, :not_eligible
+
+ iget-object v0, p0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->d:Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/g0;
+
+ if-eqz v0, :not_eligible
+
+ invoke-virtual {v0, p1}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/g0;->b(I)Lcom/aspiro/wamp/model/FavoriteTrack;
+
+ move-result-object v1
+
+ if-eqz v1, :not_eligible
+
+ invoke-virtual {p2}, Lcom/aspiro/wamp/model/MediaItem;->getId()I
+
+ move-result v2
+
+ invoke-virtual {v1}, Lcom/aspiro/wamp/model/MediaItem;->getId()I
+
+ move-result p1
+
+ if-ne v2, p1, :not_eligible
+
+ iget-object v0, p0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->f:Lcom/aspiro/wamp/model/AvailabilityInteractor;
+
+ if-eqz v0, :not_eligible
+
+ invoke-interface {v0, v1}, Lcom/aspiro/wamp/model/AvailabilityInteractor;->getAvailability(Lcom/aspiro/wamp/model/MediaItem;)Lcom/aspiro/wamp/model/Availability$MediaItem;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/aspiro/wamp/model/Availability$MediaItem;->isAvailable()Z
+
+ move-result v0
+
+ if-eqz v0, :not_eligible
+
+ const/4 v0, 0x1
+
+ return v0
+
+ :not_eligible
+ const/4 v0, 0x0
+
+ return v0
+.end method
+
+.method public final Z(ILcom/aspiro/wamp/model/FavoriteTrack;)V
+ .locals 5
+
+ invoke-virtual {p0, p1, p2}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->Y(ILcom/aspiro/wamp/model/FavoriteTrack;)Z
+
+ move-result p1
+
+ if-eqz p1, :done
+
+ # accepts a Source, wrap the swiped track.
+ iget-object p1, p0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->d:Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/g0;
+
+ if-eqz p1, :done
+
+ iget-object v0, p1, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/g0;->m:Lcom/tidal/android/navigation/NavigationInfo;
+
+ invoke-static {v0}, Lcom/aspiro/wamp/playqueue/source/model/b;->m(Lcom/tidal/android/navigation/NavigationInfo;)Lcom/aspiro/wamp/playqueue/source/model/MyItemsSource;
+
+ move-result-object v4
+
+ invoke-virtual {v4, p2}, Lcom/aspiro/wamp/playqueue/source/model/Source;->addSourceItem(Lcom/aspiro/wamp/model/MediaItem;)V
+
+ 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;
+
+ instance-of p1, v0, Lh4/a;
+
+ if-eqz p1, :done
+
+ check-cast v0, Lh4/a;
+
+ invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getActivity()Landroidx/fragment/app/FragmentActivity;
+
+ move-result-object v1
+
+ if-eqz v1, :done
+
+ move-object v2, p2
+
+ invoke-virtual/range {v0 .. v4}, Lh4/a;->q(Landroidx/fragment/app/FragmentActivity;Lcom/aspiro/wamp/model/Track;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/aspiro/wamp/playqueue/source/model/Source;)V
+
+ :done
+ return-void
+.end method
+
+
# virtual methods
.method public final M()Ln8/b;
.locals 1
@@ -2265,9 +2418,16 @@
iput-object p0, p1, Lo4/g;->e:Lo4/g$e;
.line 224
.line 225
iput p2, p1, Lo4/g;->b:I
+ iget-object p1, p0, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->l:Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/m;
+
+ invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+ iget-object p1, p1, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/m;->f:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-static {p0, p1}, Lradiant/SwipeToQueue;->install(Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;Landroidx/recyclerview/widget/RecyclerView;)V
.line 226
.line 227
invoke-virtual {p0}, Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/FavoriteTracksFragment;->N()Lcom/aspiro/wamp/mycollection/subpages/favoritetracks/n;
--- a/h4/a.smali
+++ b/h4/a.smali
@@ -931,3 +931,32 @@
.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;)V
+ .locals 2
+
+ iget-object v0, p0, Lh4/a;->n:Lcom/aspiro/wamp/contextmenu/menu/track/TrackContextMenu$a;
+
+ check-cast v0, Lcom/aspiro/wamp/contextmenu/menu/track/d;
+
+ iget-object v0, v0, Lcom/aspiro/wamp/contextmenu/menu/track/d;->a:Lcom/aspiro/wamp/contextmenu/menu/track/c;
+
+ iget-object v0, v0, Lcom/aspiro/wamp/contextmenu/menu/track/c;->b:Ldagger/internal/j;
+
+ invoke-interface {v0}, Lql0/a;->get()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Lm3/f$a;
+
+ invoke-interface {v0, p2, p3, p4}, Lm3/f$a;->a(Lcom/aspiro/wamp/model/Track;Lcom/aspiro/wamp/eventtracking/model/ContextualMetadata;Lcom/aspiro/wamp/playqueue/source/model/Source;)Lm3/f;
+
+ move-result-object v0
+
+ # call add to queue method
+ invoke-virtual {v0, p1}, Lm3/f;->b(Landroidx/fragment/app/FragmentActivity;)V
+
+ return-void
+.end method
+
.method public final o(Landroidx/fragment/app/FragmentActivity;Lcom/aspiro/wamp/model/Credit;Lcom/tidal/android/navigation/NavigationInfo;)V