Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-05-19 13:34:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Default star color multiple selection

Browse Source
This commit is contained in:
M66B
2024-12-11 21:27:57 +01:00
parent 3aafbcfd5c
commit 97f4c4acf1
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -1702,7 +1702,8 @@ public class FragmentMessages extends FragmentBase
@Override
public void onClick(View v) {
boolean more_clear = prefs.getBoolean("more_clear", true);
onActionFlagColorSelection(more_clear);
MoreResult result = (MoreResult) cardMore.getTag();
onActionFlagColorSelection(more_clear, result == null ? Color.TRANSPARENT : result.color);
}
});
@@ -4728,7 +4729,7 @@ public class FragmentMessages extends FragmentBase
onActionFlagSelection(false, Color.TRANSPARENT, null, false);
return true;
} else if (itemId == R.string.title_flag_color) {
onActionFlagColorSelection(false);
onActionFlagColorSelection(false, result == null ? Color.TRANSPARENT : result.color);
return true;
} else if (itemId == R.string.title_importance_low) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_LOW, null, false);
@@ -4981,9 +4982,9 @@ public class FragmentMessages extends FragmentBase
}.execute(this, args, "messages:flag");
}
private void onActionFlagColorSelection(boolean clear) {
private void onActionFlagColorSelection(boolean clear, Integer color) {
Bundle args = new Bundle();
args.putInt("color", Color.TRANSPARENT);
args.putInt("color", color);
args.putString("title", getString(R.string.title_flag_color));
args.putBoolean("reset", true);
args.putBoolean("clear", clear);
@@ -11585,6 +11586,7 @@ public class FragmentMessages extends FragmentBase
boolean visible;
boolean hidden;
boolean flagged;
Integer color;
boolean unflagged;
Integer importance;
Boolean hasInbox;
@@ -11726,8 +11728,14 @@ public class FragmentMessages extends FragmentBase
if (!threaded.ui_seen)
result.unseen = true;
if (threaded.ui_flagged)
if (threaded.ui_flagged) {
result.flagged = true;
if (threaded.color != null)
if (result.color == null)
result.color = threaded.color;
else if (!result.color.equals(threaded.color))
result.color = Color.TRANSPARENT;
}
int i = (message.importance == null ? EntityMessage.PRIORITIY_NORMAL : message.importance);
if (result.importance == null)