Added missing animation
This commit is contained in:
parent
c06c90fe1a
commit
7635cad984
4 changed files with 39 additions and 2 deletions
|
@ -178,7 +178,7 @@ internal fun SideMenuFragment.navigateToAccountSettings(identity: String) {
|
||||||
if (!resources.getBoolean(R.bool.isTablet)) {
|
if (!resources.getBoolean(R.bool.isTablet)) {
|
||||||
// If not a tablet, navigate directly to account settings fragment
|
// If not a tablet, navigate directly to account settings fragment
|
||||||
val deepLink = "linphone-android://account-settings/$identity"
|
val deepLink = "linphone-android://account-settings/$identity"
|
||||||
findNavController().navigate(Uri.parse(deepLink))
|
findNavController().navigate(Uri.parse(deepLink), getRightToLeftAnimationNavOptions())
|
||||||
} else {
|
} else {
|
||||||
// On tablet, to keep the categories list on left side, navigate to settings fragment first
|
// On tablet, to keep the categories list on left side, navigate to settings fragment first
|
||||||
val deepLink = "linphone-android://settings/$identity"
|
val deepLink = "linphone-android://settings/$identity"
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/backgroundColor">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/top_bar"
|
android:id="@+id/top_bar"
|
||||||
|
|
|
@ -263,6 +263,10 @@
|
||||||
android:label="AboutFragment" />
|
android:label="AboutFragment" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_aboutFragment"
|
android:id="@+id/action_global_aboutFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/aboutFragment"
|
app:destination="@id/aboutFragment"
|
||||||
app:launchSingleTop="true"
|
app:launchSingleTop="true"
|
||||||
app:popUpTo="@+id/aboutFragment"
|
app:popUpTo="@+id/aboutFragment"
|
||||||
|
@ -274,6 +278,10 @@
|
||||||
android:label="RecordingsFragment" />
|
android:label="RecordingsFragment" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_recordingsFragment"
|
android:id="@+id/action_global_recordingsFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/recordingsFragment"
|
app:destination="@id/recordingsFragment"
|
||||||
app:launchSingleTop="true"
|
app:launchSingleTop="true"
|
||||||
app:popUpTo="@+id/recordingsFragment"
|
app:popUpTo="@+id/recordingsFragment"
|
||||||
|
@ -372,6 +380,10 @@
|
||||||
</fragment>
|
</fragment>
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_settingsFragment"
|
android:id="@+id/action_global_settingsFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/settingsFragment"
|
app:destination="@id/settingsFragment"
|
||||||
app:launchSingleTop="true"
|
app:launchSingleTop="true"
|
||||||
app:popUpTo="@+id/settingsFragment"
|
app:popUpTo="@+id/settingsFragment"
|
||||||
|
@ -387,6 +399,10 @@
|
||||||
app:argType="string" />
|
app:argType="string" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment"
|
android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/phoneAccountLinkingFragment" />
|
app:destination="@id/phoneAccountLinkingFragment" />
|
||||||
<deepLink
|
<deepLink
|
||||||
android:id="@+id/accountSettingsDeepLink"
|
android:id="@+id/accountSettingsDeepLink"
|
||||||
|
@ -435,12 +451,20 @@
|
||||||
android:label="TunnelSettingsFragment" />
|
android:label="TunnelSettingsFragment" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_masterChatRoomsFragment"
|
android:id="@+id/action_global_masterChatRoomsFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/masterChatRoomsFragment"
|
app:destination="@id/masterChatRoomsFragment"
|
||||||
app:launchSingleTop="true"
|
app:launchSingleTop="true"
|
||||||
app:popUpTo="@+id/masterChatRoomsFragment"
|
app:popUpTo="@+id/masterChatRoomsFragment"
|
||||||
app:popUpToInclusive="true" />
|
app:popUpToInclusive="true" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_dialerFragment"
|
android:id="@+id/action_global_dialerFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/dialerFragment"
|
app:destination="@id/dialerFragment"
|
||||||
app:launchSingleTop="true"
|
app:launchSingleTop="true"
|
||||||
app:popUpTo="@+id/dialerFragment"
|
app:popUpTo="@+id/dialerFragment"
|
||||||
|
|
|
@ -19,6 +19,10 @@
|
||||||
app:argType="string" />
|
app:argType="string" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment"
|
android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/phoneAccountLinkingFragment" />
|
app:destination="@id/phoneAccountLinkingFragment" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
|
@ -104,6 +108,10 @@
|
||||||
android:label="PhoneAccountLinkingFragment" >
|
android:label="PhoneAccountLinkingFragment" >
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_phoneAccountLinkingFragment_to_phoneAccountValidationFragment"
|
android:id="@+id/action_phoneAccountLinkingFragment_to_phoneAccountValidationFragment"
|
||||||
|
app:enterAnim="@anim/enter_right"
|
||||||
|
app:exitAnim="@anim/exit_left"
|
||||||
|
app:popEnterAnim="@anim/enter_left"
|
||||||
|
app:popExitAnim="@anim/exit_right"
|
||||||
app:destination="@id/phoneAccountValidationFragment" />
|
app:destination="@id/phoneAccountValidationFragment" />
|
||||||
<argument
|
<argument
|
||||||
android:name="Username"
|
android:name="Username"
|
||||||
|
@ -124,6 +132,10 @@
|
||||||
android:label="PhoneAccountValidationFragment" >
|
android:label="PhoneAccountValidationFragment" >
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_phoneAccountValidationFragment_to_accountSettingsFragment"
|
android:id="@+id/action_phoneAccountValidationFragment_to_accountSettingsFragment"
|
||||||
|
app:enterAnim="@anim/enter_left"
|
||||||
|
app:exitAnim="@anim/exit_right"
|
||||||
|
app:popEnterAnim="@anim/enter_right"
|
||||||
|
app:popExitAnim="@anim/exit_left"
|
||||||
app:destination="@id/accountSettingsFragment"
|
app:destination="@id/accountSettingsFragment"
|
||||||
app:launchSingleTop="true"
|
app:launchSingleTop="true"
|
||||||
app:popUpTo="@id/accountSettingsFragment"
|
app:popUpTo="@id/accountSettingsFragment"
|
||||||
|
|
Loading…
Reference in a new issue