Skip to content

Commit 06d284e

Browse files
committed
[REFACTOR/#23] Scaffold -> Column(코드리뷰 반영)
1 parent 6302f16 commit 06d284e

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

feature/onboarding/src/main/java/com/kms/onboarding/OnBoardingScreen.kt

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package com.kms.onboarding
22

3+
import androidx.compose.foundation.background
34
import androidx.compose.foundation.layout.Box
5+
import androidx.compose.foundation.layout.Column
46
import androidx.compose.foundation.layout.fillMaxSize
5-
import androidx.compose.foundation.layout.padding
6-
import androidx.compose.material3.Scaffold
7+
import androidx.compose.foundation.layout.imePadding
8+
import androidx.compose.foundation.layout.navigationBarsPadding
9+
import androidx.compose.foundation.layout.statusBarsPadding
710
import androidx.compose.runtime.Composable
811
import androidx.compose.runtime.LaunchedEffect
912
import androidx.compose.runtime.getValue
10-
import androidx.compose.ui.Alignment
1113
import androidx.compose.ui.Modifier
1214
import androidx.hilt.navigation.compose.hiltViewModel
1315
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -66,31 +68,31 @@ fun OnboardingScreen(
6668
showTopAppBar: Boolean = true,
6769
content: @Composable () -> Unit,
6870
) {
69-
Scaffold(
70-
topBar = {
71-
if (showTopAppBar) {
72-
OnBoardingTopAppBar(
73-
currentStep = currentStep,
74-
totalSteps = totalSteps,
75-
onBackClick = onBackClick,
76-
)
77-
}
78-
},
79-
bottomBar = {
80-
OnboardingBottomBar(
81-
isButtonEnabled = isButtonEnabled,
82-
onNextClick = onNextClick,
71+
Column(
72+
modifier = Modifier
73+
.fillMaxSize()
74+
.background(OrbitTheme.colors.gray_900)
75+
.statusBarsPadding()
76+
.navigationBarsPadding()
77+
.imePadding(),
78+
) {
79+
if (showTopAppBar) {
80+
OnBoardingTopAppBar(
81+
currentStep = currentStep,
82+
totalSteps = totalSteps,
83+
onBackClick = onBackClick,
8384
)
84-
},
85-
containerColor = OrbitTheme.colors.gray_900,
86-
) { innerPadding ->
85+
}
86+
8787
Box(
88-
modifier = Modifier
89-
.fillMaxSize()
90-
.padding(innerPadding),
91-
contentAlignment = Alignment.TopCenter,
88+
modifier = Modifier.weight(1f),
9289
) {
9390
content()
9491
}
92+
93+
OnboardingBottomBar(
94+
isButtonEnabled = isButtonEnabled,
95+
onNextClick = onNextClick,
96+
)
9597
}
9698
}

0 commit comments

Comments
 (0)