From ad7b56c2c7554eeedd138875734635a909264140 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 4 Jun 2021 10:43:52 +0200
Subject: [PATCH] Bumped dependencies

---
 app/build.gradle                              |  8 +++----
 .../org/linphone/activities/Navigation.kt     | 24 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e551bc015..42056de6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -233,12 +233,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.media:media:1.2.0'
-    // Don't update to fragment-ktx:1.3.2 (nor 1.3.3) for now, will break some animations
-    // https://developer.android.com/jetpack/androidx/releases/fragment#version_132_2
-    implementation 'androidx.fragment:fragment-ktx:1.3.1'
-    implementation 'androidx.core:core-ktx:1.5.0-beta03'
+    implementation 'androidx.fragment:fragment-ktx:1.3.4'
+    implementation 'androidx.core:core-ktx:1.6.0-beta02'
 
     def nav_version = "2.3.5"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 2224ca6c0..3a118b404 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -166,17 +166,17 @@ internal fun TabsFragment.navigateToCallHistory() {
         R.id.masterContactsFragment -> findNavController().navigate(
             R.id.action_masterContactsFragment_to_masterCallLogsFragment,
             null,
-            getLeftTopToRightBottomAnimationNavOptions(R.id.masterCallLogsFragment)
+            getLeftTopToRightBottomAnimationNavOptions()
         )
         R.id.dialerFragment -> findNavController().navigate(
             R.id.action_dialerFragment_to_masterCallLogsFragment,
             null,
-            getLeftTopToRightBottomAnimationNavOptions(R.id.masterCallLogsFragment)
+            getLeftTopToRightBottomAnimationNavOptions()
         )
         R.id.masterChatRoomsFragment -> findNavController().navigate(
             R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment,
             null,
-            getLeftTopToRightBottomAnimationNavOptions(R.id.masterCallLogsFragment)
+            getLeftTopToRightBottomAnimationNavOptions()
         )
     }
 }
@@ -186,17 +186,17 @@ internal fun TabsFragment.navigateToContacts() {
         R.id.masterCallLogsFragment -> findNavController().navigate(
             R.id.action_masterCallLogsFragment_to_masterContactsFragment,
             null,
-            getRightBottomToLeftTopAnimationNavOptions(R.id.masterContactsFragment)
+            getRightBottomToLeftTopAnimationNavOptions()
         )
         R.id.dialerFragment -> findNavController().navigate(
             R.id.action_dialerFragment_to_masterContactsFragment,
             null,
-            getLeftTopToRightBottomAnimationNavOptions(R.id.masterContactsFragment)
+            getLeftTopToRightBottomAnimationNavOptions()
         )
         R.id.masterChatRoomsFragment -> findNavController().navigate(
             R.id.action_masterChatRoomsFragment_to_masterContactsFragment,
             null,
-            getLeftTopToRightBottomAnimationNavOptions(R.id.masterContactsFragment)
+            getLeftTopToRightBottomAnimationNavOptions()
         )
     }
 }
@@ -206,17 +206,17 @@ internal fun TabsFragment.navigateToDialer() {
         R.id.masterCallLogsFragment -> findNavController().navigate(
             R.id.action_masterCallLogsFragment_to_dialerFragment,
             null,
-            getRightBottomToLeftTopAnimationNavOptions(R.id.dialerFragment)
+            getRightBottomToLeftTopAnimationNavOptions()
         )
         R.id.masterContactsFragment -> findNavController().navigate(
             R.id.action_masterContactsFragment_to_dialerFragment,
             null,
-            getRightBottomToLeftTopAnimationNavOptions(R.id.dialerFragment)
+            getRightBottomToLeftTopAnimationNavOptions()
         )
         R.id.masterChatRoomsFragment -> findNavController().navigate(
             R.id.action_masterChatRoomsFragment_to_dialerFragment,
             null,
-            getLeftTopToRightBottomAnimationNavOptions(R.id.dialerFragment)
+            getLeftTopToRightBottomAnimationNavOptions()
         )
     }
 }
@@ -226,17 +226,17 @@ internal fun TabsFragment.navigateToChatRooms() {
         R.id.masterCallLogsFragment -> findNavController().navigate(
             R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment,
             null,
-            getRightBottomToLeftTopAnimationNavOptions(R.id.masterChatRoomsFragment)
+            getRightBottomToLeftTopAnimationNavOptions()
         )
         R.id.masterContactsFragment -> findNavController().navigate(
             R.id.action_masterContactsFragment_to_masterChatRoomsFragment,
             null,
-            getRightBottomToLeftTopAnimationNavOptions(R.id.masterChatRoomsFragment)
+            getRightBottomToLeftTopAnimationNavOptions()
         )
         R.id.dialerFragment -> findNavController().navigate(
             R.id.action_dialerFragment_to_masterChatRoomsFragment,
             null,
-            getRightBottomToLeftTopAnimationNavOptions(R.id.masterChatRoomsFragment)
+            getRightBottomToLeftTopAnimationNavOptions()
         )
     }
 }