From b42b1f59100a022062c531daad5ae11bb20c5353 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 19 Jan 2021 16:32:37 +0100
Subject: [PATCH] Fixed animation when pressing back button while on one of the
 four main fragments

---
 .../activities/{main => }/Navigation.kt       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)
 rename app/src/main/java/org/linphone/activities/{main => }/Navigation.kt (97%)

diff --git a/app/src/main/java/org/linphone/activities/main/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
similarity index 97%
rename from app/src/main/java/org/linphone/activities/main/Navigation.kt
rename to app/src/main/java/org/linphone/activities/Navigation.kt
index 17757ed0e..0b2699842 100644
--- a/app/src/main/java/org/linphone/activities/main/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -165,17 +165,17 @@ internal fun TabsFragment.navigateToCallHistory() {
         R.id.masterContactsFragment -> findNavController().navigate(
             R.id.action_masterContactsFragment_to_masterCallLogsFragment,
             null,
-            getLeftTopToRightBottomNoPopAnimationNavOptions(R.id.masterCallLogsFragment)
+            getLeftTopToRightBottomAnimationNavOptions(R.id.masterCallLogsFragment)
         )
         R.id.dialerFragment -> findNavController().navigate(
             R.id.action_dialerFragment_to_masterCallLogsFragment,
             null,
-            getLeftTopToRightBottomNoPopAnimationNavOptions(R.id.masterCallLogsFragment)
+            getLeftTopToRightBottomAnimationNavOptions(R.id.masterCallLogsFragment)
         )
         R.id.masterChatRoomsFragment -> findNavController().navigate(
             R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment,
             null,
-            getLeftTopToRightBottomNoPopAnimationNavOptions(R.id.masterCallLogsFragment)
+            getLeftTopToRightBottomAnimationNavOptions(R.id.masterCallLogsFragment)
         )
     }
 }
@@ -185,17 +185,17 @@ internal fun TabsFragment.navigateToContacts() {
         R.id.masterCallLogsFragment -> findNavController().navigate(
             R.id.action_masterCallLogsFragment_to_masterContactsFragment,
             null,
-            getRightBottomToLeftTopNoPopAnimationNavOptions(R.id.masterContactsFragment)
+            getRightBottomToLeftTopAnimationNavOptions(R.id.masterContactsFragment)
         )
         R.id.dialerFragment -> findNavController().navigate(
             R.id.action_dialerFragment_to_masterContactsFragment,
             null,
-            getLeftTopToRightBottomNoPopAnimationNavOptions(R.id.masterContactsFragment)
+            getLeftTopToRightBottomAnimationNavOptions(R.id.masterContactsFragment)
         )
         R.id.masterChatRoomsFragment -> findNavController().navigate(
             R.id.action_masterChatRoomsFragment_to_masterContactsFragment,
             null,
-            getLeftTopToRightBottomNoPopAnimationNavOptions(R.id.masterContactsFragment)
+            getLeftTopToRightBottomAnimationNavOptions(R.id.masterContactsFragment)
         )
     }
 }
@@ -205,17 +205,17 @@ internal fun TabsFragment.navigateToDialer() {
         R.id.masterCallLogsFragment -> findNavController().navigate(
             R.id.action_masterCallLogsFragment_to_dialerFragment,
             null,
-            getRightBottomToLeftTopNoPopAnimationNavOptions(R.id.dialerFragment)
+            getRightBottomToLeftTopAnimationNavOptions(R.id.dialerFragment)
         )
         R.id.masterContactsFragment -> findNavController().navigate(
             R.id.action_masterContactsFragment_to_dialerFragment,
             null,
-            getRightBottomToLeftTopNoPopAnimationNavOptions(R.id.dialerFragment)
+            getRightBottomToLeftTopAnimationNavOptions(R.id.dialerFragment)
         )
         R.id.masterChatRoomsFragment -> findNavController().navigate(
             R.id.action_masterChatRoomsFragment_to_dialerFragment,
             null,
-            getLeftTopToRightBottomNoPopAnimationNavOptions(R.id.dialerFragment)
+            getLeftTopToRightBottomAnimationNavOptions(R.id.dialerFragment)
         )
     }
 }
@@ -225,17 +225,17 @@ internal fun TabsFragment.navigateToChatRooms() {
         R.id.masterCallLogsFragment -> findNavController().navigate(
             R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment,
             null,
-            getRightBottomToLeftTopNoPopAnimationNavOptions(R.id.masterChatRoomsFragment)
+            getRightBottomToLeftTopAnimationNavOptions(R.id.masterChatRoomsFragment)
         )
         R.id.masterContactsFragment -> findNavController().navigate(
             R.id.action_masterContactsFragment_to_masterChatRoomsFragment,
             null,
-            getRightBottomToLeftTopNoPopAnimationNavOptions(R.id.masterChatRoomsFragment)
+            getRightBottomToLeftTopAnimationNavOptions(R.id.masterChatRoomsFragment)
         )
         R.id.dialerFragment -> findNavController().navigate(
             R.id.action_dialerFragment_to_masterChatRoomsFragment,
             null,
-            getRightBottomToLeftTopNoPopAnimationNavOptions(R.id.masterChatRoomsFragment)
+            getRightBottomToLeftTopAnimationNavOptions(R.id.masterChatRoomsFragment)
         )
     }
 }