mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reworked navigation

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-07 13:27:12 +02:00
parent cbc46ed2e0
commit fa7c6907be
24 changed files with 121 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml generated Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="1A051FDEE005XG" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-09-07T11:13:39.568123492Z" />
</component>
</project>

1
app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt
View file

@ -74,7 +74,6 @@ class CallFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner

25
app/src/main/java/org/linphone/ui/main/calls/fragment/CallsFragment.kt
View file

@ -23,6 +23,8 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.animation.Animation
import android.view.animation.AnimationUtils
import androidx.annotation.UiThread
import androidx.core.view.doOnPreDraw
import androidx.navigation.findNavController
@ -47,13 +49,20 @@ class CallsFragment : GenericFragment() {
return binding.root
}
override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
if (findNavController().currentDestination?.id == R.id.startCallFragment) {
// Holds fragment in place while new contact fragment slides over it
return AnimationUtils.loadAnimation(activity, R.anim.hold)
}
return AnimationUtils.loadAnimation(activity, R.anim.hold)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
postponeEnterTransition()
sharedViewModel.callsListReadyToBeDisplayedEvent.observe(viewLifecycleOwner) {
it.consume {
startPostponedEnterTransition()
@ -88,12 +97,18 @@ class CallsFragment : GenericFragment() {
}
}
sharedViewModel.showStartCallEvent.observe(viewLifecycleOwner) {
it.consume {
findNavController().navigate(R.id.action_global_startCallFragment)
}
}
sharedViewModel.showCallLogEvent.observe(
viewLifecycleOwner
) {
it.consume { callId ->
Log.i("[Calls Fragment] Displaying call log with call ID [$callId]")
val navController = binding.callsRightNavContainer.findNavController()
val navController = binding.callsNavContainer.findNavController()
val action = CallFragmentDirections.actionGlobalCallFragment(
callId
)
@ -105,7 +120,7 @@ class CallsFragment : GenericFragment() {
it.consume {
if (findNavController().currentDestination?.id == R.id.callsFragment) {
// To prevent any previously seen contact to show up when navigating back to here later
binding.callsRightNavContainer.findNavController().popBackStack()
binding.callsNavContainer.findNavController().popBackStack()
val action =
CallsFragmentDirections.actionCallsFragmentToConversationsFragment()
@ -118,7 +133,7 @@ class CallsFragment : GenericFragment() {
it.consume {
if (findNavController().currentDestination?.id == R.id.callsFragment) {
// To prevent any previously seen contact to show up when navigating back to here later
binding.callsRightNavContainer.findNavController().popBackStack()
binding.callsNavContainer.findNavController().popBackStack()
val action = CallsFragmentDirections.actionCallsFragmentToContactsFragment()
findNavController().navigate(action)

26
app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt
View file

@ -27,14 +27,11 @@ import android.view.Gravity
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.animation.Animation
import android.view.animation.AnimationUtils
import android.widget.PopupWindow
import androidx.annotation.UiThread
import androidx.core.view.doOnPreDraw
import androidx.databinding.DataBindingUtil
import androidx.navigation.fragment.findNavController
import androidx.navigation.navGraphViewModels
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
@ -59,20 +56,10 @@ class CallsListFragment : GenericFragment() {
private lateinit var binding: CallsListFragmentBinding
private val listViewModel: CallsListViewModel by navGraphViewModels(
R.id.callsListFragment
)
private lateinit var listViewModel: CallsListViewModel
private lateinit var adapter: CallsListAdapter
override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
if (findNavController().currentDestination?.id == R.id.startCallFragment) {
// Holds fragment in place while new contact fragment slides over it
return AnimationUtils.loadAnimation(activity, R.anim.hold)
}
return super.onCreateAnimation(transit, enter, nextAnim)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -83,12 +70,15 @@ class CallsListFragment : GenericFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
listViewModel = requireActivity().run {
ViewModelProvider(this)[CallsListViewModel::class.java]
}
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = listViewModel
postponeEnterTransition()
adapter = CallsListAdapter(viewLifecycleOwner)
binding.callsList.setHasFixedSize(true)
binding.callsList.adapter = adapter
@ -186,7 +176,7 @@ class CallsListFragment : GenericFragment() {
}
binding.setStartCallClickListener {
findNavController().navigate(R.id.action_global_startCallFragment)
sharedViewModel.showStartCallEvent.value = Event(true)
}
sharedViewModel.defaultAccountChangedEvent.observe(viewLifecycleOwner) {

1
app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt
View file

@ -100,7 +100,6 @@ class StartCallFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner

1
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
View file

@ -79,7 +79,6 @@ class ContactFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner

21
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt
View file

@ -23,6 +23,8 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.animation.Animation
import android.view.animation.AnimationUtils
import androidx.annotation.UiThread
import androidx.core.view.doOnPreDraw
import androidx.navigation.findNavController
@ -51,13 +53,20 @@ class ContactsFragment : GenericFragment() {
return binding.root
}
override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
if (findNavController().currentDestination?.id == R.id.newContactFragment) {
// Holds fragment in place while new contact fragment slides over it
return AnimationUtils.loadAnimation(activity, R.anim.hold)
}
return super.onCreateAnimation(transit, enter, nextAnim)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
postponeEnterTransition()
sharedViewModel.contactsListReadyToBeDisplayedEvent.observe(viewLifecycleOwner) {
it.consume {
Log.i("$TAG Contacts list is ready, starting postponed enter transition")
@ -107,7 +116,7 @@ class ContactsFragment : GenericFragment() {
) {
it.consume { refKey ->
Log.i("$TAG Displaying contact with ref key [$refKey]")
val navController = binding.contactsRightNavContainer.findNavController()
val navController = binding.contactsNavContainer.findNavController()
val action = ContactFragmentDirections.actionGlobalContactFragment(
refKey
)
@ -120,7 +129,7 @@ class ContactsFragment : GenericFragment() {
) {
it.consume {
Log.i("$TAG Opening contact editor for creating new contact")
val navController = binding.contactsLeftNavContainer.findNavController()
val navController = findNavController()
navController.navigate(R.id.action_global_newContactFragment)
}
}
@ -129,7 +138,7 @@ class ContactsFragment : GenericFragment() {
it.consume {
if (findNavController().currentDestination?.id == R.id.contactsFragment) {
// To prevent any previously seen contact to show up when navigating back to here later
binding.contactsRightNavContainer.findNavController().popBackStack()
binding.contactsNavContainer.findNavController().popBackStack()
val action = ContactsFragmentDirections.actionContactsFragmentToConversationsFragment()
findNavController().navigate(action)
@ -141,7 +150,7 @@ class ContactsFragment : GenericFragment() {
it.consume {
if (findNavController().currentDestination?.id == R.id.contactsFragment) {
// To prevent any previously seen contact to show up when navigating back to here later
binding.contactsRightNavContainer.findNavController().popBackStack()
binding.contactsNavContainer.findNavController().popBackStack()
val action = ContactsFragmentDirections.actionContactsFragmentToCallsFragment()
findNavController().navigate(action)

22
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
View file

@ -25,13 +25,10 @@ import android.provider.ContactsContract
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.animation.Animation
import android.view.animation.AnimationUtils
import androidx.annotation.UiThread
import androidx.core.content.FileProvider
import androidx.core.view.doOnPreDraw
import androidx.navigation.fragment.findNavController
import androidx.navigation.navGraphViewModels
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import java.io.File
import org.linphone.LinphoneApplication.Companion.coreContext
@ -54,21 +51,11 @@ class ContactsListFragment : GenericFragment() {
private lateinit var binding: ContactsListFragmentBinding
private val listViewModel: ContactsListViewModel by navGraphViewModels(
R.id.contactsListFragment
)
private lateinit var listViewModel: ContactsListViewModel
private lateinit var adapter: ContactsListAdapter
private lateinit var favouritesAdapter: ContactsListAdapter
override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
if (findNavController().currentDestination?.id == R.id.newContactFragment) {
// Holds fragment in place while new contact fragment slides over it
return AnimationUtils.loadAnimation(activity, R.anim.hold)
}
return super.onCreateAnimation(transit, enter, nextAnim)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -80,9 +67,12 @@ class ContactsListFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
listViewModel = requireActivity().run {
ViewModelProvider(this)[ContactsListViewModel::class.java]
}
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = listViewModel

3
app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
View file

@ -95,12 +95,11 @@ class EditContactFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = viewModel
postponeEnterTransition()
val refKey = args.contactRefKey
Log.i("$TAG Looking up for contact with ref key [$refKey]")
viewModel.findFriendByRefKey(refKey)

3
app/src/main/java/org/linphone/ui/main/conversations/ConversationFragment.kt
View file

@ -55,6 +55,7 @@ class ConversationFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = viewModel
@ -74,8 +75,6 @@ class ConversationFragment : Fragment() {
}
arguments?.clear()
postponeEnterTransition()
adapter = ChatEventLogsListAdapter(viewLifecycleOwner)
binding.messagesList.setHasFixedSize(false)
binding.messagesList.adapter = adapter

3
app/src/main/java/org/linphone/ui/main/conversations/ConversationsFragment.kt
View file

@ -89,12 +89,11 @@ class ConversationsFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = listViewModel
postponeEnterTransition()
adapter = ConversationsListAdapter(viewLifecycleOwner)
adapter.registerAdapterDataObserver(observer)
binding.conversationsList.setHasFixedSize(true)

3
app/src/main/java/org/linphone/ui/main/conversations/NewConversationFragment.kt
View file

@ -62,12 +62,11 @@ class NewConversationFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = viewModel
postponeEnterTransition()
adapter = ContactsSelectionAdapter(viewLifecycleOwner)
binding.contactsList.adapter = adapter
binding.contactsList.setHasFixedSize(true)

1
app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
View file

@ -68,7 +68,6 @@ class AccountProfileFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner

4
app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
View file

@ -85,6 +85,10 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() {
val callsListReadyToBeDisplayedEvent = MutableLiveData<Event<Boolean>>()
val showStartCallEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
val showCallLogEvent: MutableLiveData<Event<String>> by lazy {
MutableLiveData<Event<String>>()
}

11
app/src/main/res/layout-land/calls_fragment.xml
View file

@ -20,21 +20,20 @@
app:layout_constraintEnd_toEndOf="parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/calls_left_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:id="@+id/calls_list"
android:name="org.linphone.ui.main.calls.fragment.CallsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_with_nav_width"
android:layout_height="match_parent"
app:defaultNavHost="false"
app:navGraph="@navigation/calls_left_nav_graph"/>
app:layout="@layout/calls_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/calls_right_nav_container"
android:id="@+id/calls_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/calls_right_nav_graph"/>
app:navGraph="@navigation/calls_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>

2
app/src/main/res/layout-land/calls_list_fragment.xml
View file

@ -124,7 +124,7 @@
app:tint="@color/gray_8"
app:backgroundTint="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

11
app/src/main/res/layout-land/contacts_fragment.xml
View file

@ -20,21 +20,20 @@
app:layout_constraintEnd_toEndOf="parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_left_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:id="@+id/contacts_list"
android:name="org.linphone.ui.main.contacts.fragment.ContactsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_with_nav_width"
android:layout_height="match_parent"
app:defaultNavHost="false"
app:navGraph="@navigation/contact_left_nav_graph"/>
app:layout="@layout/contacts_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_right_nav_container"
android:id="@+id/contacts_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/contact_right_nav_graph"/>
app:navGraph="@navigation/contacts_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>

11
app/src/main/res/layout/calls_fragment.xml
View file

@ -12,21 +12,20 @@
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/calls_left_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:id="@+id/calls_list"
android:name="org.linphone.ui.main.calls.fragment.CallsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_width"
android:layout_height="match_parent"
app:defaultNavHost="false"
app:navGraph="@navigation/calls_left_nav_graph"/>
app:layout="@layout/calls_list_fragment" />
<androidx.fragment.app.FragmentContainerView
android:id="@+id/calls_right_nav_container"
android:id="@+id/calls_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="@dimen/sliding_pane_right_fragment_width"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/calls_right_nav_graph"/>
app:navGraph="@navigation/calls_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>

11
app/src/main/res/layout/contacts_fragment.xml
View file

@ -12,21 +12,20 @@
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_left_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:id="@+id/contacts_list"
android:name="org.linphone.ui.main.contacts.fragment.ContactsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_width"
android:layout_height="match_parent"
app:defaultNavHost="false"
app:navGraph="@navigation/contact_left_nav_graph"/>
app:layout="@layout/contacts_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_right_nav_container"
android:id="@+id/contacts_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="@dimen/sliding_pane_right_fragment_width"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/contact_right_nav_graph"/>
app:navGraph="@navigation/contacts_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>

27
app/src/main/res/navigation/calls_left_nav_graph.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/calls_left_nav_graph"
app:startDestination="@id/callsListFragment">
<fragment
android:id="@+id/callsListFragment"
android:name="org.linphone.ui.main.calls.fragment.CallsListFragment"
android:label="CallsListFragment"
tools:layout="@layout/calls_list_fragment"/>
<fragment
android:id="@+id/startCallFragment"
android:name="org.linphone.ui.main.calls.fragment.StartCallFragment"
android:label="StartCallFragment"
tools:layout="@layout/call_start_fragment" />
<action
android:id="@+id/action_global_startCallFragment"
app:destination="@id/startCallFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true"/>
</navigation>

0
app/src/main/res/navigation/calls_right_nav_graph.xml → app/src/main/res/navigation/calls_nav_graph.xml
View file

27
app/src/main/res/navigation/contact_left_nav_graph.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/contact_left_nav_graph"
app:startDestination="@id/contactsListFragment">
<fragment
android:id="@+id/contactsListFragment"
android:name="org.linphone.ui.main.contacts.fragment.ContactsListFragment"
android:label="ContactsListFragment"
tools:layout="@layout/contacts_list_fragment">
</fragment>
<fragment
android:id="@+id/newContactFragment"
android:name="org.linphone.ui.main.contacts.fragment.NewContactFragment"
android:label="NewContactFragment"
tools:layout="@layout/contact_new_or_edit_fragment"/>
<action
android:id="@+id/action_global_newContactFragment"
app:destination="@id/newContactFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
</navigation>

0
app/src/main/res/navigation/contact_right_nav_graph.xml → app/src/main/res/navigation/contacts_nav_graph.xml
View file

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

@ -138,4 +138,30 @@
android:id="@+id/action_global_recordingsFragment"
app:destination="@id/recordingsFragment"/>
<fragment
android:id="@+id/startCallFragment"
android:name="org.linphone.ui.main.calls.fragment.StartCallFragment"
android:label="StartCallFragment"
tools:layout="@layout/call_start_fragment" />
<action
android:id="@+id/action_global_startCallFragment"
app:destination="@id/startCallFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true"/>
<fragment
android:id="@+id/newContactFragment"
android:name="org.linphone.ui.main.contacts.fragment.NewContactFragment"
android:label="NewContactFragment"
tools:layout="@layout/contact_new_or_edit_fragment"/>
<action
android:id="@+id/action_global_newContactFragment"
app:destination="@id/newContactFragment"
app:enterAnim="@anim/slide_in"
app:popExitAnim="@anim/slide_out"
app:launchSingleTop="true" />
</navigation>