From 21fdc744cd47e6ddd9cab8004d5b0bc644a777c4 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 5 Feb 2022 12:02:47 +0100
Subject: [PATCH] allow managing visible contact fields at the Edit screen too

---
 .../contacts/pro/activities/EditContactActivity.kt |  8 ++++++++
 .../pro/dialogs/ManageVisibleFieldsDialog.kt       |  5 ++++-
 app/src/main/res/menu/menu_edit_contact.xml        | 14 +++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
index b4e1024c..f6706429 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -28,6 +28,7 @@ import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.contacts.pro.R
 import com.simplemobiletools.contacts.pro.dialogs.CustomLabelDialog
+import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleFieldsDialog
 import com.simplemobiletools.contacts.pro.dialogs.MyDatePickerDialog
 import com.simplemobiletools.contacts.pro.dialogs.SelectGroupsDialog
 import com.simplemobiletools.contacts.pro.extensions.*
@@ -289,6 +290,13 @@ class EditContactActivity : ContactActivity() {
                 deleteContact()
                 true
             }
+
+            findItem(R.id.manage_visible_fields).setOnMenuItemClickListener {
+                ManageVisibleFieldsDialog(this@EditContactActivity) {
+                    initContact()
+                }
+                true
+            }
         }
 
         contact_toolbar.setNavigationOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt
index fe9dcd03..0ab8ebf8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ManageVisibleFieldsDialog.kt
@@ -56,6 +56,9 @@ class ManageVisibleFieldsDialog(val activity: BaseSimpleActivity, val callback:
 
         val hasSomethingChanged = activity.config.showContactFields != result
         activity.config.showContactFields = result
-        callback(hasSomethingChanged)
+
+        if (hasSomethingChanged) {
+            callback(true)
+        }
     }
 }
diff --git a/app/src/main/res/menu/menu_edit_contact.xml b/app/src/main/res/menu/menu_edit_contact.xml
index e8874895..d5244b6d 100644
--- a/app/src/main/res/menu/menu_edit_contact.xml
+++ b/app/src/main/res/menu/menu_edit_contact.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save"
         android:icon="@drawable/ic_check_vector"
         android:title="@string/save"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
     <item
         android:id="@+id/share"
         android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
     <item
         android:id="@+id/delete"
         android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
     <item
         android:id="@+id/open_with"
         android:title="@string/open_with"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/manage_visible_fields"
+        android:title="@string/manage_shown_contact_fields"
+        app:showAsAction="never" />
 </menu>