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 top bar as fragment

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-16 09:56:50 +02:00
parent 26cd91ceb2
commit 174b8923dc
16 changed files with 233 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@
*/
package org.linphone.ui.main.calls.fragment
import android.content.res.Configuration
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -32,12 +31,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.databinding.CallsListFragmentBinding
import org.linphone.ui.main.MainActivity
import org.linphone.ui.main.calls.adapter.CallsListAdapter
import org.linphone.ui.main.calls.viewmodel.CallsListViewModel
import org.linphone.ui.main.fragment.GenericFragment
import org.linphone.utils.Event
import org.linphone.utils.setKeyboardInsetListener
class CallsListFragment : GenericFragment() {
@ -73,11 +70,6 @@ class CallsListFragment : GenericFragment() {
postponeEnterTransition()
binding.root.setKeyboardInsetListener { keyboardVisible ->
val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
listViewModel.bottomNavBarVisible.value = !portraitOrientation || !keyboardVisible
}
adapter = CallsListAdapter(viewLifecycleOwner)
binding.callsList.setHasFixedSize(true)
binding.callsList.adapter = adapter
@ -108,13 +100,15 @@ class CallsListFragment : GenericFragment() {
val layoutManager = LinearLayoutManager(requireContext())
binding.callsList.layoutManager = layoutManager
binding.setOnAvatarClickListener {
(requireActivity() as MainActivity).toggleDrawerMenu()
}
listViewModel.callLogs.observe(viewLifecycleOwner) {
adapter.submitList(it)
startPostponedEnterTransition()
}
sharedViewModel.searchFilter.observe(viewLifecycleOwner) {
it.consume { filter ->
listViewModel.applyFilter(filter)
}
}
}
}

59
app/src/main/java/org/linphone/ui/main/calls/viewmodel/CallsListViewModel.kt
View file

@ -20,27 +20,56 @@
package org.linphone.ui.main.calls.viewmodel
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.core.CallLog
import org.linphone.core.Core
import org.linphone.core.CoreListenerStub
import org.linphone.ui.main.calls.model.CallLogModel
import org.linphone.ui.main.viewmodel.TopBarViewModel
class CallsListViewModel : TopBarViewModel() {
class CallsListViewModel : ViewModel() {
val callLogs = MutableLiveData<ArrayList<CallLogModel>>()
init {
title.value = "Calls"
bottomNavBarVisible.value = true
private var currentFilter = ""
coreContext.postOnCoreThread { core ->
val list = arrayListOf<CallLogModel>()
// TODO : filter depending on currently selected account
for (callLog in core.callLogs) {
val model = CallLogModel(callLog)
list.add(model)
}
callLogs.postValue(list)
private val coreListener = object : CoreListenerStub() {
override fun onCallLogUpdated(core: Core, callLog: CallLog) {
computeCallLogsList()
}
}
init {
coreContext.postOnCoreThread { core ->
core.addListener(coreListener)
computeCallLogsList()
}
}
override fun onCleared() {
super.onCleared()
coreContext.postOnCoreThread { core ->
core.removeListener(coreListener)
}
}
fun applyFilter(filter: String) {
// UI thread
currentFilter = filter
// TODO
}
private fun computeCallLogsList() {
// Core thread
val list = arrayListOf<CallLogModel>()
// TODO : filter depending on currently selected account
for (callLog in coreContext.core.callLogs) {
val model = CallLogModel(callLog)
list.add(model)
}
callLogs.postValue(list)
}
}

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

@ -19,7 +19,6 @@
*/
package org.linphone.ui.main.contacts.fragment
import android.content.res.Configuration
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -32,14 +31,10 @@ import androidx.navigation.navGraphViewModels
import androidx.recyclerview.widget.LinearLayoutManager
import org.linphone.R
import org.linphone.databinding.ContactsListFragmentBinding
import org.linphone.ui.main.MainActivity
import org.linphone.ui.main.contacts.adapter.ContactsListAdapter
import org.linphone.ui.main.contacts.viewmodel.ContactsListViewModel
import org.linphone.ui.main.fragment.GenericFragment
import org.linphone.utils.Event
import org.linphone.utils.hideKeyboard
import org.linphone.utils.setKeyboardInsetListener
import org.linphone.utils.showKeyboard
class ContactsListFragment : GenericFragment() {
private lateinit var binding: ContactsListFragmentBinding
@ -76,11 +71,6 @@ class ContactsListFragment : GenericFragment() {
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = listViewModel
binding.root.setKeyboardInsetListener { keyboardVisible ->
val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
listViewModel.bottomNavBarVisible.value = !portraitOrientation || !keyboardVisible
}
adapter = ContactsListAdapter(viewLifecycleOwner, false)
binding.contactsList.setHasFixedSize(true)
binding.contactsList.adapter = adapter
@ -114,28 +104,15 @@ class ContactsListFragment : GenericFragment() {
favouritesAdapter.submitList(it)
}
listViewModel.focusSearchBarEvent.observe(viewLifecycleOwner) {
it.consume { show ->
if (show) {
// To automatically open keyboard
binding.topBar.search.showKeyboard(requireActivity().window)
} else {
binding.topBar.search.hideKeyboard()
}
sharedViewModel.searchFilter.observe(viewLifecycleOwner) {
it.consume { filter ->
listViewModel.applyFilter(filter)
}
}
listViewModel.searchFilter.observe(viewLifecycleOwner) { filter ->
listViewModel.applyFilter(filter)
}
binding.setOnNewContactClicked {
findNavController().navigate(R.id.action_global_newContactFragment)
}
binding.setOnAvatarClickListener {
(requireActivity() as MainActivity).toggleDrawerMenu()
}
}
private fun configureAdapter(adapter: ContactsListAdapter) {

16
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
View file

@ -20,6 +20,7 @@
package org.linphone.ui.main.contacts.viewmodel
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import java.util.ArrayList
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.contacts.ContactsListener
@ -29,15 +30,16 @@ import org.linphone.core.MagicSearchListenerStub
import org.linphone.core.SearchResult
import org.linphone.core.tools.Log
import org.linphone.ui.main.contacts.model.ContactAvatarModel
import org.linphone.ui.main.viewmodel.TopBarViewModel
class ContactsListViewModel : TopBarViewModel() {
class ContactsListViewModel : ViewModel() {
val contactsList = MutableLiveData<ArrayList<ContactAvatarModel>>()
val favourites = MutableLiveData<ArrayList<ContactAvatarModel>>()
val showFavourites = MutableLiveData<Boolean>()
val isListFiltered = MutableLiveData<Boolean>()
private var currentFilter = ""
private var previousFilter = "NotSet"
@ -54,13 +56,16 @@ class ContactsListViewModel : TopBarViewModel() {
private val contactsListener = object : ContactsListener {
override fun onContactsLoaded() {
// Core thread
applyFilter(currentFilter)
applyFilter(
currentFilter,
"",
MagicSearch.Source.Friends.toInt(),
MagicSearch.Aggregation.Friend
)
}
}
init {
title.value = "Contacts"
bottomNavBarVisible.value = true
showFavourites.value = true
coreContext.postOnCoreThread { core ->
@ -129,6 +134,7 @@ class ContactsListViewModel : TopBarViewModel() {
fun applyFilter(filter: String) {
// UI thread
isListFiltered.value = filter.isNotEmpty()
coreContext.postOnCoreThread {
applyFilter(
filter,

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

@ -37,8 +37,6 @@ import org.linphone.R
import org.linphone.databinding.ConversationsFragmentBinding
import org.linphone.ui.main.conversations.adapter.ConversationsListAdapter
import org.linphone.ui.main.conversations.viewmodel.ConversationsListViewModel
import org.linphone.utils.hideKeyboard
import org.linphone.utils.showKeyboard
class ConversationsFragment : Fragment() {
private lateinit var binding: ConversationsFragmentBinding
@ -145,7 +143,7 @@ class ConversationsFragment : Fragment() {
}
}
listViewModel.focusSearchBarEvent.observe(viewLifecycleOwner) {
/*listViewModel.focusSearchBarEvent.observe(viewLifecycleOwner) {
it.consume { show ->
if (show) {
// To automatically open keyboard
@ -154,7 +152,7 @@ class ConversationsFragment : Fragment() {
binding.topBar.search.hideKeyboard()
}
}
}
}*/
binding.setOnNewConversationClicked {
if (findNavController().currentDestination?.id == R.id.conversationsFragment) {

6
app/src/main/java/org/linphone/ui/main/conversations/viewmodel/ConversationsListViewModel.kt
View file

@ -20,6 +20,7 @@
package org.linphone.ui.main.conversations.viewmodel
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import java.util.ArrayList
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.contacts.ContactsListener
@ -29,11 +30,10 @@ import org.linphone.core.Core
import org.linphone.core.CoreListenerStub
import org.linphone.core.tools.Log
import org.linphone.ui.main.conversations.data.ChatRoomData
import org.linphone.ui.main.viewmodel.TopBarViewModel
import org.linphone.utils.Event
import org.linphone.utils.LinphoneUtils
class ConversationsListViewModel : TopBarViewModel() {
class ConversationsListViewModel : ViewModel() {
val chatRoomsList = MutableLiveData<ArrayList<ChatRoomData>>()
val notifyItemChangedEvent = MutableLiveData<Event<Int>>()
@ -101,8 +101,6 @@ class ConversationsListViewModel : TopBarViewModel() {
coreContext.postOnCoreThread { core ->
updateChatRoomsList()
}
title.value = "Conversations"
}
override fun onCleared() {

7
app/src/main/java/org/linphone/ui/main/fragment/BottomNavBarFragment.kt
View file

@ -19,6 +19,7 @@
*/
package org.linphone.ui.main.fragment
import android.content.res.Configuration
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -29,6 +30,7 @@ import org.linphone.R
import org.linphone.databinding.BottomNavBarBinding
import org.linphone.ui.main.viewmodel.SharedMainViewModel
import org.linphone.utils.Event
import org.linphone.utils.setKeyboardInsetListener
class BottomNavBarFragment : Fragment() {
private lateinit var binding: BottomNavBarBinding
@ -53,6 +55,11 @@ class BottomNavBarFragment : Fragment() {
binding.lifecycleOwner = viewLifecycleOwner
binding.root.setKeyboardInsetListener { keyboardVisible ->
val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
binding.bottomNavBar.visibility = if (!portraitOrientation || !keyboardVisible) View.VISIBLE else View.GONE
}
binding.setOnContactsClicked {
if (sharedViewModel.currentlyDisplayedFragment.value != R.id.contactsFragment) {
sharedViewModel.navigateToContactsEvent.value = Event(true)

104
app/src/main/java/org/linphone/ui/main/fragment/TopBarFragment.kt Normal file
View file

@ -0,0 +1,104 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of linphone-android
* (see https://www.linphone.org).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui.main.fragment
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import org.linphone.R
import org.linphone.databinding.TopSearchBarBinding
import org.linphone.ui.main.MainActivity
import org.linphone.ui.main.viewmodel.SharedMainViewModel
import org.linphone.ui.main.viewmodel.TopBarViewModel
import org.linphone.utils.Event
import org.linphone.utils.hideKeyboard
import org.linphone.utils.showKeyboard
class TopBarFragment : Fragment() {
private lateinit var binding: TopSearchBarBinding
private lateinit var viewModel: TopBarViewModel
private lateinit var sharedViewModel: SharedMainViewModel
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = TopSearchBarBinding.inflate(layoutInflater)
return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
viewModel = requireActivity().run {
ViewModelProvider(this)[TopBarViewModel::class.java]
}
sharedViewModel = requireActivity().run {
ViewModelProvider(this)[SharedMainViewModel::class.java]
}
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = viewModel
viewModel.openDrawerMenuEvent.observe(viewLifecycleOwner) {
it.consume {
(requireActivity() as MainActivity).toggleDrawerMenu()
}
}
viewModel.focusSearchBarEvent.observe(viewLifecycleOwner) {
it.consume { show ->
if (show) {
// To automatically open keyboard
binding.search.showKeyboard(requireActivity().window)
} else {
binding.search.hideKeyboard()
}
}
}
viewModel.searchFilter.observe(viewLifecycleOwner) { filter ->
sharedViewModel.searchFilter.value = Event(filter)
}
sharedViewModel.currentlyDisplayedFragment.observe(viewLifecycleOwner) {
binding.title.text = when (it) {
R.id.contactsFragment -> {
"Contacts"
}
R.id.callsFragment -> {
"Calls"
}
R.id.conversationsFragment -> {
"Conversations"
}
else -> {
""
}
}
}
}
}

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

@ -40,6 +40,10 @@ class SharedMainViewModel : ViewModel() {
var currentlyDisplayedFragment = MutableLiveData<Int>()
/* Top bar related */
val searchFilter = MutableLiveData<Event<String>>()
/* Contacts related */
val showContactEvent = MutableLiveData<Event<String>>()

11
app/src/main/java/org/linphone/ui/main/viewmodel/TopBarViewModel.kt
View file

@ -23,7 +23,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import org.linphone.utils.Event
abstract class TopBarViewModel : ViewModel() {
class TopBarViewModel : ViewModel() {
val title = MutableLiveData<String>()
val searchBarVisible = MutableLiveData<Boolean>()
@ -34,7 +34,9 @@ abstract class TopBarViewModel : ViewModel() {
MutableLiveData<Event<Boolean>>()
}
val bottomNavBarVisible = MutableLiveData<Boolean>()
val openDrawerMenuEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
init {
searchBarVisible.value = false
@ -44,6 +46,11 @@ abstract class TopBarViewModel : ViewModel() {
super.onCleared()
}
fun openDrawerMenu() {
// UI thread
openDrawerMenuEvent.value = Event(true)
}
fun openSearchBar() {
// UI thread
searchBarVisible.value = true

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

@ -5,9 +5,6 @@
<data>
<import type="android.view.View" />
<variable
name="onAvatarClickListener"
type="View.OnClickListener" />
<variable
name="onContactsClicked"
type="View.OnClickListener" />
@ -24,16 +21,15 @@
android:layout_height="match_parent"
android:background="@color/primary_color">
<include
<androidx.fragment.app.FragmentContainerView
android:id="@+id/top_bar"
bind:viewModel="@{viewModel}"
bind:onAvatarClickListener="@{onAvatarClickListener}"
layout="@layout/top_search_bar"
android:layout_height="@dimen/top_search_bar_height"
android:name="org.linphone.ui.main.fragment.TopBarFragment"
android:layout_width="0dp"
android:layout_height="@dimen/top_search_bar_height"
bind:layout="@layout/top_search_bar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
@ -61,7 +57,6 @@
android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
android:layout_width="75dp"
android:layout_height="0dp"
android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}"
bind:layout="@layout/bottom_nav_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

21
app/src/main/res/layout-land/contacts_list_fragment.xml
View file

@ -8,9 +8,6 @@
<variable
name="onNewContactClicked"
type="View.OnClickListener" />
<variable
name="onAvatarClickListener"
type="View.OnClickListener" />
<variable
name="onConversationsClicked"
type="View.OnClickListener" />
@ -38,22 +35,20 @@
android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
android:layout_width="75dp"
android:layout_height="0dp"
android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}"
bind:layout="@layout/bottom_nav_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<include
<androidx.fragment.app.FragmentContainerView
android:id="@+id/top_bar"
bind:viewModel="@{viewModel}"
bind:onAvatarClickListener="@{onAvatarClickListener}"
layout="@layout/top_search_bar"
android:layout_height="@dimen/top_search_bar_height"
android:name="org.linphone.ui.main.fragment.TopBarFragment"
android:layout_width="0dp"
android:layout_height="@dimen/top_search_bar_height"
bind:layout="@layout/top_search_bar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
@ -93,7 +88,7 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/favourites_label"
android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -110,7 +105,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/favourites_contacts_list"
android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
@ -123,7 +118,7 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/all_contacts_label"
android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

16
app/src/main/res/layout/calls_list_fragment.xml
View file

@ -5,9 +5,6 @@
<data>
<import type="android.view.View" />
<variable
name="onAvatarClickListener"
type="View.OnClickListener" />
<variable
name="onContactsClicked"
type="View.OnClickListener" />
@ -24,11 +21,15 @@
android:layout_height="match_parent"
android:background="@color/primary_color">
<include
<androidx.fragment.app.FragmentContainerView
android:id="@+id/top_bar"
bind:viewModel="@{viewModel}"
bind:onAvatarClickListener="@{onAvatarClickListener}"
layout="@layout/top_search_bar" />
android:name="org.linphone.ui.main.fragment.TopBarFragment"
android:layout_width="0dp"
android:layout_height="@dimen/top_search_bar_height"
bind:layout="@layout/top_search_bar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
@ -56,7 +57,6 @@
android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}"
bind:layout="@layout/bottom_nav_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

22
app/src/main/res/layout/contacts_list_fragment.xml
View file

@ -8,9 +8,6 @@
<variable
name="onNewContactClicked"
type="View.OnClickListener" />
<variable
name="onAvatarClickListener"
type="View.OnClickListener" />
<variable
name="onConversationsClicked"
type="View.OnClickListener" />
@ -33,11 +30,15 @@
app:constraint_referenced_ids="no_contacts_image, no_contacts_label"
android:visibility="@{viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
<include
<androidx.fragment.app.FragmentContainerView
android:id="@+id/top_bar"
bind:viewModel="@{viewModel}"
bind:onAvatarClickListener="@{onAvatarClickListener}"
layout="@layout/top_search_bar" />
android:name="org.linphone.ui.main.fragment.TopBarFragment"
android:layout_width="0dp"
android:layout_height="@dimen/top_search_bar_height"
bind:layout="@layout/top_search_bar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
@ -77,7 +78,7 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/favourites_label"
android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -95,7 +96,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/favourites_contacts_list"
android:visibility="@{viewModel.showFavourites &amp;&amp; viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
@ -108,7 +109,7 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/all_contacts_label"
android:visibility="@{viewModel.searchFilter.length() == 0 &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="5dp"
@ -138,7 +139,6 @@
android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}"
bind:layout="@layout/bottom_nav_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@ -21,10 +21,15 @@
android:layout_height="match_parent"
android:background="@color/primary_color">
<include
<androidx.fragment.app.FragmentContainerView
android:id="@+id/top_bar"
bind:viewModel="@{viewModel}"
layout="@layout/top_search_bar" />
android:name="org.linphone.ui.main.fragment.TopBarFragment"
android:layout_width="0dp"
android:layout_height="@dimen/top_search_bar_height"
bind:layout="@layout/top_search_bar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:layout_width="0dp"

5
app/src/main/res/layout/top_search_bar.xml
View file

@ -5,9 +5,6 @@
<data>
<import type="android.view.View" />
<variable
name="onAvatarClickListener"
type="View.OnClickListener" />
<variable
name="viewModel"
type="org.linphone.ui.main.viewmodel.TopBarViewModel" />
@ -38,7 +35,7 @@
app:barrierDirection="bottom" />
<io.getstream.avatarview.AvatarView
android:onClick="@{onAvatarClickListener}"
android:onClick="@{() -> viewModel.openDrawerMenu()}"
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_list_cell_size"
android:layout_height="@dimen/avatar_list_cell_size"