From 2ab46541515459ad08da73f8beb2d8b0d763b5c0 Mon Sep 17 00:00:00 2001 From: Dani43 Date: Thu, 21 Sep 2023 17:09:31 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[fix]=20#181=20=EC=86=8C=EC=85=9C=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85,=20=ED=9B=84=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=EC=84=A4=EC=A0=95=20=EC=8B=9C=20signActivity?= =?UTF-8?q?=EB=A1=9C=20=EA=B0=80=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filterSetting/FilterSettingActivity.kt | 30 ++++++++++++++----- .../filterSetting/FilterSettingViewModel.kt | 4 +++ 2 files changed, 27 insertions(+), 7 deletions(-) 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 index ba77ceb5..6fc03370 100644 --- 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 @@ -41,12 +42,12 @@ class FilterSettingActivity : BindingActivity(R.layout.ac binding.vpFilterContainer.adapter = adapter binding.vpFilterContainer.isUserInputEnabled = false binding.vpFilterContainer.registerOnPageChangeCallback(object : - ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - super.onPageSelected(position) - viewModel.setCurrentPage(position) - } - }) + ViewPager2.OnPageChangeCallback() { + override fun onPageSelected(position: Int) { + super.onPageSelected(position) + viewModel.setCurrentPage(position) + } + }) setPreviousActivity() } @@ -122,7 +123,15 @@ class FilterSettingActivity : BindingActivity(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(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 index 5695a1d4..378a2c74 100644 --- 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.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 } From 318947009f98b789b95722b4bb20840389f7ef44 Mon Sep 17 00:00:00 2001 From: Dani43 Date: Thu, 21 Sep 2023 17:12:15 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[fix]=20#181=20=EC=86=8C=EC=85=9C=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=ED=9B=84=20=ED=99=88=EB=B7=B0=EB=A1=9C=20?= =?UTF-8?q?=EC=A7=84=EC=9E=85=20=EC=8B=9C=20=EB=92=A4=EB=A1=9C=EA=B0=80?= =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=EB=B2=85=EC=9E=84=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sopt/geonppang/presentation/auth/SignActivity.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 index 24d8b6f4..793a9ea5 100644 --- 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) } } From e3f5805fdecc1f8cb5c7261a88d7a9c49f24c6ab Mon Sep 17 00:00:00 2001 From: Dani43 Date: Thu, 21 Sep 2023 19:22:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[chore]=20#181=20ktlint=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filterSetting/FilterSettingActivity.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 index 6fc03370..074f703c 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/filterSetting/FilterSettingActivity.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/filterSetting/FilterSettingActivity.kt @@ -42,12 +42,12 @@ class FilterSettingActivity : BindingActivity(R.layout.ac binding.vpFilterContainer.adapter = adapter binding.vpFilterContainer.isUserInputEnabled = false binding.vpFilterContainer.registerOnPageChangeCallback(object : - ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - super.onPageSelected(position) - viewModel.setCurrentPage(position) - } - }) + ViewPager2.OnPageChangeCallback() { + override fun onPageSelected(position: Int) { + super.onPageSelected(position) + viewModel.setCurrentPage(position) + } + }) setPreviousActivity() }