mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed sliding pane opening on resume issue

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-09 17:56:55 +02:00
parent 702504e1d5
commit 48db3d4aa2
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/linphone/ui/main/calls/fragment/CallsFragment.kt
View file

@ -44,6 +44,10 @@ class CallsFragment : GenericFragment() {
private lateinit var binding: CallsFragmentBinding
// Otherwise when going into StartCallFragment and going back,
// CallFragment will resume and ask to open the pane
private var preventSlidingPaneOpening = false
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -64,6 +68,7 @@ class CallsFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
preventSlidingPaneOpening = true
binding.lifecycleOwner = viewLifecycleOwner
@ -99,8 +104,14 @@ class CallsFragment : GenericFragment() {
viewLifecycleOwner
) {
it.consume {
Log.i("$TAG Opening sliding pane")
binding.slidingPaneLayout.openPane()
if (!preventSlidingPaneOpening) {
Log.i("$TAG Opening sliding pane")
binding.slidingPaneLayout.openPane()
} else {
Log.i(
"$TAG We were asked to open the sliding pane but we aren't resumed yet, so not doing it"
)
}
}
}
@ -152,6 +163,7 @@ class CallsFragment : GenericFragment() {
override fun onResume() {
super.onResume()
preventSlidingPaneOpening = false
sharedViewModel.currentlyDisplayedFragment.value = R.id.callsFragment
}
}

16
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt
View file

@ -44,6 +44,10 @@ class ContactsFragment : GenericFragment() {
private lateinit var binding: ContactsFragmentBinding
// Otherwise when going into NewContactFragment and going back,
// ContactFragment will resume and ask to open the pane
private var preventSlidingPaneOpening = false
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -64,6 +68,7 @@ class ContactsFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
preventSlidingPaneOpening = true
binding.lifecycleOwner = viewLifecycleOwner
@ -106,8 +111,14 @@ class ContactsFragment : GenericFragment() {
viewLifecycleOwner
) {
it.consume {
Log.i("$TAG Opening sliding pane")
binding.slidingPaneLayout.openPane()
if (!preventSlidingPaneOpening) {
Log.i("$TAG Opening sliding pane")
binding.slidingPaneLayout.openPane()
} else {
Log.i(
"$TAG We were asked to open the sliding pane but we aren't resumed yet, so not doing it"
)
}
}
}
@ -161,6 +172,7 @@ class ContactsFragment : GenericFragment() {
override fun onResume() {
super.onResume()
preventSlidingPaneOpening = false
sharedViewModel.currentlyDisplayedFragment.value = R.id.contactsFragment
}
}