Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bumped dependencies

Browse source
This commit is contained in:
Sylvain Berfini 2021-06-04 10:43:52 +02:00
parent ee1cdd69d4
commit ad7b56c2c7
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -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"

24
app/src/main/java/org/linphone/activities/Navigation.kt
View file

@ -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()
)
}
}