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

Fixed account settings back navigation

Browse source
This commit is contained in:
Sylvain Berfini 2020-07-16 13:40:55 +02:00
parent 9802d0a8d8
commit 9a856f075a
4 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import org.linphone.activities.main.contact.fragments.MasterContactsFragment
import org.linphone.activities.main.history.fragments.DetailCallLogFragment import org.linphone.activities.main.history.fragments.DetailCallLogFragment
import org.linphone.activities.main.history.fragments.MasterCallLogsFragment import org.linphone.activities.main.history.fragments.MasterCallLogsFragment
import org.linphone.activities.main.settings.fragments.SettingsFragment import org.linphone.activities.main.settings.fragments.SettingsFragment
import org.linphone.activities.main.sidemenu.fragments.SideMenuFragment
import org.linphone.contact.NativeContact import org.linphone.contact.NativeContact
import org.linphone.core.Address import org.linphone.core.Address
@ -150,6 +151,18 @@ internal fun DetailCallLogFragment.navigateToFriend(friendAddress: Address) {
/* Settings related */ /* Settings related */
internal fun SideMenuFragment.navigateToAccountSettings(identity: String) {
if (!resources.getBoolean(R.bool.isTablet)) {
// If not a tablet, navigate directly to account settings fragment
val deepLink = "linphone-android://account-settings/$identity"
findNavController().navigate(Uri.parse(deepLink))
} else {
// On tablet, to keep the categories list on left side, navigate to settings fragment first
val deepLink = "linphone-android://settings/$identity"
findNavController().navigate(Uri.parse(deepLink))
}
}
internal fun SettingsFragment.navigateToAccountSettings(identity: String) { internal fun SettingsFragment.navigateToAccountSettings(identity: String) {
val bundle = bundleOf("Identity" to identity) val bundle = bundleOf("Identity" to identity)
if (!resources.getBoolean(R.bool.isTablet)) { if (!resources.getBoolean(R.bool.isTablet)) {

3
app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt
View file

@ -70,9 +70,10 @@ class SettingsFragment : Fragment() {
viewModel.updateAccountsList() viewModel.updateAccountsList()
}) })
val identity = arguments?.getString("identity") val identity = arguments?.getString("Identity")
if (identity != null) { if (identity != null) {
Log.i("[Settings] Found identity parameter in arguments: $identity") Log.i("[Settings] Found identity parameter in arguments: $identity")
arguments?.clear()
navigateToAccountSettings(identity) navigateToAccountSettings(identity)
} }

5
app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt
View file

@ -20,7 +20,6 @@
package org.linphone.activities.main.sidemenu.fragments package org.linphone.activities.main.sidemenu.fragments
import android.content.Intent import android.content.Intent
import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -32,6 +31,7 @@ import androidx.navigation.fragment.findNavController
import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R import org.linphone.R
import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.AssistantActivity
import org.linphone.activities.main.navigateToAccountSettings
import org.linphone.activities.main.settings.SettingListenerStub import org.linphone.activities.main.settings.SettingListenerStub
import org.linphone.activities.main.sidemenu.viewmodels.SideMenuViewModel import org.linphone.activities.main.sidemenu.viewmodels.SideMenuViewModel
import org.linphone.activities.main.viewmodels.SharedMainViewModel import org.linphone.activities.main.viewmodels.SharedMainViewModel
@ -77,8 +77,7 @@ class SideMenuFragment : Fragment() {
Log.i("[Side Menu] Navigation to settings for proxy with identity: $identity") Log.i("[Side Menu] Navigation to settings for proxy with identity: $identity")
sharedViewModel.toggleDrawerEvent.value = Event(true) sharedViewModel.toggleDrawerEvent.value = Event(true)
val deepLink = "linphone-android://account-settings/$identity" navigateToAccountSettings(identity)
findNavController().navigate(Uri.parse(deepLink))
} }
} }

6
app/src/main/res/navigation/main_nav_graph.xml
View file

@ -275,7 +275,7 @@
app:popUpToInclusive="false" /> app:popUpToInclusive="false" />
<deepLink <deepLink
android:id="@+id/settingsDeepLink" android:id="@+id/settingsDeepLink"
app:uri="linphone-android://account-settings/{identity}" app:uri="linphone-android://settings/{Identity}"
android:autoVerify="true" /> android:autoVerify="true" />
</fragment> </fragment>
<action <action
@ -296,6 +296,10 @@
<action <action
android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment" android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment"
app:destination="@id/phoneAccountLinkingFragment" /> app:destination="@id/phoneAccountLinkingFragment" />
<deepLink
android:id="@+id/accountSettingsDeepLink"
app:uri="linphone-android://account-settings/{Identity}"
android:autoVerify="true" />
</fragment> </fragment>
<fragment <fragment
android:id="@+id/advancedSettingsFragment" android:id="@+id/advancedSettingsFragment"