From 326cfab865ce3831933c20ebf2291b203ad46744 Mon Sep 17 00:00:00 2001 From: tgyuu-An Date: Wed, 3 Jan 2024 22:56:48 +0900 Subject: [PATCH] =?UTF-8?q?[FEATURE]=20#76=20:=20=EC=83=81=EB=8B=A8=20?= =?UTF-8?q?=EB=B0=94=20EnableEdgeToEdge=20=EC=A0=81=EC=9A=A9=EC=8B=9C=20Sc?= =?UTF-8?q?affold=20Padding=20=EC=83=9D=EA=B8=B0=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/wap/wapp/MainActivity.kt | 4 ++-- .../wap/wapp/feature/auth/signin/SignInContent.kt | 13 +++---------- .../management/edit/event/EventEditScreen.kt | 3 +++ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt index 5103c229..35f850f0 100644 --- 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 index 3510cfdd..575008c1 100644 --- 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/feature/management/src/main/java/com/wap/wapp/feature/management/edit/event/EventEditScreen.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/edit/event/EventEditScreen.kt index d388f515..559e6eb7 100644 --- a/feature/management/src/main/java/com/wap/wapp/feature/management/edit/event/EventEditScreen.kt +++ b/feature/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, )