Skip to content

Commit 4877f78

Browse files
authored
Merge pull request #84 from YAPP-Github/ui/#82-status_bar_color
[UI 배경 색상 설정 이후 statusBar 패딩이 적용되도록 수정
2 parents 456d752 + 4411937 commit 4877f78

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ private fun EmotionScreen(
8686
Column(
8787
modifier = Modifier
8888
.fillMaxSize()
89-
.statusBarsPadding()
90-
.background(color = BitnagilTheme.colors.white),
89+
.background(color = BitnagilTheme.colors.white)
90+
.statusBarsPadding(),
9191
horizontalAlignment = Alignment.CenterHorizontally,
9292
) {
9393
BitnagilTopBar(

presentation/src/main/java/com/threegap/bitnagil/presentation/intro/IntroScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ private fun IntroScreen(
6666
horizontalAlignment = Alignment.CenterHorizontally,
6767
modifier = modifier
6868
.fillMaxSize()
69-
.statusBarsPadding()
70-
.background(BitnagilTheme.colors.white),
69+
.background(BitnagilTheme.colors.white)
70+
.statusBarsPadding(),
7171
) {
7272
Spacer(modifier = Modifier.height(screenHeight * 0.105f))
7373

presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ private fun LoginScreen(
8282
horizontalAlignment = Alignment.CenterHorizontally,
8383
modifier = modifier
8484
.fillMaxSize()
85-
.statusBarsPadding()
86-
.background(BitnagilTheme.colors.white),
85+
.background(BitnagilTheme.colors.white)
86+
.statusBarsPadding(),
8787
) {
8888
Spacer(modifier = Modifier.height(screenHeight * 0.105f))
8989

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ private fun OnBoardingScreen(
6767
) {
6868
Column(
6969
modifier = Modifier
70-
.statusBarsPadding()
71-
.background(BitnagilTheme.colors.coolGray99),
70+
.background(BitnagilTheme.colors.coolGray99)
71+
.statusBarsPadding(),
7272
) {
7373
BitnagilProgressTopBar(
7474
onBackClick = onClickPreviousInSelectOnBoarding,

presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ private fun SettingScreen(
8585
Column(
8686
modifier = Modifier
8787
.fillMaxSize()
88-
.statusBarsPadding()
89-
.background(color = BitnagilTheme.colors.white),
88+
.background(color = BitnagilTheme.colors.white)
89+
.statusBarsPadding(),
9090
) {
9191
BitnagilTopBar(
9292
title = "설정",

presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ private fun TermsAgreementScreen(
101101
Column(
102102
modifier = modifier
103103
.fillMaxSize()
104-
.statusBarsPadding()
105-
.background(BitnagilTheme.colors.white),
104+
.background(BitnagilTheme.colors.white)
105+
.statusBarsPadding(),
106106
) {
107107
BitnagilTopBar(
108108
title = "약관 동의",

presentation/src/main/java/com/threegap/bitnagil/presentation/webview/BitnagilWebViewScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ fun BitnagilWebViewScreen(
6464
Column(
6565
modifier = modifier
6666
.fillMaxSize()
67-
.statusBarsPadding()
68-
.background(BitnagilTheme.colors.white),
67+
.background(BitnagilTheme.colors.white)
68+
.statusBarsPadding(),
6969
) {
7070
BitnagilTopBar(
7171
title = title,

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ private fun WriteRoutineScreen(
105105
Column(
106106
modifier = Modifier
107107
.fillMaxSize()
108+
.background(color = BitnagilTheme.colors.white)
108109
.statusBarsPadding()
109110
.windowInsetsPadding(
110111
WindowInsets.ime.exclude(WindowInsets.navigationBars),
111-
)
112-
.background(color = BitnagilTheme.colors.white),
112+
),
113113
) {
114114
BitnagilTopBar(
115115
title = if (state.writeRoutineType == WriteRoutineType.ADD) "루틴 등록" else "루틴 수정",

0 commit comments

Comments
 (0)