From cffda3f52ce0e5df7dbbf4632b8e7cea7a2d66aa Mon Sep 17 00:00:00 2001 From: kwakjoohyeong Date: Wed, 6 Mar 2024 18:45:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=8A=A4=ED=8E=99=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 375x800 -> 360x800 --- .../withpeace/feature/login/LoginScreen.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt b/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt index 1d52b059..49fd2965 100644 --- a/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt +++ b/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults @@ -24,9 +25,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.PlatformTextStyle +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.em +import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme import com.withpeace.withpeace.googlelogin.GoogleLoginManager @@ -81,6 +86,7 @@ fun LoginScreen( ) { Spacer(modifier = Modifier.height(152.dp)) Image( + modifier = Modifier.size(150.dp), painter = painterResource(id = R.drawable.app_logo), contentDescription = stringResource(R.string.app_logo_content_description), ) @@ -92,6 +98,7 @@ fun LoginScreen( ) Spacer(modifier = Modifier.height(24.dp)) Text( + lineHeight = 19.sp, style = WithpeaceTheme.typography.body, text = stringResource(R.string.welcome_introduction), textAlign = TextAlign.Center, @@ -125,16 +132,18 @@ fun LoginScreen( ) { Image( modifier = Modifier - .padding(16.dp) + .padding(start = 16.dp) .align(Alignment.CenterStart) .size(24.dp), painter = painterResource(id = R.drawable.img_google_logo), contentDescription = stringResource(R.string.image_google_logo), ) Text( - modifier = Modifier.align(Alignment.Center), + modifier = Modifier.align(Alignment.Center).padding(PaddingValues(vertical = 18.dp)), color = WithpeaceTheme.colors.SystemBlack, - style = WithpeaceTheme.typography.notoSans, + style = WithpeaceTheme.typography.notoSans.merge( + TextStyle(platformStyle = PlatformTextStyle(includeFontPadding = false)) + ), text = stringResource(R.string.login_to_google), ) } From 15b23303a4dd3357a4990bbc7c632acb8589b9f9 Mon Sep 17 00:00:00 2001 From: kwakjoohyeong Date: Wed, 6 Mar 2024 18:56:59 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/withpeace/withpeace/feature/login/LoginScreen.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt b/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt index 49fd2965..4a47c7dd 100644 --- a/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt +++ b/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults @@ -30,7 +29,6 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.em import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme From d2afd5f45d5627f06bfc7a8eebba86046e7ab58e Mon Sep 17 00:00:00 2001 From: kwakjoohyeong Date: Thu, 7 Mar 2024 02:13:39 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20PaddingValues=20=EB=8C=80?= =?UTF-8?q?=EC=8B=A0=20=EA=B8=B0=EB=B3=B8=20padding=20=EC=86=8D=EC=84=B1?= =?UTF-8?q?=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/withpeace/withpeace/feature/login/LoginScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt b/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt index 4a47c7dd..ac80036f 100644 --- a/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt +++ b/feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt @@ -137,7 +137,7 @@ fun LoginScreen( contentDescription = stringResource(R.string.image_google_logo), ) Text( - modifier = Modifier.align(Alignment.Center).padding(PaddingValues(vertical = 18.dp)), + modifier = Modifier.align(Alignment.Center).padding(vertical = 18.dp), color = WithpeaceTheme.colors.SystemBlack, style = WithpeaceTheme.typography.notoSans.merge( TextStyle(platformStyle = PlatformTextStyle(includeFontPadding = false))