[MERGE]#188 -> develop

[REFACTOR/#188] 코드 리펙토링 및 navigate 확장함수 구현

presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt

@@ -9,10 +9,12 @@ import androidx.lifecycle.lifecycleScope
 import com.going.domain.entity.AuthState
 import com.going.presentation.R
 import com.going.presentation.dashboard.DashBoardActivity
-import com.going.presentation.databinding.ActivitySigninBinding
+import com.going.presentation.databinding.ActivitySignInBinding
 import com.going.presentation.onboarding.signup.SignUpActivity
+import com.going.presentation.setting.SettingActivity.Companion.TERMS_URL
 import com.going.presentation.tendency.splash.TendencySplashActivity
 import com.going.presentation.util.initOnBackPressedListener
+import com.going.presentation.util.navigateToScreen
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 import com.going.ui.extension.toast
@@ -21,19 +23,24 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
-class SignInActivity : BaseActivity<ActivitySigninBinding>(R.layout.activity_signin) {
+class SignInActivity : BaseActivity<ActivitySignInBinding>(R.layout.activity_sign_in) {
 
     private val viewModel by viewModels<SignInViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        clearToken()
         initKakaoLoginBtnClickListener()
         initTermsBtnClickListener()
         observeInfo()
         initOnBackPressedListener()
     }
 
+    private fun clearToken() {
+        viewModel.clearToken()
+    }
+
     private fun initKakaoLoginBtnClickListener() {
         binding.btnSignIn.setOnSingleClickListener {
             viewModel.startKakaoLogIn(this)
@@ -62,43 +69,12 @@ class SignInActivity : BaseActivity<ActivitySigninBinding>(R.layout.activity_sig
     private fun observePostChangeTokenState() {
         viewModel.postChangeTokenState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
-                AuthState.LOADING -> return@onEach
-                AuthState.SUCCESS -> navigateToDashBoardScreen()
+                AuthState.SUCCESS -> navigateToScreen<DashBoardActivity>()
                 AuthState.FAILURE -> toast(getString(R.string.server_error))
-                AuthState.SIGNUP -> navigateToOnboardingScreen()
-                AuthState.SIGNIN -> return@onEach
-                AuthState.TENDENCY -> navigateToTendencyScreen()
-                AuthState.EMPTY -> return@onEach
+                AuthState.SIGNUP -> navigateToScreen<SignUpActivity>()
+                AuthState.TENDENCY -> navigateToScreen<TendencySplashActivity>()
+                else -> return@onEach
             }
         }.launchIn(lifecycleScope)
     }
-
-    private fun navigateToDashBoardScreen() {
-        Intent(this, DashBoardActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    private fun navigateToOnboardingScreen() {
-        Intent(this, SignUpActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    private fun navigateToTendencyScreen() {
-        Intent(this, TendencySplashActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    companion object {
-        const val TERMS_URL =
-            "https://goinggoing.notion.site/75f5d981a5b842a6be74a9dc17ca67de?pvs=74"
-    }
 }

presentation/src/main/java/com/going/presentation/onboarding/signin/SignInViewModel.kt

@@ -65,7 +65,7 @@ class SignInViewModel @Inject constructor(
         }
     }
 
-    // 서버통신 - 카카오 토큰 보내서 서비스 토큰 받아오기 - 서버와 협의 후 수정예정
+    // 서버통신 - 카카오 토큰 보내서 서비스 토큰 받아오기
     private fun changeTokenFromServer(
         accessToken: String,
         platform: String = KAKAO,
@@ -93,6 +93,10 @@ class SignInViewModel @Inject constructor(
         }
     }
 
+    fun clearToken() {
+        tokenRepository.clearInfo()
+    }
+
     companion object {
         const val KAKAO = "kakao"
         const val SIGN_UP = "e4041"

presentation/src/main/java/com/going/presentation/onboarding/signup/SignUpActivity.kt

@@ -8,10 +8,12 @@ import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import com.going.domain.entity.AuthState
 import com.going.presentation.R
+import com.going.presentation.dashboard.DashBoardActivity
 import com.going.presentation.databinding.ActivitySignUpBinding
 import com.going.presentation.onboarding.splash.SplashActivity
 import com.going.presentation.tendency.splash.TendencySplashActivity
 import com.going.presentation.util.initOnBackPressedListener
+import com.going.presentation.util.navigateToScreen
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 import com.going.ui.extension.toast
@@ -78,30 +80,11 @@ class SignUpActivity :
     private fun observeIsSignUpState() {
         viewModel.isSignUpState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
-                AuthState.LOADING -> return@onEach
-                AuthState.SUCCESS -> navigateToTendencySplashScreen()
+                AuthState.SUCCESS -> navigateToScreen<TendencySplashActivity>()
                 AuthState.FAILURE -> toast(getString(R.string.server_error))
-                AuthState.SIGNUP -> return@onEach
-                AuthState.SIGNIN -> navigateToSplashScreen()
-                AuthState.TENDENCY -> return@onEach
-                AuthState.EMPTY -> return@onEach
+                AuthState.SIGNIN -> navigateToScreen<SplashActivity>()
+                else -> return@onEach
             }
         }.launchIn(lifecycleScope)
     }
-
-    private fun navigateToSplashScreen() {
-        Intent(this, SplashActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    private fun navigateToTendencySplashScreen() {
-        Intent(this, TendencySplashActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
 }

presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt

@@ -1,7 +1,6 @@
 package com.going.presentation.onboarding.splash
 
 import android.app.AlertDialog
-import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -14,6 +13,7 @@ import com.going.presentation.dashboard.DashBoardActivity
 import com.going.presentation.databinding.ActivitySplashBinding
 import com.going.presentation.onboarding.signin.SignInActivity
 import com.going.presentation.tendency.splash.TendencySplashActivity
+import com.going.presentation.util.navigateToScreen
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setStatusBarColorFromResource
 import dagger.hilt.android.AndroidEntryPoint
@@ -49,21 +49,18 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
             if (viewModel.getHasAccessToken()) {
                 viewModel.getUserState()
             } else {
-                navigateToSignInScreen()
+                navigateToScreen<SignInActivity>()
             }
         }, 2200)
     }
 
     private fun observeUserState() {
         viewModel.userState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
-                AuthState.LOADING -> return@onEach
-                AuthState.SUCCESS -> navigateToDashBoardScreen()
-                AuthState.FAILURE -> navigateToSignInScreen()
-                AuthState.SIGNUP -> return@onEach
-                AuthState.SIGNIN -> return@onEach
-                AuthState.TENDENCY -> navigateToTendencyScreen()
-                AuthState.EMPTY -> return@onEach
+                AuthState.SUCCESS -> navigateToScreen<DashBoardActivity>()
+                AuthState.FAILURE -> navigateToScreen<SignInActivity>()
+                AuthState.TENDENCY -> navigateToScreen<TendencySplashActivity>()
+                else -> return@onEach
             }
         }.launchIn(lifecycleScope)
     }
@@ -80,28 +77,4 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
             }
             .create()
             .show()
-
-    private fun navigateToDashBoardScreen() {
-        Intent(this, DashBoardActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    private fun navigateToTendencyScreen() {
-        Intent(this, TendencySplashActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    private fun navigateToSignInScreen() {
-        Intent(this, SignInActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
 }

presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt

@@ -117,7 +117,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(R.layout.activity_s
             "https://goinggoing.notion.site/FAQ-920f6ad93fea46a983061f412e15cad1?pvs=74"
         private const val PRIVACY_POLICY_URL =
             "https://goinggoing.notion.site/c4d5513bba2c4c20aaf9e21522289304?pvs=74"
-        private const val TERMS_URL =
+        const val TERMS_URL =
             "https://goinggoing.notion.site/75f5d981a5b842a6be74a9dc17ca67de?pvs=74"
         private const val ABOUT_DOORIP_URL =
             "https://goinggoing.notion.site/758273e2bebb477aac0adb0195359f21"

presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt

@@ -14,6 +14,7 @@ import com.going.presentation.databinding.ActivityTendencyResultBinding
 import com.going.presentation.tendency.splash.TendencySplashActivity
 import com.going.presentation.util.downloadImage
 import com.going.presentation.util.initOnBackPressedListener
+import com.going.presentation.util.navigateToScreen
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.UiState
 import com.going.ui.extension.setBulletPoint
@@ -46,10 +47,9 @@ class TendencyResultActivity :
     private fun observeUserInfoState() {
         viewModel.userInfoState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
-                is UiState.Loading -> return@onEach
                 is UiState.Success -> bindTendencyInfo(state.data.name, state.data.result)
                 is UiState.Failure -> toast(state.msg)
-                is UiState.Empty -> return@onEach
+                else -> return@onEach
             }
         }.launchIn(lifecycleScope)
     }
@@ -97,7 +97,7 @@ class TendencyResultActivity :
 
     private fun initRestartBtnClickListener() {
         binding.btnTendencyTestRestart.setOnSingleClickListener {
-            navigateToTendencySplashScreen()
+            navigateToScreen<TendencySplashActivity>()
         }
     }
 
@@ -109,26 +109,15 @@ class TendencyResultActivity :
 
     private fun initFinishBtnClickListener() {
         binding.btnTendencyResultFinish.setOnSingleClickListener {
-            navigateToDashBoardScreen()
+            navigateToScreen<DashBoardActivity>(
+                listOf(
+                    Intent.FLAG_ACTIVITY_NEW_TASK,
+                    Intent.FLAG_ACTIVITY_CLEAR_TASK,
+                ),
+            )
         }
     }
 
-    private fun navigateToTendencySplashScreen() {
-        Intent(this, TendencySplashActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
-    private fun navigateToDashBoardScreen() {
-        Intent(this, DashBoardActivity::class.java).apply {
-            startActivity(this)
-            finishAffinity()
-        }
-        finish()
-    }
-
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,

presentation/src/main/java/com/going/presentation/tendency/splash/TendencySplashActivity.kt

@@ -6,6 +6,7 @@ import com.going.presentation.R
 import com.going.presentation.databinding.ActivityTendencySplashBinding
 import com.going.presentation.tendency.ttest.TendencyTestActivity
 import com.going.presentation.util.initOnBackPressedListener
+import com.going.presentation.util.navigateToScreen
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 
@@ -21,15 +22,7 @@ class TendencySplashActivity :
 
     private fun initStartBtnClickListener() {
         binding.btnTendencySplashStart.setOnSingleClickListener {
-            navigateToTendencyTestScreen()
+            navigateToScreen<TendencyTestActivity>()
         }
     }
-
-    private fun navigateToTendencyTestScreen() {
-        Intent(this, TendencyTestActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
 }