[fix] #161 ArchiveResult 화면별 Result 타입 분리

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

@@ -33,7 +33,7 @@ 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 com.neki.android.feature.archive.api.ArchiveNavKey
-import com.neki.android.feature.archive.api.ArchiveResult
+import com.neki.android.feature.archive.api.PhotoUploadedResult
 import com.neki.android.feature.map.api.MapNavKey
 import com.neki.android.feature.mypage.api.MyPageNavKey
 import com.neki.android.feature.photo_upload.api.PhotoUploadNavKey
@@ -86,7 +86,7 @@ fun MainRoute(
             is MainSideEffect.NavigateToUploadAlbumWithGallery -> navigateToUploadAlbumWithGallery(sideEffect.uriStrings)
             is MainSideEffect.NavigateToUploadAlbumWithQRScan -> navigateToUploadAlbumWithQRScan(sideEffect.imageUrl)
             is MainSideEffect.ShowToast -> nekiToast.showToast(sideEffect.message)
-            MainSideEffect.RefreshArchive -> resultBus.sendResult<ArchiveResult>(result = ArchiveResult.PhotoUploaded)
+            MainSideEffect.RefreshArchive -> resultBus.sendResult(result = PhotoUploadedResult, allowDuplicate = false)
         }
     }
 

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

@@ -25,6 +25,8 @@ interface PhotoRepository {
 
     suspend fun updateFavorite(photoId: Long, favorite: Boolean): Result<Unit>
 
+    suspend fun updateMemo(photoId: Long, memo: String): Result<Unit>
+
     suspend fun getPhotosPage(
         folderId: Long? = null,
         page: Int = 0,

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

@@ -3,6 +3,7 @@ package com.neki.android.core.data.remote.api
 import com.neki.android.core.data.remote.model.request.DeletePhotoRequest
 import com.neki.android.core.data.remote.model.request.RegisterPhotoRequest
 import com.neki.android.core.data.remote.model.request.UpdateFavoriteRequest
+import com.neki.android.core.data.remote.model.request.UpdateMemoRequest
 import com.neki.android.core.data.remote.model.response.BasicNullableResponse
 import com.neki.android.core.data.remote.model.response.BasicResponse
 import com.neki.android.core.data.remote.model.response.FavoriteSummaryResponse
@@ -15,6 +16,7 @@ import io.ktor.client.request.get
 import io.ktor.client.request.parameter
 import io.ktor.client.request.patch
 import io.ktor.client.request.post
+import io.ktor.client.request.put
 import io.ktor.client.request.setBody
 import javax.inject.Inject
 
@@ -53,6 +55,13 @@ class PhotoService @Inject constructor(
         }.body()
     }
 
+    // 메모 수정
+    suspend fun updateMemo(photoId: Long, memo: String): BasicNullableResponse<Unit> {
+        return client.put("/api/photos/$photoId") {
+            setBody(UpdateMemoRequest(memo))
+        }.body()
+    }
+
     // 즐겨찾는 앨범 조회
     suspend fun getFavoritePhotos(
         page: Int = 0,

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

@@ -0,0 +1,9 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateMemoRequest(
+    @SerialName("memo") val memo: String,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PhotoResponse.kt

@@ -20,6 +20,7 @@ data class PhotoResponse(
         @SerialName("width") val width: Int? = null,
         @SerialName("height") val height: Int? = null,
         @SerialName("createdAt") val createdAt: String,
+        @SerialName("memo") val memo: String? = null,
     ) {
         internal fun toModel() = Photo(
             id = photoId,
@@ -29,6 +30,7 @@ data class PhotoResponse(
             height = height,
             date = createdAt.toFormattedDate(),
             contentType = ContentType.fromString(contentType),
+            memo = memo.orEmpty(),
         )
     }
 

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

@@ -65,6 +65,10 @@ class PhotoRepositoryImpl @Inject constructor(
         photoService.updateFavorite(photoId, favorite)
     }
 
+    override suspend fun updateMemo(photoId: Long, memo: String): Result<Unit> = runSuspendCatching {
+        photoService.updateMemo(photoId, memo)
+    }
+
     override suspend fun getPhotosPage(
         folderId: Long?,
         page: Int,

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

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M11.698,22.845H4.45C3.649,22.845 3,22.196 3,21.396V11.849C3,11.464 3.153,11.095 3.425,10.824L9.824,4.425C10.095,4.153 10.464,4 10.849,4H20.396C21.196,4 21.845,4.649 21.845,5.45V11.248"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.93285"
+      android:fillColor="#00000000"
+      android:strokeColor="#4F525F"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,11.731H8.315C9.116,11.731 9.765,11.082 9.765,10.282V4"
+      android:strokeWidth="1.93285"
+      android:fillColor="#00000000"
+      android:strokeColor="#4F525F"/>
+  <path
+      android:pathData="M20.699,14.347L15.035,20.012C14.91,20.137 14.822,20.294 14.78,20.465L14.37,22.141C14.196,22.85 14.84,23.487 15.547,23.308L17.204,22.886C17.373,22.843 17.527,22.755 17.649,22.632L23.317,16.965C23.694,16.588 23.694,15.976 23.317,15.598L22.066,14.347C21.689,13.97 21.077,13.97 20.699,14.347Z"
+      android:strokeWidth="1.93285"
+      android:fillColor="#00000000"
+      android:strokeColor="#4F525F"/>
+</vector>

core/model/src/main/java/com/neki/android/core/model/Photo.kt

@@ -13,4 +13,5 @@ data class Photo(
     val width: Int? = null,
     val height: Int? = null,
     val contentType: ContentType = ContentType.JPEG,
+    val memo: String = "",
 )

feature/archive/api/src/main/kotlin/com/neki/android/feature/archive/api/ArchiveResult.kt

@@ -1,11 +1,13 @@
 package com.neki.android.feature.archive.api
 
-sealed interface ArchiveResult {
-    data class PhotoDeleted(val photoId: List<Long>) : ArchiveResult {
-        constructor(photoId: Long) : this(listOf(photoId))
-    }
+sealed interface ArchiveResult
 
-    data class FavoriteChanged(val photoId: Long, val isFavorite: Boolean) : ArchiveResult
+data object PhotoDetailResult : ArchiveResult
 
-    data object PhotoUploaded : ArchiveResult
-}
+data object AlbumDetailResult : ArchiveResult
+
+data object AllPhotoResult : ArchiveResult
+
+data object AllAlbumResult : ArchiveResult
+
+data object PhotoUploadedResult : ArchiveResult

feature/archive/impl/build.gradle.kts

@@ -12,4 +12,5 @@ dependencies {
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.paging.compose)
+    implementation(libs.zoomable)
 }

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album/AllAlbumContract.kt

@@ -53,11 +53,15 @@ sealed interface AllAlbumIntent {
     data object DismissDeleteAlbumBottomSheet : AllAlbumIntent
     data class SelectDeleteOption(val option: AlbumDeleteOption) : AllAlbumIntent
     data object ClickDeleteConfirmButton : AllAlbumIntent
+
+    // Result Intent
+    data object RefreshAlbums : AllAlbumIntent
 }
 
 sealed interface AllAlbumSideEffect {
     data object NavigateBack : AllAlbumSideEffect
     data class NavigateToFavoriteAlbum(val albumId: Long) : AllAlbumSideEffect
     data class NavigateToAlbumDetail(val albumId: Long, val title: String) : AllAlbumSideEffect
     data class ShowToastMessage(val message: String) : AllAlbumSideEffect
+    data object NotifyResult : AllAlbumSideEffect
 }

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album/AllAlbumScreen.kt

@@ -20,6 +20,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.neki.android.core.designsystem.DevicePreview
 import com.neki.android.core.designsystem.ui.theme.NekiTheme
 import com.neki.android.core.model.AlbumPreview
+import com.neki.android.core.navigation.result.LocalResultEventBus
+import com.neki.android.feature.archive.api.AllAlbumResult
 import com.neki.android.core.ui.component.AlbumRowComponent
 import com.neki.android.core.ui.component.DoubleButtonOptionBottomSheet
 import com.neki.android.core.ui.component.FavoriteAlbumRowComponent
@@ -41,6 +43,7 @@ internal fun AllAlbumRoute(
     val uiState by viewModel.store.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
     val nekiToast = remember { NekiToast(context) }
+    val resultEventBus = LocalResultEventBus.current
 
     viewModel.store.sideEffects.collectWithLifecycle { sideEffect ->
         when (sideEffect) {
@@ -50,6 +53,9 @@ internal fun AllAlbumRoute(
             is AllAlbumSideEffect.ShowToastMessage -> {
                 nekiToast.showToast(text = sideEffect.message)
             }
+            AllAlbumSideEffect.NotifyResult -> {
+                resultEventBus.sendResult(result = AllAlbumResult, allowDuplicate = false)
+            }
         }
     }
 

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album/AllAlbumViewModel.kt

@@ -76,6 +76,9 @@ class AllAlbumViewModel @Inject constructor(
             AllAlbumIntent.DismissDeleteAlbumBottomSheet -> reduce { copy(isShowDeleteAlbumBottomSheet = false) }
             is AllAlbumIntent.SelectDeleteOption -> reduce { copy(selectedDeleteOption = intent.option) }
             AllAlbumIntent.ClickDeleteConfirmButton -> handleDeleteConfirm(state, reduce, postSideEffect)
+
+            // Result Intent
+            AllAlbumIntent.RefreshAlbums -> fetchInitialData(reduce)
         }
     }
 
@@ -178,6 +181,7 @@ class AllAlbumViewModel @Inject constructor(
                 .onSuccess {
                     fetchFolders(reduce)
                     postSideEffect(AllAlbumSideEffect.ShowToastMessage("새로운 앨범을 추가했어요"))
+                    postSideEffect(AllAlbumSideEffect.NotifyResult)
                 }
                 .onFailure { e ->
                     postSideEffect(AllAlbumSideEffect.ShowToastMessage("앨범 추가에 실패했어요"))
@@ -200,6 +204,7 @@ class AllAlbumViewModel @Inject constructor(
                 .onSuccess {
                     fetchFolders(reduce)
                     postSideEffect(AllAlbumSideEffect.ShowToastMessage("앨범을 삭제했어요"))
+                    postSideEffect(AllAlbumSideEffect.NotifyResult)
                 }
                 .onFailure { e ->
                     Timber.e(e, "사진 삭제 실패")

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album_detail/AlbumDetailContract.kt

@@ -71,9 +71,8 @@ sealed interface AlbumDetailIntent {
     data object ClickRenameBottomSheetConfirmButton : AlbumDetailIntent
 
     // Result Intent
-    data class PhotoDeleted(val photoIds: List<Long>) : AlbumDetailIntent
+    data object RefreshPhotos : AlbumDetailIntent
     data class ClickFavoriteIcon(val photo: Photo) : AlbumDetailIntent
-    data class FavoriteChanged(val photoId: Long, val isFavorite: Boolean) : AlbumDetailIntent
 }
 
 sealed interface AlbumDetailSideEffect {
@@ -83,4 +82,5 @@ sealed interface AlbumDetailSideEffect {
     data class DownloadImages(val imageUrls: List<String>) : AlbumDetailSideEffect
     data object OpenGallery : AlbumDetailSideEffect
     data object RefreshPhotos : AlbumDetailSideEffect
+    data object NotifyResult : AlbumDetailSideEffect
 }

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album_detail/AlbumDetailScreen.kt

@@ -36,6 +36,8 @@ import androidx.paging.compose.itemKey
 import com.neki.android.core.designsystem.ui.theme.NekiTheme
 import com.neki.android.core.model.Photo
 import com.neki.android.core.model.SortOrder
+import com.neki.android.core.navigation.result.LocalResultEventBus
+import com.neki.android.feature.archive.api.AlbumDetailResult
 import com.neki.android.core.ui.component.DoubleButtonOptionBottomSheet
 import com.neki.android.feature.archive.api.ArchiveNavKey
 import com.neki.android.core.ui.component.LoadingDialog
@@ -69,6 +71,7 @@ internal fun AlbumDetailRoute(
     val pagingItems = viewModel.photoPagingData.collectAsLazyPagingItems()
     val context = LocalContext.current
     val nekiToast = remember { NekiToast(context) }
+    val resultEventBus = LocalResultEventBus.current
     val photoPicker = rememberLauncherForActivityResult(ActivityResultContracts.PickMultipleVisualMedia(10)) { uris ->
         if (uris.isNotEmpty()) {
             viewModel.store.onIntent(AlbumDetailIntent.SelectGalleryImage(uris))
@@ -109,6 +112,10 @@ internal fun AlbumDetailRoute(
 
             AlbumDetailSideEffect.OpenGallery -> photoPicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
             AlbumDetailSideEffect.RefreshPhotos -> pagingItems.refresh()
+
+            AlbumDetailSideEffect.NotifyResult -> {
+                resultEventBus.sendResult(result = AlbumDetailResult, allowDuplicate = false)
+            }
         }
     }
 

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album_detail/AlbumDetailViewModel.kt

@@ -143,8 +143,10 @@ class AlbumDetailViewModel @AssistedInject constructor(
             is AlbumDetailIntent.SelectGalleryImage -> uploadMultipleImages(intent.uris, reduce, postSideEffect)
 
             // Result Intent
-            is AlbumDetailIntent.PhotoDeleted -> {
-                deletedPhotoIds.update { it + intent.photoIds.toSet() }
+            AlbumDetailIntent.RefreshPhotos -> {
+                deletedPhotoIds.value = emptySet()
+                updatedFavorites.value = emptyMap()
+                postSideEffect(AlbumDetailSideEffect.RefreshPhotos)
             }
 
             is AlbumDetailIntent.ClickFavoriteIcon -> {
@@ -160,10 +162,6 @@ class AlbumDetailViewModel @AssistedInject constructor(
                 }
             }
 
-            is AlbumDetailIntent.FavoriteChanged -> {
-                updatedFavorites.update { it + (intent.photoId to intent.isFavorite) }
-            }
-
             AlbumDetailIntent.DismissRenameBottomSheet -> reduce {
                 copy(isShowRenameAlbumBottomSheet = false, renameAlbumTextState = TextFieldState())
             }
@@ -196,6 +194,7 @@ class AlbumDetailViewModel @AssistedInject constructor(
                     )
                 }
                 postSideEffect(AlbumDetailSideEffect.ShowToastMessage("앨범 이름을 변경했어요"))
+                postSideEffect(AlbumDetailSideEffect.NotifyResult)
             }.onFailure { e ->
                 Timber.e(e)
                 reduce { copy(isLoading = false) }
@@ -220,6 +219,7 @@ class AlbumDetailViewModel @AssistedInject constructor(
                 reduce { copy(isLoading = false) }
                 postSideEffect(AlbumDetailSideEffect.RefreshPhotos)
                 postSideEffect(AlbumDetailSideEffect.ShowToastMessage("새로운 사진을 추가했어요"))
+                postSideEffect(AlbumDetailSideEffect.NotifyResult)
             }.onFailure { e ->
                 Timber.e(e)
                 postSideEffect(AlbumDetailSideEffect.ShowToastMessage("이미지 업로드에 실패했어요"))
@@ -322,6 +322,7 @@ class AlbumDetailViewModel @AssistedInject constructor(
                         )
                     }
                     postSideEffect(AlbumDetailSideEffect.ShowToastMessage("사진을 삭제했어요"))
+                    postSideEffect(AlbumDetailSideEffect.NotifyResult)
                 }
                 .onFailure { e ->
                     Timber.e(e)
@@ -364,6 +365,7 @@ class AlbumDetailViewModel @AssistedInject constructor(
                         )
                     }
                     postSideEffect(AlbumDetailSideEffect.ShowToastMessage("사진을 삭제했어요"))
+                    postSideEffect(AlbumDetailSideEffect.NotifyResult)
                 }
                 .onFailure { e ->
                     Timber.e(e)

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/main/ArchiveMainContract.kt

@@ -18,7 +18,7 @@ data class ArchiveMainState(
 
 sealed interface ArchiveMainIntent {
     data object EnterArchiveMainScreen : ArchiveMainIntent
-    data object RefreshArchiveMainPhotos : ArchiveMainIntent
+    data object RefreshArchiveMain : ArchiveMainIntent
     data object ClickScreen : ArchiveMainIntent
     data object ClickGoToTopButton : ArchiveMainIntent
 

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/main/ArchiveMainViewModel.kt

@@ -45,7 +45,13 @@ class ArchiveMainViewModel @Inject constructor(
         if (intent != ArchiveMainIntent.EnterArchiveMainScreen) reduce { copy(isFirstEntered = false) }
         when (intent) {
             ArchiveMainIntent.EnterArchiveMainScreen -> fetchInitialData(reduce)
-            ArchiveMainIntent.RefreshArchiveMainPhotos -> viewModelScope.launch { fetchPhotos(reduce) }
+            ArchiveMainIntent.RefreshArchiveMain -> viewModelScope.launch {
+                awaitAll(
+                    async { fetchFavoriteSummary(reduce) },
+                    async { fetchPhotos(reduce) },
+                    async { fetchFolders(reduce) },
+                )
+            }
             ArchiveMainIntent.ClickScreen -> reduce { copy(isFirstEntered = false) }
             ArchiveMainIntent.ClickGoToTopButton -> postSideEffect(ArchiveMainSideEffect.ScrollToTop)