Issues boostcampwm-2022#287 feat: SAA 구조로 변경 Intro -> Fragment 로 변경

domain/src/main/java/com/lighthouse/domain/usecase/user/IsLoginUserUseCase.kt

@@ -1,13 +1,14 @@
 package com.lighthouse.domain.usecase.user
 
 import com.lighthouse.domain.repository.user.UserRepository
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class IsLoginUserUseCase @Inject constructor(
     private val userRepository: UserRepository
 ) {
 
-    suspend operator fun invoke(): Boolean {
+    operator fun invoke(): Flow<Boolean> {
         return userRepository.isLogin()
     }
 }

features/ui-intro/src/main/java/com/lighthouse/features/intro/ui/IntroActivity.kt → features/ui-intro/src/main/java/com/lighthouse/features/intro/ui/IntroFragment.kt

@@ -2,11 +2,10 @@ package com.lighthouse.features.intro.ui
 
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
+import android.view.View
 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.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import com.lighthouse.auth.google.exception.FailedApiException
@@ -18,24 +17,20 @@ import com.lighthouse.features.common.ext.repeatOnStarted
 import com.lighthouse.features.common.ext.show
 import com.lighthouse.features.common.utils.throttle.onThrottleClick
 import com.lighthouse.features.intro.R
-import com.lighthouse.features.intro.databinding.ActivityIntroBinding
-import com.lighthouse.features.intro.di.IntroNav
+import com.lighthouse.features.intro.databinding.FragmentIntroBinding
 import com.lighthouse.features.intro.exception.FailedSaveLoginUserException
 import com.lighthouse.features.intro.model.SignInState
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class IntroActivity : AppCompatActivity() {
+class IntroFragment : Fragment(R.layout.fragment_intro) {
 
-    private lateinit var binding: ActivityIntroBinding
+    private lateinit var binding: FragmentIntroBinding
 
     private val viewModel: IntroViewModel by viewModels()
 
-    @Inject
-    lateinit var nav: IntroNav
-
     @Inject
     lateinit var googleClient: GoogleClient
 
@@ -53,28 +48,8 @@ class IntroActivity : AppCompatActivity() {
             }
         }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        installSplashScreen()
-        super.onCreate(savedInstanceState)
-        lifecycleScope.launch {
-            if (viewModel.isLogin()) {
-                openMainScreen()
-            } else {
-                openIntroScreen()
-            }
-        }
-    }
-
-    private fun openMainScreen() {
-        nav.openMain(this)
-        finish()
-    }
-
-    private fun openIntroScreen() {
-        binding = DataBindingUtil.setContentView(
-            this@IntroActivity,
-            R.layout.activity_intro
-        )
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         animateLogo()
         setUpSignInStateFlow()
@@ -95,13 +70,13 @@ class IntroActivity : AppCompatActivity() {
                         progressDialog?.dismiss()
                     }
                     progressDialog = ProgressDialog()
-                    progressDialog?.show(supportFragmentManager)
+                    progressDialog?.show(childFragmentManager)
                 } else {
                     progressDialog?.dismiss()
                 }
 
                 when (state) {
-                    is SignInState.Success -> openMainScreen()
+                    is SignInState.Success -> signInSuccess()
                     is SignInState.Failed -> signInFailed(state.e)
                     else -> {}
                 }
@@ -134,6 +109,11 @@ class IntroActivity : AppCompatActivity() {
         }
     }
 
+    private fun signInSuccess() {
+        val message = getString(R.string.login_success)
+        showSnackBar(message)
+    }
+
     private fun signInFailed(e: Exception) {
         val message = when (e) {
             is FailedApiException -> getString(R.string.google_login_failed)

features/ui-intro/src/main/java/com/lighthouse/features/intro/ui/IntroViewModel.kt

@@ -1,7 +1,6 @@
 package com.lighthouse.features.intro.ui
 
 import androidx.lifecycle.ViewModel
-import com.lighthouse.domain.usecase.user.IsLoginUserUseCase
 import com.lighthouse.domain.usecase.user.LoginUseCase
 import com.lighthouse.features.intro.model.SignInState
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -11,15 +10,12 @@ import javax.inject.Inject
 
 @HiltViewModel
 internal class IntroViewModel @Inject constructor(
-    private val isLoginUserUseCase: IsLoginUserUseCase,
     private val loginUseCase: LoginUseCase
 ) : ViewModel() {
 
     private val _signInState = MutableStateFlow<SignInState>(SignInState.None)
     val signInState = _signInState.asStateFlow()
 
-    suspend fun isLogin() = isLoginUserUseCase()
-
     suspend fun login(): Result<Unit> {
         return loginUseCase()
     }