From 72d26f1752ba5fefe528d3b6e2cd1b6d66030d36 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 21 May 2024 20:07:49 +0200
Subject: [PATCH] Edit color title

---
 app/src/main/java/eu/faircode/email/AdapterAccount.java  | 4 ++--
 app/src/main/java/eu/faircode/email/AdapterFolder.java   | 4 ++--
 app/src/main/java/eu/faircode/email/AdapterIdentity.java | 4 ++--
 app/src/main/res/values/strings.xml                      | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 4dde893a0b..43d8e54ba7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -495,7 +495,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             popupMenu.getMenu().add(Menu.NONE, R.string.title_primary, order++, R.string.title_primary)
                     .setCheckable(true).setChecked(account.primary);
             if (parentFragment instanceof FragmentAccounts)
-                popupMenu.getMenu().add(Menu.NONE, R.string.title_color, order++, R.string.title_color);
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_color, order++, R.string.title_edit_color);
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 String channelId = EntityAccount.getNotificationChannelId(account.id);
@@ -538,7 +538,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                     } else if (itemId == R.string.title_primary) {
                         onActionPrimary(!item.isChecked());
                         return true;
-                    } else if (itemId == R.string.title_color) {
+                    } else if (itemId == R.string.title_edit_color) {
                         onActionEditColor();
                         return true;
                     } else if (itemId == R.string.title_create_channel) {
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 4ac2962177..56df26dcb8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -659,7 +659,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 }
 
                 if (parentFragment instanceof FragmentFolders)
-                    popupMenu.getMenu().add(Menu.NONE, R.string.title_color, order++, R.string.title_color);
+                    popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_color, order++, R.string.title_edit_color);
 
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_properties, order++, R.string.title_edit_properties);
 
@@ -813,7 +813,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     } else if (itemId == R.string.title_import_messages) {
                         onActionImportMessages();
                         return true;
-                    } else if (itemId == R.string.title_color) {
+                    } else if (itemId == R.string.title_edit_color) {
                         onActionEditColor();
                         return true;
                     } else if (itemId == R.string.title_edit_properties) {
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index dbb3a585f5..5165a9b726 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -239,7 +239,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                     .setCheckable(true).setChecked(identity.primary);
 
             if (parentFragment instanceof FragmentIdentities)
-                popupMenu.getMenu().add(Menu.NONE, R.string.title_color, order++, R.string.title_color);
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_color, order++, R.string.title_edit_color);
 
             if (identity.sign_key != null || identity.sign_key_alias != null)
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_reset_sign_key, order++, R.string.title_reset_sign_key);
@@ -260,7 +260,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                     } else if (itemId == R.string.title_primary) {
                         onActionPrimary(!item.isChecked());
                         return true;
-                    } else if (itemId == R.string.title_color) {
+                    } else if (itemId == R.string.title_edit_color) {
                         onActionEditColor();
                         return true;
                     } else if (itemId == R.string.title_reset_sign_key) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1990623919..80917aa1b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1358,6 +1358,7 @@
     <string name="title_expunge_remark">This will permanently delete all messages marked for deletion</string>
     <string name="title_empty_trash">Empty trash</string>
     <string name="title_empty_spam">Empty spam</string>
+    <string name="title_edit_color">Edit color</string>
     <string name="title_edit_properties">Edit properties</string>
     <string name="title_edit_rules">Edit rules</string>
     <string name="title_execute_rules">Execute rules</string>