diff --git a/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt index 901db6d5e..127360176 100644 --- a/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt @@ -68,7 +68,7 @@ abstract class AbstractTopBarFragment : GenericFragment() { viewLifecycleOwner ) { it.consume { - if (slidingPane.isOpen) { + if (slidingPane.isOpen && slidingPane.isSlideable) { Log.i("$TAG Closing sliding pane") slidingPane.closePane() } diff --git a/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt index bcb92de98..fe82f82a1 100644 --- a/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt @@ -23,34 +23,21 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.animation.Animation -import android.view.animation.AnimationUtils import androidx.annotation.UiThread import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import androidx.transition.AutoTransition -import org.linphone.R import org.linphone.databinding.EmptyFragmentBinding @UiThread class EmptyFragment : Fragment() { private lateinit var binding: EmptyFragmentBinding - override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? { - if (findNavController().currentDestination?.id == R.id.newContactFragment) { - // Holds fragment in place while new fragment slides over it - return AnimationUtils.loadAnimation(activity, R.anim.hold) - } - return super.onCreateAnimation(transit, enter, nextAnim) - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { binding = EmptyFragmentBinding.inflate(layoutInflater) - sharedElementEnterTransition = AutoTransition() return binding.root } @@ -59,4 +46,10 @@ class EmptyFragment : Fragment() { binding.lifecycleOwner = viewLifecycleOwner } + + override fun onResume() { + super.onResume() + + findNavController().popBackStack() + } }