[FEATURE] #76 : 상단 바 EnableEdgeToEdge 적용시 Scaffold Padding 생기는 버그 수정

pknu-wap · Jan 3, 2024 · 326cfab · 326cfab
1 parent e3e6b1c
commit 326cfab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -41,7 +41,7 @@ class MainActivity : ComponentActivity() {
     lateinit var signInUseCase: SignInUseCase
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setStautsBarColor()
+        setSystemBarStyle()
         super.onCreate(savedInstanceState)
         setContent {
             WappTheme {
@@ -88,7 +88,7 @@ class MainActivity : ComponentActivity() {
     }
 }
 
-private fun ComponentActivity.setStautsBarColor() = enableEdgeToEdge(
+private fun ComponentActivity.setSystemBarStyle() = enableEdgeToEdge(
     statusBarStyle = SystemBarStyle.light(
         getColor(R.color.yellow34),
         getColor(R.color.yellow34),

diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInContent.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInContent.kt
@@ -73,6 +73,9 @@ internal fun SignInContent(
                 onClick = {
                     openSignInSheet()
                 },
+                colors = ButtonDefaults.elevatedButtonColors(
+                    containerColor = WappTheme.colors.white,
+                ),
                 shape = RoundedCornerShape(10.dp),
             ) {
                 Icon(
@@ -123,13 +126,3 @@ internal fun SignInContent(
         }
     }
 }
-
-/*@Preview
-@Composable
-fun previewSignInScreen() {
-    SignInScreen(
-
-        navigateToSignUp = { },
-        navigateToNotice = { },
-    )
-}*/
diff --git a/...re/management/src/main/java/com/wap/wapp/feature/management/edit/event/EventEditScreen.kt b/...re/management/src/main/java/com/wap/wapp/feature/management/edit/event/EventEditScreen.kt
@@ -3,6 +3,7 @@ package com.wap.wapp.feature.management.edit.event
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -142,6 +143,7 @@ internal fun EventEditScreen(
         snackbarHost = { SnackbarHost(snackBarHostState) },
         containerColor = WappTheme.colors.backgroundBlack,
         modifier = Modifier.fillMaxSize(),
+        contentWindowInsets = WindowInsets(0.dp),
     ) { paddingValues ->
         Column(
             modifier = Modifier
@@ -235,6 +237,7 @@ private fun EventEditStateProgressBar(
             .fillMaxWidth()
             .height(10.dp),
         color = WappTheme.colors.yellow34,
+        trackColor = WappTheme.colors.white,
         progress = currentRegistrationProgress,
         strokeCap = StrokeCap.Round,
     )