redesigning some remaining screens

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt

@@ -5,9 +5,8 @@ import android.content.Intent
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.NavigationIcon
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.contacts.pro.R
 import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter
@@ -32,28 +31,14 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
 
     protected var contact: Contact? = null
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
-        super.onActivityResult(requestCode, resultCode, resultData)
-        if (requestCode == INTENT_SELECT_RINGTONE && resultCode == Activity.RESULT_OK && resultData != null) {
-            val extras = resultData.extras
-            if (extras?.containsKey(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) == true) {
-                val uri = extras.getParcelable<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) ?: return
-                try {
-                    setRingtoneOnSelected(uri)
-                } catch (e: Exception) {
-                    showErrorToast(e)
-                }
-            }
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_group_contacts)
         updateTextColors(group_contacts_coordinator)
+        setupOptionsMenu()
 
         group = intent.extras?.getSerializable(GROUP) as Group
-        supportActionBar?.title = group.title
+        group_contacts_toolbar.title = group.title
 
         group_contacts_fab.setOnClickListener {
             if (wasInit) {
@@ -74,22 +59,34 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
     override fun onResume() {
         super.onResume()
         refreshContacts()
+        setupToolbar(group_contacts_toolbar, NavigationIcon.Arrow)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    private fun setupOptionsMenu() {
-        menuInflater.inflate(R.menu.menu_group, menu)
+        group_contacts_toolbar.setOnMenuItemClickListener { menuItem ->
-        updateMenuItemColors(menu)
+            when (menuItem.itemId) {
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
                 R.id.send_sms_to_group -> sendSMSToGroup()
                 R.id.send_email_to_group -> sendEmailToGroup()
                 R.id.assign_ringtone_to_group -> assignRingtoneToGroup()
-            else -> return super.onOptionsItemSelected(item)
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
+        super.onActivityResult(requestCode, resultCode, resultData)
+        if (requestCode == INTENT_SELECT_RINGTONE && resultCode == Activity.RESULT_OK && resultData != null) {
+            val extras = resultData.extras
+            if (extras?.containsKey(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) == true) {
+                val uri = extras.getParcelable<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) ?: return
+                try {
+                    setRingtoneOnSelected(uri)
+                } catch (e: Exception) {
+                    showErrorToast(e)
+                }
+            }
         }
-        return true
     }
 
     private fun fabClicked() {

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt

@@ -53,6 +53,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_insert_edit_contact)
+        setupOptionsMenu()
         isSelectContactIntent = intent.action == Intent.ACTION_PICK
 
         if (isSelectContactIntent) {
@@ -89,6 +90,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
     override fun onResume() {
         super.onResume()
         setupTabColors()
+        setupToolbar(insert_edit_toolbar, NavigationIcon.None, searchMenuItem = searchMenuItem)
     }
 
     override fun onStop() {
@@ -96,20 +98,16 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
         searchMenuItem?.collapseActionView()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    private fun setupOptionsMenu() {
-        menuInflater.inflate(R.menu.menu_insert_or_edit, menu)
+        setupSearch(insert_edit_toolbar.menu)
-        setupSearch(menu)
+        insert_edit_toolbar.setOnMenuItemClickListener { menuItem ->
-        updateMenuItemColors(menu)
+            when (menuItem.itemId) {
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
                 R.id.sort -> showSortingDialog()
                 R.id.filter -> showFilterDialog()
-            else -> return super.onOptionsItemSelected(item)
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
         }
-        return true
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
@@ -122,18 +120,15 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
 
     private fun initFragments() {
         view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
-            override fun onPageScrollStateChanged(state: Int) {
+            override fun onPageScrollStateChanged(state: Int) {}
-                if (isSearchOpen) {
-                    getCurrentFragment()?.onSearchQueryChanged("")
-                    searchMenuItem?.collapseActionView()
-                }
-            }
 
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
 
             override fun onPageSelected(position: Int) {
                 insert_or_edit_tabs_holder.getTabAt(position)?.select()
-                invalidateOptionsMenu()
+                getAllFragments().forEach {
+                    it?.finishActMode()
+                }
             }
         })
 

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

@@ -5,6 +5,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/settings_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/group_contacts_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_group"
+            app:title=""
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/group_contacts_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
         <RelativeLayout
             android:id="@+id/group_contacts_wrapper"
             android:layout_width="match_parent"
@@ -64,3 +86,4 @@
             android:src="@drawable/ic_plus_vector" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,10 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/insert_edit_contact_holder"
+    android:id="@+id/insert_edit_coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/insert_edit_app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/insert_edit_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_insert_or_edit"
+            app:title="@string/select_contact"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
+        android:id="@+id/insert_edit_contact_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
         <RelativeLayout
             android:id="@+id/new_contact_holder"
             android:layout_width="match_parent"
@@ -68,3 +90,4 @@
             app:tabRippleColor="@null" />
 
     </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/menu/menu_group.xml

@@ -5,15 +5,15 @@
         android:id="@+id/assign_ringtone_to_group"
         android:icon="@drawable/ic_bell_vector"
         android:title="@string/ringtone"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/send_sms_to_group"
         android:icon="@drawable/ic_sms_vector"
         android:title="@string/send_sms_to_group"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always" />
     <item
         android:id="@+id/send_email_to_group"
         android:icon="@drawable/ic_mail_vector"
         android:title="@string/send_email_to_group"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always" />
 </menu>