diff --git a/app/src/main/java/app/closer/ui/auth/AuthVisuals.kt b/app/src/main/java/app/closer/ui/auth/AuthVisuals.kt index a14a1ba2..1e79f772 100644 --- a/app/src/main/java/app/closer/ui/auth/AuthVisuals.kt +++ b/app/src/main/java/app/closer/ui/auth/AuthVisuals.kt @@ -1,11 +1,15 @@ package app.closer.ui.auth +import app.closer.R import app.closer.ui.theme.closerCardColor import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.size import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton @@ -17,8 +21,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import app.closer.ui.theme.CloserPalette import app.closer.ui.theme.BackgroundColor import app.closer.ui.theme.OnBackgroundColor @@ -26,9 +32,6 @@ import app.closer.ui.theme.OnPrimaryColor import app.closer.ui.theme.OnSurfaceVariantColor import app.closer.ui.theme.PrimaryColor -internal const val GOOGLE_WEB_CLIENT_ID = - "556235913214-l3risvbo7ouv80e22cojblufhjchgn1a.apps.googleusercontent.com" - internal val AuthBackgroundBrush: Brush get() = Brush.linearGradient( colors = listOf(BackgroundColor, CloserPalette.BackgroundWash, CloserPalette.PinkMist), @@ -56,20 +59,26 @@ internal fun GoogleSignInButton( containerColor = Color.White, contentColor = Color(0xFF1F1F1F) ), - border = BorderStroke(1.dp, Color(0xFFDADCE0)) + border = BorderStroke(1.dp, Color(0xFF747775)), + contentPadding = PaddingValues(start = 12.dp, end = 12.dp) ) { Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp) + horizontalArrangement = Arrangement.spacedBy(10.dp) ) { + Image( + painter = painterResource(id = R.drawable.ic_google_g), + contentDescription = null, + modifier = Modifier.size(18.dp) + ) Text( - text = "G", + text = "Continue with Google", style = MaterialTheme.typography.labelLarge.copy( - fontWeight = FontWeight.ExtraBold, - color = Color(0xFF4285F4) + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp ) ) - Text("Continue with Google", style = MaterialTheme.typography.labelLarge) } } } diff --git a/app/src/main/java/app/closer/ui/auth/LoginScreen.kt b/app/src/main/java/app/closer/ui/auth/LoginScreen.kt index a5615c11..d00d639a 100644 --- a/app/src/main/java/app/closer/ui/auth/LoginScreen.kt +++ b/app/src/main/java/app/closer/ui/auth/LoginScreen.kt @@ -1,5 +1,6 @@ package app.closer.ui.auth +import app.closer.R import androidx.compose.foundation.background import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -184,7 +185,9 @@ fun LoginScreen( scope.launch { try { val credMgr = CredentialManager.create(context) - val option = GetSignInWithGoogleOption.Builder(GOOGLE_WEB_CLIENT_ID).build() + val option = GetSignInWithGoogleOption + .Builder(context.getString(R.string.default_web_client_id)) + .build() val request = GetCredentialRequest.Builder().addCredentialOption(option).build() val result = credMgr.getCredential(context, request) val idToken = GoogleIdTokenCredential.createFrom(result.credential.data).idToken diff --git a/app/src/main/res/drawable/ic_google_g.xml b/app/src/main/res/drawable/ic_google_g.xml new file mode 100644 index 00000000..f6cd59ef --- /dev/null +++ b/app/src/main/res/drawable/ic_google_g.xml @@ -0,0 +1,18 @@ + + + + + +