From 425cb45cd5bb33420f47d2cf39249fdc0bdf34f5 Mon Sep 17 00:00:00 2001 From: shinythinking Date: Mon, 2 Dec 2024 23:20:42 +0900 Subject: [PATCH] =?UTF-8?q?ui/#192=20:=20=EA=B5=AC=EA=B8=80=20=EC=86=8C?= =?UTF-8?q?=EC=85=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B2=84=ED=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/ic_google_login.xml | 32 ++++++++++ .../boostcamp/mapisode/login/LoginScreen.kt | 62 ++++++------------- feature/login/src/main/res/values/strings.xml | 3 +- 3 files changed, 53 insertions(+), 44 deletions(-) create mode 100644 core/designsystem/src/main/res/drawable/ic_google_login.xml diff --git a/core/designsystem/src/main/res/drawable/ic_google_login.xml b/core/designsystem/src/main/res/drawable/ic_google_login.xml new file mode 100644 index 00000000..cf70ca00 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_google_login.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/feature/login/src/main/java/com/boostcamp/mapisode/login/LoginScreen.kt b/feature/login/src/main/java/com/boostcamp/mapisode/login/LoginScreen.kt index fcaf9eb8..978564d1 100644 --- a/feature/login/src/main/java/com/boostcamp/mapisode/login/LoginScreen.kt +++ b/feature/login/src/main/java/com/boostcamp/mapisode/login/LoginScreen.kt @@ -1,29 +1,23 @@ package com.boostcamp.mapisode.login import androidx.compose.foundation.Image -import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.boostcamp.mapisode.designsystem.R.drawable import com.boostcamp.mapisode.designsystem.compose.MapisodeIcon -import com.boostcamp.mapisode.designsystem.compose.MapisodeIconButton import com.boostcamp.mapisode.designsystem.compose.MapisodeText import com.boostcamp.mapisode.designsystem.theme.MapisodeTheme @@ -64,50 +58,32 @@ fun LoginScreen( style = MapisodeTheme.typography.headlineSmall, ) - Spacer(modifier = Modifier.height(15.dp)) + Spacer(modifier = Modifier.height(16.dp)) MapisodeText( - text = stringResource(R.string.login_app_long_description), + text = stringResource(R.string.login_app_long_description1), modifier = Modifier.align(Alignment.CenterHorizontally), - style = MapisodeTheme.typography.bodyLarge.copy( - textAlign = TextAlign.Center, - ), + style = MapisodeTheme.typography.bodyLarge, ) - Spacer(modifier = Modifier.weight(1f)) + Spacer(modifier = Modifier.height(4.dp)) - MapisodeIconButton( - onClick = googleSignInClicked, - modifier = Modifier - .fillMaxWidth(0.8f) - .weight(1f) - .border( - width = 1.dp, - color = MapisodeTheme.colorScheme.outlineButtonStroke, - ), - ) { - Row( - modifier = Modifier.fillMaxSize(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center, - ) { - Image( - painter = painterResource(id = drawable.ic_google), - contentDescription = "구글 로그인", - modifier = Modifier - .fillMaxHeight(0.5f) - .aspectRatio(1f), - contentScale = ContentScale.Fit, - ) + MapisodeText( + text = stringResource(R.string.login_app_long_description2), + modifier = Modifier.align(Alignment.CenterHorizontally), + style = MapisodeTheme.typography.bodyLarge, + ) - Spacer(modifier = Modifier.width(24.dp)) + Spacer(modifier = Modifier.weight(1f)) - MapisodeText( - text = "구글 계정으로 로그인", - style = MapisodeTheme.typography.bodyLarge, - ) - } - } + Image( + painter = painterResource(drawable.ic_google_login), + contentDescription = stringResource(R.string.login_google_login), + modifier = Modifier + .fillMaxWidth(0.5f) + .clickable { googleSignInClicked() }, + contentScale = ContentScale.FillWidth, + ) Spacer(modifier = Modifier.weight(2f)) } diff --git a/feature/login/src/main/res/values/strings.xml b/feature/login/src/main/res/values/strings.xml index 6d6dd2e5..fa88060b 100644 --- a/feature/login/src/main/res/values/strings.xml +++ b/feature/login/src/main/res/values/strings.xml @@ -1,6 +1,7 @@ - 당신의 순간을 지도에 담아 공유해보세요.\n소중한 사람들과 함께 해보세요!. + 당신의 순간을 지도에 담아 공유해보세요. + 소중한 사람들과 함께 해보세요! 우리의 순간이 모인 지도, 메피소드 Mapisode subIcon 닉네임