feat(mini player gestures): track swipe feedback + fix stuck offsets

This commit is contained in:
Se7en-dev
2026-06-23 23:08:02 +02:00
parent 75450aad60
commit 3758ba19f3
7 changed files with 660 additions and 97 deletions
@@ -17,14 +17,6 @@
# instance fields
.field public final a:Lyl0/l;
# X at ACTION_DOWN
.field public b:F
# Y at ACTION_DOWN
.field public c:F
.field public d:Z
# direct methods
.method public constructor <init>(Lyl0/l;)V
@@ -37,24 +29,6 @@
return-void
.end method
.method private static dp(F)F
.locals 1
invoke-static {}, Landroid/content/res/Resources;->getSystem()Landroid/content/res/Resources;
move-result-object v0
invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
move-result-object v0
iget v0, v0, Landroid/util/DisplayMetrics;->density:F
mul-float/2addr p0, v0
return p0
.end method
.method private nextTrack()V
.locals 2
@@ -82,7 +56,7 @@
# virtual methods
.method public final invoke(Landroid/view/MotionEvent;)Lkotlin/u;
.locals 6
.locals 3
invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
@@ -94,6 +68,10 @@
if-eq v0, v1, :up
const/4 v1, 0x2
if-eq v0, v1, :move
const/4 v1, 0x3
if-eq v0, v1, :cancel
@@ -105,101 +83,53 @@
invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
move-result v0
iput v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->b:F
invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
move-result v1
invoke-static {v0, v1}, Lradiant/MiniPlayerTrackGestures;->beginDrag(FF)V
goto :done
# ACTION_MOVE
:move
invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
move-result v0
invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
iput v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->c:F
const/4 v0, 0x1
iput-boolean v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->d:Z
move-result v1
invoke-static {v0, v1}, Lradiant/MiniPlayerTrackGestures;->moveDrag(FF)V
goto :done
# ACTION_UP
:up
iget-boolean v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->d:Z
if-eqz v0, :done
const/4 v0, 0x0
iput-boolean v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->d:Z
invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawX()F
move-result v0
iget v1, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->b:F
sub-float/2addr v0, v1
invoke-virtual {p1}, Landroid/view/MotionEvent;->getRawY()F
move-result v1
invoke-static {v0, v1}, Lradiant/MiniPlayerTrackGestures;->finishDrag(FF)I
iget v2, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->c:F
move-result v0
sub-float/2addr v1, v2
if-eqz v0, :done
invoke-static {v0}, Ljava/lang/Math;->abs(F)F
move-result v2
const/high16 v3, 0x42400000 # 48.0f -> at least 48dp horizontal swipe
invoke-static {v3}, Lradiant/MiniPlayerTrackGestures$Gesture;->dp(F)F
move-result v3
cmpg-float v4, v2, v3
if-gez v4, :check_axis
goto :done
:check_axis
invoke-static {v1}, Ljava/lang/Math;->abs(F)F
move-result v1
const/high16 v3, 0x3fc00000 # 1.5f -> horizontal distance must dominate vertical mov. by 1.5x
mul-float/2addr v1, v3
cmpg-float v2, v2, v1
if-lez v2, :done
const/4 v1, 0x0
cmpg-float v0, v0, v1
# Negative dx = swipe left -> next. Positive dx = swipe right -> previous
if-ltz v0, :next
# Negative result = swipe left -> next. Positive result = swipe right -> previous
if-gez v0, :previous
invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
invoke-direct {p0}, Lradiant/MiniPlayerTrackGestures$Gesture;->previousTrack()V
goto :done
:next
invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
invoke-direct {p0}, Lradiant/MiniPlayerTrackGestures$Gesture;->nextTrack()V
goto :done
:previous
invoke-static {}, Lradiant/MiniPlayerTrackGestures;->suppressTapOpen()V
invoke-direct {p0}, Lradiant/MiniPlayerTrackGestures$Gesture;->previousTrack()V
goto :done
# ACTION_CANCEL
:cancel
const/4 v0, 0x0
iput-boolean v0, p0, Lradiant/MiniPlayerTrackGestures$Gesture;->d:Z
invoke-static {}, Lradiant/MiniPlayerTrackGestures;->cancelDrag()V
:done
sget-object p1, Lkotlin/u;->a:Lkotlin/u;