[CHORE] #112 : 관리 페이지 설문 목록 하단 Margin 추가

pknu-wap · Feb 6, 2024 · 47291b6 · 47291b6
1 parent 7c41c14
commit 47291b6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -117,7 +117,7 @@ private fun handleBottomBarState(
     attendanceManagementNavigationRoute -> setBottomBarState(false)
     ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
-    SurveyRoute.answerRoute("{id}") ->setBottomBarState(false)
+    SurveyRoute.answerRoute("{id}") -> setBottomBarState(false)
     else -> setBottomBarState(true)
 }
 

diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt
@@ -1,6 +1,7 @@
-
 package com.wap.wapp.feature.management
 
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Scaffold
@@ -15,6 +16,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
@@ -44,11 +46,17 @@ internal fun ManagementRoute(
 
         viewModel.userRole.collectLatest { userRoleUiState ->
             when (userRoleUiState) {
-                is ManagementViewModel.UserRoleUiState.Init -> { }
+                is ManagementViewModel.UserRoleUiState.Init -> {}
                 is ManagementViewModel.UserRoleUiState.Success -> {
                     when (userRoleUiState.userRole) {
-                        UserRole.GUEST -> { showGuestScreen = true }
-                        UserRole.MEMBER -> { showValidationScreen = true }
+                        UserRole.GUEST -> {
+                            showGuestScreen = true
+                        }
+
+                        UserRole.MEMBER -> {
+                            showValidationScreen = true
+                        }
+
                         UserRole.MANAGER -> viewModel.getEventSurveyList()
                     }
                 }
@@ -101,6 +109,7 @@ internal fun ManagementScreen(
     Scaffold(
         containerColor = WappTheme.colors.backgroundBlack,
         snackbarHost = { SnackbarHost(snackBarHostState) },
+        contentWindowInsets = WindowInsets(0.dp),
         topBar = {
             WappLeftMainTopBar(
                 titleRes = R.string.management,
@@ -109,7 +118,9 @@ internal fun ManagementScreen(
         },
     ) { paddingValues ->
         LazyColumn(
-            modifier = Modifier.padding(paddingValues),
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize(),
         ) {
             item {
                 ManagementEventCard(

diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementSurveyCard.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementSurveyCard.kt
@@ -44,7 +44,7 @@ internal fun ManagementSurveyCard(
             containerColor = WappTheme.colors.black25,
         ),
         modifier = Modifier
-            .padding(top = 20.dp)
+            .padding(vertical = 20.dp)
             .padding(horizontal = 8.dp),
     ) {
         Column(