Skip to content

Commit

Permalink
[feat] multi-selection in recycle screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@Steve-Mr
Steve-Mr committed Sep 30, 2024
1 parent 4355e94 commit c06ca2d
Show file tree
Hide file tree
Showing 4 changed files with 171 additions and 34 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,6 @@ dependencies {

implementation(libs.androidx.datastore.preferences)


implementation("androidx.compose.material:material-icons-extended:1.7.2")

}
111 changes: 93 additions & 18 deletions app/src/main/java/top/maary/oblivionis/ui/ActionComponents.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.gestures.awaitEachGesture
import androidx.compose.foundation.gestures.awaitFirstDown
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.gestures.draggable
import androidx.compose.foundation.gestures.rememberDraggableState
import androidx.compose.foundation.interaction.MutableInteractionSource
Expand All @@ -37,6 +38,8 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.RadioButtonUnchecked
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Badge
import androidx.compose.material3.BadgeDefaults
Expand Down Expand Up @@ -73,6 +76,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.input.nestedscroll.nestedScroll
Expand Down Expand Up @@ -418,30 +422,101 @@ fun ActionScreen(
}
}

//@Composable
//fun MediaPlayer(modifier: Modifier, uri: Uri, imageLoader: ImageLoader,
// onImageClick: () -> Unit = {}, onVideoClick: () -> Unit, onLongPress: () -> Unit = {}) {
// Box(modifier = Modifier.wrapContentSize()) {
// when {
// uri.toString().startsWith(MediaStore.Images.Media.EXTERNAL_CONTENT_URI.toString()) -> {
// // 处理图片变化
// AsyncImage(
// model = uri,
// contentDescription = "",
// modifier = modifier
// .clickable { onImageClick() }
// .clip(RoundedCornerShape(8.dp))
// )
// }
//
// uri.toString().startsWith(MediaStore.Video.Media.EXTERNAL_CONTENT_URI.toString()) -> {
// // 处理视频变化
//// VideoView(modifier = modifier, uri = uri)
// VideoViewAlt(modifier = modifier, uri = uri, imageLoader = imageLoader, onClick = {
// onVideoClick()
// })
// }
// }
// }
//}

