Skip to content

Commit

Permalink
[feat/#21] Eisen 화면 연결
Browse files Browse the repository at this point in the history
  • Loading branch information
imtaejugkim committed Jan 18, 2025
1 parent 301b9ee commit 894b5fe
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 8 deletions.
23 changes: 15 additions & 8 deletions app/src/main/java/org/memento/presentation/main/MainScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -62,10 +63,10 @@ fun MainScreenContent(
) {
Column(
modifier =
Modifier
.fillMaxWidth()
.fillMaxHeight(0.73f)
.imePadding(),
Modifier
.fillMaxWidth()
.fillMaxHeight(0.73f)
.imePadding(),
) {
when (currentBottomSheet) {
BottomSheetType.MAIN ->
Expand All @@ -78,6 +79,9 @@ fun MainScreenContent(
onNavigateTagSetting = {
currentBottomSheet = BottomSheetType.TAG
},
onNavigateEisenSetting = {
currentBottomSheet = BottomSheetType.EISEN
}
)

BottomSheetType.DEADLINE ->
Expand All @@ -98,12 +102,15 @@ fun MainScreenContent(
},
)

BottomSheetType.URGENCY ->
AddToDoDeadLineScreen(
BottomSheetType.EISEN ->
AddToDoEisenScreen(
onClose = { currentBottomSheet = null },
onDone = { },
onDone = {

},
)


null -> {}
}
}
Expand Down Expand Up @@ -139,7 +146,7 @@ enum class BottomSheetType {
MAIN,
DEADLINE,
TAG,
URGENCY,
EISEN
}

@Preview(showBackground = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.memento.presentation.plusbottomsheet

import androidx.compose.runtime.Composable

@Composable
fun AddToDoEisenScreen(
onClose: () -> Unit,
onDone: () -> Unit,
) {
// Eisen 화면 구현
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -91,6 +92,7 @@ fun MainPlusBottomSheet(
tagColor = tagColor,
onNavigateDeadLineSetting = onNavigateDeadLineSetting,
onNavigateTagSetting = onNavigateTagSetting,
onNavigateEisenHourSetting = onNavigateEisenSetting
)

1 -> AddPlanScreen()
Expand All @@ -101,6 +103,7 @@ fun MainPlusBottomSheet(
tagColor = tagColor,
onNavigateDeadLineSetting = onNavigateDeadLineSetting,
onNavigateTagSetting = onNavigateTagSetting,
onNavigateEisenHourSetting = onNavigateEisenSetting
)
}
}
Expand Down

0 comments on commit 894b5fe

Please sign in to comment.