Merge pull request #182 from GEON-PPANG/fix-sign-change-view

[fix] 소셜 로그인, 회원가입 후 뒤로가기를 누를때 생기는 버벅임 문제 해결
GEON-PPANG · Sep 21, 2023 · b9fda07 · b9fda07
2 parents 8fc4abc + e3f5805
commit b9fda07
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/app/src/main/java/com/sopt/geonppang/presentation/auth/SignActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/auth/SignActivity.kt
@@ -75,6 +75,9 @@ class SignActivity :
     }
 
     private fun moveToMain() {
-        startActivity(Intent(this, MainActivity::class.java))
+        val intent = Intent(this, MainActivity::class.java)
+        intent.flags =
+            Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+        startActivity(intent)
     }
 }
diff --git a/app/src/main/java/com/sopt/geonppang/presentation/filterSetting/FilterSettingActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/filterSetting/FilterSettingActivity.kt
@@ -11,6 +11,7 @@ import com.sopt.geonppang.databinding.ActivityFilterBinding
 import com.sopt.geonppang.presentation.MainActivity
 import com.sopt.geonppang.presentation.auth.SignActivity
 import com.sopt.geonppang.presentation.type.FilterInfoType
+import com.sopt.geonppang.presentation.type.PlatformType
 import com.sopt.geonppang.util.AmplitudeUtils
 import com.sopt.geonppang.util.UiState
 import com.sopt.geonppang.util.binding.BindingActivity
@@ -122,7 +123,15 @@ class FilterSettingActivity : BindingActivity<ActivityFilterBinding>(R.layout.ac
                         }
 
                         FilterInfoType.ONBOARDING -> {
-                            moveToSign()
+                            when (viewModel.platformType) {
+                                PlatformType.NONE.name -> {
+                                    moveToSign()
+                                }
+
+                                PlatformType.KAKAO.name -> {
+                                    moveOnBoardingToMain()
+                                }
+                            }
                         }
 
                         else -> {}
@@ -135,6 +144,13 @@ class FilterSettingActivity : BindingActivity<ActivityFilterBinding>(R.layout.ac
         }.launchIn(lifecycleScope)
     }
 
+    private fun moveOnBoardingToMain() {
+        val intent = Intent(this, MainActivity::class.java)
+        intent.flags =
+            Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+        startActivity(intent)
+    }
+
     private fun moveToMain(initialFragment: String?) {
         val intent = Intent(this, MainActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/filterSetting/FilterSettingViewModel.kt b/app/src/main/java/com/sopt/geonppang/presentation/filterSetting/FilterSettingViewModel.kt
@@ -2,6 +2,7 @@ package com.sopt.geonppang.presentation.filterSetting
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.sopt.geonppang.data.datasource.local.GPDataSource
 import com.sopt.geonppang.data.model.request.RequestSettingFilter
 import com.sopt.geonppang.domain.model.SelectedFilter
 import com.sopt.geonppang.domain.repository.FilterSettingRepository
@@ -22,6 +23,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class FilterSettingViewModel @Inject constructor(
+    gpDataSource: GPDataSource,
     private val filterRepository: FilterSettingRepository
 ) : ViewModel() {
     private val _selectedFilterState = MutableStateFlow<UiState<SelectedFilter>>(UiState.Loading)
@@ -61,6 +63,8 @@ class FilterSettingViewModel @Inject constructor(
         }
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false)
 
+    val platformType = gpDataSource.platformType
+
     fun setPreviousActivity(filterInfoType: FilterInfoType) {
         _previousActivity.value = filterInfoType
     }