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

Color verified

Browse Source
pull/200/head
M66B 4 years ago
parent fa0e333e29
commit 52dc5f5c66
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -226,6 +226,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private int colorUnread; private int colorUnread;
private int colorRead; private int colorRead;
private int colorSubject; private int colorSubject;
private int colorVerified;
private int colorEncrypt; private int colorEncrypt;
private int colorSeparator; private int colorSeparator;
private int colorWarning; private int colorWarning;
@ -1052,7 +1053,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
!EntityFolder.OUTBOX.equals(message.folderType)) { !EntityFolder.OUTBOX.equals(message.folderType)) {
ibAuth.setImageLevel(auths + 1); ibAuth.setImageLevel(auths + 1);
ibAuth.setImageTintList(ColorStateList.valueOf( ibAuth.setImageTintList(ColorStateList.valueOf(
auths < 3 ? colorSeparator : colorControlNormal)); auths < 3 ? colorControlNormal : colorVerified));
ibAuth.setVisibility(View.VISIBLE); ibAuth.setVisibility(View.VISIBLE);
} else } else
ibAuth.setVisibility(View.GONE); ibAuth.setVisibility(View.GONE);
@ -1569,7 +1570,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
Boolean.TRUE.equals(message.dmarc)) { Boolean.TRUE.equals(message.dmarc)) {
ibVerified.setImageLevel(main.isVerified() ? 1 : 0); ibVerified.setImageLevel(main.isVerified() ? 1 : 0);
ibVerified.setImageTintList(ColorStateList.valueOf(main.isVerified() ibVerified.setImageTintList(ColorStateList.valueOf(main.isVerified()
? colorAccent : colorSeparator)); ? colorVerified : colorControlNormal));
ibVerified.setContentDescription(context.getString(main.isVerified() ibVerified.setContentDescription(context.getString(main.isVerified()
? R.string.title_advanced_bimi_verified ? R.string.title_advanced_bimi_verified
: R.string.title_advanced_bimi_unverified)); : R.string.title_advanced_bimi_unverified));
@ -5632,6 +5633,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
this.colorUnread = (highlight_unread ? colorHighlight : Helper.resolveColor(context, R.attr.colorUnread)); this.colorUnread = (highlight_unread ? colorHighlight : Helper.resolveColor(context, R.attr.colorUnread));
this.colorRead = Helper.resolveColor(context, R.attr.colorRead); this.colorRead = Helper.resolveColor(context, R.attr.colorRead);
this.colorSubject = Helper.resolveColor(context, highlight_subject ? R.attr.colorUnreadHighlight : R.attr.colorRead); this.colorSubject = Helper.resolveColor(context, highlight_subject ? R.attr.colorUnreadHighlight : R.attr.colorRead);
this.colorVerified = Helper.resolveColor(context, R.attr.colorVerified);
this.colorEncrypt = Helper.resolveColor(context, R.attr.colorEncrypt); this.colorEncrypt = Helper.resolveColor(context, R.attr.colorEncrypt);
this.colorSeparator = Helper.resolveColor(context, R.attr.colorSeparator); this.colorSeparator = Helper.resolveColor(context, R.attr.colorSeparator);
this.colorError = Helper.resolveColor(context, R.attr.colorError); this.colorError = Helper.resolveColor(context, R.attr.colorError);

10
app/src/main/res/layout/fragment_options_display.xml
Unescape View File

@ -518,7 +518,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:drawableStart="@drawable/twotone_check_24" android:drawableStart="@drawable/twotone_check_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableTint="?attr/colorSeparator" android:drawableTint="?attr/colorControlNormal"
android:text="@string/title_advanced_bimi_unverified" android:text="@string/title_advanced_bimi_unverified"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
@ -532,7 +532,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:drawableStart="@drawable/twotone_done_all_24" android:drawableStart="@drawable/twotone_done_all_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableTint="?attr/colorAccent" android:drawableTint="?attr/colorVerified"
android:text="@string/title_advanced_bimi_verified" android:text="@string/title_advanced_bimi_verified"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
@ -1461,7 +1461,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:drawableStart="@drawable/twotone_gpp_bad_24" android:drawableStart="@drawable/twotone_gpp_bad_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableTint="?attr/colorSeparator" android:drawableTint="?attr/colorControlNormal"
android:text="@string/title_advanced_authentication_none" android:text="@string/title_advanced_authentication_none"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
@ -1476,7 +1476,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:drawableStart="@drawable/twotone_gpp_maybe_24" android:drawableStart="@drawable/twotone_gpp_maybe_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableTint="?attr/colorSeparator" android:drawableTint="?attr/colorControlNormal"
android:text="@string/title_advanced_authentication_some" android:text="@string/title_advanced_authentication_some"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
@ -1491,7 +1491,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:drawableStart="@drawable/twotone_gpp_good_24" android:drawableStart="@drawable/twotone_gpp_good_24"
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableTint="?attr/colorControlNormal" android:drawableTint="?attr/colorVerified"
android:text="@string/title_advanced_authentication_all" android:text="@string/title_advanced_authentication_all"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"

3
app/src/main/res/values/colors.xml
Unescape View File

@ -15,6 +15,9 @@
<color name="colorHighlightLight">#7fffe000</color> <color name="colorHighlightLight">#7fffe000</color>
<color name="colorHighlightDark">#7fffe000</color> <color name="colorHighlightDark">#7fffe000</color>
<color name="colorVerifiedLight">#ff00e000</color>
<color name="colorVerifiedDark">#ff00ff00</color>
<color name="colorEncryptLight">#ff00ff00</color> <color name="colorEncryptLight">#ff00ff00</color>
<color name="colorEncryptDark">#ff00e000</color> <color name="colorEncryptDark">#ff00e000</color>

3
app/src/main/res/values/styles.xml
Unescape View File

@ -5,6 +5,7 @@
<attr name="colorUnreadHighlight" format="reference" /> <attr name="colorUnreadHighlight" format="reference" />
<attr name="colorBlockquote" format="reference" /> <attr name="colorBlockquote" format="reference" />
<attr name="colorHighlight" format="reference" /> <attr name="colorHighlight" format="reference" />
<attr name="colorVerified" format="reference" />
<attr name="colorEncrypt" format="reference" /> <attr name="colorEncrypt" format="reference" />
<attr name="colorSeparator" format="reference" /> <attr name="colorSeparator" format="reference" />
<attr name="colorThumb" format="reference" /> <attr name="colorThumb" format="reference" />
@ -32,6 +33,7 @@
<item name="colorHighlight">@color/colorHighlightLight</item> <item name="colorHighlight">@color/colorHighlightLight</item>
<item name="colorVerified">@color/colorVerifiedLight</item>
<item name="colorEncrypt">@color/colorEncryptLight</item> <item name="colorEncrypt">@color/colorEncryptLight</item>
<item name="colorSeparator">@color/lightColorSeparator</item> <item name="colorSeparator">@color/lightColorSeparator</item>
@ -76,6 +78,7 @@
<item name="colorHighlight">@color/colorHighlightDark</item> <item name="colorHighlight">@color/colorHighlightDark</item>
<item name="colorVerified">@color/colorVerifiedDark</item>
<item name="colorEncrypt">@color/colorEncryptDark</item> <item name="colorEncrypt">@color/colorEncryptDark</item>
<item name="colorSeparator">@color/darkColorSeparator</item> <item name="colorSeparator">@color/darkColorSeparator</item>

Write Preview
Loading…
Cancel
Save