[feat] #179 #180 #181 #184 Sprint 4: 사진 이동/복제 + 앨범 삭제

app/src/main/java/com/neki/android/app/main/MainScreen.kt

@@ -1,41 +1,39 @@
 package com.neki.android.app.main
 
-import androidx.compose.animation.ContentTransform
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.ContentTransform
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.net.toUri
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.ui.NavDisplay
 import com.neki.android.app.main.component.AddPhotoBottomSheet
 import com.neki.android.app.main.component.AlbumUploadOption
-import com.neki.android.app.ui.BottomNavigationBar
 import com.neki.android.app.main.component.SelectWithAlbumDialog
+import com.neki.android.app.ui.BottomNavigationBar
 import com.neki.android.core.navigation.result.LocalResultEventBus
 import com.neki.android.core.navigation.result.ResultEffect
 import com.neki.android.core.ui.component.LoadingDialog
 import com.neki.android.core.ui.compose.collectWithLifecycle
 import com.neki.android.core.ui.toast.NekiToast
-import androidx.core.net.toUri
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import com.neki.android.feature.archive.api.ArchiveNavKey
 import com.neki.android.feature.archive.api.PhotoUploadedResult
 import com.neki.android.feature.map.api.MapNavKey
@@ -44,6 +42,8 @@ import com.neki.android.feature.photo_upload.api.PhotoUploadNavKey
 import com.neki.android.feature.photo_upload.api.QRScanResult
 import com.neki.android.feature.pose.api.PoseNavKey
 import com.neki.android.feature.select_album.api.SelectAlbumAction
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import timber.log.Timber
 
 @Composable
@@ -95,6 +95,7 @@ fun MainRoute(
             MainSideEffect.OpenGallery -> photoPicker.launch(
                 PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly),
             )
+
             is MainSideEffect.NavigateToSelectAlbum -> navigateToSelectAlbum(sideEffect.action)
             is MainSideEffect.ShowToast -> nekiToast.showToast(sideEffect.message)
             MainSideEffect.RefreshArchive -> resultBus.sendResult(result = PhotoUploadedResult, allowDuplicate = false)
@@ -127,7 +128,6 @@ fun MainScreen(
     val shouldShowBottomBar by remember(currentKey) {
         mutableStateOf(currentKey in topLevelKeys)
     }
-
     Scaffold(
         modifier = Modifier
             .fillMaxSize()

app/src/main/java/com/neki/android/app/main/component/AddPhotoBottomSheet.kt

@@ -80,7 +80,7 @@ private fun AddPhotoBottomSheetContent(
                 onClick = onClickQRScan,
             )
             AddPhotoOptionButton(
-                iconRes = R.drawable.icon_add_photo,
+                iconRes = R.drawable.icon_add_photo_gallery,
                 label = "갤러리에서 추가",
                 onClick = onClickGallery,
             )

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/FolderRepository.kt

@@ -8,4 +8,6 @@ interface FolderRepository {
     suspend fun deleteFolder(id: List<Long>, deletePhotos: Boolean): Result<Unit>
     suspend fun removePhotosFromFolder(folderId: Long, photoIds: List<Long>): Result<Unit>
     suspend fun updateFolder(folderId: Long, name: String): Result<Unit>
+    suspend fun movePhotos(sourceFolderId: Long, photoIds: List<Long>, targetFolderIds: List<Long>): Result<Unit>
+    suspend fun copyPhotos(photoIds: List<Long>, targetFolderIds: List<Long>): Result<Unit>
 }

core/data/src/main/java/com/neki/android/core/data/remote/api/FolderService.kt

@@ -1,8 +1,10 @@
 package com.neki.android.core.data.remote.api
 
+import com.neki.android.core.data.remote.model.request.CopyPhotosRequest
 import com.neki.android.core.data.remote.model.request.CreateFolderRequest
 import com.neki.android.core.data.remote.model.request.DeleteFolderRequest
 import com.neki.android.core.data.remote.model.request.DeletePhotoRequest
+import com.neki.android.core.data.remote.model.request.MovePhotosRequest
 import com.neki.android.core.data.remote.model.request.UpdateFolderRequest
 import com.neki.android.core.data.remote.model.response.BasicNullableResponse
 import com.neki.android.core.data.remote.model.response.BasicResponse
@@ -52,4 +54,14 @@ class FolderService @Inject constructor(
             setBody(requestBody)
         }.body()
     }
+
+    // 사진 이동
+    suspend fun movePhotos(requestBody: MovePhotosRequest): BasicNullableResponse<Unit> {
+        return client.patch("/api/folders/photos/move") { setBody(requestBody) }.body()
+    }
+
+    // 사진 복제
+    suspend fun copyPhotos(requestBody: CopyPhotosRequest): BasicNullableResponse<Unit> {
+        return client.post("/api/folders/photos/copy") { setBody(requestBody) }.body()
+    }
 }

