Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-11 07:29:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

key queue rows and keep the dragged row composed

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:52 +00:00
parent 821a2b02a2
commit 68ca600bb5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
+9 -2
View File
@@ -59,6 +59,7 @@ import androidx.paging.PagingConfig
import androidx.paging.PagingData import androidx.paging.PagingData
import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.collectAsLazyPagingItems
import androidx.paging.compose.itemKey
import com.subtracks.data.model.CoverArtRef import com.subtracks.data.model.CoverArtRef
import com.subtracks.data.repo.QUEUE_PAGE_SIZE import com.subtracks.data.repo.QUEUE_PAGE_SIZE
import com.subtracks.data.repo.QueuePagingSource import com.subtracks.data.repo.QueuePagingSource
@@ -192,6 +193,7 @@ fun QueueScreen(
val threshold = with(density) { 72.dp.toPx() } val threshold = with(density) { 72.dp.toPx() }
val step = with(density) { 12.dp.toPx() } val step = with(density) { 12.dp.toPx() }
while (true) { while (true) {
val from = dragging ?: break
val start = listState.layoutInfo.viewportStartOffset.toFloat() val start = listState.layoutInfo.viewportStartOffset.toFloat()
val end = listState.layoutInfo.viewportEndOffset.toFloat() val end = listState.layoutInfo.viewportEndOffset.toFloat()
val edge = val edge =
@@ -200,7 +202,12 @@ fun QueueScreen(
fingerY > end - threshold -> step fingerY > end - threshold -> step
else -> 0f else -> 0f
} }
if (edge != 0f) listState.scrollBy(edge) if (edge != 0f) {
val next = slotOffset(listState, items, rowHeight, from)?.minus(edge)
if (next != null && next + rowHeight > start + 1f && next < end - 1f) {
listState.scrollBy(edge)
}
}
delay(16) delay(16)
} }
} }
@@ -269,7 +276,7 @@ fun QueueScreen(
modifier = Modifier.padding(padding).fillMaxSize(), modifier = Modifier.padding(padding).fillMaxSize(),
contentPadding = PaddingValues(bottom = 16.dp), contentPadding = PaddingValues(bottom = 16.dp),
) { ) {
items(count = items.itemCount) { index -> items(count = items.itemCount, key = items.itemKey { it.position }) { index ->
val item = items[index] val item = items[index]
if (item != null) { if (item != null) {
val active = settle val active = settle