From 6b455ebf6a1ef6565462d1ea80d81574190c6d77 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 7 Feb 2024 18:37:50 +0100 Subject: [PATCH] Added default receipt titles / colors --- .../java/eu/faircode/email/TupleKeyword.java | 16 ++++++++++++++++ app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 5 +++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/TupleKeyword.java b/app/src/main/java/eu/faircode/email/TupleKeyword.java index fd28379619..4c85a1e2d8 100644 --- a/app/src/main/java/eu/faircode/email/TupleKeyword.java +++ b/app/src/main/java/eu/faircode/email/TupleKeyword.java @@ -119,6 +119,14 @@ public class TupleKeyword { return context.getString(R.string.title_keyword_label4); case "$label5": // Later return context.getString(R.string.title_keyword_label5); + case MessageHelper.FLAG_DISPLAYED: + return context.getString(R.string.title_keyword_displayed); + case MessageHelper.FLAG_DELIVERED: + return context.getString(R.string.title_keyword_delivered); + case MessageHelper.FLAG_NOT_DISPLAYED: + return context.getString(R.string.title_keyword_not_displayed); + case MessageHelper.FLAG_NOT_DELIVERED: + return context.getString(R.string.title_keyword_not_delivered); default: return keyword; } @@ -136,6 +144,14 @@ public class TupleKeyword { return Color.parseColor("#3333FF"); case "$label5": // Later return Color.parseColor("#993399"); + + case MessageHelper.FLAG_DISPLAYED: + case MessageHelper.FLAG_DELIVERED: + return Helper.resolveColor(context, R.attr.colorVerified); + case MessageHelper.FLAG_NOT_DISPLAYED: + case MessageHelper.FLAG_NOT_DELIVERED: + return Helper.resolveColor(context, androidx.appcompat.R.attr.colorError); + default: return null; } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d79518fd45..52a0c2747a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,7 +17,7 @@ #7fffe000 #7fffe000 - #ff00e000 + #ff00c000 #ff00ff00 #ff00ff00 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a7ac8bd282..9018708cf3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2408,6 +2408,11 @@ To do Later + Displayed + Delivered + Not displayed + Not delivered + %1$d message %1$d messages