From 7deef26f80180425f3d9686e05e34c895ffec691 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 15 Sep 2023 09:46:02 +0200
Subject: [PATCH] Fixed navigation issue

---
 .../main/chat/fragments/DetailChatRoomFragment.kt      |  9 +++------
 .../main/chat/fragments/MasterChatRoomsFragment.kt     | 10 +---------
 .../main/contact/fragments/DetailContactFragment.kt    |  7 ++-----
 .../main/contact/fragments/MasterContactsFragment.kt   |  9 +--------
 .../activities/main/viewmodels/SharedMainViewModel.kt  |  8 --------
 5 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index f9a55819b..8b105a700 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -33,7 +33,6 @@ import android.webkit.MimeTypeMap
 import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
-import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -163,6 +162,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        postponeEnterTransition()
 
         binding.lifecycleOwner = viewLifecycleOwner
 
@@ -208,11 +208,6 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             return
         }
 
-        view.doOnPreDraw {
-            // Notifies fragment is ready to be drawn
-            sharedViewModel.chatRoomFragmentOpenedEvent.value = Event(true)
-        }
-
         Compatibility.setLocusIdInContentCaptureSession(binding.root, chatRoom)
 
         isSecure = chatRoom.currentParams.isEncryptionEnabled
@@ -800,6 +795,8 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 sharedViewModel.isPendingMessageForward.value = false
             }
         }
+
+        startPostponedEnterTransition()
     }
 
     override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 1e0b468bd..e41ff59db 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -115,15 +115,6 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             }
         })
 
-        // Chat room loading can take some time, so wait until it is ready before opening the pane
-        sharedViewModel.chatRoomFragmentOpenedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                binding.slidingPane.openPane()
-            }
-        }
-
         sharedViewModel.layoutChangedEvent.observe(
             viewLifecycleOwner
         ) {
@@ -280,6 +271,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                                 sharedViewModel
                             )
                         )
+                        binding.slidingPane.openPane()
                     }
                 }
             }
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
index 78cff1f94..ab01a9b23 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
@@ -24,7 +24,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
-import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.ViewModelProvider
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
@@ -48,6 +47,7 @@ class DetailContactFragment : GenericFragment<ContactDetailFragmentBinding>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        postponeEnterTransition()
 
         binding.lifecycleOwner = viewLifecycleOwner
 
@@ -140,10 +140,7 @@ class DetailContactFragment : GenericFragment<ContactDetailFragmentBinding>() {
         }
         viewModel.updateNumbersAndAddresses()
 
-        view.doOnPreDraw {
-            // Notifies fragment is ready to be drawn
-            sharedViewModel.contactFragmentOpenedEvent.value = Event(true)
-        }
+        startPostponedEnterTransition()
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
index 344d4f588..8a6dc29f9 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
@@ -98,14 +98,6 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
             }
         }
 
-        sharedViewModel.contactFragmentOpenedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                binding.slidingPane.openPane()
-            }
-        }
-
         sharedViewModel.layoutChangedEvent.observe(
             viewLifecycleOwner
         ) {
@@ -230,6 +222,7 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
                     sipUriToAdd = null
                 } else {
                     navigateToContact()
+                    binding.slidingPane.openPane()
                 }
             }
         }
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
index 052027802..5bc6ae662 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
@@ -39,10 +39,6 @@ class SharedMainViewModel : ViewModel() {
 
     /* Chat */
 
-    val chatRoomFragmentOpenedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
     val selectedChatRoom = MutableLiveData<ChatRoom>()
     var destructionPendingChatRoom: ChatRoom? = null
 
@@ -75,10 +71,6 @@ class SharedMainViewModel : ViewModel() {
 
     /* Contacts */
 
-    val contactFragmentOpenedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
     val selectedContact = MutableLiveData<Friend>()
 
     // For correct animations directions