Merge pull request #234 from YAPP-Github/BOOK-474-feature/#232

easyhooon · web-flow · commit ec9017179baf · 2026-01-30T16:19:15.000+09:00
feat: 구글 로그인 구현
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -32,7 +32,6 @@ android {
         getByName("debug") {
             isDebuggable = true
             applicationIdSuffix = ".dev"
-            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("DEBUG_GOOGLE_WEB_CLIENT_ID"))
             manifestPlaceholders += mapOf(
                 "appName" to "@string/app_name_dev",
             )
@@ -43,7 +42,6 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
             signingConfig = signingConfigs.getByName("release")
-            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("RELEASE_GOOGLE_WEB_CLIENT_ID"))
             manifestPlaceholders += mapOf(
                 "appName" to "@string/app_name",
             )
@@ -55,6 +53,7 @@ android {
     }
 
     defaultConfig {
+        buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("GOOGLE_WEB_CLIENT_ID"))
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getLocalProperty("KAKAO_NATIVE_APP_KEY"))
         manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = getLocalProperty("KAKAO_NATIVE_APP_KEY").trim('"')
     }
diff --git a/core/common/src/main/kotlin/com/ninecraft/booket/core/common/constants/BookStatus.kt b/core/common/src/main/kotlin/com/ninecraft/booket/core/common/constants/BookStatus.kt
@@ -16,7 +16,7 @@ enum class BookStatus(val value: String) {
         }
     }
 
