Skip to content

Commit

Permalink
[feat] #48 MyPageFragment에서 필터 변경 후 다시 MyPage로 이동되도록 구현
Browse files Browse the repository at this point in the history
  • Loading branch information
jihyunniiii committed Jul 20, 2023
1 parent 81cc411 commit ec1145b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
supportFragmentManager.findFragmentById(R.id.fcv_home_container)
?: navigateTo<HomeFragment>()

if (intent.getStringExtra(FRAGMENT) == FRAGMENT) {
supportFragmentManager.findFragmentById(R.id.fcv_home_container)
?: navigateTo<MyPageFragment>()
}

binding.bnvHome.setOnItemSelectedListener { menu ->
when (menu.itemId) {
R.id.menu_home -> navigateTo<HomeFragment>()
Expand All @@ -39,4 +44,8 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
replace<T>(R.id.fcv_home_container, T::class.java.canonicalName)
}
}

companion object {
const val FRAGMENT = "fragment"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ class FilterActivity : BindingActivity<ActivityFilterBinding>(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)
}
}

Expand Down Expand Up @@ -88,5 +92,6 @@ class FilterActivity : BindingActivity<ActivityFilterBinding>(R.layout.activity_

companion object {
const val FILTER_INFO = "filterInfo"
const val FRAGMENT = "fragment"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
private fun moveToFilter() {
val intent = Intent(requireContext(), FilterActivity::class.java)
intent.putExtra("filterInfo", FilterInfoType.MYPAGE.activityName)
startActivity(intent)
}
}

0 comments on commit ec1145b

Please sign in to comment.