✨ Data Store에 최초 로그인 시점에 uid, 닉네임, 프로필 이미지 uri 저장

peter-j0y · peter-j0y · commit 30613f54adf6 · 2022-11-21T16:36:43.000+09:00
diff --git a/signin/build.gradle b/signin/build.gradle
@@ -70,4 +70,7 @@ dependencies {
     // hilt
     implementation "com.google.dagger:hilt-android:$hiltVersion"
     kapt "com.google.dagger:hilt-compiler:$hiltVersion"
+
+    // by viewModels
+    implementation "androidx.activity:activity-ktx:$activityKtxVersion"
 }
diff --git a/signin/src/main/java/com/whyranoid/SaveLogInUserInfoUseCase.kt b/signin/src/main/java/com/whyranoid/SaveLogInUserInfoUseCase.kt
@@ -1,9 +1,11 @@
 package com.whyranoid
 
-// class SaveLogInUserInfoUseCase @Inject constructor(
-//    private val signInRepository: SignInRepository
-// ) {
-//    operator fun invoke(uid: String, nickName: String, profileImgUrl: String): Boolean {
-//        //return signInRepository.saveLogInUserInfo(uid, nickName, profileImgUrl)
-//    }
-// }
+import javax.inject.Inject
+
+class SaveLogInUserInfoUseCase @Inject constructor(
+    private val signInRepository: SignInRepository
+) {
+    suspend operator fun invoke(userInfo: User): Boolean {
+        return signInRepository.saveLogInUserInfo(userInfo)
+    }
+}
diff --git a/signin/src/main/java/com/whyranoid/SignInDataSource.kt b/signin/src/main/java/com/whyranoid/SignInDataSource.kt
@@ -1,9 +1,5 @@
 package com.whyranoid
 
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
-import javax.inject.Inject
-
-class SignInDataSource @Inject constructor(
-    private val db: DataStore<Preferences>
-)
+interface SignInDataSource {
+    suspend fun saveLogInUserInfo(userInfo: User): Boolean
+}
diff --git a/signin/src/main/java/com/whyranoid/SignInDataSourceImpl.kt b/signin/src/main/java/com/whyranoid/SignInDataSourceImpl.kt
@@ -0,0 +1,33 @@
+package com.whyranoid
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import javax.inject.Inject
+
+class SignInDataSourceImpl @Inject constructor(
+    private val dataStoreDb: DataStore<Preferences>
+) : SignInDataSource {
+
+    private object PreferenceKeys {
+        val uid = stringPreferencesKey(UID_KEY)
+        val nickName = stringPreferencesKey(NICK_NAME_KEY)
+        val profileImgUrl = stringPreferencesKey(PROFILE_IMG_URI)
+    }
+
+    override suspend fun saveLogInUserInfo(userInfo: User): Boolean {
+        dataStoreDb.edit { preferences ->
+            preferences[PreferenceKeys.uid] = userInfo.uid
+            preferences[PreferenceKeys.nickName] = userInfo.nickName ?: ""
+            preferences[PreferenceKeys.profileImgUrl] = userInfo.profileImgUri ?: ""
+        }
+        return true
+    }
+
+    companion object {
+        private const val UID_KEY = "uid"
+        private const val NICK_NAME_KEY = "nick_name"
+        private const val PROFILE_IMG_URI = "profile_img_uri"
+    }
+}
diff --git a/signin/src/main/java/com/whyranoid/SignInModule.kt b/signin/src/main/java/com/whyranoid/SignInModule.kt
@@ -0,0 +1,20 @@
+package com.whyranoid
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class SignInModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindSignInRepository(impl: SignInRepositoryImpl): SignInRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindSignInDataSource(impl: SignInDataSourceImpl): SignInDataSource
+}
diff --git a/signin/src/main/java/com/whyranoid/SignInRepository.kt b/signin/src/main/java/com/whyranoid/SignInRepository.kt
@@ -1,5 +1,5 @@
 package com.whyranoid
 
 interface SignInRepository {
-    fun saveLogInUserInfo(uid: String, nickName: String, profileImgUrl: String)
+    suspend fun saveLogInUserInfo(userInfo: User): Boolean
 }
