diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt index 5de4415b7..da6174a68 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt @@ -178,6 +178,10 @@ class ConversationFragment : GenericFragment() { viewModel.showBackButton.value = slideable } + adapter.viewLifecycleOwner = viewLifecycleOwner + binding.eventsList.setHasFixedSize(true) + binding.eventsList.layoutManager = LinearLayoutManager(requireContext()) + val localSipUri = args.localSipUri val remoteSipUri = args.remoteSipUri Log.i( @@ -198,10 +202,6 @@ class ConversationFragment : GenericFragment() { } } - adapter.viewLifecycleOwner = viewLifecycleOwner - binding.eventsList.setHasFixedSize(true) - binding.eventsList.layoutManager = LinearLayoutManager(requireContext()) - viewModel.events.observe(viewLifecycleOwner) { items -> val currentCount = adapter.itemCount adapter.submitList(items) diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml index cb79e92d8..b3685314f 100644 --- a/app/src/main/res/layout/chat_conversation_fragment.xml +++ b/app/src/main/res/layout/chat_conversation_fragment.xml @@ -205,10 +205,10 @@ android:id="@+id/events_list" android:layout_width="match_parent" android:layout_height="0dp" + android:layout_marginTop="55dp" android:paddingBottom="5dp" - android:background="@color/white" - app:layout_constraintTop_toBottomOf="@id/top_bar_barrier" - app:layout_constraintBottom_toTopOf="@id/composing" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/composing"/>