Merge branch 'develop' into feature/jaino/#95

pknu-wap · Feb 13, 2024 · 282df0e · 282df0e
2 parents b7b9a2e + dadd9ab
commit 282df0e
Show file tree

Hide file tree

Showing 17 changed files with 158 additions and 104 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -21,6 +21,7 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
 }

diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -1,23 +1,22 @@
 package com.wap.wapp
 
+import android.content.res.Resources
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
@@ -51,9 +50,10 @@ class MainActivity : ComponentActivity() {
         setContent {
             WappTheme {
                 val navController = rememberNavController()
+                val density = LocalDensity.current
+                val navigationBarHeight = getNavigationBarHeight(density)
 
                 Scaffold(
-                    modifier = Modifier.fillMaxSize(),
                     containerColor = WappTheme.colors.backgroundBlack,
                     bottomBar = {
                         val navBackStackEntry by
@@ -69,11 +69,6 @@ class MainActivity : ComponentActivity() {
                             },
                         )
 
-                        val systemBars = WindowInsets.systemBars
-                        val density = LocalDensity.current
-                        val bottomPadding =
-                            remember { with(density) { systemBars.getBottom(this).toDp() } }
-
                         WappBottomBar(
                             currentRoute = currentRoute,
                             bottomBarState = bottomBarState,
@@ -83,11 +78,12 @@ class MainActivity : ComponentActivity() {
                                     destination,
                                 )
                             },
-                            modifier = Modifier
-                                .padding(bottom = bottomPadding)
-                                .height(70.dp),
+                            modifier = Modifier.height(70.dp),
                         )
                     },
+                    modifier = Modifier
+                        .padding(bottom = navigationBarHeight)
+                        .fillMaxSize(),
                 ) { innerPadding ->
                     WappNavHost(
                         signInUseCase = signInUseCase,
@@ -118,7 +114,7 @@ private fun handleBottomBarState(
     ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
     ManagementSurveyRoute.surveyFormEditRoute("{id}") -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
-    SurveyRoute.answerRoute("{id}") ->setBottomBarState(false)
+    SurveyRoute.answerRoute("{id}") -> setBottomBarState(false)
     else -> setBottomBarState(true)
 }
 
@@ -134,3 +130,15 @@ private fun navigateToTopLevelDestination(
         restoreState = true
     }
 }
+
+private fun getNavigationBarHeight(density: Density) = with(density) {
+    Resources.getSystem().run {
+        getDimensionPixelSize(
+            getIdentifier(
+                "navigation_bar_height",
+                "dimen",
+                "android",
+            ),
+        ).toDp()
+    }
+}
diff --git a/core/designsystem/src/main/java/com/wap/designsystem/component/SubTopBar.kt b/core/designsystem/src/main/java/com/wap/designsystem/component/SubTopBar.kt
@@ -97,7 +97,7 @@ fun WappSubTopBarWithRightButton() {
             WappSubTopBar(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(16.dp),
+                    .padding(vertical = 16.dp),
                 titleRes = R.string.notice,
                 showRightButton = true,
             )
@@ -115,7 +115,7 @@ fun WappSubTopBarWithLeftButton() {
             WappSubTopBar(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(16.dp),
+                    .padding(vertical = 16.dp),
                 titleRes = R.string.notice,
                 showLeftButton = true,
             )
@@ -133,7 +133,7 @@ fun WappSubTopBarWithBothButton() {
             WappSubTopBar(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(16.dp),
+                    .padding(vertical = 16.dp),
                 titleRes = R.string.notice,
                 showRightButton = true,
                 showLeftButton = true,

diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt
@@ -86,9 +86,7 @@ internal fun SignUpScreen(
                 .padding(horizontal = 16.dp),
         ) {
             WappSubTopBar(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 16.dp),
+                modifier = Modifier.fillMaxWidth(),
                 titleRes = string.sign_up,
                 showLeftButton = true,
                 onClickLeftButton = { navigateToSignIn() },

diff --git a/...agement-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt b/...agement-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt
@@ -175,7 +175,7 @@ internal fun EventEditScreen(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(paddingValues)
-                .padding(16.dp),
+                .padding(vertical = 16.dp),
         ) {
             WappSubTopBar(
                 titleRes = R.string.event_edit,
@@ -187,12 +187,12 @@ internal fun EventEditScreen(
 
             EventEditStateIndicator(
                 eventRegistrationState = currentEditState,
-                modifier = Modifier.padding(top = 16.dp),
+                modifier = Modifier.padding(top = 16.dp, start = 20.dp, end = 20.dp),
             )
 
             EventRegistrationContent(
                 eventRegistrationState = currentEditState,
-                modifier = Modifier.padding(top = 50.dp),
+                modifier = Modifier.padding(top = 50.dp, start = 20.dp, end = 20.dp),
                 eventTitle = title,
                 eventContent = content,
                 location = location,

diff --git a/.../main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt b/.../main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt
@@ -165,7 +165,7 @@ private fun EventDetailsContent(
         WappButton(
             onClick = onNextButtonClicked,
             textRes = R.string.next,
-            modifier = Modifier.padding(vertical = 20.dp),
+            modifier = Modifier.padding(top = 20.dp),
         )
     }
 }
@@ -311,7 +311,6 @@ private fun EventScheduleContent(
         WappButton(
             onClick = onRegisterButtonClicked,
             textRes = R.string.register_event,
-            modifier = Modifier.padding(bottom = 20.dp),
         )
     }
 }
diff --git a/...c/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt b/...c/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt
@@ -149,7 +149,6 @@ internal fun EventRegistrationScreen(
                 titleRes = R.string.event_registration,
                 showLeftButton = true,
                 onClickLeftButton = onBackButtonClicked,
-                modifier = Modifier.padding(start = 10.dp),
             )
 
             EventRegistrationStateIndicator(

diff --git a/...t-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormStateIndicator.kt b/...t-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormStateIndicator.kt
@@ -18,10 +18,12 @@ import com.wap.designsystem.WappTheme
 @Composable
 internal fun SurveyFormStateIndicator(
     surveyRegistrationState: SurveyFormState,
+    modifier: Modifier = Modifier,
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = modifier,
     ) {
         SurveyRegistrationStateProgressBar(surveyRegistrationState.progress)
         SurveyRegistrationStateText(surveyRegistrationState.page)

diff --git a/.../java/com/wap/wapp/feature/management/survey/registration/SurveyFormRegistrationScreen.kt b/.../java/com/wap/wapp/feature/management/survey/registration/SurveyFormRegistrationScreen.kt
@@ -97,6 +97,7 @@ internal fun SurveyRegistrationScreen(
         ) {
             SurveyFormStateIndicator(
                 surveyRegistrationState = currentRegistrationState,
+                modifier = Modifier.padding(horizontal = 20.dp),
             )
 
             SurveyFormContent(

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,6 @@
-
 package com.wap.wapp.feature.management
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Scaffold
@@ -15,6 +15,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,7 +45,7 @@ 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 }
@@ -56,9 +57,7 @@ internal fun ManagementRoute(
         }
 
         viewModel.errorFlow.collectLatest { throwable ->
-            snackBarHostState.showSnackbar(
-                message = throwable.toSupportingText(),
-            )
+            snackBarHostState.showSnackbar(message = throwable.toSupportingText())
         }
     }
 
@@ -101,16 +100,15 @@ internal fun ManagementScreen(
     Scaffold(
         containerColor = WappTheme.colors.backgroundBlack,
         snackbarHost = { SnackbarHost(snackBarHostState) },
+        contentWindowInsets = WindowInsets(0.dp),
         topBar = {
             WappLeftMainTopBar(
                 titleRes = R.string.management,
                 contentRes = R.string.management_content,
             )
         },
     ) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier.padding(paddingValues),
-        ) {
+        LazyColumn(modifier = Modifier.padding(paddingValues)) {
             item {
                 ManagementEventCard(
                     eventsState = eventsState,

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(