File tree Expand file tree Collapse file tree
core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block
presentation/src/main/java/com/threegap/bitnagil/presentation Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.RowScope
77import androidx.compose.foundation.layout.fillMaxWidth
88import androidx.compose.foundation.layout.height
99import androidx.compose.foundation.layout.padding
10- import androidx.compose.foundation.layout.systemBarsPadding
1110import androidx.compose.material3.HorizontalDivider
1211import androidx.compose.material3.Text
1312import androidx.compose.runtime.Composable
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Spacer
88import androidx.compose.foundation.layout.fillMaxSize
99import androidx.compose.foundation.layout.height
1010import androidx.compose.foundation.layout.padding
11+ import androidx.compose.foundation.layout.statusBarsPadding
1112import androidx.compose.foundation.lazy.grid.GridCells
1213import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
1314import androidx.compose.foundation.lazy.grid.items
@@ -59,6 +60,7 @@ private fun EmotionScreen(
5960 Column (
6061 modifier = Modifier
6162 .fillMaxSize()
63+ .statusBarsPadding()
6264 .background(color = BitnagilTheme .colors.white),
6365 horizontalAlignment = Alignment .CenterHorizontally ,
6466 ) {
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
99import androidx.compose.foundation.layout.fillMaxWidth
1010import androidx.compose.foundation.layout.height
1111import androidx.compose.foundation.layout.padding
12- import androidx.compose.foundation.layout.systemBarsPadding
12+ import androidx.compose.foundation.layout.statusBarsPadding
1313import androidx.compose.material3.Text
1414import androidx.compose.runtime.Composable
1515import androidx.compose.ui.Alignment
@@ -61,8 +61,8 @@ private fun IntroScreen(
6161 horizontalAlignment = Alignment .CenterHorizontally ,
6262 modifier = modifier
6363 .fillMaxSize()
64- .background( BitnagilTheme .colors.white )
65- .systemBarsPadding( ),
64+ .statusBarsPadding( )
65+ .background( BitnagilTheme .colors.white ),
6666 ) {
6767 Spacer (modifier = Modifier .height(screenHeight * 0.0748f ))
6868
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize
1111import androidx.compose.foundation.layout.fillMaxWidth
1212import androidx.compose.foundation.layout.height
1313import androidx.compose.foundation.layout.padding
14- import androidx.compose.foundation.layout.systemBarsPadding
14+ import androidx.compose.foundation.layout.statusBarsPadding
1515import androidx.compose.foundation.shape.RoundedCornerShape
1616import androidx.compose.material3.Text
1717import androidx.compose.runtime.Composable
@@ -83,8 +83,8 @@ private fun LoginScreen(
8383 horizontalAlignment = Alignment .CenterHorizontally ,
8484 modifier = modifier
8585 .fillMaxSize()
86- .background( BitnagilTheme .colors.white )
87- .systemBarsPadding( ),
86+ .statusBarsPadding( )
87+ .background( BitnagilTheme .colors.white ),
8888 ) {
8989 Spacer (modifier = Modifier .height(screenHeight * 0.0748f ))
9090
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
88import androidx.compose.foundation.layout.height
99import androidx.compose.foundation.layout.padding
1010import androidx.compose.foundation.layout.size
11+ import androidx.compose.foundation.layout.statusBarsPadding
1112import androidx.compose.foundation.shape.CircleShape
1213import androidx.compose.material3.HorizontalDivider
1314import androidx.compose.material3.Text
@@ -60,7 +61,8 @@ private fun MyPageScreen(
6061 Column (
6162 modifier = Modifier
6263 .fillMaxSize()
63- .background(color = BitnagilTheme .colors.white),
64+ .background(color = BitnagilTheme .colors.white)
65+ .statusBarsPadding(),
6466 horizontalAlignment = Alignment .CenterHorizontally ,
6567 ) {
6668 BitnagilTopBar (
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package com.threegap.bitnagil.presentation.onboarding
33import androidx.compose.foundation.background
44import androidx.compose.foundation.layout.Box
55import androidx.compose.foundation.layout.Column
6+ import androidx.compose.foundation.layout.statusBarsPadding
67import androidx.compose.runtime.Composable
78import androidx.compose.runtime.collectAsState
89import androidx.compose.runtime.getValue
@@ -64,6 +65,7 @@ private fun OnBoardingScreen(
6465) {
6566 Column (
6667 modifier = Modifier
68+ .statusBarsPadding()
6769 .background(BitnagilTheme .colors.coolGray99),
6870 ) {
6971 BitnagilProgressTopBar (
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1212import androidx.compose.foundation.layout.height
1313import androidx.compose.foundation.layout.padding
1414import androidx.compose.foundation.layout.size
15+ import androidx.compose.foundation.layout.statusBarsPadding
1516import androidx.compose.foundation.lazy.LazyColumn
1617import androidx.compose.foundation.lazy.LazyRow
1718import androidx.compose.foundation.lazy.items
@@ -81,7 +82,8 @@ private fun RecommendRoutineScreen(
8182 Column (
8283 modifier = Modifier
8384 .fillMaxSize()
84- .background(BitnagilTheme .colors.white),
85+ .background(BitnagilTheme .colors.white)
86+ .statusBarsPadding(),
8587 ) {
8688 BitnagilTopBar (title = " 추천 루틴" )
8789
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize
1010import androidx.compose.foundation.layout.fillMaxWidth
1111import androidx.compose.foundation.layout.height
1212import androidx.compose.foundation.layout.padding
13+ import androidx.compose.foundation.layout.statusBarsPadding
1314import androidx.compose.foundation.rememberScrollState
1415import androidx.compose.foundation.shape.RoundedCornerShape
1516import androidx.compose.foundation.verticalScroll
@@ -85,6 +86,7 @@ private fun SettingScreen(
8586 Column (
8687 modifier = Modifier
8788 .fillMaxSize()
89+ .statusBarsPadding()
8890 .background(color = BitnagilTheme .colors.white),
8991 ) {
9092 BitnagilTopBar (
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
77import androidx.compose.foundation.layout.fillMaxWidth
88import androidx.compose.foundation.layout.height
99import androidx.compose.foundation.layout.padding
10+ import androidx.compose.foundation.layout.statusBarsPadding
1011import androidx.compose.material3.Text
1112import androidx.compose.runtime.Composable
1213import androidx.compose.runtime.getValue
@@ -100,6 +101,7 @@ private fun TermsAgreementScreen(
100101 Column (
101102 modifier = modifier
102103 .fillMaxSize()
104+ .statusBarsPadding()
103105 .background(BitnagilTheme .colors.white),
104106 ) {
105107 BitnagilTopBar (
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import android.webkit.WebViewClient
88import androidx.compose.foundation.background
99import androidx.compose.foundation.layout.Column
1010import androidx.compose.foundation.layout.fillMaxSize
11+ import androidx.compose.foundation.layout.statusBarsPadding
1112import androidx.compose.runtime.Composable
1213import androidx.compose.runtime.DisposableEffect
1314import androidx.compose.runtime.remember
@@ -63,6 +64,7 @@ fun BitnagilWebViewScreen(
6364 Column (
6465 modifier = modifier
6566 .fillMaxSize()
67+ .statusBarsPadding()
6668 .background(BitnagilTheme .colors.white),
6769 ) {
6870 BitnagilTopBar (
You can’t perform that action at this time.
0 commit comments