From 8f1e2b1cc194b17be9ca44a91915ca339548e86b Mon Sep 17 00:00:00 2001 From: AllenTom Date: Tue, 17 Sep 2024 22:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riderpro/ui/composables/DragAndDrop.kt | 5 +++- .../com/aiosman/riderpro/ui/post/NewPost.kt | 27 ++++++++++--------- .../riderpro/ui/post/NewPostImageGrid.kt | 5 +--- .../riderpro/ui/post/NewPostViewModel.kt | 27 ++++++++++++------- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/DragAndDrop.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/DragAndDrop.kt index aa41065..dc25aeb 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/composables/DragAndDrop.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/DragAndDrop.kt @@ -46,6 +46,7 @@ import java.util.UUID @Composable fun DraggableGrid( items: List, + getItemId: (T) -> String, onMove: (Int, Int) -> Unit, onDragModeStart: () -> Unit, // New parameter for drag start onDragModeEnd: () -> Unit, // New parameter for drag end, @@ -66,7 +67,9 @@ fun DraggableGrid( horizontalArrangement = Arrangement.spacedBy(16.dp), ) { - itemsIndexed(items, key = { _, item -> "${item}-${UUID.randomUUID()}" }) { index, item -> + itemsIndexed(items, key = { _, item -> + getItemId(item) + }) { index, item -> DraggableItem(dragDropState, index) { isDragging -> content(item, isDragging) } diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt index 8cca3d9..bd39a06 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt @@ -5,7 +5,6 @@ import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.AnimatedVisibility -import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -13,7 +12,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio @@ -29,7 +27,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.material.LinearProgressIndicator -import androidx.compose.material.MaterialTheme import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.Text @@ -43,7 +40,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.drawBehind -import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.PathEffect @@ -226,7 +222,6 @@ fun NewPostTextField(hint: String, value: String, onValueChange: (String) -> Uni } - @Composable fun AddImageGrid() { val navController = LocalNavController.current @@ -237,7 +232,12 @@ fun AddImageGrid() { contract = ActivityResultContracts.GetMultipleContents() ) { uris -> if (uris.isNotEmpty()) { - model.imageUriList += uris.map { it.toString() } + model.imageList += uris.map { + ImageItem( + uri = it.toString(), + id = java.util.UUID.randomUUID().toString() + ) + } } } @@ -245,7 +245,10 @@ fun AddImageGrid() { contract = ActivityResultContracts.TakePicture() ) { success -> if (success) { - model.imageUriList += model.currentPhotoUri.toString() + model.imageList += ImageItem( + uri = model.currentPhotoUri.toString(), + id = java.util.UUID.randomUUID().toString() + ) } } @@ -254,9 +257,9 @@ fun AddImageGrid() { pathEffect = PathEffect.dashPathEffect(floatArrayOf(10f, 10f), 0f) ) DraggableGrid( - items = NewPostViewModel.imageUriList, + items = NewPostViewModel.imageList, onMove = { from, to -> - NewPostViewModel.imageUriList = NewPostViewModel.imageUriList.toMutableList().apply { + NewPostViewModel.imageList = NewPostViewModel.imageList.toMutableList().apply { add(to, removeAt(from)) } }, @@ -268,14 +271,14 @@ fun AddImageGrid() { additionalItems = listOf( ), - - ) { item, isDrag -> + getItemId = { it.id } + ) { item, isDrag -> Box( modifier = Modifier ) { CustomAsyncImage( LocalContext.current, - item, + item.uri, contentDescription = "Image", modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt index cee17cd..5fc09a2 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt @@ -24,9 +24,6 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Delete import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.derivedStateOf -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -42,7 +39,7 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController @Composable fun NewPostImageGridScreen() { val model = NewPostViewModel - val imageList = model.imageUriList + val imageList = model.imageList val pagerState = rememberPagerState(pageCount = { imageList.size }) val systemUiController = rememberSystemUiController() val paddingValues = WindowInsets.systemBars.asPaddingValues() diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt index e4e7a23..818e5ee 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt @@ -19,14 +19,19 @@ import kotlinx.coroutines.withContext import java.io.File import java.io.FileOutputStream import java.io.InputStream +import java.util.UUID +data class ImageItem( + val uri: String, + val id: String +) object NewPostViewModel : ViewModel() { var momentService: MomentService = MomentServiceImpl() var textContent by mutableStateOf("") var searchPlaceAddressResult by mutableStateOf(null) var modificationList by mutableStateOf>(listOf()) - var imageUriList by mutableStateOf(listOf()) + var imageList by mutableStateOf(listOf()) var relPostId by mutableStateOf(null) var relMoment by mutableStateOf(null) var currentPhotoUri: Uri? = null @@ -34,14 +39,16 @@ object NewPostViewModel : ViewModel() { textContent = "" searchPlaceAddressResult = null modificationList = listOf() - imageUriList = listOf() + imageList = listOf() relPostId = null } fun asNewPostWithImageUris(imageUris: List) { textContent = "" searchPlaceAddressResult = null modificationList = listOf() - imageUriList = imageUris + imageList = imageUris.map { + ImageItem(it, UUID.randomUUID().toString()) + } relPostId = null } @@ -59,7 +66,7 @@ object NewPostViewModel : ViewModel() { } fun validateMoment(): String? { - if (imageUriList.isEmpty()) { + if (imageList.isEmpty()) { return "Please select at least one image" } return null @@ -67,21 +74,21 @@ object NewPostViewModel : ViewModel() { suspend fun createMoment(context: Context, onUploadProgress: (Float) -> Unit) { val uploadImageList = emptyList().toMutableList() var index = 0 - for (uri in imageUriList) { - val cursor = context.contentResolver.query(Uri.parse(uri), null, null, null, null) + for (item in imageList) { + val cursor = context.contentResolver.query(Uri.parse(item.uri), null, null, null, null) cursor?.use { if (it.moveToFirst()) { val displayName = it.getString(it.getColumnIndex("_display_name")) val extension = displayName.substringAfterLast(".") Log.d("NewPost", "File name: $displayName, extension: $extension") // read as file - val file = uriToFile(context, Uri.parse(uri)) + val file = uriToFile(context, Uri.parse(item.uri)) Log.d("NewPost", "File size: ${file.length()}") - uploadImageList += UploadImage(file, displayName, uri, extension) + uploadImageList += UploadImage(file, displayName, item.uri, extension) } } // 在上传过程中调用 onUploadProgress 更新进度 - onUploadProgress(((index / imageUriList.size).toFloat())) // progressValue 是当前上传进度，例如 0.5 表示 50% + onUploadProgress(((index / imageList.size).toFloat())) // progressValue 是当前上传进度，例如 0.5 表示 50% index += 1 } momentService.createMoment(textContent, 1, uploadImageList, relPostId) @@ -97,7 +104,7 @@ object NewPostViewModel : ViewModel() { } } fun deleteImage(index: Int) { - imageUriList = imageUriList.toMutableList().apply { + imageList = imageList.toMutableList().apply { removeAt(index) } }