[MERGE] #99 -> develop

[FIX/#99] 스플래쉬뷰 / 액티비티 intent 조정
Genti2024 · Aug 1, 2024 · 28ffbf5 · 28ffbf5
2 parents 677d85a + fb7cba9
commit 28ffbf5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -3,6 +3,6 @@ object Constants {
     const val compileSdk = 34
     const val minSdk = 28
     const val targetSdk = 34
-    const val versionCode = 1
+    const val versionCode = 2
     const val versionName = "1.0"
-}
+}
diff --git a/presentation/src/main/java/kr/genti/presentation/auth/splash/SplashActivity.kt b/presentation/src/main/java/kr/genti/presentation/auth/splash/SplashActivity.kt
@@ -56,19 +56,23 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
         viewModel.reissueTokenResult.flowWithLifecycle(lifecycle).distinctUntilChanged()
             .onEach { isSuccess ->
                 if (isSuccess) {
-                    Intent(this, MainActivity::class.java).apply {
-                        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                        startActivity(this)
-                    }
+                    navigateToMainView()
                 } else {
                     navigateToLoginView()
                 }
             }.launchIn(lifecycleScope)
     }
 
+    private fun navigateToMainView() {
+        Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+            startActivity(this)
+        }
+    }
+
     private fun navigateToLoginView() {
         Intent(this, LoginActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
             startActivity(
                 this,
                 ActivityOptions.makeCustomAnimation(