msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Edit color title

Browse Source
pull/215/head
M66B 7 months ago
parent 7e74869f8f
commit 72d26f1752
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/eu/faircode/email/AdapterAccount.java
Unescape View File

@ -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) popupMenu.getMenu().add(Menu.NONE, R.string.title_primary, order++, R.string.title_primary)
.setCheckable(true).setChecked(account.primary); .setCheckable(true).setChecked(account.primary);
if (parentFragment instanceof FragmentAccounts) 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) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
String channelId = EntityAccount.getNotificationChannelId(account.id); 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) { } else if (itemId == R.string.title_primary) {
onActionPrimary(!item.isChecked()); onActionPrimary(!item.isChecked());
return true; return true;
} else if (itemId == R.string.title_color) { } else if (itemId == R.string.title_edit_color) {
onActionEditColor(); onActionEditColor();
return true; return true;
} else if (itemId == R.string.title_create_channel) { } else if (itemId == R.string.title_create_channel) {

4
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -659,7 +659,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
} }
if (parentFragment instanceof FragmentFolders) 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); 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) { } else if (itemId == R.string.title_import_messages) {
onActionImportMessages(); onActionImportMessages();
return true; return true;
} else if (itemId == R.string.title_color) { } else if (itemId == R.string.title_edit_color) {
onActionEditColor(); onActionEditColor();
return true; return true;
} else if (itemId == R.string.title_edit_properties) { } else if (itemId == R.string.title_edit_properties) {

4
app/src/main/java/eu/faircode/email/AdapterIdentity.java
Unescape View File

@ -239,7 +239,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
.setCheckable(true).setChecked(identity.primary); .setCheckable(true).setChecked(identity.primary);
if (parentFragment instanceof FragmentIdentities) 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) 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); 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) { } else if (itemId == R.string.title_primary) {
onActionPrimary(!item.isChecked()); onActionPrimary(!item.isChecked());
return true; return true;
} else if (itemId == R.string.title_color) { } else if (itemId == R.string.title_edit_color) {
onActionEditColor(); onActionEditColor();
return true; return true;
} else if (itemId == R.string.title_reset_sign_key) { } else if (itemId == R.string.title_reset_sign_key) {

1
app/src/main/res/values/strings.xml
Unescape View File

@ -1358,6 +1358,7 @@
<string name="title_expunge_remark">This will permanently delete all messages marked for deletion</string> <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_trash">Empty trash</string>
<string name="title_empty_spam">Empty spam</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_properties">Edit properties</string>
<string name="title_edit_rules">Edit rules</string> <string name="title_edit_rules">Edit rules</string>
<string name="title_execute_rules">Execute rules</string> <string name="title_execute_rules">Execute rules</string>

Write Preview
Loading…
Cancel
Save