diff --git a/signin/src/main/java/com/whyranoid/SignInRepositoryImpl.kt b/signin/src/main/java/com/whyranoid/SignInRepositoryImpl.kt
@@ -1,3 +1,11 @@
 package com.whyranoid
 
-class SignInRepositoryImpl()
+import javax.inject.Inject
+
+class SignInRepositoryImpl @Inject constructor(private val signInDataSource: SignInDataSource) :
+    SignInRepository {
+
+    override suspend fun saveLogInUserInfo(userInfo: User): Boolean {
+        return signInDataSource.saveLogInUserInfo(userInfo)
+    }
+}
diff --git a/signin/src/main/java/com/whyranoid/SignInViewModel.kt b/signin/src/main/java/com/whyranoid/SignInViewModel.kt
@@ -1,10 +1,14 @@
 package com.whyranoid
 
-// @HiltViewModel
-// class SignInViewModel @Inject constructor(
-//    private val saveLogInUserInfoUseCase: SaveLogInUserInfoUseCase
-// ) : ViewModel() {
-//    fun saveUserInfo() {
-//        // saveLogInUserInfoUseCase()
-//    }
-// }
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class SignInViewModel @Inject constructor(
+    private val saveLogInUserInfoUseCase: SaveLogInUserInfoUseCase
+) : ViewModel() {
+    suspend fun saveUserInfo(userInfo: User) {
+        saveLogInUserInfoUseCase(userInfo)
+    }
+}
diff --git a/signin/src/main/java/com/whyranoid/User.kt b/signin/src/main/java/com/whyranoid/User.kt
@@ -0,0 +1,7 @@
+package com.whyranoid
+
+data class User(
+    val uid: String,
+    val nickName: String?,
+    val profileImgUri: String?
+)
diff --git a/signin/src/main/java/com/whyranoid/signin/SignInActivity.kt b/signin/src/main/java/com/whyranoid/signin/SignInActivity.kt
@@ -4,9 +4,11 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.lifecycleScope
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
@@ -17,15 +19,21 @@ import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
+import com.whyranoid.SignInViewModel
+import com.whyranoid.User
 import com.whyranoid.presentation.MainActivity
 import com.whyranoid.signin.databinding.ActivitySignInBinding
 import dagger.hilt.android.AndroidEntryPoint
-import timber.log.Timber
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class SignInActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySignInBinding
     private lateinit var auth: FirebaseAuth
+    private var uid: String? = null
+    private var nickName: String? = null
+    private var profileImgUri: String? = null
+    private val viewModel by viewModels<SignInViewModel>()
 
     // 구글 로그인 클라이언트 객체
     private val googleSignInClient by lazy {
@@ -50,7 +58,8 @@ class SignInActivity : AppCompatActivity() {
                     account.idToken?.let { idToken ->
                         signInWithGoogle(idToken)
                         // 데이터 스토어에 유저 정보 저장
-                        Timber.d("닉네임 : ${account.displayName} 프로필 사진 주소 : ${account.photoUrl}")
+                        nickName = account.displayName
+                        profileImgUri = account.photoUrl.toString()
                     }
                 } catch (e: ApiException) {
                     Snackbar.make(
@@ -110,6 +119,14 @@ class SignInActivity : AppCompatActivity() {
                     getString(R.string.sign_in_success),
                     Snackbar.LENGTH_SHORT
                 ).show()
+
+                uid = auth.uid
+                lifecycleScope.launch {
+                    uid?.let {
+                        viewModel.saveUserInfo(User(it, nickName, profileImgUri))
+                    }
+                }
+
                 startActivity(intent)
             } else {
                 Snackbar.make(

Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,7 @@ dependencies {`
`70`	`70`	`// hilt`
`71`	`71`	`implementation "com.google.dagger:hilt-android:$hiltVersion"`
`72`	`72`	`kapt "com.google.dagger:hilt-compiler:$hiltVersion"`
	`73`	`+`
	`74`	`+ // by viewModels`
	`75`	`+ implementation "androidx.activity:activity-ktx:$activityKtxVersion"`
`73`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package com.whyranoid`
`2`	`2`
`3`	`3`	`interface SignInRepository {`
`4`		`- fun saveLogInUserInfo(uid: String, nickName: String, profileImgUrl: String)`
	`4`	`+ suspend fun saveLogInUserInfo(userInfo: User): Boolean`
`5`	`5`	`}`