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

Also fixed landscape anim from call history to contact details

Browse source
This commit is contained in:
Sylvain Berfini 2020-11-09 10:40:58 +01:00
parent 4d05f313cb
commit 98e81bb5c0
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ fun getLeftTopToRightBottomAnimationNavOptions(): NavOptions {
.build() .build()
} }
fun getRightToLeftNoPopAnimationNavOptions(): NavOptions { fun getRightBottomToLeftTopNoPopAnimationNavOptions(): NavOptions {
if (!corePreferences.enableAnimations) return NavOptions.Builder().build() if (!corePreferences.enableAnimations) return NavOptions.Builder().build()
return NavOptions.Builder() return NavOptions.Builder()
.setEnterAnim(R.anim.enter_right_or_bottom) .setEnterAnim(R.anim.enter_right_or_bottom)
@ -104,7 +104,7 @@ fun getRightToLeftNoPopAnimationNavOptions(): NavOptions {
.build() .build()
} }
fun getLeftToRightNoPopAnimationNavOptions(): NavOptions { fun getLeftTopToRightBottomNoPopAnimationNavOptions(): NavOptions {
if (!corePreferences.enableAnimations) return NavOptions.Builder().build() if (!corePreferences.enableAnimations) return NavOptions.Builder().build()
return NavOptions.Builder() return NavOptions.Builder()
.setEnterAnim(R.anim.enter_left_or_top) .setEnterAnim(R.anim.enter_left_or_top)
@ -129,17 +129,17 @@ internal fun TabsFragment.navigateToCallHistory() {
R.id.masterContactsFragment -> findNavController().navigate( R.id.masterContactsFragment -> findNavController().navigate(
R.id.action_masterContactsFragment_to_masterCallLogsFragment, R.id.action_masterContactsFragment_to_masterCallLogsFragment,
null, null,
getLeftToRightNoPopAnimationNavOptions() getLeftTopToRightBottomNoPopAnimationNavOptions()
) )
R.id.dialerFragment -> findNavController().navigate( R.id.dialerFragment -> findNavController().navigate(
R.id.action_dialerFragment_to_masterCallLogsFragment, R.id.action_dialerFragment_to_masterCallLogsFragment,
null, null,
getLeftToRightNoPopAnimationNavOptions() getLeftTopToRightBottomNoPopAnimationNavOptions()
) )
R.id.masterChatRoomsFragment -> findNavController().navigate( R.id.masterChatRoomsFragment -> findNavController().navigate(
R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment, R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment,
null, null,
getLeftToRightNoPopAnimationNavOptions() getLeftTopToRightBottomNoPopAnimationNavOptions()
) )
} }
} }
@ -149,17 +149,17 @@ internal fun TabsFragment.navigateToContacts() {
R.id.masterCallLogsFragment -> findNavController().navigate( R.id.masterCallLogsFragment -> findNavController().navigate(
R.id.action_masterCallLogsFragment_to_masterContactsFragment, R.id.action_masterCallLogsFragment_to_masterContactsFragment,
null, null,
getRightToLeftNoPopAnimationNavOptions() getRightBottomToLeftTopNoPopAnimationNavOptions()
) )
R.id.dialerFragment -> findNavController().navigate( R.id.dialerFragment -> findNavController().navigate(
R.id.action_dialerFragment_to_masterContactsFragment, R.id.action_dialerFragment_to_masterContactsFragment,
null, null,
getLeftToRightNoPopAnimationNavOptions() getLeftTopToRightBottomNoPopAnimationNavOptions()
) )
R.id.masterChatRoomsFragment -> findNavController().navigate( R.id.masterChatRoomsFragment -> findNavController().navigate(
R.id.action_masterChatRoomsFragment_to_masterContactsFragment, R.id.action_masterChatRoomsFragment_to_masterContactsFragment,
null, null,
getLeftToRightNoPopAnimationNavOptions() getLeftTopToRightBottomNoPopAnimationNavOptions()
) )
} }
} }
@ -169,17 +169,17 @@ internal fun TabsFragment.navigateToDialer() {
R.id.masterCallLogsFragment -> findNavController().navigate( R.id.masterCallLogsFragment -> findNavController().navigate(
R.id.action_masterCallLogsFragment_to_dialerFragment, R.id.action_masterCallLogsFragment_to_dialerFragment,
null, null,
getRightToLeftNoPopAnimationNavOptions() getRightBottomToLeftTopNoPopAnimationNavOptions()
) )
R.id.masterContactsFragment -> findNavController().navigate( R.id.masterContactsFragment -> findNavController().navigate(
R.id.action_masterContactsFragment_to_dialerFragment, R.id.action_masterContactsFragment_to_dialerFragment,
null, null,
getRightToLeftNoPopAnimationNavOptions() getRightBottomToLeftTopNoPopAnimationNavOptions()
) )
R.id.masterChatRoomsFragment -> findNavController().navigate( R.id.masterChatRoomsFragment -> findNavController().navigate(
R.id.action_masterChatRoomsFragment_to_dialerFragment, R.id.action_masterChatRoomsFragment_to_dialerFragment,
null, null,
getLeftToRightNoPopAnimationNavOptions() getLeftTopToRightBottomNoPopAnimationNavOptions()
) )
} }
} }
@ -189,17 +189,17 @@ internal fun TabsFragment.navigateToChatRooms() {
R.id.masterCallLogsFragment -> findNavController().navigate( R.id.masterCallLogsFragment -> findNavController().navigate(
R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment, R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment,
null, null,
getRightToLeftNoPopAnimationNavOptions() getRightBottomToLeftTopNoPopAnimationNavOptions()
) )
R.id.masterContactsFragment -> findNavController().navigate( R.id.masterContactsFragment -> findNavController().navigate(
R.id.action_masterContactsFragment_to_masterChatRoomsFragment, R.id.action_masterContactsFragment_to_masterChatRoomsFragment,
null, null,
getRightToLeftNoPopAnimationNavOptions() getRightBottomToLeftTopNoPopAnimationNavOptions()
) )
R.id.dialerFragment -> findNavController().navigate( R.id.dialerFragment -> findNavController().navigate(
R.id.action_dialerFragment_to_masterChatRoomsFragment, R.id.action_dialerFragment_to_masterChatRoomsFragment,
null, null,
getRightToLeftNoPopAnimationNavOptions() getRightBottomToLeftTopNoPopAnimationNavOptions()
) )
} }
} }
@ -208,7 +208,7 @@ internal fun TabsFragment.navigateToChatRooms() {
internal fun DialerFragment.navigateToContacts(uriToAdd: String?) { internal fun DialerFragment.navigateToContacts(uriToAdd: String?) {
val deepLink = "linphone-android://contact/new/$uriToAdd" val deepLink = "linphone-android://contact/new/$uriToAdd"
findNavController().navigate(Uri.parse(deepLink), getLeftToRightNoPopAnimationNavOptions()) findNavController().navigate(Uri.parse(deepLink), getLeftTopToRightBottomNoPopAnimationNavOptions())
} }
/* Chat related */ /* Chat related */
@ -466,11 +466,11 @@ internal fun DetailCallLogFragment.navigateToContact(contact: NativeContact) {
findMasterNavController().navigate( findMasterNavController().navigate(
R.id.action_detailCallLogFragment_to_detailContactFragment, R.id.action_detailCallLogFragment_to_detailContactFragment,
args, args,
getRightToLeftAnimationNavOptions() getRightBottomToLeftTopAnimationNavOptions()
) )
} else { } else {
val deepLink = "linphone-android://contact/view/${contact.nativeId}" val deepLink = "linphone-android://contact/view/${contact.nativeId}"
findMasterNavController().navigate(Uri.parse(deepLink), getRightToLeftAnimationNavOptions()) findMasterNavController().navigate(Uri.parse(deepLink), getRightBottomToLeftTopAnimationNavOptions())
} }
} }