[feat] #72 AddStudyScreen에서 SubjectDetailScreen으로 이동

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

Hide file tree

Showing 5 changed files with 16 additions and 6 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
@@ -117,6 +117,7 @@ fun MainNavHost(
 
             addStudyNavGraph(
                 padding = padding,
+                popBackStack = { navigator.popBackStackIfNotSubject() },
                 navigateSplitStudy = { navigator.navigateToSplitStudy(it) },
             )
 

diff --git a/...src/main/java/org/android/bbangzip/presentation/ui/subject/addstudy/AddStudyNavigation.kt b/...src/main/java/org/android/bbangzip/presentation/ui/subject/addstudy/AddStudyNavigation.kt
@@ -24,13 +24,15 @@ fun NavController.navigateAddStudy(
 
 fun NavGraphBuilder.addStudyNavGraph(
     padding: PaddingValues,
+    popBackStack: () -> Unit,
     navigateSplitStudy: (AddStudyData) -> Unit,
 ) {
     composable<AddStudyRoute>(
         typeMap = mapOf(typeOf<SplitStudyData>() to SplitStudyDataType),
     ) {
         AddStudyRoute(
             padding = padding,
+            popBackStack = popBackStack,
             navigateSplitStudy = navigateSplitStudy,
             splitStudyData = it.toRoute<AddStudyRoute>().splitStudyData,
         )

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/subject/addstudy/AddStudyRoute.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/subject/addstudy/AddStudyRoute.kt
@@ -13,6 +13,7 @@ import org.android.bbangzip.presentation.model.SplitStudyData
 @Composable
 fun AddStudyRoute(
     padding: PaddingValues,
+    popBackStack: () -> Unit,
     splitStudyData: SplitStudyData,
     viewModel: AddStudyViewModel = hiltViewModel(),
     navigateSplitStudy: (AddStudyData) -> Unit = {},

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/subject/addstudy/AddStudyScreen.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/subject/addstudy/AddStudyScreen.kt
@@ -78,6 +78,7 @@ fun AddStudyScreen(
     onClickCancleIcon: () -> Unit = {},
     onClickConfirmDateBtn: () -> Unit = {},
     onClickAgainSplitBtn: (Int) -> Unit = {},
+    popBackStack: () -> Unit
 ) {
     val focusManager = LocalFocusManager.current
 
@@ -93,7 +94,9 @@ fun AddStudyScreen(
         BbangZipBaseTopBar(
             leadingIcon = R.drawable.ic_chevronleft_thick_small_24,
             title = subjectTitle,
+            onLeadingIconClick = popBackStack
         )
+
         Column(
             modifier =
                 Modifier
@@ -392,5 +395,6 @@ fun AddStudyScreenPreview() {
         padding = PaddingValues(),
         selectedDate = Date("2025", "1", "21"),
         pieceNumber = 3,
+        popBackStack = {}
     )
 }
diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/todo/TodoScreen.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/todo/TodoScreen.kt
@@ -272,12 +272,14 @@ fun TodoScreen(
             onDismissRequest = onFilterBottomSheetDismissRequest,
         )
 
-        BbangZipGetBadgeBottomSheet(
-            badgeList = todoState.badgeList,
-            isBottomSheetVisible = todoState.getBadgeBottomSheetState,
-            onDismissRequest = { onClickBadgeCloseBtn() },
-            onClickCancelButton = { onClickBadgeCloseBtn() }
-        )
+        if (todoState.badgeList.isNotEmpty()) {
+            BbangZipGetBadgeBottomSheet(
+                badgeList = todoState.badgeList,
+                isBottomSheetVisible = todoState.getBadgeBottomSheetState,
+                onDismissRequest = { onClickBadgeCloseBtn() },
+                onClickCancelButton = { onClickBadgeCloseBtn() }
+            )
+        }
     }
 }