diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 0649eecbdf..1849999f1b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -105,6 +105,7 @@ public class FragmentMessage extends FragmentEx {
private Group grpHeader;
private Group grpAddresses;
private Group grpAttachments;
+ private Group grpError;
private Group grpMessage;
private TupleMessageEx message = null;
@@ -148,6 +149,7 @@ public class FragmentMessage extends FragmentEx {
grpHeader = view.findViewById(R.id.grpHeader);
grpAddresses = view.findViewById(R.id.grpAddresses);
grpAttachments = view.findViewById(R.id.grpAttachments);
+ grpError = view.findViewById(R.id.grpError);
grpMessage = view.findViewById(R.id.grpMessage);
setHasOptionsMenu(true);
@@ -219,11 +221,11 @@ public class FragmentMessage extends FragmentEx {
tvCount.setVisibility(View.GONE);
grpAddresses.setVisibility(View.GONE);
grpAttachments.setVisibility(View.GONE);
- tvError.setVisibility(View.GONE);
+ grpError.setVisibility(View.GONE);
tvCount.setTag(tvCount.getVisibility());
tvCc.setTag(grpAddresses.getVisibility());
- tvError.setTag(tvError.getVisibility());
+ tvError.setTag(grpError.getVisibility());
}
});
@@ -243,7 +245,7 @@ public class FragmentMessage extends FragmentEx {
tvCount.setVisibility((int) tvCount.getTag());
grpAddresses.setVisibility((int) tvCc.getTag());
grpAttachments.setVisibility(adapter != null && adapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
- tvError.setVisibility((int) tvError.getTag());
+ grpError.setVisibility((int) tvError.getTag());
return true;
}
@@ -284,7 +286,7 @@ public class FragmentMessage extends FragmentEx {
pbBody.setVisibility(View.GONE);
bottom_navigation.setVisibility(View.GONE);
tvCount.setVisibility(View.GONE);
- tvError.setVisibility(View.GONE);
+ grpError.setVisibility(View.GONE);
fab.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
@@ -474,10 +476,10 @@ public class FragmentMessage extends FragmentEx {
if (free) {
tvCount.setVisibility((int) tvCount.getTag());
grpAddresses.setVisibility((int) tvCc.getTag());
- tvError.setVisibility((int) tvError.getTag());
+ grpError.setVisibility((int) tvError.getTag());
} else {
tvCount.setVisibility(!free && message.count > 1 ? View.VISIBLE : View.GONE);
- tvError.setVisibility(free || message.error == null ? View.GONE : View.VISIBLE);
+ grpError.setVisibility(free || message.error == null ? View.GONE : View.VISIBLE);
}
// Observe attachments
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index c305030c4f..cba22235b2 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -203,19 +203,29 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
+
+
+ app:layout_constraintTop_toBottomOf="@id/vSeparatorError" />
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 66d7cd0b5e..bcc4455b0a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
#000
#ccc
#aaa
+ #ffff0000
#99000000
#111
#eee
@@ -17,6 +18,7 @@
#fff
#555
#666
+ #ffffb300
#997f7f7f
#fff
#222
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bb80ef7787..dcbeb2a28f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,7 @@
+
@@ -15,6 +16,7 @@
- @color/lightColorUnread
- @color/lightColorSeparator
+ - @color/lightColorWarning
- @color/lightColorDrawerScrim
- @color/lightColorDrawerText
- @color/lightColorDrawerBackground
@@ -31,6 +33,7 @@
- @color/darkColorUnread
- @color/darkColorSeparator
+ - @color/darkColorWarning
- @color/darkColorDrawerScrim
- @color/darkColorDrawerText
- @color/darkColorDrawerBackground