diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin index 0cd62196..2f696e1a 100644 Binary files a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin and b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin differ diff --git a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin index b7632e36..f32efdc9 100644 Binary files a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin and b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin differ diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar index ba756a72..3f14f915 100644 Binary files a/buildSrc/build/libs/buildSrc.jar and b/buildSrc/build/libs/buildSrc.jar differ 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..2b278617 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_google_login.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/presentation/src/main/java/com/dpm/presentation/login/ui/KakaoSignupActivity.kt b/presentation/src/main/java/com/dpm/presentation/login/ui/KakaoSignupActivity.kt index 40737cf4..8996d2a4 100644 --- a/presentation/src/main/java/com/dpm/presentation/login/ui/KakaoSignupActivity.kt +++ b/presentation/src/main/java/com/dpm/presentation/login/ui/KakaoSignupActivity.kt @@ -15,6 +15,7 @@ import com.dpm.presentation.login.viewmodel.KakaoSignupViewModel import com.dpm.presentation.login.viewmodel.LoginUiState import com.dpm.presentation.scheme.SchemeKey import com.dpm.presentation.scheme.viewmodel.SchemeState +import com.google.android.gms.auth.api.signin.GoogleSignInOptions import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.common.model.ClientError import com.kakao.sdk.common.model.ClientErrorCause @@ -46,9 +47,14 @@ class KakaoSignupActivity : BaseActivity({ private fun initComposeView() { binding.kakaoSignComposeView.setContent { MaterialTheme { - KakaoSignupScreen() { - kakaoLoginCallBack() - } + KakaoSignupScreen( + onKakaoLoginClick = { + kakaoLoginCallBack() + }, + onGoogleLoginClick = { + onGoogleLogin() + } + ) } } } @@ -71,6 +77,10 @@ class KakaoSignupActivity : BaseActivity({ } } + private fun onGoogleLogin() { + //Todo GoogleLogin + } + private fun initObservers() { signUpViewModel.kakaoToken.observe(this) { token -> if (token.isNotEmpty()) { diff --git a/presentation/src/main/java/com/dpm/presentation/login/ui/compose/KakaoSignupScreen.kt b/presentation/src/main/java/com/dpm/presentation/login/ui/compose/KakaoSignupScreen.kt index 57be0469..b1328e87 100644 --- a/presentation/src/main/java/com/dpm/presentation/login/ui/compose/KakaoSignupScreen.kt +++ b/presentation/src/main/java/com/dpm/presentation/login/ui/compose/KakaoSignupScreen.kt @@ -3,6 +3,7 @@ package com.dpm.presentation.login.ui.compose import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -41,7 +42,8 @@ import kotlinx.coroutines.delay @OptIn(ExperimentalFoundationApi::class) @Composable fun KakaoSignupScreen( - onKakaoLoginClick: () -> Unit = {} + onKakaoLoginClick: () -> Unit = {}, + onGoogleLoginClick: () -> Unit = {} ) { val onBoardingList = listOf( Pair("시야찾기로 원하는 야구장\n자리를 빠르게 알아봐요!", listOf(0..3)), @@ -153,12 +155,12 @@ fun KakaoSignupScreen( Row( modifier = Modifier .fillMaxWidth() - .padding(vertical = 30.dp, horizontal = 40.dp) + .padding(top = 30.dp, start = 40.dp, end = 40.dp) .noRippleClickable { onKakaoLoginClick() } .background(Color(0xFFFEE500), RoundedCornerShape(40.dp)) - .padding(horizontal = 40.dp, vertical = 16.dp), + .padding(vertical = 12.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center ) { @@ -169,7 +171,31 @@ fun KakaoSignupScreen( ) Spacer(modifier = Modifier.size(8.dp)) Text( - text = "카카오 로그인", + text = "카카오로 3초만에 로그인", + style = SpotTheme.typography.subtitle02 + ) + } + + Row( + modifier = Modifier + .fillMaxWidth() + .padding(start = 40.dp, end = 40.dp, bottom = 40.dp, top = 10.dp) + .noRippleClickable { + onGoogleLoginClick() + } + .border(1.dp, SpotTheme.colors.strokePrimary, RoundedCornerShape(40.dp)) + .padding(vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + Image( + painter = painterResource(id = com.depromeet.designsystem.R.drawable.ic_google_login), + contentDescription = "google-login", + modifier = Modifier.size(18.dp) + ) + Spacer(modifier = Modifier.size(8.dp)) + Text( + text = "구글 계정으로 로그인", style = SpotTheme.typography.subtitle02 ) }