fix(ui): 移除子卡片事件拦截,恢复模拟器与触摸屏按住滑动多选手势
This commit is contained in:
parent
4ada46a549
commit
51a7a43b47
@ -420,13 +420,6 @@ private fun RecordGrid(
|
|||||||
if (selectionMode) onToggleSelection(record.id)
|
if (selectionMode) onToggleSelection(record.id)
|
||||||
else onOpenRecord(record.id)
|
else onOpenRecord(record.id)
|
||||||
},
|
},
|
||||||
onLongClick = {
|
|
||||||
if (selectionMode) {
|
|
||||||
onToggleSelection(record.id)
|
|
||||||
} else {
|
|
||||||
onStartSelectionWith(record.id)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
modifier = Modifier.animateItem(
|
modifier = Modifier.animateItem(
|
||||||
fadeInSpec = tween(300),
|
fadeInSpec = tween(300),
|
||||||
fadeOutSpec = tween(300),
|
fadeOutSpec = tween(300),
|
||||||
@ -473,7 +466,6 @@ private fun findItemIndexAtOffset(gridState: LazyGridState, offset: Offset): Int
|
|||||||
return rowMatch?.index
|
return rowMatch?.index
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun RecordCard(
|
private fun RecordCard(
|
||||||
record: DateRecord,
|
record: DateRecord,
|
||||||
@ -481,7 +473,6 @@ private fun RecordCard(
|
|||||||
isSelected: Boolean,
|
isSelected: Boolean,
|
||||||
selectionMode: Boolean,
|
selectionMode: Boolean,
|
||||||
onClick: () -> Unit,
|
onClick: () -> Unit,
|
||||||
onLongClick: () -> Unit,
|
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val cardScale by animateFloatAsState(
|
val cardScale by animateFloatAsState(
|
||||||
@ -501,6 +492,7 @@ private fun RecordCard(
|
|||||||
)
|
)
|
||||||
val cardShape = RoundedCornerShape(8.dp)
|
val cardShape = RoundedCornerShape(8.dp)
|
||||||
Card(
|
Card(
|
||||||
|
onClick = onClick,
|
||||||
shape = cardShape,
|
shape = cardShape,
|
||||||
border = BorderStroke(borderWidth, borderColor),
|
border = BorderStroke(borderWidth, borderColor),
|
||||||
elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
|
elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
|
||||||
@ -510,11 +502,6 @@ private fun RecordCard(
|
|||||||
scaleX = cardScale
|
scaleX = cardScale
|
||||||
scaleY = cardScale
|
scaleY = cardScale
|
||||||
}
|
}
|
||||||
.clip(cardShape)
|
|
||||||
.combinedClickable(
|
|
||||||
onClick = onClick,
|
|
||||||
onLongClick = onLongClick
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
Box {
|
Box {
|
||||||
AsyncImage(
|
AsyncImage(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user