From 702504e1d551d6926975536e1fa4861317ad1f69 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Sat, 9 Sep 2023 17:50:43 +0200 Subject: [PATCH] Added logs & fixed nav graph id --- .../linphone/ui/main/calls/fragment/CallsFragment.kt | 10 +++++++++- .../ui/main/calls/fragment/CallsListFragment.kt | 3 +++ .../ui/main/calls/fragment/StartCallFragment.kt | 4 ++-- app/src/main/res/navigation/calls_nav_graph.xml | 2 +- app/src/main/res/navigation/contacts_nav_graph.xml | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsFragment.kt index 2d3cd3e1e..55b227e40 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsFragment.kt @@ -38,6 +38,10 @@ import org.linphone.utils.SlidingPaneBackPressedCallback @UiThread class CallsFragment : GenericFragment() { + companion object { + private const val TAG = "[Calls Fragment]" + } + private lateinit var binding: CallsFragmentBinding override fun onCreateView( @@ -65,6 +69,7 @@ class CallsFragment : GenericFragment() { sharedViewModel.callsListReadyToBeDisplayedEvent.observe(viewLifecycleOwner) { it.consume { + Log.i("$TAG Calls list is ready, starting postponed enter transition") startPostponedEnterTransition() } } @@ -85,6 +90,7 @@ class CallsFragment : GenericFragment() { viewLifecycleOwner ) { it.consume { + Log.i("$TAG Closing sliding pane") binding.slidingPaneLayout.closePane() } } @@ -93,12 +99,14 @@ class CallsFragment : GenericFragment() { viewLifecycleOwner ) { it.consume { + Log.i("$TAG Opening sliding pane") binding.slidingPaneLayout.openPane() } } sharedViewModel.showStartCallEvent.observe(viewLifecycleOwner) { it.consume { + Log.i("$TAG Navigating to start call fragment") findNavController().navigate(R.id.action_global_startCallFragment) } } @@ -107,7 +115,7 @@ class CallsFragment : GenericFragment() { viewLifecycleOwner ) { it.consume { callId -> - Log.i("[Calls Fragment] Displaying call log with call ID [$callId]") + Log.i("$TAG Displaying call log with call ID [$callId]") val navController = binding.callsNavContainer.findNavController() val action = CallFragmentDirections.actionGlobalCallFragment( callId diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt index 922429575..1e8846a66 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt @@ -130,6 +130,7 @@ class CallsListFragment : GenericFragment() { adapter.callLogClickedEvent.observe(viewLifecycleOwner) { it.consume { model -> + Log.i("$TAG Show details for call log with ID [${model.id}]") sharedViewModel.showCallLogEvent.value = Event(model.id ?: "") } } @@ -147,6 +148,7 @@ class CallsListFragment : GenericFragment() { binding.callsList.layoutManager = layoutManager listViewModel.callLogs.observe(viewLifecycleOwner) { + Log.i("$TAG Call logs ready with [${it.size}] items") adapter.submitList(it) binding.callsList.scrollToPosition(0) @@ -158,6 +160,7 @@ class CallsListFragment : GenericFragment() { listViewModel.historyDeletedEvent.observe(viewLifecycleOwner) { it.consume { + Log.w("$TAG Deleting all call history") // TODO FIXME: show translated string (requireActivity() as MainActivity).showGreenToast( "Historique supprimé", diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt index f2bb2ff91..6c9754f65 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt @@ -58,11 +58,11 @@ class StartCallFragment : GenericFragment() { private lateinit var binding: CallStartFragmentBinding private val viewModel: StartCallViewModel by navGraphViewModels( - R.id.voip_nav_graph + R.id.main_nav_graph ) private val contactsListViewModel: ContactsListViewModel by navGraphViewModels( - R.id.voip_nav_graph + R.id.main_nav_graph ) private lateinit var contactsAdapter: ContactsListAdapter diff --git a/app/src/main/res/navigation/calls_nav_graph.xml b/app/src/main/res/navigation/calls_nav_graph.xml index a4bc34294..a0bad162e 100644 --- a/app/src/main/res/navigation/calls_nav_graph.xml +++ b/app/src/main/res/navigation/calls_nav_graph.xml @@ -2,7 +2,7 @@