diff --git a/app/src/main/java/com/sopt/geonppang/presentation/MainActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/MainActivity.kt index 2d69ce53..78f9eaf7 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/MainActivity.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/MainActivity.kt @@ -24,6 +24,11 @@ class MainActivity : BindingActivity(R.layout.activity_main supportFragmentManager.findFragmentById(R.id.fcv_home_container) ?: navigateTo() + if (intent.getStringExtra(FRAGMENT) == FRAGMENT) { + supportFragmentManager.findFragmentById(R.id.fcv_home_container) + ?: navigateTo() + } + binding.bnvHome.setOnItemSelectedListener { menu -> when (menu.itemId) { R.id.menu_home -> navigateTo() @@ -39,4 +44,8 @@ class MainActivity : BindingActivity(R.layout.activity_main replace(R.id.fcv_home_container, T::class.java.canonicalName) } } + + companion object { + const val FRAGMENT = "fragment" + } } diff --git a/app/src/main/java/com/sopt/geonppang/presentation/filter/FilterActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/filter/FilterActivity.kt index f8ecd89c..fd2137c9 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/filter/FilterActivity.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/filter/FilterActivity.kt @@ -54,6 +54,10 @@ class FilterActivity : BindingActivity(R.layout.activity_ startActivity(Intent(this, MainActivity::class.java)) } else if (viewModel.previousState.value == FilterInfoType.ONBOARDING.activityName) { startActivity(Intent(this, WelcomeActivity::class.java)) + } else { + val intent = Intent(this, MainActivity::class.java) + intent.putExtra(FRAGMENT, FRAGMENT) + startActivity(intent) } } @@ -88,5 +92,6 @@ class FilterActivity : BindingActivity(R.layout.activity_ companion object { const val FILTER_INFO = "filterInfo" + const val FRAGMENT = "fragment" } } diff --git a/app/src/main/java/com/sopt/geonppang/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/geonppang/presentation/mypage/MyPageFragment.kt index 04a53be3..612c18d8 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/mypage/MyPageFragment.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/mypage/MyPageFragment.kt @@ -49,5 +49,6 @@ class MyPageFragment : BindingFragment(R.layout.fragment_ private fun moveToFilter() { val intent = Intent(requireContext(), FilterActivity::class.java) intent.putExtra("filterInfo", FilterInfoType.MYPAGE.activityName) + startActivity(intent) } }