core/data/src/main/java/com/neki/android/core/data/remote/model/request/CopyPhotosRequest.kt

@@ -0,0 +1,10 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CopyPhotosRequest(
+    @SerialName("photoIds") val photoIds: List<Long>,
+    @SerialName("targetFolderIds") val targetFolderIds: List<Long>,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/request/MovePhotosRequest.kt

@@ -0,0 +1,11 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MovePhotosRequest(
+    @SerialName("sourceFolderId") val sourceFolderId: Long,
+    @SerialName("photoIds") val photoIds: List<Long>,
+    @SerialName("targetFolderIds") val targetFolderIds: List<Long>,
+)

core/data/src/main/java/com/neki/android/core/data/repository/impl/FolderRepositoryImpl.kt

@@ -1,9 +1,11 @@
 package com.neki.android.core.data.repository.impl
 
 import com.neki.android.core.data.remote.api.FolderService
+import com.neki.android.core.data.remote.model.request.CopyPhotosRequest
 import com.neki.android.core.data.remote.model.request.CreateFolderRequest
 import com.neki.android.core.data.remote.model.request.DeleteFolderRequest
 import com.neki.android.core.data.remote.model.request.DeletePhotoRequest
+import com.neki.android.core.data.remote.model.request.MovePhotosRequest
 import com.neki.android.core.data.remote.model.request.UpdateFolderRequest
 import com.neki.android.core.data.util.runSuspendCatching
 import com.neki.android.core.dataapi.repository.FolderRepository
@@ -43,4 +45,16 @@ class FolderRepositoryImpl @Inject constructor(
             requestBody = UpdateFolderRequest(name = name),
         )
     }
+
+    override suspend fun movePhotos(sourceFolderId: Long, photoIds: List<Long>, targetFolderIds: List<Long>): Result<Unit> = runSuspendCatching {
+        folderService.movePhotos(
+            requestBody = MovePhotosRequest(sourceFolderId = sourceFolderId, photoIds = photoIds, targetFolderIds = targetFolderIds),
+        )
+    }
+
+    override suspend fun copyPhotos(photoIds: List<Long>, targetFolderIds: List<Long>): Result<Unit> = runSuspendCatching {
+        folderService.copyPhotos(
+            requestBody = CopyPhotosRequest(photoIds = photoIds, targetFolderIds = targetFolderIds),
+        )
+    }
 }

core/designsystem/src/main/java/com/neki/android/core/designsystem/actionbar/NekiActionBar.kt

@@ -3,7 +3,9 @@ package com.neki.android.core.designsystem.actionbar
 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.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -21,9 +23,10 @@ import com.neki.android.core.designsystem.button.NekiIconButton
 import com.neki.android.core.designsystem.ui.theme.NekiTheme
 
 @Composable
