cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trigger page reordering on long-press

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-09-27 15:47:32 +02:00
parent ce83ccd560
commit 56e0447ae6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/fairscan/app/view/PageList.kt
View File

@@ -14,7 +14,6 @@
*/ */
package org.fairscan.app.view package org.fairscan.app.view
import android.annotation.SuppressLint
import android.content.res.Configuration import android.content.res.Configuration
import android.graphics.Bitmap import android.graphics.Bitmap
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
@@ -76,10 +75,19 @@ fun CommonPageList(
} }
val content: LazyListScope.() -> Unit = { val content: LazyListScope.() -> Unit = {
itemsIndexed(state.document.pageIds, key = { _, item -> item}) { index, item -> itemsIndexed(state.document.pageIds, key = { _, item -> item}) { index, item ->
ReorderableItem(reorderableLazyListState, key = item) { _ -> ReorderableItem(reorderableLazyListState, key = item) { isDragging ->
val borderColor =
if (isDragging) MaterialTheme.colorScheme.primary else Color.Transparent
val modifier = Modifier
.longPressDraggableHandle()
.border(
width = 2.dp,
color = borderColor,
shape = RoundedCornerShape(6.dp)
)
val image = state.document.loadThumbnail(index) val image = state.document.loadThumbnail(index)
if (image != null) { if (image != null) {
PageThumbnail(image, index, state, Modifier.draggableHandle()) PageThumbnail(image, index, state, modifier)
} }
} }
} }
@@ -114,7 +122,7 @@ private fun PageThumbnail(
image: Bitmap, image: Bitmap,
index: Int, index: Int,
state: CommonPageListState, state: CommonPageListState,
@SuppressLint("ModifierParameter") draggableModifier: Modifier, modifier: Modifier,
) { ) {
val bitmap = image.asImageBitmap() val bitmap = image.asImageBitmap()
val isSelected = index == state.currentPageIndex val isSelected = index == state.currentPageIndex
@@ -130,7 +138,7 @@ private fun PageThumbnail(
val density = LocalDensity.current val density = LocalDensity.current
imageModifier = imageModifier.addPositionCallback(state.onLastItemPosition, density, 1.0f) imageModifier = imageModifier.addPositionCallback(state.onLastItemPosition, density, 1.0f)
} }
Box (modifier = Modifier.height(PAGE_LIST_ELEMENT_SIZE_DP.dp)) { Box (modifier = modifier.height(PAGE_LIST_ELEMENT_SIZE_DP.dp)) {
Image( Image(
bitmap = bitmap, bitmap = bitmap,
contentDescription = null, contentDescription = null,
@@ -141,7 +149,7 @@ private fun PageThumbnail(
.clickable { state.onPageClick(index) } .clickable { state.onPageClick(index) }
) )
Box( Box(
modifier = draggableModifier modifier = Modifier
.padding(8.dp) .padding(8.dp)
.align(Alignment.BottomCenter) .align(Alignment.BottomCenter)
.background(Color.Black.copy(alpha = 0.5f), shape = RoundedCornerShape(4.dp)) .background(Color.Black.copy(alpha = 0.5f), shape = RoundedCornerShape(4.dp))