From 09c528dd92ae3912949c5556fe407b153cb88d74 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 30 Dec 2017 17:43:29 +0100
Subject: [PATCH] use different icons for deleting a contact and removing a
 favorite

---
 .../contacts/adapters/ContactsAdapter.kt               | 10 +++++++++-
 .../contacts/fragments/MyViewPagerFragment.kt          |  2 +-
 app/src/main/res/menu/cab.xml                          |  5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index 58cfe84d..6553bba2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -24,7 +24,8 @@ import com.simplemobiletools.contacts.models.Contact
 import kotlinx.android.synthetic.main.item_contact_with_number.view.*
 
 class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Contact>, val listener: RefreshRecyclerViewListener?,
-                      recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
+                      val isFavoritesFragment: Boolean, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) :
+        MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
 
     var config = activity.config
     lateinit private var contactDrawable: Drawable
@@ -42,6 +43,8 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     override fun prepareActionMode(menu: Menu) {
         menu.apply {
             findItem(R.id.cab_edit).isVisible = activity.config.callContact && isOneItemSelected()
+            findItem(R.id.cab_remove).isVisible = isFavoritesFragment
+            findItem(R.id.cab_delete).isVisible = !isFavoritesFragment
         }
     }
 
@@ -56,6 +59,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
             R.id.cab_edit -> editContact()
             R.id.cab_select_all -> selectAll()
             R.id.cab_delete -> askConfirmDelete()
+            R.id.cab_remove -> removeFavorites()
         }
     }
 
@@ -108,6 +112,10 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
         removeSelectedItems()
     }
 
+    private fun removeFavorites() {
+
+    }
+
     override fun onViewRecycled(holder: ViewHolder?) {
         super.onViewRecycled(holder)
         if (!activity.isActivityDestroyed()) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt
index 5bd3ad46..98051209 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt
@@ -116,7 +116,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
 
         val currAdapter = fragment_list.adapter
         if (currAdapter == null) {
-            ContactsAdapter(activity as SimpleActivity, contacts, this, fragment_list) {
+            ContactsAdapter(activity as SimpleActivity, contacts, this, this is FavoritesFragment, fragment_list) {
                 if (config.callContact) {
                     val contact = it as Contact
                     if (contact.phoneNumbers.isNotEmpty()) {
diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml
index 49c496c7..ca7e4ca0 100644
--- a/app/src/main/res/menu/cab.xml
+++ b/app/src/main/res/menu/cab.xml
@@ -16,4 +16,9 @@
         android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/cab_remove"
+        android:icon="@drawable/ic_minus"
+        android:title="@string/remove_from_favorites"
+        app:showAsAction="ifRoom"/>
 </menu>