|
1 | 1 | package com.kms.onboarding |
2 | 2 |
|
| 3 | +import androidx.compose.foundation.background |
3 | 4 | import androidx.compose.foundation.layout.Box |
| 5 | +import androidx.compose.foundation.layout.Column |
4 | 6 | 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 |
7 | 10 | import androidx.compose.runtime.Composable |
8 | 11 | import androidx.compose.runtime.LaunchedEffect |
9 | 12 | import androidx.compose.runtime.getValue |
10 | | -import androidx.compose.ui.Alignment |
11 | 13 | import androidx.compose.ui.Modifier |
12 | 14 | import androidx.hilt.navigation.compose.hiltViewModel |
13 | 15 | import androidx.lifecycle.compose.collectAsStateWithLifecycle |
@@ -66,31 +68,31 @@ fun OnboardingScreen( |
66 | 68 | showTopAppBar: Boolean = true, |
67 | 69 | content: @Composable () -> Unit, |
68 | 70 | ) { |
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, |
83 | 84 | ) |
84 | | - }, |
85 | | - containerColor = OrbitTheme.colors.gray_900, |
86 | | - ) { innerPadding -> |
| 85 | + } |
| 86 | + |
87 | 87 | Box( |
88 | | - modifier = Modifier |
89 | | - .fillMaxSize() |
90 | | - .padding(innerPadding), |
91 | | - contentAlignment = Alignment.TopCenter, |
| 88 | + modifier = Modifier.weight(1f), |
92 | 89 | ) { |
93 | 90 | content() |
94 | 91 | } |
| 92 | + |
| 93 | + OnboardingBottomBar( |
| 94 | + isButtonEnabled = isButtonEnabled, |
| 95 | + onNextClick = onNextClick, |
| 96 | + ) |
95 | 97 | } |
96 | 98 | } |
0 commit comments