From fe4162753dadae7fdcd5d51afea259ad8ee76c5d Mon Sep 17 00:00:00 2001 From: tgyuuAn Date: Fri, 7 Feb 2025 00:14:22 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[PC-000]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=90=EC=85=8B=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/ic_avoid_acquaintances.xml | 188 ++++++++++++++++++ .../main/res/drawable/ic_login_background.xml | 164 +++++++++++++++ .../puzzle/auth/graph/login/LoginScreen.kt | 38 ++-- .../signup/page/AvoidAcquaintancesPage.kt | 11 +- 4 files changed, 382 insertions(+), 19 deletions(-) create mode 100644 core/designsystem/src/main/res/drawable/ic_avoid_acquaintances.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_login_background.xml diff --git a/core/designsystem/src/main/res/drawable/ic_avoid_acquaintances.xml b/core/designsystem/src/main/res/drawable/ic_avoid_acquaintances.xml new file mode 100644 index 00000000..da2e1d8e --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_avoid_acquaintances.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_login_background.xml b/core/designsystem/src/main/res/drawable/ic_login_background.xml new file mode 100644 index 00000000..92ba577e --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_login_background.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/auth/src/main/java/com/puzzle/auth/graph/login/LoginScreen.kt b/feature/auth/src/main/java/com/puzzle/auth/graph/login/LoginScreen.kt index f3cf786f..1064191b 100644 --- a/feature/auth/src/main/java/com/puzzle/auth/graph/login/LoginScreen.kt +++ b/feature/auth/src/main/java/com/puzzle/auth/graph/login/LoginScreen.kt @@ -10,14 +10,13 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -38,7 +37,6 @@ import com.puzzle.auth.graph.login.contract.LoginState import com.puzzle.common.ui.repeatOnStarted import com.puzzle.designsystem.R import com.puzzle.designsystem.component.PieceLoginButton -import com.puzzle.designsystem.component.PieceSubCloseTopBar import com.puzzle.designsystem.foundation.PieceTheme import com.puzzle.domain.model.auth.OAuthProvider @@ -97,8 +95,7 @@ private fun LoginScreen( Column( modifier = modifier .fillMaxSize() - .background(PieceTheme.colors.white) - .padding(horizontal = 20.dp), + .background(PieceTheme.colors.white), ) { Text( text = buildAnnotatedString { @@ -112,7 +109,7 @@ private fun LoginScreen( color = PieceTheme.colors.black, modifier = Modifier .fillMaxWidth() - .padding(top = 80.dp, bottom = 12.dp), + .padding(top = 80.dp, bottom = 12.dp, start = 20.dp, end = 20.dp), ) Text( @@ -121,25 +118,36 @@ private fun LoginScreen( color = PieceTheme.colors.dark3, modifier = Modifier .fillMaxWidth() - .padding(bottom = 70.dp), + .padding(horizontal = 20.dp), + ) + + Spacer( + modifier = Modifier + .fillMaxWidth() + .weight(1f), ) Image( - painter = painterResource(R.drawable.ic_puzzle1), + painter = painterResource(R.drawable.ic_login_background), contentDescription = null, - modifier = Modifier - .size(240.dp) - .align(Alignment.CenterHorizontally), + contentScale = ContentScale.Crop, + modifier = Modifier.fillMaxWidth(), ) - Spacer(modifier = Modifier.weight(1f)) + Spacer( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + ) PieceLoginButton( label = stringResource(R.string.kakao_login), imageId = R.drawable.ic_kakao_login, containerColor = Color(0xFFFFE812), onClick = loginKakao, - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp), ) PieceLoginButton( @@ -153,7 +161,7 @@ private fun LoginScreen( onClick = loginGoogle, modifier = Modifier .fillMaxWidth() - .padding(vertical = 10.dp), + .padding(vertical = 10.dp, horizontal = 20.dp), ) } } @@ -223,4 +231,4 @@ private fun PreviewAuthScreen() { loginGoogle = {}, ) } -} \ No newline at end of file +} diff --git a/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt b/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt index 95f60432..2728238d 100644 --- a/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt +++ b/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt @@ -1,7 +1,7 @@ package com.puzzle.auth.graph.signup.page import androidx.activity.compose.BackHandler -import androidx.compose.foundation.background +import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -14,6 +14,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString @@ -65,11 +66,13 @@ internal fun ColumnScope.AvoidAcquaintancesPage( .weight(0.7f), ) - Spacer( + + Image( + painter = painterResource(R.drawable.ic_avoid_acquaintances), + contentDescription = null, modifier = Modifier .align(Alignment.CenterHorizontally) - .size(240.dp) - .background(PieceTheme.colors.black), + .size(300.dp), ) Spacer( From f4a5fe937b5879f953b7e04d0944f205efbc540d Mon Sep 17 00:00:00 2001 From: tgyuuAn Date: Fri, 7 Feb 2025 00:48:05 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[PC-000]=20=EC=A7=80=EC=9D=B8=20=EC=B0=A8?= =?UTF-8?q?=EB=8B=A8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=97=90=EC=85=8B=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/puzzle/auth/navigation/AuthNavigation.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/auth/src/main/java/com/puzzle/auth/navigation/AuthNavigation.kt b/feature/auth/src/main/java/com/puzzle/auth/navigation/AuthNavigation.kt index 4f95f126..be642485 100644 --- a/feature/auth/src/main/java/com/puzzle/auth/navigation/AuthNavigation.kt +++ b/feature/auth/src/main/java/com/puzzle/auth/navigation/AuthNavigation.kt @@ -10,7 +10,7 @@ import com.puzzle.navigation.AuthGraph import com.puzzle.navigation.AuthGraphDest fun NavGraphBuilder.authNavGraph() { - navigation(startDestination = AuthGraphDest.LoginRoute) { + navigation(startDestination = AuthGraphDest.SignUpRoute) { composable { LoginRoute() } @@ -23,4 +23,4 @@ fun NavGraphBuilder.authNavGraph() { VerificationRoute() } } -} \ No newline at end of file +} From 13a5e23e36450866bd438dcd4dc06f67e59f6a70 Mon Sep 17 00:00:00 2001 From: tgyuuAn Date: Fri, 7 Feb 2025 01:05:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[PC-000]=20=ED=9A=8C=EC=9B=90=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=90=EC=85=8B=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/ic_leave.xml | 59 +++++++++++++++++++ .../signup/page/AvoidAcquaintancesPage.kt | 1 - .../setting/graph/withdraw/WithdrawScreen.kt | 2 +- .../graph/withdraw/page/ConfirmPage.kt | 8 ++- 4 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 core/designsystem/src/main/res/drawable/ic_leave.xml diff --git a/core/designsystem/src/main/res/drawable/ic_leave.xml b/core/designsystem/src/main/res/drawable/ic_leave.xml new file mode 100644 index 00000000..c0529195 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_leave.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt b/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt index 2728238d..50cb0e9e 100644 --- a/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt +++ b/feature/auth/src/main/java/com/puzzle/auth/graph/signup/page/AvoidAcquaintancesPage.kt @@ -66,7 +66,6 @@ internal fun ColumnScope.AvoidAcquaintancesPage( .weight(0.7f), ) - Image( painter = painterResource(R.drawable.ic_avoid_acquaintances), contentDescription = null, diff --git a/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/WithdrawScreen.kt b/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/WithdrawScreen.kt index 886f9bf3..3e8f87da 100644 --- a/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/WithdrawScreen.kt +++ b/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/WithdrawScreen.kt @@ -156,4 +156,4 @@ private fun PreviewSettingScreen() { onBackClick = {}, ) } -} \ No newline at end of file +} diff --git a/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/page/ConfirmPage.kt b/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/page/ConfirmPage.kt index 4a5db659..103dafc0 100644 --- a/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/page/ConfirmPage.kt +++ b/feature/setting/src/main/java/com/puzzle/setting/graph/withdraw/page/ConfirmPage.kt @@ -36,17 +36,19 @@ internal fun ColumnScope.ConfirmPage( text = stringResource(R.string.confirm_page_second_header), style = PieceTheme.typography.bodySM, color = PieceTheme.colors.dark3, - modifier = modifier.padding(top = 12.dp, bottom = 60.dp), + modifier = modifier.padding(top = 12.dp), ) + Spacer(modifier = Modifier.weight(2f)) + Image( - painter = painterResource(id = R.drawable.ic_image_default), + painter = painterResource(id = R.drawable.ic_leave), contentDescription = "일러스트", contentScale = ContentScale.Crop, modifier = modifier.fillMaxWidth(), ) - Spacer(modifier = modifier.weight(1f)) + Spacer(modifier = modifier.weight(5f)) PieceSolidButton( label = stringResource(R.string.withdraw),