Flt 21 컬렉션 상세 UI 개편

app/src/main/java/com/flint/core/navigation/Route.kt

@@ -40,13 +40,21 @@ interface Route {
     data class CollectionDetail(
         val collectionId: String,
         val targetImageUrl: String? = null,
+        val showEditSuccessToast: Boolean = false,
+    ) : Route
+
+    @Serializable
+    data class CollectionReport(
+        val collectionId: String,
     ) : Route
 
     @Serializable
     data object CollectionCreate : Route
 
     @Serializable
-    data object CollectionCreateGraph : Route
+    data class CollectionCreateGraph(
+        val collectionId: String? = null,
+    ) : Route
 
     @Serializable
     data object SavedContentList : Route

app/src/main/java/com/flint/data/api/CollectionApi.kt

@@ -1,14 +1,17 @@
 package com.flint.data.api
 
+import com.flint.data.dto.base.BaseEmptyResponse
 import com.flint.data.dto.base.BaseResponse
 import com.flint.data.dto.collection.request.CollectionCreateRequestDto
 import com.flint.data.dto.collection.response.CollectionCreateResponseDto
 import com.flint.data.dto.collection.response.CollectionDetailResponseDto
 import com.flint.data.dto.collection.response.CollectionsResponseDto
 import com.flint.data.dto.collection.response.RecentCollectionListResponseDto
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -32,6 +35,19 @@ interface CollectionApi {
         @Path("collectionId") collectionId: String,
     ): BaseResponse<CollectionDetailResponseDto>
 
+    // 컬렉션 수정
+    @PUT("/api/v1/collections/{collectionId}")
+    suspend fun updateCollection(
+        @Path("collectionId") collectionId: String,
+        @Body requestDto: CollectionCreateRequestDto,
+    ): BaseEmptyResponse
+
+    // 컬렉션 삭제
+    @DELETE("/api/v1/collections/{collectionId}")
+    suspend fun deleteCollection(
+        @Path("collectionId") collectionId: String,
+    ): BaseEmptyResponse
+
     // 최근 본 컬렉션 목록 조회
     @GET("/api/v1/collections/recent")
     suspend fun getRecentCollectionList(): BaseResponse<RecentCollectionListResponseDto>

app/src/main/java/com/flint/data/dto/collection/request/CollectionCreateRequestDto.kt

@@ -24,7 +24,7 @@ data class CollectionCreateRequestDto(
         val isSpoiler: Boolean,
         @SerialName("reason")
         val reason: String,
-        @SerialName("imageUrls")
+        @SerialName("customImages")
         val imageUrls: List<String> = emptyList(),
     )
 }

app/src/main/java/com/flint/data/dto/collection/response/CollectionDetailResponseDto.kt

@@ -12,6 +12,7 @@ data class CollectionDetailResponseDto(
     @SerialName("id") val id: String,
     @SerialName("thumbnailUrl") val thumbnailUrl: String,
     @SerialName("isBookmarked") val isBookmarked: Boolean,
+    @SerialName("isPublic") val isPublic: Boolean,
     @SerialName("title") val title: String,
 ) {
     @Serializable
@@ -31,6 +32,7 @@ data class CollectionDetailResponseDto(
         @SerialName("isSpoiler") val isSpoiler: Boolean,
         @SerialName("reason") val reason: String,
         @SerialName("imageUrl") val imageUrl: String,
+        @SerialName("customImageUrls") val customImageUrls: List<String> = emptyList(),
         @SerialName("title") val title: String,
         @SerialName("year") val year: Int,
     )

app/src/main/java/com/flint/domain/mapper/collection/CollectionDetailMapper.kt

@@ -17,6 +17,7 @@ fun CollectionDetailResponseDto.toModel(): CollectionDetailModelNew {
         id = id,
         thumbnailUrl = thumbnailUrl,
         isBookmarked = isBookmarked,
+        isPublic = isPublic,
         title = title,
     )
 }
@@ -39,6 +40,7 @@ private fun CollectionDetailResponseDto.Content.toModel(): ContentModelNew {
         isSpoiler = isSpoiler,
         reason = reason,
         imageUrl = imageUrl,
+        customImageUrls = customImageUrls,
         title = title,
         year = year,
     )

app/src/main/java/com/flint/domain/model/collection/CollectionDetailModel.kt

