[feat] #72 SubjectDetailScreen에서 SubjectScreen 뒤로가기 처리

SOPT-all · Jan 24, 2025 · bbb1e0d · bbb1e0d
1 parent bf47145
commit bbb1e0d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt
@@ -144,9 +144,10 @@ fun MainNavHost(
                 navigateToAddToDo = { navigator.navigateToToDoAdd() },
                 navigateToAddPendingToDo = { navigator.navigateToToDoAddPending() },
             )
+
             subjectDetailNavGraph(
                 padding = padding,
-                navigateToBack = { navigator.popBackStackIfNotSubject() },
+                popBackStack = { navigator.popBackStackIfNotSubject() },
                 navigateToModifyMotivation = { id, name -> navigator.navigateToModifyMotivationMessage(id, name) },
                 navigateToModifySubjectName = { id, name -> navigator.navigateToModifySubjectName(id, name) },
                 navigateToAddStudy = { splitStudyData -> navigator.navigateToAddStudy(splitStudyData) },

diff --git a/.../java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailContract.kt b/.../java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailContract.kt
@@ -240,5 +240,7 @@ class SubjectDetailContract {
 
         // 공부 n개가 삭제 되었어요
         data object ShowDeleteSuccessSnackBar : SubjectDetailSideEffect
+
+        data object PopBackStack: SubjectDetailSideEffect
     }
 }
diff --git a/...ava/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailNavigation.kt b/...ava/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailNavigation.kt
@@ -23,7 +23,7 @@ fun NavController.navigateToSubjectDetail(
 
 fun NavGraphBuilder.subjectDetailNavGraph(
     padding: PaddingValues,
-    navigateToBack: () -> Unit = {},
+    popBackStack: () -> Unit = {},
     navigateToModifyMotivation: (Int, String) -> Unit = { _, _ -> },
     navigateToModifySubjectName: (Int, String) -> Unit = { _, _ -> },
     navigateToAddStudy: (SplitStudyData) -> Unit = {},
@@ -33,7 +33,7 @@ fun NavGraphBuilder.subjectDetailNavGraph(
             padding = padding,
             subjectId = backStackEntry.toRoute<SubjectDetailRoute>().subjectId,
             subjectName = backStackEntry.toRoute<SubjectDetailRoute>().subjectName,
-            navigateToBack = navigateToBack,
+            popBackStack = popBackStack,
             navigateToModifyMotivation = navigateToModifyMotivation,
             navigateToModifySubjectName = navigateToModifySubjectName,
             navigateToAddStudy = navigateToAddStudy,

diff --git a/...ain/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailRoute.kt b/...ain/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailRoute.kt
@@ -21,7 +21,7 @@ fun SubjectDetailRoute(
     padding: PaddingValues,
     subjectId: Int,
     subjectName: String,
-    navigateToBack: () -> Unit,
+    popBackStack: () -> Unit,
     navigateToModifyMotivation: (Int, String) -> Unit,
     navigateToModifySubjectName: (Int, String) -> Unit,
     navigateToAddStudy: (SplitStudyData) -> Unit,
@@ -52,6 +52,10 @@ fun SubjectDetailRoute(
                 is SubjectDetailContract.SubjectDetailSideEffect.NavigateToModifySubjectName -> {
                     navigateToModifySubjectName(effect.subjectId, effect.subjectName)
                 }
+
+                is SubjectDetailContract.SubjectDetailSideEffect.PopBackStack -> {
+                    popBackStack()
+                }
             }
         }
     }

diff --git a/...java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailViewModel.kt b/...java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailViewModel.kt
@@ -104,7 +104,7 @@ class SubjectDetailViewModel
                 }
 
                 is SubjectDetailContract.SubjectDetailEvent.OnClickGetBadgeBottomSheetCloseBtn -> {
-                    updateState(SubjectDetailContract.SubjectDetailReduce.UpdateGetBadgeBottomSheetState(getBadgeBottomSheetState = !currentUiState.getBadgeBottomSheetState))
+                    updateState(SubjectDetailContract.SubjectDetailReduce.UpdateGetBadgeBottomSheetState(getBadgeBottomSheetState = false))
                 }
             }
         }

diff --git a/...n/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetatilScreen.kt b/...n/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetatilScreen.kt
@@ -324,12 +324,14 @@ fun SubjectDetailScreen(
             onClickCancelButton = onRevertCompleteBottomSheetDismissButtonClicked,
         )
 
-        BbangZipGetBadgeBottomSheet(
-            badgeList = state.badgeList,
-            isBottomSheetVisible = state.getBadgeBottomSheetState,
-            onDismissRequest = { onClickBadgeCloseBtn() },
-            onClickCancelButton = { onClickCancleBtn() }
-        )
+        if (state.badgeList.isNotEmpty()) {
+            BbangZipGetBadgeBottomSheet(
+                badgeList = state.badgeList,
+                isBottomSheetVisible = state.getBadgeBottomSheetState,
+                onDismissRequest = { onClickBadgeCloseBtn() },
+                onClickCancelButton = { onClickBadgeCloseBtn() }
+            )
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,7 +104,7 @@ class SubjectDetailViewModel @@
                     }
                     is SubjectDetailContract.SubjectDetailEvent.OnClickGetBadgeBottomSheetCloseBtn -> {
-                        updateState(SubjectDetailContract.SubjectDetailReduce.UpdateGetBadgeBottomSheetState(getBadgeBottomSheetState = !currentUiState.getBadgeBottomSheetState))
+                        updateState(SubjectDetailContract.SubjectDetailReduce.UpdateGetBadgeBottomSheetState(getBadgeBottomSheetState = false))
                     }
                 }
             }
@@ Expand Down @@