Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 17:43:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added account color dot option

Browse Source
This commit is contained in:
M66B
2024-08-03 08:19:49 +02:00
parent d086623dd7
commit d486080152
9 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -46,6 +46,7 @@ import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.graphics.text.LineBreaker;
import android.net.Uri;
import android.os.Build;
@@ -271,7 +272,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private boolean threading_unread;
private boolean indentation;
private boolean avatars;
private boolean color_stripe;
private int account_color;
private boolean check_authentication;
private boolean native_dkim;
private boolean check_tls;
@@ -364,6 +365,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private View view;
private View header;
private ImageView ivBadge;
private View vwColor;
private ImageButton ibExpander;
private ImageView ibFlagged;
@@ -737,6 +739,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
view = itemView.findViewById(R.id.clItem);
header = itemView.findViewById(R.id.inHeader);
ivBadge = itemView.findViewById(R.id.ivBadge);
vwColor = itemView.findViewById(R.id.vwColor);
ibExpander = itemView.findViewById(R.id.ibExpander);
ibFlagged = itemView.findViewById(R.id.ibFlagged);
@@ -772,7 +775,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvError.setAutoLinkMask(Linkify.EMAIL_ADDRESSES | Linkify.WEB_URLS);
ibError = itemView.findViewById(R.id.ibError);
if (vwColor != null)
if (account_color == 1 && vwColor != null)
vwColor.getLayoutParams().width = colorStripeWidth;
if (tvFrom != null) {
@@ -1380,11 +1383,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
int colorBackground =
(message.accountColor == null || !ActivityBilling.isPro(context)
? colorSeparator : message.accountColor);
if (!Objects.equals(vwColor.getTag() == null, colorBackground)) {
if (account_color == 2)
((GradientDrawable) ivBadge.getDrawable().mutate()).setColor(colorBackground);
ivBadge.setVisibility(account_color == 2 ? View.VISIBLE : View.GONE);
if (account_color == 1 &&
!Objects.equals(vwColor.getTag() == null, colorBackground)) {
vwColor.setTag(colorBackground);
vwColor.setBackgroundColor(colorBackground);
}
vwColor.setVisibility(color_stripe ? View.VISIBLE : View.GONE);
vwColor.setVisibility(account_color == 1 ? View.VISIBLE : View.GONE);
// Expander
if (!Objects.equals(ibExpander.getTag(), expanded)) {
@@ -7964,6 +7973,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean expanded = properties.getValue("expanded", message.id);
ivBadge.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
vwColor.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
if (ibExpander.getVisibility() == View.VISIBLE)
@@ -8274,7 +8284,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
this.indentation = prefs.getBoolean("indentation", false);
this.avatars = (contacts && avatars) || (bimi || gravatars || libravatars || favicons || generated);
this.color_stripe = prefs.getBoolean("color_stripe", true);
this.account_color = prefs.getInt("account_color", 1);
this.check_authentication = prefs.getBoolean("check_authentication", true);
this.native_dkim = prefs.getBoolean("native_dkim", false);
this.check_tls = prefs.getBoolean("check_tls", true);