Skip to content
Snippets Groups Projects
Commit 209b26fa authored by Adrien Béraud's avatar Adrien Béraud
Browse files

fragments: use setReorderingAllowed

Change-Id: I3f9d7f5fd85afc73e9e4819d7ee9ecc88a2e7545
parent fef197dc
Branches
Tags
No related merge requests found
......@@ -261,6 +261,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
if (mHomeFragment == null) {
mHomeFragment = HomeFragment()
supportFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.replace(R.id.home_fragment, mHomeFragment!!, HomeFragment::class.java.simpleName)
.commit()
}
......@@ -461,6 +462,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
conversationBackPressedCallback.isEnabled = true
supportFragmentManager.beginTransaction()
.replace(R.id.conversation, conversation, ConversationFragment.TAG)
.setReorderingAllowed(true)
.runOnCommit {
intent?.let { conversation.handleShareIntent(it) }
}.commit()
......@@ -476,6 +478,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
frameContent = fragment
supportFragmentManager
.beginTransaction()
.setReorderingAllowed(true)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.replace(R.id.frame, fragment, SettingsFragment.TAG)
.addToBackStack(SettingsFragment.TAG)
......@@ -492,6 +495,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
mBinding!!.frame.isVisible = true
supportFragmentManager
.beginTransaction()
.setReorderingAllowed(true)
//.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out, android.R.animator.fade_in, android.R.animator.fade_out)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.frame, fragment, AboutFragment.TAG)
......@@ -529,6 +533,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
// Place it into the frame
frameContent = fragment
supportFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.replace(R.id.frame, fragment, JamiAccountSummaryFragment.TAG)
.addToBackStack(JamiAccountSummaryFragment.TAG)
......@@ -548,6 +553,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
// Place it into the frame
frameContent = fragment
supportFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.replace(R.id.frame, fragment, AccountEditionFragment.TAG)
.addToBackStack(AccountEditionFragment.TAG)
......
......@@ -72,7 +72,8 @@ class WelcomeJamiFragment : Fragment() {
// Create the JamiIdFragment
childFragmentManager.beginTransaction()
.replace(R.id.jamiIdFragmentContainerView, JamiIdFragment())
.commit()
.setReorderingAllowed(true)
.commitAllowingStateLoss()
}.root
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
......
......@@ -60,6 +60,7 @@ public abstract class BaseBottomSheetFragment<T extends RootPresenter> extends B
protected void replaceFragmentWithSlide(Fragment fragment, @IdRes int content) {
getParentFragmentManager()
.beginTransaction()
.setReorderingAllowed(true)
.setCustomAnimations(R.anim.slide_in_right,
R.anim.slide_out_left, R.anim.slide_in_left, R.anim.slide_out_right)
.replace(content, fragment, TAG)
......@@ -70,6 +71,7 @@ public abstract class BaseBottomSheetFragment<T extends RootPresenter> extends B
protected void replaceFragment(Fragment fragment, @IdRes int content) {
getParentFragmentManager()
.beginTransaction()
.setReorderingAllowed(true)
.replace(content, fragment, TAG)
.addToBackStack(TAG)
.commit();
......
......@@ -48,6 +48,7 @@ abstract class BaseSupportFragment<T : RootPresenter<in V>, in V> : Fragment() {
protected fun replaceFragmentWithSlide(fragment: Fragment, tag: String?, @IdRes containerID: Int) {
parentFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left, R.anim.slide_in_left, R.anim.slide_out_right)
.replace(containerID, fragment, tag)
.addToBackStack(tag)
......@@ -56,6 +57,7 @@ abstract class BaseSupportFragment<T : RootPresenter<in V>, in V> : Fragment() {
protected fun replaceFragment(fragment: Fragment, tag: String?, @IdRes containerID: Int) {
parentFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.replace(containerID, fragment, tag)
.addToBackStack(tag)
.commit()
......
......@@ -32,15 +32,13 @@ class TVShareActivity : FragmentActivity() {
var mAccountService: AccountService
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.tv_activity_share)
val f = TVShareFragment.newInstance(Uri.fromString(mAccountService.currentAccount?.uri!!))
supportFragmentManager.beginTransaction()
.replace(R.id.share_frag, f)
.commit()
.setReorderingAllowed(true)
.commitNow()
}
companion object {
......
......@@ -59,6 +59,7 @@ class TVCallActivity : FragmentActivity() {
callFragment = TVCallFragment.newInstance(intent.action!!, path.accountId, path.conversationId,
intent.extras!!.getString(Intent.EXTRA_PHONE_NUMBER, path.conversationId), true)
fragmentTransaction.replace(R.id.main_call_layout, callFragment!!, CALL_FRAGMENT_TAG)
.setReorderingAllowed(true)
.commit()
} else {
Log.d(TAG, "onCreate: incoming call")
......@@ -66,6 +67,7 @@ class TVCallActivity : FragmentActivity() {
Log.d(TAG, "onCreate: conf $confId")
callFragment = TVCallFragment.newInstance(Intent.ACTION_VIEW, confId)
fragmentTransaction.replace(R.id.main_call_layout, callFragment!!, CALL_FRAGMENT_TAG)
.setReorderingAllowed(true)
.commit()
}
}
......
......@@ -42,8 +42,9 @@ class TVContactDetailPresenter : Presenter() {
val fragment = TvConversationFragment.newInstance(ConversationPath.toBundle(item.accountId, item.uri))
val fragmentManager = (view.context as FragmentActivity).supportFragmentManager
fragmentManager.beginTransaction()
.setReorderingAllowed(true)
.replace(R.id.content, fragment, FRAGMENT_TAG)
.commit()
.commitAllowingStateLoss()
}
}
......
......@@ -138,9 +138,13 @@ class MainFragment : BaseBrowseFragment<MainPresenter>(), MainView {
override fun showLoading(show: Boolean) {
if (show) {
parentFragmentManager.beginTransaction()
.replace(R.id.main_browse_fragment, mSpinnerFragment).commitAllowingStateLoss()
.setReorderingAllowed(true)
.replace(R.id.main_browse_fragment, mSpinnerFragment)
.commitAllowingStateLoss()
} else {
parentFragmentManager.beginTransaction().remove(mSpinnerFragment)
parentFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.remove(mSpinnerFragment)
.commitAllowingStateLoss()
}
}
......@@ -321,6 +325,7 @@ class MainFragment : BaseBrowseFragment<MainPresenter>(), MainView {
arguments = ConversationPath.toBundle(model.accountId, model.uri)
}
parentFragmentManager.beginTransaction()
.setReorderingAllowed(true)
.hide(this@MainFragment)
.add(R.id.fragment_container, contactFragment, TVContactFragment.TAG)
.addToBackStack(TVContactFragment.TAG)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment