Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] 회원탈퇴 / 인텐트 플래그 수정 #129

Merged
merged 5 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_

private fun navigateToGuideScreen() {
Intent(requireContext(), GuideActivity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(this)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.android.go.sopt.winey.presentation.onboarding.story
import android.content.Intent
import android.icu.lang.UCharacter.GraphemeClusterBreak.T
import android.os.Bundle
import androidx.activity.OnBackPressedCallback
import androidx.activity.viewModels
import androidx.annotation.StringRes
import androidx.fragment.app.Fragment
Expand All @@ -28,54 +27,29 @@ class StoryActivity : BindingActivity<ActivityStoryBinding>(R.layout.activity_st
setUpDefaultNavigationText()
setUpDefaultFragment(savedInstanceState)
initNextButtonClickListener()
registerBackPressedCallback()
}

private fun registerBackPressedCallback() {
val callback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
when (supportFragmentManager.findFragmentById(R.id.fcv_story)) {
is FirstStoryFragment -> finish()
is SecondStoryFragment -> {
supportFragmentManager.popBackStack()
updateNavigationText(BACK_DIRECTION, R.string.story_first_detail_text)
}

is ThirdStoryFragment -> {
supportFragmentManager.popBackStack()
updateNavigationText(BACK_DIRECTION, R.string.story_second_detail_text)
}
}
}
}
onBackPressedDispatcher.addCallback(this, callback)
}

private fun initNextButtonClickListener() {
binding.fabStoryNext.setOnClickListener {
when (supportFragmentManager.findFragmentById(R.id.fcv_story)) {
is FirstStoryFragment -> {
updateNavigationText(FRONT_DIRECTION, R.string.story_second_detail_text)
navigateAndBackStack<SecondStoryFragment>()
updateNavigationText(R.string.story_second_detail_text)
navigateTo<SecondStoryFragment>()
}

is SecondStoryFragment -> {
updateNavigationText(FRONT_DIRECTION, R.string.story_third_detail_text)
navigateAndBackStack<ThirdStoryFragment>()
updateNavigationText(R.string.story_third_detail_text)
navigateTo<ThirdStoryFragment>()
}

is ThirdStoryFragment -> navigateToNicknameScreen()
}
}
}

private fun updateNavigationText(direction: Int, @StringRes resId: Int) {
private fun updateNavigationText(@StringRes resId: Int) {
viewModel.apply {
if (direction == BACK_DIRECTION) {
updatePageNumber(--currentPageNumber)
} else {
updatePageNumber(++currentPageNumber)
}
updatePageNumber(++currentPageNumber)
updateDetailText(stringOf(resId))
}
}
Expand All @@ -96,10 +70,9 @@ class StoryActivity : BindingActivity<ActivityStoryBinding>(R.layout.activity_st
}
}

private inline fun <reified T : Fragment> navigateAndBackStack() {
private inline fun <reified T : Fragment> navigateTo() {
supportFragmentManager.commit {
replace<T>(R.id.fcv_story, T::class.simpleName)
addToBackStack(null)
}
}

Expand All @@ -113,8 +86,6 @@ class StoryActivity : BindingActivity<ActivityStoryBinding>(R.layout.activity_st

companion object {
private const val FIRST_PAGE_NUM = 1
private const val BACK_DIRECTION = -1
private const val FRONT_DIRECTION = 1
private const val EXTRA_KEY = "PREV_SCREEN_NAME"
private const val EXTRA_VALUE = "StoryActivity"
}
Expand Down