[FIX] #61 : 관리 화면에서 추가 화면 navigate 빼먹은거 수정

pknu-wap · Dec 6, 2023 · 07f59e4 · 07f59e4
1 parent cef1650
commit 07f59e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt
@@ -16,6 +16,8 @@ import com.wap.wapp.feature.management.check.navigation.surveyCheckScreen
 import com.wap.wapp.feature.management.navigation.managementScreen
 import com.wap.wapp.feature.management.navigation.navigateToManagement
 import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationScreen
+import com.wap.wapp.feature.management.registration.event.navigation.navigateToEventRegistration
+import com.wap.wapp.feature.management.registration.survey.navigation.navigateToSurveyRegistration
 import com.wap.wapp.feature.management.registration.survey.navigation.surveyRegistrationScreen
 import com.wap.wapp.feature.notice.navigation.navigateToNotice
 import com.wap.wapp.feature.notice.navigation.noticeScreen
@@ -69,6 +71,9 @@ fun WappNavHost(
         profileScreen(
             navigateToProfileSetting = { navController.navigateToProfileSetting() },
         )
-        managementScreen()
+        managementScreen(
+            navigateToSurveyRegistration = { navController.navigateToSurveyRegistration() },
+            navigateToEventRegistration = { navController.navigateToEventRegistration() },
+        )
     }
 }
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt
@@ -28,7 +28,8 @@ class ManagementViewModel @Inject constructor(
     private val _errorFlow: MutableSharedFlow<Throwable> = MutableSharedFlow()
     val errorFlow: SharedFlow<Throwable> = _errorFlow.asSharedFlow()
 
-    private val _managerState: MutableStateFlow<ManagerState> = MutableStateFlow(ManagerState.Init)
+    //for test
+    private val _managerState: MutableStateFlow<ManagerState> = MutableStateFlow(ManagerState.Manager)
     val managerState: StateFlow<ManagerState> = _managerState.asStateFlow()
 
     private val _surveyList: MutableStateFlow<List<Survey>> = MutableStateFlow(emptyList())

diff --git a/...nagement/src/main/java/com/wap/wapp/feature/management/navigation/ManagementNavigation.kt b/...nagement/src/main/java/com/wap/wapp/feature/management/navigation/ManagementNavigation.kt
@@ -14,8 +14,8 @@ fun NavController.navigateToManagement(navOptions: NavOptions? = navOptions {})
 }
 
 fun NavGraphBuilder.managementScreen(
-    navigateToEventRegistration: () -> Unit = {},
-    navigateToSurveyRegistration: () -> Unit = {},
+    navigateToEventRegistration: () -> Unit,
+    navigateToSurveyRegistration: () -> Unit,
     showToast: (String) -> Unit = {},
 ) {
     composable(route = managementNavigationRoute) {

diff --git a/.../main/java/com/wap/wapp/feature/management/registration/event/EventRegistrationContent.kt b/.../main/java/com/wap/wapp/feature/management/registration/event/EventRegistrationContent.kt
@@ -72,12 +72,13 @@ private fun EventDetailsContent(
         title = stringResource(id = R.string.event_details_title),
         content = stringResource(id = R.string.event_details_content),
     )
-    Box(modifier = Modifier.fillMaxSize()) {
+    Column(modifier = Modifier.fillMaxSize()) {
         Column(
             verticalArrangement = Arrangement.spacedBy(10.dp),
             modifier = Modifier
+                .fillMaxSize()
                 .padding(top = 50.dp)
-                .align(Alignment.TopCenter),
+                .weight(1f),
         ) {
             Text(
                 text = stringResource(R.string.event_title),
@@ -112,9 +113,7 @@ private fun EventDetailsContent(
         WappButton(
             onClick = onNextButtonClicked,
             textRes = R.string.next,
-            modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .padding(bottom = 20.dp),
+            modifier = Modifier.padding(bottom = 20.dp),
         )
     }
 }