feat: 앱심사를 위한 로그인 페이지 추가

YAPP-Github · Jul 30, 2022 · 71b9f20 · 71b9f20
1 parent 3259837
commit 71b9f20
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 2 deletions.
diff --git a/core/src/main/java/com/best/friends/core/BaseViewModel.kt b/core/src/main/java/com/best/friends/core/BaseViewModel.kt
@@ -18,6 +18,14 @@ abstract class BaseViewModel : ViewModel() {
     val error: SharedFlow<String>
         get() = _error
 
+    protected fun startLoading() {
+        _loading.value = true
+    }
+
+    protected fun stopLoading() {
+        _loading.value = false
+    }
+
     protected fun sendErrorMessage(throwable: Throwable) {
         sendErrorMessage(throwable.message.toString())
     }

diff --git a/data/src/main/java/com/yapp/android2/data/remote/login/LoginRemoteDataSource.kt b/data/src/main/java/com/yapp/android2/data/remote/login/LoginRemoteDataSource.kt
@@ -1,6 +1,7 @@
 package com.yapp.android2.data.remote.login
 
 import com.yapp.android2.data.remote.RemoteDataSource
+import com.yapp.android2.data.remote.request.LoginForAppReviewRequest
 import com.yapp.android2.data.remote.request.PostLoginRequest
 import com.yapp.android2.domain.entity.FCMToken
 import com.yapp.android2.domain.entity.User
@@ -10,4 +11,6 @@ interface LoginRemoteDataSource : RemoteDataSource {
     suspend fun postLogin(request: PostLoginRequest): User
 
     suspend fun postFCMToken(request: FCMToken)
+
+    suspend fun loginForAppReview(request: LoginForAppReviewRequest): User
 }
diff --git a/data/src/main/java/com/yapp/android2/data/remote/login/LoginRemoteDataSourceImpl.kt b/data/src/main/java/com/yapp/android2/data/remote/login/LoginRemoteDataSourceImpl.kt
@@ -1,5 +1,6 @@
 package com.yapp.android2.data.remote.login
 
+import com.yapp.android2.data.remote.request.LoginForAppReviewRequest
 import com.yapp.android2.data.remote.request.PostLoginRequest
 import com.yapp.android2.data.service.LoginService
 import com.yapp.android2.domain.entity.FCMToken
@@ -17,4 +18,8 @@ class LoginRemoteDataSourceImpl @Inject constructor(
     override suspend fun postFCMToken(request: FCMToken) {
         return loginService.postFCMToken(request)
     }
+
+    override suspend fun loginForAppReview(request: LoginForAppReviewRequest): User {
+        return loginService.loginForAppReview(request).data ?: User.EMPTY
+    }
 }
diff --git a/data/src/main/java/com/yapp/android2/data/remote/request/LoginForAppReviewRequest.kt b/data/src/main/java/com/yapp/android2/data/remote/request/LoginForAppReviewRequest.kt
@@ -0,0 +1,6 @@
+package com.yapp.android2.data.remote.request
+
+data class LoginForAppReviewRequest(
+    val email: String,
+    val password: String
+)
diff --git a/data/src/main/java/com/yapp/android2/data/repository/LoginRepositoryImpl.kt b/data/src/main/java/com/yapp/android2/data/repository/LoginRepositoryImpl.kt
@@ -2,6 +2,7 @@ package com.yapp.android2.data.repository
 
 import com.yapp.android2.data.local.login.LoginLocalDataSource
 import com.yapp.android2.data.remote.login.LoginRemoteDataSource
+import com.yapp.android2.data.remote.request.LoginForAppReviewRequest
 import com.yapp.android2.data.remote.request.PostLoginRequest
 import com.yapp.android2.domain.entity.FCMToken
 import com.yapp.android2.domain.entity.User
@@ -23,6 +24,12 @@ class LoginRepositoryImpl @Inject constructor(
         return loginRemoteDataSource.postLogin(request)
     }
 
+    override suspend fun loginForAppReview(email: String, password: String) {
+        val request = LoginForAppReviewRequest(email, password)
+        val user = loginRemoteDataSource.loginForAppReview(request)
+        saveUser(user)
+    }
+
     override suspend fun postFCMToken(fcmToken: String) {
         val request = FCMToken(
             fcmToken = fcmToken

diff --git a/data/src/main/java/com/yapp/android2/data/service/LoginService.kt b/data/src/main/java/com/yapp/android2/data/service/LoginService.kt
@@ -1,5 +1,6 @@
 package com.yapp.android2.data.service
 
+import com.yapp.android2.data.remote.request.LoginForAppReviewRequest
 import com.yapp.android2.data.remote.request.PostLoginRequest
 import com.yapp.android2.domain.entity.FCMToken
 import com.yapp.android2.domain.entity.User
@@ -18,4 +19,9 @@ interface LoginService : Service {
     suspend fun postFCMToken(
         @Body request: FCMToken
     )
+
+    @POST("api/user/signin")
+    suspend fun loginForAppReview(
+        @Body request: LoginForAppReviewRequest
+    ): ApiResponse<User>
 }
diff --git a/domain/src/main/java/com/yapp/android2/domain/repository/login/LoginRepository.kt b/domain/src/main/java/com/yapp/android2/domain/repository/login/LoginRepository.kt
@@ -12,6 +12,8 @@ interface LoginRepository : Repository {
         providerId: String
     ): User
 
+    suspend fun loginForAppReview(email: String, password: String)
+
     suspend fun postFCMToken(fcmToken: String)
 
     fun saveUser(user: User)

diff --git a/presentation/login/src/main/java/com/best/friends/login/LoginForAppReviewActivity.kt b/presentation/login/src/main/java/com/best/friends/login/LoginForAppReviewActivity.kt
@@ -1,20 +1,68 @@
 package com.best.friends.login
 
 import android.os.Bundle
+import androidx.activity.viewModels
 import com.best.friends.core.BaseActivity
 import com.best.friends.login.databinding.ActivityLoginForAppReviewBinding
 import com.best.friends.navigator.HomeNavigator
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.messaging.FirebaseMessaging
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class LoginForAppReviewActivity :
     BaseActivity<ActivityLoginForAppReviewBinding>(R.layout.activity_login_for_app_review) {
 
+    private val viewModel by viewModels<LoginForAppReviewViewModel>()
+
     @Inject
     lateinit var homeNavigator: HomeNavigator
 
+    @Inject
+    lateinit var firebaseMessaging: FirebaseMessaging
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        initView()
+        observe()
+        initFirebase()
+    }
+
+    private fun initView() {
+        binding.viewModel = viewModel
+    }
+
+    private fun observe() {
+        viewModel.isRegisterUser.observe(this) {
+            if (it) {
+                viewModel.addFCMToken()
+            }
+        }
+
+        viewModel.isSuccess.observe(this) {
+            if (it) {
+                // 메인 화면으로 이동
+                val intent = homeNavigator.intent(this)
+                startActivity(intent)
+                finish()
+            }
+        }
+    }
+
+    private fun initFirebase() {
+        firebaseMessaging.token.addOnCompleteListener(OnCompleteListener { task ->
+            if (!task.isSuccessful) {
+                Timber.e(task.exception)
+                return@OnCompleteListener
+            }
+
+            // Get new FCM registration token
+            val token = task.result
+            viewModel.setFCMToken(token)
+            Timber.i("FCM Token: $token")
+        })
     }
 }
diff --git a/presentation/login/src/main/java/com/best/friends/login/LoginForAppReviewViewModel.kt b/presentation/login/src/main/java/com/best/friends/login/LoginForAppReviewViewModel.kt
@@ -0,0 +1,68 @@
+package com.best.friends.login
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.viewModelScope
+import com.best.friends.core.BaseViewModel
+import com.best.friends.core.extensions.Empty
+import com.yapp.android2.domain.repository.login.LoginRepository
+import com.yapp.android2.domain.usecase.PostFCMTokenUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class LoginForAppReviewViewModel @Inject constructor(
+    private val loginRepository: LoginRepository,
+    private val postFCMTokenUseCase: PostFCMTokenUseCase
+) : BaseViewModel() {
+
+    val email = MutableStateFlow(String.Empty)
+    val password = MutableStateFlow(String.Empty)
+
+    private val _fcmToken = MutableLiveData<String>()
+    val fcmToken: LiveData<String>
+        get() = _fcmToken
+
+    private val _isSuccess = MutableLiveData(false)
+    val isSuccess: LiveData<Boolean>
+        get() = _isSuccess.distinctUntilChanged()
+
+    private val _isRegisterUser = MutableLiveData(false)
+    val isRegisterUser: LiveData<Boolean>
+        get() = _isRegisterUser
+
+    fun login() {
+        viewModelScope.launch {
+            startLoading()
+            kotlin.runCatching {
+                loginRepository.loginForAppReview(email.value, password.value)
+            }.onSuccess {
+                _isRegisterUser.postValue(true)
+            }.onFailure {
+
+            }
+
+            stopLoading()
+        }
+    }
+
+    fun setFCMToken(token: String) {
+        _fcmToken.value = token
+    }
+
+    fun addFCMToken() {
+        viewModelScope.launch {
+            kotlin.runCatching {
+                postFCMTokenUseCase(requireNotNull(fcmToken.value))
+            }.onSuccess {
+                _isSuccess.postValue(true)
+            }.onFailure {
+                Timber.tag("--- LoginViewModel - FCM Token error").e("$it")
+            }
+        }
+    }
+}
diff --git a/presentation/login/src/main/res/layout/activity_login_for_app_review.xml b/presentation/login/src/main/res/layout/activity_login_for_app_review.xml
@@ -3,6 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.best.friends.login.LoginForAppReviewViewModel" />
+    </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -30,6 +37,7 @@
             android:inputType="textEmailAddress"
             android:paddingHorizontal="20dp"
             android:paddingVertical="12dp"
+            android:text="@={viewModel.email}"
             android:textAppearance="@style/Typography.Body3.Medium"
             android:textColorHint="@color/gray2"
             app:layout_constraintEnd_toEndOf="parent"
@@ -48,6 +56,7 @@
             android:inputType="textPassword"
             android:paddingHorizontal="20dp"
             android:paddingVertical="12dp"
+            android:text="@={viewModel.password}"
             android:textAppearance="@style/Typography.Body3.Medium"
             android:textColorHint="@color/gray2"
             app:layout_constraintEnd_toEndOf="parent"
@@ -109,6 +118,7 @@
 
         <TextView
             android:id="@+id/tv_login"
+            android:onClick="@{() -> viewModel.login()}"
             android:layout_width="0dp"
             android:layout_height="46dp"
             android:layout_marginHorizontal="30dp"
@@ -120,9 +130,17 @@
             android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_find_id"
+            app:layout_constraintTop_toBottomOf="@id/tv_find_id" />
 
-            />
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="@{viewModel.loading, default=gone}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>