Feature/Create Approve NightStudy

common/src/commonMain/kotlin/com/b1nd/dodam/common/utiles/Utiles.kt

@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.joinAll
+import kotlinx.datetime.LocalDate
 
 fun <T1, T2, R> combineWhenAllComplete(flow1: Flow<T1>, flow2: Flow<T2>, transform: suspend (T1, T2) -> R): Flow<R> = flow {
     var lastValue1: T1? = null
@@ -28,3 +29,7 @@ fun <T1, T2, R> combineWhenAllComplete(flow1: Flow<T1>, flow2: Flow<T2>, transfo
     // 두 Flow가 모두 종료되었을 때 마지막 값으로 변환 작업 수행
     emit(transform(lastValue1!!, lastValue2!!))
 }
+
+fun getDate(date: LocalDate): String {
+    return "${date.monthNumber}월 ${date.dayOfMonth}일"
+}

dodam-teacher-android/build.gradle.kts

@@ -34,6 +34,7 @@ kotlin {
             implementation(projects.feature.meal)
             implementation(projects.featureTeacher.outing)
             implementation(projects.featureTeacher.approveOuting)
+            implementation(projects.featureTeacher.approveNightstudy)
             implementation(projects.featureTeacher.point)
             implementation(projects.featureTeacher.all)
             implementation(projects.feature.setting)

dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/DodamTeacherApp.kt

@@ -38,6 +38,8 @@ import coil3.request.crossfade
 import coil3.util.DebugLogger
 import com.b1nd.dodam.all.navigation.ALL_ROUTE
 import com.b1nd.dodam.all.navigation.allScreen
+import com.b1nd.dodam.approvenightstudy.approveNightStudyScreen
+import com.b1nd.dodam.approvenightstudy.navigateToApproveNightStudy
 import com.b1nd.dodam.approveouting.approveOutingScreen
 import com.b1nd.dodam.approveouting.navigateToApproveOuting
 import com.b1nd.dodam.designsystem.DodamTheme
@@ -59,7 +61,6 @@ import com.b1nd.dodam.onboarding.navigation.ONBOARDING_ROUTE
 import com.b1nd.dodam.onboarding.navigation.navigateToOnboarding
 import com.b1nd.dodam.onboarding.navigation.onboardingScreen
 import com.b1nd.dodam.outing.navigation.OUTING_ROUTE
-import com.b1nd.dodam.outing.navigation.navigateToOuting
 import com.b1nd.dodam.outing.navigation.outingScreen
 import com.b1nd.dodam.point.navigation.navigateToPoint
 import com.b1nd.dodam.point.navigation.pointScreen
@@ -162,7 +163,9 @@ fun DodamTeacherApp(exit: () -> Unit, viewModel: DodamTeacherAppViewModel = koin
                             role = "TEACHER",
                         )
 
-                        nightStudyScreen()
+                        nightStudyScreen(
+                            navigateToApproveStudy = navHostController::navigateToApproveNightStudy,
+                        )
                         homeScreen(
                             navigateToMeal = {
                                 navHostController.navigationToMeal(
@@ -175,28 +178,17 @@ fun DodamTeacherApp(exit: () -> Unit, viewModel: DodamTeacherAppViewModel = koin
                                     },
                                 )
                             },
-                            navigateToOuting = {
-                                navHostController.navigateToOuting(
-                                    navOptions = navOptions {
-                                        popUpTo(navHostController.graph.findStartDestination().route.toString()) {
-                                            saveState = true
-                                        }
-                                        launchSingleTop = true
-                                        restoreState = true
-                                    },
+                            navigateToOut = {
+                                navHostController.navigateToApproveOuting(
+                                    title = 0,
                                 )
                             },
-                            navigateToNightStudy = {
-                                navHostController.navigateToNightStudy(
-                                    navOptions = navOptions {
-                                        popUpTo(navHostController.graph.findStartDestination().route.toString()) {
-                                            saveState = true
-                                        }
-                                        launchSingleTop = true
-                                        restoreState = true
-                                    },
+                            navigateToSleep = {
+                                navHostController.navigateToApproveOuting(
+                                    title = 1,
                                 )
                             },
+                            navigateToNightStudy = navHostController::navigateToApproveNightStudy,
                         )
 
                         mealScreen()
@@ -207,19 +199,27 @@ fun DodamTeacherApp(exit: () -> Unit, viewModel: DodamTeacherAppViewModel = koin
                         )
                         mealScreen()
                         outingScreen(
-                            navHostController::navigateToApproveOuting,
+                            navigateToApprove = { title ->
+                                navHostController.navigateToApproveOuting(
+                                    title = title,
+                                )
+                            },
                         )
                         approveOutingScreen(
                             onBackClick = navHostController::popBackStack,
                         )
 
                         allScreen(
                             navigateToSetting = navHostController::navigateToSetting,
-                            navigateToOut = {},
-                            navigateToNightStudy = {},
+                            navigateToOut = navHostController::navigateToApproveOuting,
+                            navigateToNightStudy = navHostController::navigateToApproveNightStudy,
                             navigateToPoint = navHostController::navigateToPoint,
                         )
 
+                        approveNightStudyScreen(
+                            onBackClick = navHostController::popBackStack,
+                        )
+
                         settingScreen(
                             popBackStack = navHostController::popBackStack,
                             logout = exit,
@@ -260,7 +260,14 @@ fun DodamTeacherApp(exit: () -> Unit, viewModel: DodamTeacherAppViewModel = koin
 private fun DodamTeacherBottomNavigation(modifier: Modifier = Modifier, backStackEntry: NavBackStackEntry?, onClick: (destination: String) -> Unit) {
     val route = backStackEntry?.destination?.route
 
-    if (route != null && route in listOf(HOME_ROUTE, MEAL_ROUTE, NIGHT_STUDY_ROUTE, ALL_ROUTE, OUTING_ROUTE)) {
+    if (route != null && route in listOf(
+            HOME_ROUTE,
+            MEAL_ROUTE,
+            NIGHT_STUDY_ROUTE,
+            ALL_ROUTE,
+            OUTING_ROUTE,
+        )
+    ) {
         DodamNavigationBar(
             modifier = modifier,
             items = persistentListOf(

dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/Koin.kt

@@ -1,6 +1,7 @@
 package com.b1nd.dodam.teacher
 
 import com.b1nd.dodam.all.di.allViewModelModule
+import com.b1nd.dodam.approvenightstudy.approveNightStudyViewModelModule
 import com.b1nd.dodam.approveouting.approveOutingViewModelModule
 import com.b1nd.dodam.common.network.di.coroutineScopeModule
 import com.b1nd.dodam.common.network.di.dispatchersModule
@@ -71,6 +72,7 @@ fun initKoin(block: KoinApplication.() -> Unit = {}) {
             outingViewModelModule,
             approveOutingViewModelModule,
             allViewModelModule,
+            approveNightStudyViewModelModule,
             settingViewModelModule,
         )
         block()

feature-teacher/approve-nightstudy/.gitignore

@@ -0,0 +1 @@
+/build

feature-teacher/approve-nightstudy/build.gradle.kts

@@ -0,0 +1,59 @@
+import com.b1nd.dodam.dsl.androidLibrary
+import com.b1nd.dodam.dsl.setIOS
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.dodam.multiplatform.feature)
+    alias(libs.plugins.dodam.multiplatform.koin)
+    alias(libs.plugins.dodam.multiplatform.kotlin.serialization)
+}
+
+
+kotlin{
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
+        }
+    }
+    setIOS(
+        name = "ApproveNightStudy",
+        bundleId = "com.b1nd.dodam.approve_nightstudy"
+    )
+
+    sourceSets{
+        commonMain.dependencies {
+            implementation(projects.common)
+            api(projects.data.nightStudy)
+            implementation(libs.dodam.design.system.cmm)
+            implementation(projects.ui)
+        }
+    }
+}
+
+
+androidLibrary {
+    namespace = "com.b1nd.dodam.approve_nightstudy"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    buildFeatures {
+        compose = true
+    }
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    composeCompiler {
+        enableStrongSkippingMode = true
+
+        reportsDestination = layout.buildDirectory.dir("compose_compiler")
+        stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
+    }
+}
+
+