feat: 받은 봉투 -> 해당 장부 상세 화면 이동

YAPP-Github · May 15, 2024 · 3c433a9 · 3c433a9
1 parent e960887
commit 3c433a9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/...ceived/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddContract.kt b/...ceived/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddContract.kt
@@ -1,6 +1,8 @@
 package com.susu.feature.received.envelopeadd
 
 import androidx.annotation.StringRes
+import com.susu.core.model.Envelope
+import com.susu.core.model.Ledger
 import com.susu.core.ui.base.SideEffect
 import com.susu.core.ui.base.UiState
 import com.susu.feature.received.R
@@ -37,7 +39,7 @@ enum class EnvelopeAddStep(
 sealed interface ReceivedEnvelopeAddSideEffect : SideEffect {
     data class ShowSnackbar(val message: String) : ReceivedEnvelopeAddSideEffect
     data object PopBackStack : ReceivedEnvelopeAddSideEffect
-    data class PopBackStackWithEnvelope(val envelope: String) : ReceivedEnvelopeAddSideEffect
+    data class NavigateEnvelopeDetail(val envelope: Envelope, val ledger: Ledger) : ReceivedEnvelopeAddSideEffect
     data class HandleException(val throwable: Throwable, val retry: () -> Unit) : ReceivedEnvelopeAddSideEffect
     data class LogClickNextButton(val step: EnvelopeAddStep) : ReceivedEnvelopeAddSideEffect
     data class LogClickBackButton(val step: EnvelopeAddStep) : ReceivedEnvelopeAddSideEffect

diff --git a/...received/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddScreen.kt b/...received/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddScreen.kt
@@ -29,6 +29,8 @@ import com.susu.core.designsystem.component.button.MediumButtonStyle
 import com.susu.core.designsystem.component.button.SusuFilledButton
 import com.susu.core.designsystem.component.screen.LoadingScreen
 import com.susu.core.designsystem.theme.SusuTheme
+import com.susu.core.model.Envelope
+import com.susu.core.model.Ledger
 import com.susu.core.model.Relationship
 import com.susu.core.ui.SnackbarToken
 import com.susu.core.ui.extension.collectWithLifecycle
@@ -50,7 +52,7 @@ import java.time.LocalDateTime
 fun ReceivedEnvelopeAddRoute(
     viewModel: ReceivedEnvelopeAddViewModel = hiltViewModel(),
     popBackStack: () -> Unit,
-    popBackStackWithEnvelope: (String) -> Unit,
+    navigateEnvelopeDetail: (Envelope, Ledger) -> Unit,
     onShowSnackbar: (SnackbarToken) -> Unit,
     handleException: (Throwable, () -> Unit) -> Unit,
 ) {
@@ -64,7 +66,7 @@ fun ReceivedEnvelopeAddRoute(
             is ReceivedEnvelopeAddSideEffect.HandleException -> handleException(sideEffect.throwable, sideEffect.retry)
             ReceivedEnvelopeAddSideEffect.PopBackStack -> popBackStack()
             is ReceivedEnvelopeAddSideEffect.ShowSnackbar -> onShowSnackbar(SnackbarToken(message = sideEffect.message))
-            is ReceivedEnvelopeAddSideEffect.PopBackStackWithEnvelope -> popBackStackWithEnvelope(sideEffect.envelope)
+            is ReceivedEnvelopeAddSideEffect.NavigateEnvelopeDetail -> navigateEnvelopeDetail(sideEffect.envelope, sideEffect.ledger)
             is ReceivedEnvelopeAddSideEffect.LogClickBackButton -> scope.launch {
                 FirebaseAnalytics.getInstance(context).logEvent(
                     FirebaseAnalytics.Event.SELECT_CONTENT,

diff --git a/...eived/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddViewModel.kt b/...eived/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddViewModel.kt
@@ -66,8 +66,8 @@ class ReceivedEnvelopeAddViewModel @Inject constructor(
                 handedOverAt = date!!.toKotlinLocalDateTime(),
                 hasVisited = hasVisited,
             ),
-        ).onSuccess {
-            postSideEffect(ReceivedEnvelopeAddSideEffect.PopBackStackWithEnvelope(Json.encodeToUri(it)))
+        ).onSuccess { envelope ->
+            postSideEffect(ReceivedEnvelopeAddSideEffect.NavigateEnvelopeDetail(envelope, ledger))
         }.onFailure { throwable ->
             when (throwable) {
                 is AlreadyRegisteredFriendPhoneNumberException -> postSideEffect(ReceivedEnvelopeAddSideEffect.ShowSnackbar(throwable.message))

diff --git a/feature/received/src/main/java/com/susu/feature/received/navigation/ReceivedNavigation.kt b/feature/received/src/main/java/com/susu/feature/received/navigation/ReceivedNavigation.kt
@@ -172,7 +172,10 @@ fun NavGraphBuilder.receivedNavGraph(
         ReceivedEnvelopeAddRoute(
             popBackStack = popBackStack,
             onShowSnackbar = onShowSnackbar,
-            popBackStackWithEnvelope = popBackStackWithEnvelope,
+            navigateEnvelopeDetail = { envelope, ledger ->
+                popBackStackWithEnvelope(Json.encodeToUri(envelope))
+                navigateEnvelopeDetail(envelope, ledger)
+            },
             handleException = handleException,
         )
     }