-fun NekiStartActionBar(
+fun NekiActionBar(
     modifier: Modifier = Modifier,
-    content: @Composable () -> Unit,
+    padding: PaddingValues = PaddingValues(),
+    content: @Composable RowScope.() -> Unit,
 ) {
     Column(
         modifier = modifier,
@@ -33,18 +36,22 @@ fun NekiStartActionBar(
             thickness = 1.dp,
             color = NekiTheme.colorScheme.gray75,
         )
-        Box(
-            modifier = Modifier.fillMaxWidth(),
-            contentAlignment = Alignment.CenterStart,
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(padding),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             content()
         }
     }
 }
 
 @Composable
-fun NekiEndActionBar(
+fun NekiStartActionBar(
     modifier: Modifier = Modifier,
+    padding: PaddingValues = PaddingValues(),
     content: @Composable () -> Unit,
 ) {
     Column(
@@ -56,19 +63,21 @@ fun NekiEndActionBar(
             color = NekiTheme.colorScheme.gray75,
         )
         Box(
-            modifier = Modifier.fillMaxWidth(),
-            contentAlignment = Alignment.CenterEnd,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(padding),
+            contentAlignment = Alignment.CenterStart,
         ) {
             content()
         }
     }
 }
 
 @Composable
-fun NekiBothSidesActionBar(
+fun NekiEndActionBar(
     modifier: Modifier = Modifier,
-    startContent: @Composable () -> Unit,
-    endContent: @Composable () -> Unit,
+    padding: PaddingValues = PaddingValues(),
+    content: @Composable () -> Unit,
 ) {
     Column(
         modifier = modifier,
@@ -78,17 +87,49 @@ fun NekiBothSidesActionBar(
             thickness = 1.dp,
             color = NekiTheme.colorScheme.gray75,
         )
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(padding),
+            contentAlignment = Alignment.CenterEnd,
         ) {
-            startContent()
-            endContent()
+            content()
         }
     }
 }
 
+@ComponentPreview
+@Composable
+private fun NekiActionBarPreview() {
+    NekiTheme {
+        NekiActionBar(
+            modifier = Modifier.fillMaxWidth(),
+            content = {
+                NekiIconButton(
+                    modifier = Modifier.padding(8.dp),
+                    onClick = {},
+                ) {
+                    Icon(
+                        imageVector = ImageVector.vectorResource(R.drawable.icon_arrow_left),
+                        contentDescription = null,
+                        tint = NekiTheme.colorScheme.gray900,
+                    )
+                }
+                NekiIconButton(
+                    modifier = Modifier.padding(8.dp),
+                    onClick = {},
+                ) {
+                    Icon(
+                        imageVector = ImageVector.vectorResource(R.drawable.icon_bookmark_stroked),
+                        contentDescription = null,
+                        tint = NekiTheme.colorScheme.gray500,
+                    )
+                }
+            },
+        )
+    }
+}
+
 @ComponentPreview
 @Composable
 private fun NekiStartActionBarPreview() {
@@ -131,37 +172,3 @@ private fun NekiEndActionBarPreview() {
         }
     }
 }
-
-@ComponentPreview
-@Composable
-private fun NekiBothSidesActionBarPreview() {
-    NekiTheme {
-        NekiBothSidesActionBar(
-            modifier = Modifier.fillMaxWidth(),
-            startContent = {
-                NekiIconButton(
-                    modifier = Modifier.padding(8.dp),
-                    onClick = {},
-                ) {
-                    Icon(
-                        imageVector = ImageVector.vectorResource(R.drawable.icon_arrow_left),
-                        contentDescription = null,
-                        tint = NekiTheme.colorScheme.gray900,
-                    )
-                }
-            },
-            endContent = {
-                NekiIconButton(
-                    modifier = Modifier.padding(8.dp),
-                    onClick = {},
-                ) {
-                    Icon(
-                        imageVector = ImageVector.vectorResource(R.drawable.icon_bookmark_stroked),
-                        contentDescription = null,
-                        tint = NekiTheme.colorScheme.gray500,
-                    )
-                }
-            },
-        )
-    }
-}

core/designsystem/src/main/res/drawable/icon_copy_photo.xml

@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <group>
+    <clip-path
+        android:pathData="M8.5,3L23.5,3A1.5,1.5 0,0 1,25 4.5L25,19.5A1.5,1.5 0,0 1,23.5 21L8.5,21A1.5,1.5 0,0 1,7 19.5L7,4.5A1.5,1.5 0,0 1,8.5 3z"/>
+    <path
+        android:pathData="M8.5,3L23.5,3A1.5,1.5 0,0 1,25 4.5L25,19.5A1.5,1.5 0,0 1,23.5 21L8.5,21A1.5,1.5 0,0 1,7 19.5L7,4.5A1.5,1.5 0,0 1,8.5 3z"
+        android:strokeWidth="4"
+        android:fillColor="#00000000"
+        android:strokeColor="#616575"/>
+  </group>
+  <path
+      android:pathData="M4,7V22.5C4,23.328 4.672,24 5.5,24H21"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#616575"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,12H20"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#616575"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.006,8.006L16.006,16.006"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#616575"
+      android:strokeLineCap="round"/>
+</vector>