Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 11:25:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Widget highlight color remark

Browse Source
This commit is contained in:
M66B
2022-04-26 11:54:04 +02:00
parent d999d2eca3
commit b6033db425
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
View File

@@ -68,7 +68,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
private boolean distinguish_contacts;
private int colorStripeWidth;
private int colorWidgetForeground;
private int colorUnreadHighlight;
private int colorWidgetUnread;
private int colorWidgetRead;
private int colorSeparator;
private boolean pro;
@@ -113,8 +113,8 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
this.colorStripeWidth = Helper.dp2pixels(context, color_stripe_wide ? 12 : 6);
colorWidgetForeground = ContextCompat.getColor(context, R.color.colorWidgetForeground);
colorUnreadHighlight = prefs.getInt("highlight_color", Helper.resolveColor(context, R.attr.colorUnreadHighlight));
colorUnreadHighlight = ColorUtils.setAlphaComponent(colorUnreadHighlight, 255);
int highlight_color = prefs.getInt("highlight_color", colorWidgetForeground);
colorWidgetUnread = ColorUtils.setAlphaComponent(highlight_color, 255);
colorWidgetRead = ContextCompat.getColor(context, R.color.colorWidgetRead);
colorSeparator = ContextCompat.getColor(context, R.color.lightColorSeparator);
@@ -233,10 +233,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
views.setTextViewText(idSubject, ssSubject);
views.setTextViewText(idAccount, ssAccount);
int textColor = (message.ui_seen
? colorWidgetRead
: (highlight ? colorUnreadHighlight : colorWidgetForeground));
int textColor = (message.ui_seen ? colorWidgetRead : colorWidgetUnread);
views.setTextColor(idFrom, textColor);
views.setTextColor(idTime, textColor);
views.setTextColor(idSubject, textColor);

14
app/src/main/res/layout/activity_widget_unified.xml
View File

@@ -75,6 +75,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbFlagged" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvHighlightHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_widget_highlight_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbHighlight" />
<CheckBox
android:id="@+id/cbSemiTransparent"
android:layout_width="wrap_content"
@@ -83,7 +95,7 @@
android:checked="true"
android:text="@string/title_widget_semi_transparent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbHighlight" />
app:layout_constraintTop_toBottomOf="@id/tvHighlightHint" />
<eu.faircode.email.ViewButtonColor
android:id="@+id/btnColor"

1
app/src/main/res/values/strings.xml
View File

@@ -1922,6 +1922,7 @@
<string name="title_widget_folder_unified">Unified inbox folders</string>
<string name="title_widget_unseen">Unread messages only</string>
<string name="title_widget_flagged">Starred messages only</string>
<string name="title_widget_highlight_remark">The highlight color can be selected in the display settings</string>
<string name="title_widget_font_size">Text size</string>
<string name="title_widget_padding">Padding size</string>
<string name="title_widget_semi_transparent">Semi transparent background</string>