Re-organized a few things

app/src/main/java/org/linphone/ui/MainActivity.kt

@@ -27,19 +27,15 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.databinding.MainActivityBinding
-import org.linphone.utils.hideKeyboard
-import org.linphone.utils.showKeyboard
 
 class MainActivity : AppCompatActivity() {
     companion object {
         private const val CONTACTS_PERMISSION_REQUEST = 0
     }
 
-    private lateinit var viewModel: MainActivityViewModel
     private lateinit var binding: MainActivityBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -61,28 +57,6 @@ class MainActivity : AppCompatActivity() {
 
         binding = DataBindingUtil.setContentView(this, R.layout.main_activity)
         binding.lifecycleOwner = this
-
-        viewModel = ViewModelProvider(this)[MainActivityViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setAvatarClickListener {
-            if (binding.sideMenu.isDrawerOpen(Gravity.LEFT)) {
-                binding.sideMenu.closeDrawer(binding.sideMenuContent, true)
-            } else {
-                binding.sideMenu.openDrawer(binding.sideMenuContent, true)
-            }
-        }
-
-        viewModel.focusSearchBarEvent.observe(this) {
-            it.consume { take ->
-                if (take) {
-                    // To automatically open keyboard
-                    binding.search.showKeyboard(window)
-                } else {
-                    binding.search.hideKeyboard()
-                }
-            }
-        }
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -107,4 +81,12 @@ class MainActivity : AppCompatActivity() {
 
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
+
+    fun toggleDrawerMenu() {
+        if (binding.sideMenu.isDrawerOpen(Gravity.LEFT)) {
+            binding.sideMenu.closeDrawer(binding.sideMenuContent, true)
+        } else {
+            binding.sideMenu.openDrawer(binding.sideMenuContent, true)
+        }
+    }
 }

app/src/main/java/org/linphone/ui/TopBarViewModel.kt

@@ -23,7 +23,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import org.linphone.utils.Event
 
-class MainActivityViewModel : ViewModel() {
+open class TopBarViewModel : ViewModel() {
     val searchBarVisible = MutableLiveData<Boolean>()
 
     val searchFilter = MutableLiveData<String>()

app/src/main/java/org/linphone/ui/contacts/ContactsFragment.kt

@@ -32,7 +32,10 @@ import androidx.navigation.navGraphViewModels
 import androidx.transition.AutoTransition
 import org.linphone.R
 import org.linphone.databinding.ContactsFragmentBinding
+import org.linphone.ui.MainActivity
 import org.linphone.ui.contacts.viewmodel.ContactsListViewModel
+import org.linphone.utils.hideKeyboard
+import org.linphone.utils.showKeyboard
 
 class ContactsFragment : Fragment() {
     private lateinit var binding: ContactsFragmentBinding
@@ -84,6 +87,21 @@ class ContactsFragment : Fragment() {
             }
         }
 
+        binding.setOnAvatarClickListener {
+            (requireActivity() as MainActivity).toggleDrawerMenu()
+        }
+
+        listViewModel.focusSearchBarEvent.observe(viewLifecycleOwner) {
+            it.consume { take ->
+                if (take) {
+                    // To automatically open keyboard
+                    binding.topBar.search.showKeyboard(requireActivity().window)
+                } else {
+                    binding.topBar.search.hideKeyboard()
+                }
+            }
+        }
+
         /*(view.parent as? ViewGroup)?.doOnPreDraw {
             startPostponedEnterTransition()
         }*/

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

@@ -19,6 +19,6 @@
  */
 package org.linphone.ui.contacts.viewmodel
 
-import androidx.lifecycle.ViewModel
+import org.linphone.ui.TopBarViewModel
 
-class ContactsListViewModel : ViewModel()
+class ContactsListViewModel : TopBarViewModel()

app/src/main/res/layout/contacts_fragment.xml

@@ -5,6 +5,9 @@
 
     <data>
         <import type="android.view.View" />
+        <variable
+            name="onAvatarClickListener"
+            type="View.OnClickListener" />
         <variable
             name="onNewContactClicked"
             type="View.OnClickListener" />
@@ -21,15 +24,22 @@
         android:layout_height="match_parent"
         android:background="@color/primary_color">
 
+        <include
+            android:id="@+id/top_bar"
+            bind:viewModel="@{viewModel}"
+            bind:onAvatarClickListener="@{onAvatarClickListener}"
+            layout="@layout/main_fragment_top_bar" />
+
         <ImageView
             android:id="@+id/background"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginTop="17dp"
             android:src="@drawable/shape_white_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/top_bar" />
 
         <ImageView
             android:id="@+id/no_contacts_image"

app/src/main/res/layout/main_activity.xml

@@ -11,7 +11,7 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.MainActivityViewModel" />
+            type="org.linphone.ui.TopBarViewModel" />
     </data>
 
     <!-- Background color here is mandatory for transparency effect on child views -->
@@ -25,130 +25,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <androidx.constraintlayout.widget.Group
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="avatar, title, search_toggle"
-                android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE, default=gone}" />
-
-            <androidx.constraintlayout.widget.Group
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="cancel_search, search, clear_field"
-                android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE}" />
-
-            <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/background_barrier"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="title, search"
-                app:barrierDirection="bottom" />
-
-            <ImageView
-                android:onClick="@{avatarClickListener}"
-                android:id="@+id/avatar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="15dp"
-                android:src="@drawable/contact_avatar"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/title" />
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="0dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="10dp"
-                android:gravity="center_vertical"
-                android:text="Contacts"
-                android:textColor="#FFFFFF"
-                android:textSize="20sp"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@id/search_toggle"
-                app:layout_constraintStart_toEndOf="@id/avatar"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/search_toggle"
-                android:onClick="@{() -> viewModel.openSearchBar()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="6dp"
-                android:layout_marginEnd="9dp"
-                android:src="@drawable/search"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/title"
-                app:tint="@color/white" />
-
-            <ImageView
-                android:id="@+id/cancel_search"
-                android:onClick="@{() -> viewModel.closeSearchBar()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:layout_marginStart="5dp"
-                android:src="@drawable/back"
-                app:layout_constraintBottom_toBottomOf="@id/search"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/search"
-                app:tint="@color/white" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                style="?attr/textInputFilledStyle"
-                android:id="@+id/search"
-                android:layout_width="0dp"
-                android:layout_height="35dp"
-                android:layout_marginTop="20dp"
-                android:gravity="center_vertical"
-                android:textColorHint="@color/gray_6"
-                android:hint="Search contacts"
-                app:hintEnabled="@{viewModel.searchFilter.length() == 0}"
-                app:hintAnimationEnabled="false"
-                app:hintTextColor="@color/gray_6"
-                app:boxStrokeWidth="0dp"
-                app:boxStrokeWidthFocused="0dp"
-                app:layout_constraintEnd_toStartOf="@id/clear_field"
-                app:layout_constraintStart_toEndOf="@id/cancel_search"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:textCursorDrawable="@null"
-                    android:textColor="@color/gray_6"
-                    android:textStyle="bold"
-                    android:textSize="16sp"
-                    android:inputType="text"
-                    android:paddingVertical="10dp"
-                    android:text="@={viewModel.searchFilter}"
-                    android:background="@android:color/transparent" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <ImageView
-                android:id="@+id/clear_field"
-                android:onClick="@{() -> viewModel.clearFilter()}"
-                android:enabled="@{viewModel.searchFilter.length() > 0}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="6dp"
-                android:layout_marginEnd="9dp"
-                android:src="@drawable/close"
-                app:layout_constraintBottom_toBottomOf="@id/search"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/search"
-                app:tint="@color/white" />
-
             <androidx.drawerlayout.widget.DrawerLayout
                 android:id="@+id/side_menu"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginTop="17dp"
+                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/background_barrier"
                 app:layout_constraintBottom_toBottomOf="parent">
 
                 <androidx.fragment.app.FragmentContainerView

app/src/main/res/layout/main_fragment_top_bar.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="onAvatarClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.TopBarViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/primary_color">
+
+        <androidx.constraintlayout.widget.Group
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="avatar, title, search_toggle"
+            android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}" />
+
+        <androidx.constraintlayout.widget.Group
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="cancel_search, search, clear_field"
+            android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/background_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="title, search"
+            app:barrierDirection="bottom" />
+
+        <ImageView
+            android:onClick="@{onAvatarClickListener}"
+            android:id="@+id/avatar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:src="@drawable/contact_avatar"
+            app:layout_constraintBottom_toBottomOf="@id/title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="10dp"
+            android:gravity="center_vertical"
+            android:text="Contacts"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@id/search_toggle"
+            app:layout_constraintStart_toEndOf="@id/avatar"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/search_toggle"
+            android:onClick="@{() -> viewModel.openSearchBar()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="6dp"
+            android:layout_marginEnd="9dp"
+            android:src="@drawable/search"
+            app:layout_constraintBottom_toBottomOf="@id/title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title"
+            app:tint="@color/white" />
+
+        <ImageView
+            android:id="@+id/cancel_search"
+            android:onClick="@{() -> viewModel.closeSearchBar()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_marginStart="5dp"
+            android:src="@drawable/back"
+            app:layout_constraintBottom_toBottomOf="@id/search"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/search"
+            app:tint="@color/white" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="?attr/textInputFilledStyle"
+            android:id="@+id/search"
+            android:layout_width="0dp"
+            android:layout_height="35dp"
+            android:layout_marginTop="20dp"
+            android:gravity="center_vertical"
+            android:textColorHint="@color/gray_6"
+            android:hint="Search contacts"
+            app:hintEnabled="@{viewModel.searchFilter.length() == 0}"
+            app:hintAnimationEnabled="false"
+            app:hintTextColor="@color/gray_6"
+            app:boxStrokeWidth="0dp"
+            app:boxStrokeWidthFocused="0dp"
+            app:layout_constraintEnd_toStartOf="@id/clear_field"
+            app:layout_constraintStart_toEndOf="@id/cancel_search"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:textCursorDrawable="@null"
+                android:textColor="@color/gray_6"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:inputType="text"
+                android:paddingVertical="1dp"
+                android:text="@={viewModel.searchFilter}"
+                android:background="@android:color/transparent" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <ImageView
+            android:id="@+id/clear_field"
+            android:onClick="@{() -> viewModel.clearFilter()}"
+            android:enabled="@{viewModel.searchFilter.length() > 0}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="6dp"
+            android:layout_marginEnd="9dp"
+            android:src="@drawable/close"
+            app:layout_constraintBottom_toBottomOf="@id/search"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/search"
+            app:tint="@color/white" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>