[feat] 오늘 할 일 뷰 구현

app/src/main/java/org/android/bbangzip/domain/model/ToDoCardEntity.kt

@@ -0,0 +1,13 @@
+package org.android.bbangzip.domain.model
+
+data class ToDoCardEntity(
+    val pieceId: Int,
+    val subjectName: String = "",
+    val examName: String = "",
+    val studyContents: String,
+    val startPage: Int,
+    val finishPage: Int,
+    val deadline: String,
+    val remainingDays: Int,
+    val isFinished: Boolean = false,
+)

app/src/main/java/org/android/bbangzip/domain/model/ToDoInfoEntity.kt

@@ -0,0 +1,8 @@
+package org.android.bbangzip.domain.model
+
+data class ToDoInfoEntity(
+    val todoList: List<ToDoCardEntity>,
+    val pendingCount: Int,
+    val remainingStudyCount: Int,
+    val completeCount: Int,
+)

app/src/main/java/org/android/bbangzip/presentation/component/balloon/BalloonContainer.kt

@@ -34,7 +34,7 @@ fun BalloonContainer(
                 .padding(horizontal = 16.dp, vertical = 8.dp),
         contentAlignment = Alignment.Center,
     ) {
-        Row {
+        Row(verticalAlignment = Alignment.CenterVertically) {
             leadingIcon()
 
             Text(

app/src/main/java/org/android/bbangzip/presentation/component/bottomsheet/BbangZipBasicModalBottomSheet.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.SheetState
@@ -38,6 +39,7 @@ fun BbangZipBasicModalBottomSheet(
         ModalBottomSheet(
             onDismissRequest = onDismissRequest,
             sheetState = sheetState,
+            dragHandle = { BottomSheetDefaults.DragHandle(color = BbangZipTheme.colors.interactionInactive_D4D3D1) },
             shape = RoundedCornerShape(topStart = 48.dp, topEnd = 48.dp),
             containerColor = BbangZipTheme.colors.backgroundNormal_FFFFFF,
             scrimColor = BbangZipTheme.colors.materialDimmer_282119_52,

app/src/main/java/org/android/bbangzip/presentation/component/button/BbangZipButton.kt

@@ -83,14 +83,15 @@ fun BbangZipButton(
             )
         },
         trailingIcon = {
+            Spacer(modifier = Modifier.width(bbangZipButtonSize.spacing))
+
             if (trailingIcon != null) {
                 Icon(
                     imageVector = ImageVector.vectorResource(trailingIcon),
                     modifier = Modifier.size(size = bbangZipButtonSize.iconSize),
                     contentDescription = null,
                     tint = contentColor,
                 )
-                Spacer(modifier = Modifier.width(bbangZipButtonSize.spacing))
             }
         },
     )

app/src/main/java/org/android/bbangzip/presentation/component/card/ToDoCard.kt

@@ -33,12 +33,11 @@ import org.android.bbangzip.ui.theme.BbangZipTheme
 
 @Composable
 fun ToDoCard(
-    state: BbangZipCardState,
     data: ToDoCardModel,
     modifier: Modifier = Modifier,
-    isDeleted: Boolean = false,
     onClick: () -> Unit = {},
 ) {
+    val state = data.cardState
     val radius = state.getRadius()
     val infoOpacity = state.getInfoOpacity()
     Box(
@@ -60,9 +59,9 @@ fun ToDoCard(
                 )
                 .applyFilterOnClick(
                     baseColor = state.getBackgroundColor(),
-                    isDisabled = isDeleted,
+                    isDisabled = false,
                     radius = radius,
-                ) { if (!isDeleted) onClick() }
+                ) { onClick() }
                 .padding(horizontal = 16.dp, vertical = 10.dp),
     ) {
         Row(
@@ -105,9 +104,9 @@ fun ToDoInfo(
 
     val chipBackgroundColor =
         if (data.remainingDays >= 0) {
-            getColor(BbangZipTheme.colors.labelAlternative_282119_61)
-        } else {
             getColor(BbangZipTheme.colors.statusDestructive_FF8345)
+        } else {
+            getColor(BbangZipTheme.colors.labelAlternative_282119_61)
         }
 
     Column(modifier = modifier) {
@@ -196,7 +195,6 @@ fun ToDoCardPreview() {
     BBANGZIPTheme {
         Column {
             ToDoCard(
-                state = BbangZipCardState.DEFAULT,
                 data =
                     ToDoCardModel(
                         subjectName = "경제통계학개론",
@@ -205,15 +203,15 @@ fun ToDoCardPreview() {
                         startPage = 36,
                         finishPage = 60,
                         deadline = "2025년 4월 25일",
-                        pieceId = "1",
+                        pieceId = 1,
                         remainingDays = 1,
+                        cardState = BbangZipCardState.DEFAULT,
                     ),
                 modifier =
                     Modifier
                         .padding(16.dp),
             )
             ToDoCard(
-                state = BbangZipCardState.CHECKABLE,
                 data =
                     ToDoCardModel(
                         subjectName = "경제통계학개론",
@@ -222,15 +220,15 @@ fun ToDoCardPreview() {
                         startPage = 36,
                         finishPage = 60,
                         deadline = "2025년 4월 25일",
-                        pieceId = "1",
+                        pieceId = 1,
                         remainingDays = 1,
+                        cardState = BbangZipCardState.CHECKED,
                     ),
                 modifier =
                     Modifier
                         .padding(16.dp),
             )
             ToDoCard(
-                state = BbangZipCardState.CHECKED,
                 data =
                     ToDoCardModel(
                         subjectName = "",
@@ -239,15 +237,15 @@ fun ToDoCardPreview() {
                         startPage = 36,
                         finishPage = 60,
                         deadline = "2025년 4월 25일",
-                        pieceId = "1",
+                        pieceId = 1,
                         remainingDays = 1,
+                        cardState = BbangZipCardState.CHECKABLE,
                     ),
                 modifier =
                     Modifier
                         .padding(16.dp),
             )
             ToDoCard(
-                state = BbangZipCardState.COMPLETE,
                 data =
                     ToDoCardModel(
                         subjectName = "경제통계학개론",
@@ -256,8 +254,9 @@ fun ToDoCardPreview() {
                         startPage = 36,
                         finishPage = 60,
                         deadline = "2025년 4월 25일",
-                        pieceId = "1",
+                        pieceId = 1,
                         remainingDays = 1,
+                        cardState = BbangZipCardState.COMPLETE,
                     ),
                 modifier =
                     Modifier

app/src/main/java/org/android/bbangzip/presentation/model/card/ToDoCardModel.kt

@@ -2,15 +2,17 @@ package org.android.bbangzip.presentation.model.card
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.android.bbangzip.presentation.component.card.BbangZipCardState
 
 @Parcelize
 data class ToDoCardModel(
-    val pieceId: String,
+    val pieceId: Int,
     val subjectName: String,
     val examName: String,
     val studyContents: String,
     val startPage: Int,
     val finishPage: Int,
     val deadline: String,
     val remainingDays: Int,
+    val cardState: BbangZipCardState,
 ) : Parcelable

app/src/main/java/org/android/bbangzip/presentation/type/BbangZipButtonType.kt

@@ -24,7 +24,7 @@ sealed class BbangZipButtonType(
     )
 
     data object Outlined : BbangZipButtonType(
-        enableBackgroundColor = defaultBbangZipColors.staticWhite_FFFFFF,
+        enableBackgroundColor = Color.Transparent,
         enableContentColor = defaultBbangZipColors.primaryNormal_282119,
         enableBorderColor = defaultBbangZipColors.lineStrong_68645E_52,
         disableBackgroundColor = Color.Unspecified,

app/src/main/java/org/android/bbangzip/presentation/type/BbangZipCardType.kt

@@ -19,19 +19,19 @@ enum class BbangZipCardType(
         backgroundColor = defaultBbangZipColors.backgroundNormal_FFFFFF,
         borderColor = defaultBbangZipColors.lineAlternative_68645E_08,
         borderWidth = 1.dp,
-        shadowOptions = BbangZipShadowType.EMPHASIZE,
+        shadowOptions = BbangZipShadowType.NORMAL,
     ),
     CHECKABLE(
         backgroundColor = defaultBbangZipColors.backgroundAlternative_F5F5F5,
         borderColor = defaultBbangZipColors.lineAlternative_68645E_08,
         borderWidth = 1.dp,
-        shadowOptions = BbangZipShadowType.STRONG,
+        shadowOptions = BbangZipShadowType.EMPHASIZE,
     ),
     CHECKED(
         backgroundColor = defaultBbangZipColors.backgroundAlternative_F5F5F5,
         borderColor = defaultBbangZipColors.lineStrong_68645E_52,
-        borderWidth = 3.dp,
-        shadowOptions = BbangZipShadowType.EMPHASIZE,
+        borderWidth = 2.dp,
+        shadowOptions = BbangZipShadowType.NORMAL,
     ),
     COMPLETE(
         backgroundColor = defaultBbangZipColors.backgroundNormal_FFFFFF,

app/src/main/java/org/android/bbangzip/presentation/type/ToDoFilterType.kt

@@ -0,0 +1,19 @@
+package org.android.bbangzip.presentation.type
+
+enum class ToDoFilterType(
+    val filter: String,
+    val id: String,
+) {
+    RECENT(
+        filter = "최근 등록 순",
+        id = "recent",
+    ),
+    VOLUME(
+        filter = "분량 적은 순",
+        id = "leastVolume",
+    ),
+    DEADLINE(
+        filter = "마감 기한 빠른 순",
+        id = "nearestDeadline",
+    ),
+}

app/src/main/java/org/android/bbangzip/presentation/type/ToDoScreenType.kt

@@ -0,0 +1,7 @@
+package org.android.bbangzip.presentation.type
+
+enum class ToDoScreenType {
+    EMPTY,
+    DEFAULT,
+    DELETE,
+}

app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt

@@ -20,7 +20,9 @@ import org.android.bbangzip.presentation.ui.onboarding.navigation.onboardingNavG
 import org.android.bbangzip.presentation.ui.onboarding.navigation.onboardingStartNavGraph
 import org.android.bbangzip.presentation.ui.subject.navigateSubject
 import org.android.bbangzip.presentation.ui.subject.subjectNavGraph
-import org.android.bbangzip.presentation.ui.todo.todoNavGraph
+import org.android.bbangzip.presentation.ui.todo.navigation.todoNavGraph
+import org.android.bbangzip.presentation.ui.todo.pendingtodoadd.navigation.todoAddPendingNavGraph
+import org.android.bbangzip.presentation.ui.todo.todoadd.navigation.todoAddNavGraph
 import org.android.bbangzip.ui.theme.BbangZipTheme
 
 @Composable
@@ -60,13 +62,30 @@ fun MainNavHost(
                 navigateToSubject = { navigator.navHostController.navigateSubject() },
             )
 
+            todoAddNavGraph(
+                snackBarHostState = snackBarHostState,
+                navigateToBack = { navigator.popBackStackIfNotSubject() },
+                navigateToToDo = { navigator.popBackStackIfNotSubject() },
+            )
+
+            todoAddPendingNavGraph(
+                snackBarHostState = snackBarHostState,
+                navigateToBack = { navigator.popBackStackIfNotSubject() },
+                navigateToToDo = { navigator.popBackStackIfNotSubject() },
+            )
+
             friendNavGraph()
 
             myNavGraph()
 
             subjectNavGraph()
 
-            todoNavGraph()
+            todoNavGraph(
+                snackBarHostState = snackBarHostState,
+                bottomPadding = padding,
+                navigateToAddToDo = { navigator.navigateToToDoAdd() },
+                navigateToAddPendingToDo = { navigator.navigateToToDoAddPending() },
+            )
         }
     }
 }

app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavigator.kt

@@ -19,7 +19,9 @@ import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboar
 import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboardingEnd
 import org.android.bbangzip.presentation.ui.onboarding.navigation.navigateOnboardingStart
 import org.android.bbangzip.presentation.ui.subject.navigateSubject
-import org.android.bbangzip.presentation.ui.todo.navigateTodo
+import org.android.bbangzip.presentation.ui.todo.navigation.navigateTodo
+import org.android.bbangzip.presentation.ui.todo.pendingtodoadd.navigation.navigateTodoAddPending
+import org.android.bbangzip.presentation.ui.todo.todoadd.navigation.navigateTodoAdd
 import timber.log.Timber
 
 class MainNavigator(
@@ -77,6 +79,14 @@ class MainNavigator(
         navHostController.navigateOnboardingEnd()
     }
 
+    fun navigateToToDoAdd() {
+        navHostController.navigateTodoAdd()
+    }
+
+    fun navigateToToDoAddPending() {
+        navHostController.navigateTodoAddPending()
+    }
+
     private fun popBackStack() {
         navHostController.popBackStack()
     }

app/src/main/java/org/android/bbangzip/presentation/ui/navigator/component/BottomNavigationBar.kt

@@ -30,8 +30,9 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import okhttp3.internal.toImmutableList
 import org.android.bbangzip.R
+import org.android.bbangzip.presentation.type.BbangZipShadowType
 import org.android.bbangzip.presentation.type.BottomNavigationType
-import org.android.bbangzip.presentation.util.modifier.dropShadow
+import org.android.bbangzip.presentation.util.modifier.applyShadows
 import org.android.bbangzip.presentation.util.modifier.noRippleClickable
 import org.android.bbangzip.ui.theme.BBANGZIPTheme
 import org.android.bbangzip.ui.theme.BbangZipTheme
@@ -52,12 +53,12 @@ fun BottomNavigationBar(
         Box(
             modifier =
                 modifier
-                    .fillMaxWidth()
-                    .background(color = Color.Transparent)
-                    .dropShadow(
-                        offsetY = (-4).dp,
+                    .applyShadows(
+                        shadowType = BbangZipShadowType.EMPHASIZE_INVERSE,
                         shape = RoundedCornerShape(topStart = 32.dp, topEnd = 32.dp),
-                    ),
+                    )
+                    .fillMaxWidth()
+                    .background(color = Color.Transparent),
         ) {
             Row(
                 modifier =