@@ -13,5 +13,6 @@ data class CollectionDetailModelNew(
     val id: String,
     val thumbnailUrl: String,
     val isBookmarked: Boolean,
+    val isPublic: Boolean,
     val title: String,
 )

app/src/main/java/com/flint/domain/model/content/ContentModel.kt

@@ -11,6 +11,7 @@ data class ContentModelNew(
     val isSpoiler: Boolean,
     val reason: String,
     val imageUrl: String,
+    val customImageUrls: List<String> = emptyList(),
     val title: String,
     val year: Int,
 )

app/src/main/java/com/flint/domain/repository/CollectionRepository.kt

@@ -41,6 +41,23 @@ class CollectionRepository @Inject constructor(
             response.toModel()
         }
 
+    // 컬렉션 수정
+    suspend fun updateCollection(
+        collectionId: String,
+        requestDto: CollectionCreateRequestDto,
+    ): Result<Unit> =
+        suspendRunCatching {
+            apiService.updateCollection(collectionId, requestDto)
+            Unit
+        }
+
+    // 컬렉션 삭제
+    suspend fun deleteCollection(collectionId: String): Result<Unit> =
+        suspendRunCatching {
+            apiService.deleteCollection(collectionId)
+            Unit
+        }
+
     // 최근 본 컬렉션 목록 조회
     suspend fun getRecentCollectionList(): Result<CollectionListModel> =
         suspendRunCatching { apiService.getRecentCollectionList().data.toModel() }

app/src/main/java/com/flint/presentation/collectioncreate/CollectionCreateScreen.kt

@@ -120,6 +120,7 @@ fun CollectionCreateRoute(
                 contentImageLauncher.launch("image/*")
             }
         },
+        onRemoveExistingContentImage = viewModel::removeExistingContentImageUrl,
         onRemoveContentImage = viewModel::removeContentImageUri,
         modifier = Modifier.padding(paddingValues),
     )
@@ -141,6 +142,7 @@ fun CollectionCreateScreen(
     onGalleryClick: () -> Unit = {},
     onThumbnailDelete: () -> Unit = {},
     onSelectContentImage: (contentId: String) -> Unit = {},
+    onRemoveExistingContentImage: (contentId: String, index: Int) -> Unit = { _, _ -> },
     onRemoveContentImage: (contentId: String, index: Int) -> Unit = { _, _ -> },
     modifier: Modifier = Modifier,
 ) {
@@ -163,7 +165,7 @@ fun CollectionCreateScreen(
             // 썸네일
             item {
                 CollectionCreateThumbnail(
-                    imageUrl = uiState.thumbnailImageUri,
+                    imageUrl = uiState.thumbnailImageUri ?: uiState.existingThumbnailUrl,
                     onClick = { isThumbnailBottomSheetVisible = true },
                 )
 
@@ -212,6 +214,7 @@ fun CollectionCreateScreen(
                     onReasonChanged = onReasonChanged,
                     onAddContentClick = onAddContentClick,
                     onSelectContentImage = onSelectContentImage,
+                    onRemoveExistingContentImage = onRemoveExistingContentImage,
                     onRemoveContentImage = onRemoveContentImage,
                     modifier = Modifier.padding(horizontal = (16).dp),
                 )
@@ -408,6 +411,7 @@ private fun CollectionAddContentSection(
     onReasonChanged: (String, String) -> Unit,
     onAddContentClick: () -> Unit,
     onSelectContentImage: (contentId: String) -> Unit,
+    onRemoveExistingContentImage: (contentId: String, index: Int) -> Unit,
     onRemoveContentImage: (contentId: String, index: Int) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -460,9 +464,11 @@ private fun CollectionAddContentSection(
 
             Spacer(Modifier.height(16.dp))
 
-            if (detail.contentImageUris.isNotEmpty()) {
+            if (detail.existingImageUrls.isNotEmpty() || detail.contentImageUris.isNotEmpty()) {
                 CollectionCreateContentImage(
+                    existingImageUrls = detail.existingImageUrls,
                     imageUris = detail.contentImageUris,
+                    onDeleteExistingClick = { index -> onRemoveExistingContentImage(content.id, index) },
                     onDeleteClick = { index -> onRemoveContentImage(content.id, index) },
                 )