-    companion object Companion {
+    companion object {
         fun fromValue(value: String): BookStatus? {
             return entries.find { it.value == value }
         }
diff --git a/core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt b/core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt
@@ -5,7 +5,10 @@ import com.ninecraft.booket.core.model.UserState
 import kotlinx.coroutines.flow.Flow
 
 interface AuthRepository {
-    suspend fun login(accessToken: String): Result<Unit>
+    suspend fun login(
+        providerType: String,
+        token: String,
+    ): Result<Unit>
 
     suspend fun logout(): Result<Unit>
 
diff --git a/core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt b/core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt
@@ -12,19 +12,20 @@ import com.ninecraft.booket.core.di.DataScope
 import dev.zacsweers.metro.SingleIn
 import kotlinx.coroutines.flow.map
 
-private const val KAKAO_PROVIDER_TYPE = "KAKAO"
-
 @SingleIn(DataScope::class)
 @Inject
 class DefaultAuthRepository(
     private val service: ReedService,
     private val tokenDataSource: TokenDataSource,
 ) : AuthRepository {
-    override suspend fun login(accessToken: String) = runSuspendCatching {
+    override suspend fun login(
+        providerType: String,
+        token: String,
+    ) = runSuspendCatching {
         val response = service.login(
             LoginRequest(
-                providerType = KAKAO_PROVIDER_TYPE,
-                oauthToken = accessToken,
+                providerType = providerType,
+                oauthToken = token,
             ),
         )
         saveTokens(response.accessToken, response.refreshToken)
diff --git a/core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultNotificationDataSource.kt b/core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultNotificationDataSource.kt
@@ -48,7 +48,7 @@ class DefaultNotificationDataSource(
         }
     }
 
-    companion object Companion {
+    companion object {
         private val USER_NOTIFICATION_ENABLED = booleanPreferencesKey("USER_NOTIFICATION_ENABLED")
         private val LAST_SYNCED_NOTIFICATION_ENABLED = booleanPreferencesKey("LAST_SYNCED_NOTIFICATION_ENABLED")
     }
diff --git a/core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultTokenDataSource.kt b/core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultTokenDataSource.kt
@@ -64,7 +64,7 @@ class DefaultTokenDataSource(
             }.orEmpty()
         }
 
-    companion object Companion {
+    companion object {
         private val ACCESS_TOKEN = stringPreferencesKey("ACCESS_TOKEN")
         private val REFRESH_TOKEN = stringPreferencesKey("REFRESH_TOKEN")
     }
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonColorStyle.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonColorStyle.kt
@@ -8,16 +8,17 @@ import com.ninecraft.booket.core.designsystem.theme.Kakao
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 
 enum class ReedButtonColorStyle {
-    PRIMARY, SECONDARY, TERTIARY, STROKE, TEXT, KAKAO;
+    PRIMARY, SECONDARY, TERTIARY, STROKE, TEXT, KAKAO, GOOGLE;
 
     @Composable
     fun containerColor(isPressed: Boolean) = when (this) {
         PRIMARY -> if (isPressed) ReedTheme.colors.bgPrimaryPressed else ReedTheme.colors.bgPrimary
         SECONDARY -> if (isPressed) ReedTheme.colors.bgSecondaryPressed else ReedTheme.colors.bgSecondary
         TERTIARY -> if (isPressed) ReedTheme.colors.bgTertiaryPressed else ReedTheme.colors.bgTertiary
-        STROKE -> if (isPressed) ReedTheme.colors.basePrimary else ReedTheme.colors.basePrimary
+        STROKE -> ReedTheme.colors.basePrimary
         TEXT -> Color.Transparent
         KAKAO -> Kakao
+        GOOGLE -> ReedTheme.colors.basePrimary
     }
 
     @Composable
@@ -26,8 +27,9 @@ enum class ReedButtonColorStyle {
         SECONDARY -> ReedTheme.colors.contentPrimary
         TERTIARY -> ReedTheme.colors.contentBrand
         STROKE -> ReedTheme.colors.contentBrand
-        TEXT -> ReedTheme.colors.borderBrand
+        TEXT -> ReedTheme.colors.contentTertiary
         KAKAO -> ReedTheme.colors.contentPrimary
+        GOOGLE -> ReedTheme.colors.contentPrimary
     }
 
     @Composable
@@ -42,6 +44,7 @@ enum class ReedButtonColorStyle {
     @Composable
     fun borderStroke() = when (this) {
         STROKE -> BorderStroke(1.dp, ReedTheme.colors.borderBrand)
+        GOOGLE -> BorderStroke(1.dp, ReedTheme.colors.borderPrimary)
         else -> null
     }
 }
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/theme/Color.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/theme/Color.kt
@@ -85,7 +85,7 @@ val Violet700 = Color(0xFF652EA0)
 val Violet800 = Color(0xFF4C1E7E)
 val Violet900 = Color(0xFF36125C)
 
-val Kakao = Color(0xFFFBD300)
+val Kakao = Color(0xFFFFEB00)
 val Blank = Color(0xFFD6D6D6)
 val HomeBg = Color(0xFFF0F9E8)
 
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUiState.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUiState.kt
@@ -100,7 +100,7 @@ enum class RecordSort(val value: String) {
         }
     }
 
-    companion object Companion {
+    companion object {
         fun fromValue(value: String): RecordSort? {
             return entries.find { it.value == value }
         }
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUiState.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUiState.kt
@@ -85,7 +85,7 @@ enum class LibraryFilterOption(val value: String) {
         }
     }
 
-    companion object Companion {
+    companion object {
         fun fromValue(value: String): LibraryFilterOption? {
             return entries.find { it.value == value }
         }
diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
@@ -11,14 +11,8 @@ plugins {
 android {
     namespace = "com.ninecraft.booket.feature.login"
 
-    buildTypes {
-        getByName("debug") {
-            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("DEBUG_GOOGLE_WEB_CLIENT_ID"))
-        }
-
-        getByName("release") {
-            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("RELEASE_GOOGLE_WEB_CLIENT_ID"))
-        }
+    defaultConfig {
+        buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("GOOGLE_WEB_CLIENT_ID"))
     }
 
     buildFeatures {
@@ -30,5 +24,8 @@ dependencies {
     implementations(
         libs.logger,
         libs.kakao.auth,
+        libs.androidx.credentials,
+        libs.androidx.credentials.play.services.auth,
+        libs.googleid,
     )
 }
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/HandleLoginSideEffects.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/HandleLoginSideEffects.kt
@@ -3,31 +3,62 @@ package com.ninecraft.booket.feature.login
 import android.widget.Toast
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
+import com.ninecraft.booket.feature.login.client.GoogleLoginClient
+import com.ninecraft.booket.feature.login.client.KakaoLoginClient
 import com.skydoves.compose.effects.RememberedEffect
+import kotlinx.coroutines.launch
 
 @Composable
 internal fun HandleLoginSideEffects(
     state: LoginUiState,
     eventSink: (LoginUiEvent) -> Unit,
 ) {
     val context = LocalContext.current
+    val scope = rememberCoroutineScope()
     val kakaoLoginClient = remember { KakaoLoginClient() }
+    val googleLoginClient = remember { GoogleLoginClient() }
 
     RememberedEffect(state.sideEffect) {
         when (state.sideEffect) {
             is LoginSideEffect.KakaoLogin -> {
                 kakaoLoginClient.loginWithKakao(
                     context = context,
                     onSuccess = { token ->
-                        eventSink(LoginUiEvent.Login(token))
+                        eventSink(
+                            LoginUiEvent.Login(
+                                providerType = LoginUiEvent.PROVIDER_TYPE_KAKAO,
+                                token = token,
+                            ),
+                        )
                     },
                     onFailure = { errorMessage ->
                         eventSink(LoginUiEvent.LoginFailure(errorMessage))
                     },
                 )
             }
 
+            is LoginSideEffect.GoogleLogin -> {
+                scope.launch {
+                    googleLoginClient.loginWithGoogle(
+                        context = context,
+                        webClientId = BuildConfig.GOOGLE_WEB_CLIENT_ID,
+                        onSuccess = { idToken ->
+                            eventSink(
+                                LoginUiEvent.Login(
+                                    providerType = LoginUiEvent.PROVIDER_TYPE_GOOGLE,
+                                    token = idToken,
+                                ),
+                            )
+                        },
+                        onFailure = { errorMessage ->
+                            eventSink(LoginUiEvent.LoginFailure(errorMessage))
+                        },
+                    )
+                }
+            }
+
             is LoginSideEffect.ShowToast -> {
                 Toast.makeText(context, state.sideEffect.message, Toast.LENGTH_SHORT).show()
             }
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt
@@ -85,6 +85,11 @@ class LoginPresenter(
                     sideEffect = LoginSideEffect.KakaoLogin()
                 }
 
+                is LoginUiEvent.OnGoogleLoginButtonClick -> {
+                    isLoading = true
+                    sideEffect = LoginSideEffect.GoogleLogin()
+                }
+
                 is LoginUiEvent.LoginFailure -> {
                     isLoading = false
                     analyticsHelper.logEvent(EVENT_ERROR_LOGIN)
@@ -95,7 +100,7 @@ class LoginPresenter(
                     scope.launch {
                         try {
                             isLoading = true
-                            authRepository.login(event.accessToken)
+                            authRepository.login(event.providerType, event.token)
                                 .onSuccess {
                                     userRepository.syncFcmToken()
                                     navigateAfterLogin()
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt
@@ -113,8 +113,30 @@ internal fun LoginUi(
                                 )
                             },
                         )
+                        Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
+                        ReedButton(
+                            onClick = {
+                                state.eventSink(LoginUiEvent.OnGoogleLoginButtonClick)
+                            },
+                            sizeStyle = largeButtonStyle,
+                            colorStyle = ReedButtonColorStyle.GOOGLE,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(
+                                    start = ReedTheme.spacing.spacing5,
+                                    end = ReedTheme.spacing.spacing5,
+                                ),
+                            text = stringResource(id = R.string.google_login),
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = ImageVector.vectorResource(id = R.drawable.ic_google),
+                                    contentDescription = "Google Icon",
+                                    tint = Color.Unspecified,
+                                )
+                            },
+                        )
                         Spacer(
-                            modifier = Modifier.height(if (state.returnToScreen == null) ReedTheme.spacing.spacing2 else ReedTheme.spacing.spacing8),
+                            modifier = Modifier.height(if (state.returnToScreen == null) ReedTheme.spacing.spacing3 else ReedTheme.spacing.spacing8),
                         )
                         if (state.returnToScreen == null) {
                             ReedTextButton(
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUiState.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUiState.kt
@@ -16,6 +16,7 @@ data class LoginUiState(
 @Immutable
 sealed interface LoginSideEffect {
     data class KakaoLogin(private val key: String = UUID.randomUUID().toString()) : LoginSideEffect
+    data class GoogleLogin(private val key: String = UUID.randomUUID().toString()) : LoginSideEffect
     data class ShowToast(
         val message: String,
         private val key: String = UUID.randomUUID().toString(),
@@ -24,8 +25,17 @@ sealed interface LoginSideEffect {
 
 sealed interface LoginUiEvent : CircuitUiEvent {
     data object OnKakaoLoginButtonClick : LoginUiEvent
-    data class Login(val accessToken: String) : LoginUiEvent
+    data object OnGoogleLoginButtonClick : LoginUiEvent
+    data class Login(
+        val providerType: String,
+        val token: String,
+    ) : LoginUiEvent
     data class LoginFailure(val message: String) : LoginUiEvent
     data object OnGuestLoginButtonClick : LoginUiEvent
     data object OnCloseButtonClick : LoginUiEvent
+
+    companion object {
+        const val PROVIDER_TYPE_KAKAO = "KAKAO"
+        const val PROVIDER_TYPE_GOOGLE = "GOOGLE"
+    }
 }
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/client/GoogleLoginClient.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/client/GoogleLoginClient.kt
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/client/KakaoLoginClient.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/client/KakaoLoginClient.kt
diff --git a/feature/login/src/main/res/drawable/ic_google.xml b/feature/login/src/main/res/drawable/ic_google.xml
diff --git a/feature/login/src/main/res/values/strings.xml b/feature/login/src/main/res/values/strings.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ android {`
`32`	`32`	`getByName("debug") {`
`33`	`33`	`isDebuggable = true`
`34`	`34`	`applicationIdSuffix = ".dev"`
`35`		`- buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("DEBUG_GOOGLE_WEB_CLIENT_ID"))`
`36`	`35`	`manifestPlaceholders += mapOf(`
`37`	`36`	`"appName" to "@string/app_name_dev",`
`38`	`37`	`)`
`@@ -43,7 +42,6 @@ android {`
`43`	`42`	`isMinifyEnabled = true`
`44`	`43`	`isShrinkResources = true`
`45`	`44`	`signingConfig = signingConfigs.getByName("release")`
`46`		`- buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("RELEASE_GOOGLE_WEB_CLIENT_ID"))`
`47`	`45`	`manifestPlaceholders += mapOf(`
`48`	`46`	`"appName" to "@string/app_name",`
`49`	`47`	`)`
`@@ -55,6 +53,7 @@ android {`
`55`	`53`	`}`
`56`	`54`
`57`	`55`	`defaultConfig {`
	`56`	`+ buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("GOOGLE_WEB_CLIENT_ID"))`
`58`	`57`	`buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getLocalProperty("KAKAO_NATIVE_APP_KEY"))`
`59`	`58`	`manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = getLocalProperty("KAKAO_NATIVE_APP_KEY").trim('"')`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ enum class BookStatus(val value: String) {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- companion object Companion {`
	`19`	`+ companion object {`
`20`	`20`	`fun fromValue(value: String): BookStatus? {`
`21`	`21`	`return entries.find { it.value == value }`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class DefaultNotificationDataSource(`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- companion object Companion {`
	`51`	`+ companion object {`
`52`	`52`	`private val USER_NOTIFICATION_ENABLED = booleanPreferencesKey("USER_NOTIFICATION_ENABLED")`
`53`	`53`	`private val LAST_SYNCED_NOTIFICATION_ENABLED = booleanPreferencesKey("LAST_SYNCED_NOTIFICATION_ENABLED")`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class DefaultTokenDataSource(`
`64`	`64`	`}.orEmpty()`
`65`	`65`	`}`
`66`	`66`
`67`		`- companion object Companion {`
	`67`	`+ companion object {`
`68`	`68`	`private val ACCESS_TOKEN = stringPreferencesKey("ACCESS_TOKEN")`
`69`	`69`	`private val REFRESH_TOKEN = stringPreferencesKey("REFRESH_TOKEN")`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ enum class RecordSort(val value: String) {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`- companion object Companion {`
	`103`	`+ companion object {`
`104`	`104`	`fun fromValue(value: String): RecordSort? {`
`105`	`105`	`return entries.find { it.value == value }`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ enum class LibraryFilterOption(val value: String) {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- companion object Companion {`
	`88`	`+ companion object {`
`89`	`89`	`fun fromValue(value: String): LibraryFilterOption? {`
`90`	`90`	`return entries.find { it.value == value }`
`91`	`91`	`}`