@Composable
fun MediaPlayer(modifier: Modifier, uri: Uri, imageLoader: ImageLoader,
onImageClick: () -> Unit = {}, onVideoClick: () -> Unit) {
when {
uri.toString().startsWith(MediaStore.Images.Media.EXTERNAL_CONTENT_URI.toString()) -> {
// 处理图片变化
AsyncImage(
model = uri,
contentDescription = "",
modifier = modifier
.clickable { onImageClick() }
.clip(RoundedCornerShape(8.dp))
)
fun MediaPlayer(
modifier: Modifier,
uri: Uri,
imageLoader: ImageLoader,
isMultiSelectionState: Boolean = false,
isSelected: Boolean = false, // 用于表示当前项是否被选中
onImageClick: () -> Unit = {},
onVideoClick: () -> Unit = {},
onLongPress: () -> Unit = {} // 长按事件
) {
Box(
modifier = Modifier
.wrapContentSize()
.pointerInput(Unit) {
detectTapGestures(
onLongPress = {
Log.v("OBLIVIONIS", "LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG PRESS")
onLongPress() // 处理长按事件
},
onTap = {
if (uri.toString().startsWith(MediaStore.Images.Media.EXTERNAL_CONTENT_URI.toString())) {
onImageClick()
} else if (uri.toString().startsWith(MediaStore.Video.Media.EXTERNAL_CONTENT_URI.toString())) {
onVideoClick()
}
}
)
}
) {
when {
// 处理图片显示
uri.toString().startsWith(MediaStore.Images.Media.EXTERNAL_CONTENT_URI.toString()) -> {
AsyncImage(
model = uri,
contentDescription = "",
modifier = modifier
.clip(RoundedCornerShape(8.dp))
)
}

// 处理视频显示
uri.toString().startsWith(MediaStore.Video.Media.EXTERNAL_CONTENT_URI.toString()) -> {
VideoViewAlt(
modifier = modifier,
uri = uri,
imageLoader = imageLoader
)
}
}
uri.toString().startsWith(MediaStore.Video.Media.EXTERNAL_CONTENT_URI.toString()) -> {
// 处理视频变化
// VideoView(modifier = modifier, uri = uri)
VideoViewAlt(modifier = modifier, uri = uri, imageLoader = imageLoader,onClick = {
onVideoClick()
})

if (isMultiSelectionState) {
// 显示选择框的图标
Icon(
imageVector = if (isSelected) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
contentDescription = if (isSelected) "Selected" else "Not Selected",
modifier = Modifier
.align(Alignment.TopEnd) // 选择框显示在右上角
.size(48.dp)
.padding(8.dp),
tint = if (isSelected) Color.Blue else Color.Gray // 设置选中的颜色
)
}

}
}


@Composable
fun ActionRow(
modifier: Modifier,
Expand Down
90 changes: 75 additions & 15 deletions app/src/main/java/top/maary/oblivionis/ui/RecycleCompoments.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package top.maary.oblivionis.ui

import android.app.Activity
import android.util.Log
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.IntentSenderRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.calculateTargetValue
import androidx.compose.animation.splineBasedDecay
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.awaitFirstDown
import androidx.compose.foundation.gestures.verticalDrag
import androidx.compose.foundation.layout.Spacer
Expand All @@ -32,12 +34,15 @@ import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.input.pointer.positionChange
import androidx.compose.ui.input.pointer.util.VelocityTracker
Expand Down Expand Up @@ -101,6 +106,7 @@ fun RecycleScreen(
}
}

val selectedItems = remember { mutableStateOf(mutableSetOf<Int>()) }

Scaffold(
containerColor = MaterialTheme.colorScheme.surfaceContainer,
Expand Down Expand Up @@ -153,9 +159,26 @@ fun RecycleScreen(
dialogText = stringResource(id = R.string.deleteAllConfirmation)
)
}
FilledTonalButton(onClick = { openDialog.value = true },
modifier = Modifier.padding(end = 8.dp)) {
Text(stringResource(id = R.string.deleteAll))
if (selectedItems.value.isNotEmpty()) {
FilledTonalButton(
onClick = {
if (selectedItems.value.size != images.value.size) {
selectedItems.value = images.value.indices.toMutableSet()
}else{
selectedItems.value = mutableSetOf()
} },
modifier = Modifier.padding(end = 8.dp)
) {
Text(stringResource(id = R.string.select_all))
}
} else {
FilledTonalButton(
enabled = images.value.isNotEmpty(),
onClick = { openDialog.value = true },
modifier = Modifier.padding(end = 8.dp)
) {
Text(stringResource(id = R.string.deleteAll))
}
}
},
title = {}
Expand All @@ -165,19 +188,28 @@ fun RecycleScreen(
val openDialog = remember {
mutableStateOf(false)
}
FloatingActionButton(onClick = { openDialog.value = true }) {
if (openDialog.value) {
Dialog(
onDismissRequest = { openDialog.value = false },
onConfirmation = {
actionViewModel.unMarkAll()
openDialog.value = false },
dialogText = stringResource(id = R.string.restoreAllConfirmation)
if (selectedItems.value.isNotEmpty()) {
FloatingActionButton(onClick = { openDialog.value = true }) {
if (openDialog.value) {
Dialog(
onDismissRequest = { openDialog.value = false },
onConfirmation = {
selectedItems.value.forEach { index ->
actionViewModel.unMarkImage(images.value[index])
}
selectedItems.value = mutableSetOf()
openDialog.value = false
},
dialogText = stringResource(id = R.string.restore_selected_confirmation)
)
}
Icon(
painter = painterResource(id = R.drawable.ic_restore_all),
contentDescription = stringResource(
id = R.string.restoreAllConfirmation
)
)
}
Icon(painter = painterResource(id = R.drawable.ic_restore_all), contentDescription = stringResource(
id = R.string.restoreAllConfirmation
))
}
}
) { innerPadding ->
Expand All @@ -201,6 +233,7 @@ fun RecycleScreen(
)
}
items(images.value.size) { index ->
val isSelected by remember { derivedStateOf { selectedItems.value.contains(index) }}

if (openDialog.value) {
Dialog(
Expand All @@ -216,16 +249,43 @@ fun RecycleScreen(

MediaPlayer(
modifier = Modifier
.padding(2.dp),
.padding(2.dp)
.background(if (isSelected) Color.Gray else Color.Transparent),
uri = images.value[index].contentUri,
isMultiSelectionState = selectedItems.value.isNotEmpty(),
isSelected = selectedItems.value.contains(index),
imageLoader = imageLoader,
onImageClick = {
if (selectedItems.value.isNotEmpty()) {
val newSet = selectedItems.value.toMutableSet() // 创建一个新集合
if (!newSet.add(index)) {
newSet.remove(index) // 如果元素已存在，则移除
}
selectedItems.value = newSet // 更新 `selectedItems.value`，触发重组
return@MediaPlayer
}
clickedIndex.intValue = index
openDialog.value = true
},
onVideoClick = {
if (selectedItems.value.isNotEmpty()) {
val newSet = selectedItems.value.toMutableSet() // 创建一个新集合
if (!newSet.add(index)) {
newSet.remove(index) // 如果元素已存在，则移除
}
selectedItems.value = newSet // 更新 `selectedItems.value`，触发重组
return@MediaPlayer
}
clickedIndex.intValue = index
openDialog.value = true
},
onLongPress = {
val newSet = selectedItems.value.toMutableSet() // 创建一个新集合
if (!newSet.add(index)) {
newSet.remove(index) // 如果元素已存在，则移除
}
selectedItems.value = newSet // 更新 `selectedItems.value`，触发重组

})

}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,6 @@
<string name="is_excluded">This media will be excluded when holding delete button to delete</string>
<string name="delete_excluded">This media has been marked to exclude from deletion, are you sure to delete it?</string>
<string name="share_media">Share this media</string>
<string name="select_all">Select All</string>
<string name="restore_selected_confirmation">Selected media will be restored.</string>
</resources>

0 comments on commit c06ca2d

Please sign in to comment.