[FEAT/#206] paddingValues 적용

teamterning · Sep 4, 2024 · 2c3ac87 · 2c3ac87
1 parent d0f394c
commit 2c3ac87
Show file tree

Hide file tree

Showing 15 changed files with 134 additions and 57 deletions.
diff --git a/feature/src/main/java/com/terning/feature/filtering/filtering/FilteringOneScreen.kt b/feature/src/main/java/com/terning/feature/filtering/filtering/FilteringOneScreen.kt
@@ -1,6 +1,8 @@
 package com.terning.feature.filtering.filtering
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -21,6 +23,7 @@ import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
 import com.terning.feature.R
 import com.terning.feature.filtering.filtering.component.StatusOneRadioGroup
 
@@ -30,6 +33,7 @@ fun FilteringOneScreen(
     onNextClick: (Int) -> Unit,
     navigateUp: () -> Unit,
     modifier: Modifier = Modifier,
+    paddingValues: PaddingValues = PaddingValues(),
     onButtonClick: (Int) -> Unit = {},
 ) {
     val isButtonValid = remember { mutableStateOf(false) }
@@ -38,6 +42,8 @@ fun FilteringOneScreen(
 
     Column(
         modifier = modifier
+            .padding(paddingValues)
+            .background(White)
     ) {
         BackButtonTopAppBar(
             onBackButtonClick = { navigateUp() }

diff --git a/feature/src/main/java/com/terning/feature/filtering/filtering/FilteringThreeRoute.kt b/feature/src/main/java/com/terning/feature/filtering/filtering/FilteringThreeRoute.kt
@@ -1,6 +1,8 @@
 package com.terning.feature.filtering.filtering
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -26,6 +28,7 @@ import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
 import com.terning.core.extension.toast
 import com.terning.feature.R
 import java.util.Calendar
@@ -37,6 +40,7 @@ fun FilteringThreeRoute(
     navigateUp: () -> Unit,
     navigateToStartHome: () -> Unit,
     viewModel: FilteringViewModel = hiltViewModel(),
+    paddingValues: PaddingValues
 ) {
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
@@ -68,6 +72,7 @@ fun FilteringThreeRoute(
     }
 
     FilteringThreeScreen(
+        paddingValues = paddingValues,
         navigateUp = { navigateUp() },
         chosenYear = chosenYear,
         chosenMonth = chosenMonth,
@@ -80,6 +85,7 @@ fun FilteringThreeRoute(
 @Composable
 fun FilteringThreeScreen(
     modifier: Modifier = Modifier,
+    paddingValues: PaddingValues = PaddingValues(),
     navigateUp: () -> Unit,
     chosenYear: Int,
     chosenMonth: Int,
@@ -88,7 +94,9 @@ fun FilteringThreeScreen(
     onNextClick: () -> Unit,
 ) {
     Column(
-        modifier = modifier,
+        modifier = modifier
+            .padding(paddingValues)
+            .background(White),
     ) {
         BackButtonTopAppBar(
             onBackButtonClick = { navigateUp() }

diff --git a/feature/src/main/java/com/terning/feature/filtering/filtering/FilteringTwoScreen.kt b/feature/src/main/java/com/terning/feature/filtering/filtering/FilteringTwoScreen.kt
@@ -1,6 +1,8 @@
 package com.terning.feature.filtering.filtering
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -21,6 +23,7 @@ import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
 import com.terning.feature.R
 import com.terning.feature.filtering.filtering.component.StatusTwoRadioGroup
 
@@ -30,6 +33,7 @@ fun FilteringTwoScreen(
     onNextClick: (Int, Int) -> Unit,
     navigateUp: () -> Unit,
     modifier: Modifier = Modifier,
+    paddingValues: PaddingValues = PaddingValues(),
     onButtonClick: (Int) -> Unit = {},
 ) {
     val isButtonValid = remember { mutableStateOf(false) }
@@ -38,6 +42,8 @@ fun FilteringTwoScreen(
 
     Column(
         modifier = modifier
+            .padding(paddingValues)
+            .background(White)
     ) {
         BackButtonTopAppBar(
             onBackButtonClick = { navigateUp() }

diff --git a/...rc/main/java/com/terning/feature/filtering/filtering/navigation/FilteringOneNavigation.kt b/...rc/main/java/com/terning/feature/filtering/filtering/navigation/FilteringOneNavigation.kt
@@ -1,5 +1,6 @@
 package com.terning.feature.filtering.filtering.navigation
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -21,11 +22,13 @@ fun NavController.navigateFilteringOne(
 }
 
 fun NavGraphBuilder.filteringOneNavGraph(
+    paddingValues: PaddingValues,
     navHostController: NavHostController
 ) {
     composable<FilteringOne> {
         val args = it.toRoute<FilteringOne>()
         FilteringOneScreen(
+            paddingValues = paddingValues,
             name = args.name,
             onNextClick = { grade -> navHostController.navigateFilteringTwo(grade) },
             navigateUp = { navHostController.navigateUp() }

diff --git a/.../main/java/com/terning/feature/filtering/filtering/navigation/FilteringThreeNavigation.kt b/.../main/java/com/terning/feature/filtering/filtering/navigation/FilteringThreeNavigation.kt
@@ -1,5 +1,6 @@
 package com.terning.feature.filtering.filtering.navigation
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -23,11 +24,13 @@ fun NavController.navigateFilteringThree(
 }
 
 fun NavGraphBuilder.filteringThreeNavGraph(
+    paddingValues: PaddingValues,
     navHostController: NavHostController
 ) {
     composable<FilteringThree> {
         val args = it.toRoute<FilteringThree>()
         FilteringThreeRoute(
+            paddingValues = paddingValues,
             grade = args.grade,
             workingPeriod = args.workingPeriod,
             navigateUp = { navHostController.navigateUp() },

diff --git a/...rc/main/java/com/terning/feature/filtering/filtering/navigation/FilteringTwoNavigation.kt b/...rc/main/java/com/terning/feature/filtering/filtering/navigation/FilteringTwoNavigation.kt
@@ -1,5 +1,6 @@
 package com.terning.feature.filtering.filtering.navigation
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -21,11 +22,13 @@ fun NavController.navigateFilteringTwo(
 }
 
 fun NavGraphBuilder.filteringTwoNavGraph(
+    paddingValues: PaddingValues,
     navHostController: NavHostController
 ) {
     composable<FilteringTwo> {
         val args = it.toRoute<FilteringTwo>()
         FilteringTwoScreen(
+            paddingValues = paddingValues,
             grade = args.grade,
             onNextClick = { _, workingPeriod ->
                 navHostController.navigateFilteringThree(

diff --git a/feature/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringScreen.kt b/feature/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringScreen.kt
@@ -2,8 +2,10 @@ package com.terning.feature.filtering.startfiltering
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -27,12 +29,14 @@ import com.terning.core.designsystem.component.button.RectangleButton
 import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
 import com.terning.feature.R
 import kotlinx.coroutines.delay
 
 @Composable
 fun StartFilteringScreen(
     modifier: Modifier = Modifier,
+    paddingValues: PaddingValues = PaddingValues(),
     onNextClick: () -> Unit
 ) {
     var isVisible by remember { mutableStateOf(false) }
@@ -46,7 +50,10 @@ fun StartFilteringScreen(
     }
 
     Box(
-        modifier = modifier.fillMaxSize()
+        modifier = modifier
+            .fillMaxSize()
+            .padding(paddingValues)
+            .background(White)
     ) {
         Column(
             modifier = Modifier.fillMaxSize(),

diff --git a/.../java/com/terning/feature/filtering/startfiltering/navigation/StartFilteringNavigation.kt b/.../java/com/terning/feature/filtering/startfiltering/navigation/StartFilteringNavigation.kt
@@ -1,5 +1,6 @@
 package com.terning.feature.filtering.startfiltering.navigation
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -22,11 +23,13 @@ fun NavController.navigateStartFiltering(
 }
 
 fun NavGraphBuilder.startFilteringNavGraph(
+    paddingValues: PaddingValues,
     navHostController: NavHostController
 ) {
     composable<StartFiltering> {
         val args = it.toRoute<StartFiltering>()
         StartFilteringScreen(
+            paddingValues = paddingValues,
             onNextClick = {
                 navHostController.navigateFilteringOne(args.name)
             }

diff --git a/feature/src/main/java/com/terning/feature/filtering/starthome/StartHomeScreen.kt b/feature/src/main/java/com/terning/feature/filtering/starthome/StartHomeScreen.kt
@@ -2,8 +2,10 @@ package com.terning.feature.filtering.starthome
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
@@ -24,26 +26,21 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
-import androidx.navigation.NavOptions
-import androidx.navigation.compose.rememberNavController
 import com.airbnb.lottie.compose.LottieAnimation
 import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.LottieConstants
 import com.airbnb.lottie.compose.rememberLottieComposition
 import com.terning.core.designsystem.component.button.RectangleButton
 import com.terning.core.designsystem.theme.TerningPointTheme
 import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
 import com.terning.feature.R
-import com.terning.feature.home.home.navigation.navigateHome
-import com.terning.feature.main.MainNavigator
-import com.terning.feature.main.rememberMainNavigator
-import com.terning.feature.onboarding.signin.navigation.SignIn
 import kotlinx.coroutines.delay
 
 @Composable
 fun StartHomeScreen(
     modifier: Modifier = Modifier,
+    paddingValues: PaddingValues = PaddingValues(),
     navigateToHome: () -> Unit
 ) {
     var isVisible by remember { mutableStateOf(false) }
@@ -57,7 +54,10 @@ fun StartHomeScreen(
     }
 
     Box(
-        modifier = modifier.fillMaxSize()
+        modifier = modifier
+            .fillMaxSize()
+            .padding(paddingValues)
+            .background(White)
     ) {
         Column(
             modifier = Modifier.fillMaxSize(),
@@ -95,7 +95,7 @@ fun StartHomeScreen(
     }
 }
 
-private const val DELAY : Long = 1000
+private const val DELAY: Long = 1000
 
 @Composable
 fun StartHomeLottieAnimation(

diff --git a/...e/src/main/java/com/terning/feature/filtering/starthome/navigation/StartHomeNavigation.kt b/...e/src/main/java/com/terning/feature/filtering/starthome/navigation/StartHomeNavigation.kt
@@ -2,6 +2,7 @@ package com.terning.feature.filtering.starthome.navigation
 
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -21,6 +22,7 @@ fun NavController.navigateStartHome(navOptions: NavOptions? = null) {
 }
 
 fun NavGraphBuilder.startHomeNavGraph(
+    paddingValues: PaddingValues,
     navHostController: NavHostController
 ) {
     composable<StartHome>(
@@ -37,14 +39,16 @@ fun NavGraphBuilder.startHomeNavGraph(
             ExitTransition.None
         }
     ) {
-        StartHomeScreen(navigateToHome = {
-            navHostController.navigateHome(
-                navOptions = NavOptions.Builder().setPopUpTo(
-                    route = SignIn,
-                    inclusive = true
-                ).build()
-            )
-        }
+        StartHomeScreen(
+            paddingValues = paddingValues,
+            navigateToHome = {
+                navHostController.navigateHome(
+                    navOptions = NavOptions.Builder().setPopUpTo(
+                        route = SignIn,
+                        inclusive = true
+                    ).build()
+                )
+            }
         )
     }
 }