Skip to content

Commit dfc7b71

Browse files
committed
Feat: edge-to-edge 적용 및 시스템 바 패딩 추가
1 parent 4f1be8d commit dfc7b71

7 files changed

Lines changed: 26 additions & 7 deletions

File tree

app/src/main/java/com/threegap/bitnagil/MainActivity.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.threegap.bitnagil
22

33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
5+
import androidx.activity.SystemBarStyle
56
import androidx.activity.compose.setContent
67
import androidx.activity.enableEdgeToEdge
78
import com.threegap.bitnagil.designsystem.BitnagilTheme
@@ -11,7 +12,12 @@ import dagger.hilt.android.AndroidEntryPoint
1112
class MainActivity : ComponentActivity() {
1213
override fun onCreate(savedInstanceState: Bundle?) {
1314
super.onCreate(savedInstanceState)
14-
enableEdgeToEdge()
15+
enableEdgeToEdge(
16+
statusBarStyle = SystemBarStyle.light(
17+
scrim = android.graphics.Color.TRANSPARENT,
18+
darkScrim = android.graphics.Color.TRANSPARENT,
19+
),
20+
)
1521
setContent {
1622
val mainNavigator = rememberMainNavigator()
1723
BitnagilTheme {

app/src/main/java/com/threegap/bitnagil/MainScreen.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.threegap.bitnagil
22

3+
import androidx.compose.foundation.layout.WindowInsets
34
import androidx.compose.foundation.layout.fillMaxSize
5+
import androidx.compose.foundation.layout.navigationBars
46
import androidx.compose.foundation.layout.padding
57
import androidx.compose.material3.Scaffold
68
import androidx.compose.runtime.Composable
79
import androidx.compose.ui.Modifier
10+
import com.threegap.bitnagil.designsystem.BitnagilTheme
811

912
@Composable
1013
fun MainScreen(
@@ -13,6 +16,8 @@ fun MainScreen(
1316
) {
1417
Scaffold(
1518
modifier = modifier.fillMaxSize(),
19+
contentWindowInsets = WindowInsets.navigationBars,
20+
containerColor = BitnagilTheme.colors.white,
1621
) { innerPadding ->
1722
MainNavHost(
1823
navigator = navigator,

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fun HomeNavHost(
4646

4747
DoubleBackButtonPressedHandler()
4848

49-
Box(modifier = Modifier.fillMaxSize()) {
49+
Box(modifier = modifier.fillMaxSize()) {
5050
Scaffold(
5151
modifier = Modifier.fillMaxSize(),
5252
bottomBar = {

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilProgressTopBar.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Row
55
import androidx.compose.foundation.layout.fillMaxWidth
66
import androidx.compose.foundation.layout.height
77
import androidx.compose.foundation.layout.padding
8+
import androidx.compose.foundation.layout.systemBarsPadding
89
import androidx.compose.runtime.Composable
910
import androidx.compose.ui.Alignment
1011
import androidx.compose.ui.Modifier
@@ -24,6 +25,7 @@ fun BitnagilProgressTopBar(
2425
Row(
2526
modifier = modifier
2627
.fillMaxWidth()
28+
.systemBarsPadding()
2729
.height(54.dp)
2830
.padding(start = 4.dp, end = 18.dp),
2931
verticalAlignment = Alignment.CenterVertically,

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilTopBar.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.RowScope
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
99
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.systemBarsPadding
1011
import androidx.compose.material3.HorizontalDivider
1112
import androidx.compose.material3.Text
1213
import androidx.compose.runtime.Composable
@@ -30,6 +31,7 @@ fun BitnagilTopBar(
3031
Box(
3132
modifier = modifier
3233
.fillMaxWidth()
34+
.systemBarsPadding()
3335
.height(54.dp),
3436
) {
3537
if (showBackButton) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
99
import androidx.compose.foundation.layout.fillMaxWidth
1010
import androidx.compose.foundation.layout.height
1111
import androidx.compose.foundation.layout.padding
12+
import androidx.compose.foundation.layout.systemBarsPadding
1213
import androidx.compose.material3.Text
1314
import androidx.compose.runtime.Composable
1415
import androidx.compose.ui.Alignment
@@ -60,7 +61,8 @@ private fun IntroScreen(
6061
horizontalAlignment = Alignment.CenterHorizontally,
6162
modifier = modifier
6263
.fillMaxSize()
63-
.background(BitnagilTheme.colors.white),
64+
.background(BitnagilTheme.colors.white)
65+
.systemBarsPadding(),
6466
) {
6567
Spacer(modifier = Modifier.height(screenHeight * 0.0748f))
6668

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.threegap.bitnagil.presentation.login
22

33
import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
5-
import androidx.compose.foundation.clickable
65
import androidx.compose.foundation.layout.Arrangement
76
import androidx.compose.foundation.layout.Column
87
import androidx.compose.foundation.layout.Row
@@ -12,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize
1211
import androidx.compose.foundation.layout.fillMaxWidth
1312
import androidx.compose.foundation.layout.height
1413
import androidx.compose.foundation.layout.padding
14+
import androidx.compose.foundation.layout.systemBarsPadding
1515
import androidx.compose.foundation.shape.RoundedCornerShape
1616
import androidx.compose.material3.Text
1717
import androidx.compose.runtime.Composable
@@ -29,6 +29,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
2929
import com.threegap.bitnagil.designsystem.BitnagilTheme
3030
import com.threegap.bitnagil.designsystem.R
3131
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
32+
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
3233
import com.threegap.bitnagil.presentation.login.kakao.KakaoLoginHandlerImpl
3334
import com.threegap.bitnagil.presentation.login.model.LoginSideEffect
3435
import org.orbitmvi.orbit.compose.collectSideEffect
@@ -82,7 +83,8 @@ private fun LoginScreen(
8283
horizontalAlignment = Alignment.CenterHorizontally,
8384
modifier = modifier
8485
.fillMaxSize()
85-
.background(BitnagilTheme.colors.white),
86+
.background(BitnagilTheme.colors.white)
87+
.systemBarsPadding(),
8688
) {
8789
Spacer(modifier = Modifier.height(screenHeight * 0.0748f))
8890

@@ -111,7 +113,7 @@ private fun LoginScreen(
111113
modifier = Modifier
112114
.padding(start = 16.dp, end = 16.dp, bottom = 20.dp)
113115
.height(54.dp)
114-
.clickable { onKakaoLoginClick() }
116+
.clickableWithoutRipple { onKakaoLoginClick() }
115117
.background(
116118
color = BitnagilTheme.colors.kakao,
117119
shape = RoundedCornerShape(12.dp),
@@ -122,7 +124,7 @@ private fun LoginScreen(
122124
) {
123125
BitnagilIcon(
124126
id = R.drawable.ic_kakao_login,
125-
modifier = Modifier.padding(end = 8.dp)
127+
modifier = Modifier.padding(end = 8.dp),
126128
)
127129
Text(
128130
text = "카카오로 시작하기",

0 commit comments

Comments
 (0)