From 894b5fe962b67d56744414ea6c6364f35583e85e Mon Sep 17 00:00:00 2001 From: TaejungKim Date: Sun, 19 Jan 2025 02:27:39 +0900 Subject: [PATCH] =?UTF-8?q?[feat/#21]=20Eisen=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../memento/presentation/main/MainScreen.kt | 23 ++++++++++++------- .../plusbottomsheet/AddToDoEisenScreen.kt | 11 +++++++++ .../plusbottomsheet/MainPlusBottomSheet.kt | 3 +++ 3 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/org/memento/presentation/plusbottomsheet/AddToDoEisenScreen.kt diff --git a/app/src/main/java/org/memento/presentation/main/MainScreen.kt b/app/src/main/java/org/memento/presentation/main/MainScreen.kt index 9a85a2a..8d03cbc 100644 --- a/app/src/main/java/org/memento/presentation/main/MainScreen.kt +++ b/app/src/main/java/org/memento/presentation/main/MainScreen.kt @@ -26,6 +26,7 @@ import org.memento.presentation.navigator.component.MainBottomBar import org.memento.presentation.navigator.component.MainNavHost import org.memento.presentation.navigator.rememberMainNavigator import org.memento.presentation.plusbottomsheet.AddToDoDeadLineScreen +import org.memento.presentation.plusbottomsheet.AddToDoEisenScreen import org.memento.presentation.plusbottomsheet.AddToDoTagScreen import org.memento.presentation.plusbottomsheet.MainPlusBottomSheet import org.memento.ui.theme.darkModeColors @@ -62,10 +63,10 @@ fun MainScreenContent( ) { Column( modifier = - Modifier - .fillMaxWidth() - .fillMaxHeight(0.73f) - .imePadding(), + Modifier + .fillMaxWidth() + .fillMaxHeight(0.73f) + .imePadding(), ) { when (currentBottomSheet) { BottomSheetType.MAIN -> @@ -78,6 +79,9 @@ fun MainScreenContent( onNavigateTagSetting = { currentBottomSheet = BottomSheetType.TAG }, + onNavigateEisenSetting = { + currentBottomSheet = BottomSheetType.EISEN + } ) BottomSheetType.DEADLINE -> @@ -98,12 +102,15 @@ fun MainScreenContent( }, ) - BottomSheetType.URGENCY -> - AddToDoDeadLineScreen( + BottomSheetType.EISEN -> + AddToDoEisenScreen( onClose = { currentBottomSheet = null }, - onDone = { }, + onDone = { + + }, ) + null -> {} } } @@ -139,7 +146,7 @@ enum class BottomSheetType { MAIN, DEADLINE, TAG, - URGENCY, + EISEN } @Preview(showBackground = true) diff --git a/app/src/main/java/org/memento/presentation/plusbottomsheet/AddToDoEisenScreen.kt b/app/src/main/java/org/memento/presentation/plusbottomsheet/AddToDoEisenScreen.kt new file mode 100644 index 0000000..ce96f98 --- /dev/null +++ b/app/src/main/java/org/memento/presentation/plusbottomsheet/AddToDoEisenScreen.kt @@ -0,0 +1,11 @@ +package org.memento.presentation.plusbottomsheet + +import androidx.compose.runtime.Composable + +@Composable +fun AddToDoEisenScreen( + onClose: () -> Unit, + onDone: () -> Unit, +) { + // Eisen 화면 구현 +} \ No newline at end of file diff --git a/app/src/main/java/org/memento/presentation/plusbottomsheet/MainPlusBottomSheet.kt b/app/src/main/java/org/memento/presentation/plusbottomsheet/MainPlusBottomSheet.kt index 13dc16d..77e4ce9 100644 --- a/app/src/main/java/org/memento/presentation/plusbottomsheet/MainPlusBottomSheet.kt +++ b/app/src/main/java/org/memento/presentation/plusbottomsheet/MainPlusBottomSheet.kt @@ -28,6 +28,7 @@ fun MainPlusBottomSheet( deadLineText: String, onNavigateDeadLineSetting: () -> Unit, onNavigateTagSetting: () -> Unit, + onNavigateEisenSetting: () -> Unit ) { val pages = listOf(R.drawable.ic_check_tab, R.drawable.ic_calendar_tab, R.drawable.ic_brain_tab) val pagerState = @@ -91,6 +92,7 @@ fun MainPlusBottomSheet( tagColor = tagColor, onNavigateDeadLineSetting = onNavigateDeadLineSetting, onNavigateTagSetting = onNavigateTagSetting, + onNavigateEisenHourSetting = onNavigateEisenSetting ) 1 -> AddPlanScreen() @@ -101,6 +103,7 @@ fun MainPlusBottomSheet( tagColor = tagColor, onNavigateDeadLineSetting = onNavigateDeadLineSetting, onNavigateTagSetting = onNavigateTagSetting, + onNavigateEisenHourSetting = onNavigateEisenSetting ) } }