Merge pull request #480 from adeekshith/feat/toolbars-on-filter-activities

feat: Set Toolbars on filter activities

Author: spuday90

app/src/main/java/com/parishod/watomatic/activity/contactselector/ContactSelectorActivity.kt

@@ -22,11 +22,14 @@ class ContactSelectorActivity : BaseActivity() {
         val binding = ActivityContactSelectorBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        val toolbar = binding.toolbar
+        setSupportActionBar(toolbar)
+        supportActionBar?.title = getString(R.string.contact_selector)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
         contactSelectorFragment = supportFragmentManager.findFragmentById(R.id.contact_selector_layout)
                 as ContactSelectorFragment
 
-        title = getString(R.string.contact_selector)
-
         ViewModelProvider(this).get(SwipeToKillAppDetectViewModel::class.java)
 
         ViewCompat.setOnApplyWindowInsetsListener(binding.contactSelectorRoot) { v, insets ->
@@ -36,6 +39,11 @@ class ContactSelectorActivity : BaseActivity() {
         }
     }
 
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressedDispatcher.onBackPressed()
+        return true
+    }
+
     override fun onRequestPermissionsResult(
             requestCode: Int,
             permissions: Array<out String>,

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

@@ -1,16 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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_selector_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
+        android:layout_height="?attr/actionBarSize"
+        android:elevation="4dp"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:navigationIconTint="?attr/colorOnSurface"
+        app:titleTextColor="?attr/colorOnSurface"
+        app:titleCentered="true"
+        app:title="@string/select_contacts"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <androidx.fragment.app.FragmentContainerView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:name="com.parishod.watomatic.fragment.ContactSelectorFragment"
         android:id="@+id/contact_selector_layout"
-        tools:layout="@layout/fragment_contact_selector" />
-
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:name="com.parishod.watomatic.fragment.ContactSelectorFragment"
+        tools:layout="@layout/fragment_contact_selector"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -166,7 +166,7 @@
     <string name="pref_code_whitelist" translatable="false">pref_whitelist</string>
     <string name="pref_reply_contacts_type" translatable="false">pref_reply_contacts_type</string>
     <string name="enable_contact_based_reply">Enable contact based replies</string>
-    <string name="select_contacts">Select contacts</string>
+    <string name="select_contacts">Select Contacts</string>
     <string name="key_pref_select_contacts" translatable="false">pref_select_contacts</string>
     <string name="contact_selector">Contact selector</string>
     <string name="select_all">Select all</string>