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

PoC: widget day/night mode

Browse Source
pull/207/head
M66B 3 years ago
parent 92129a522a
commit 316a4bcae8
7 changed files with 96 additions and 54 deletions
Show Stats Download Patch File Download Diff File

21
app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
Unescape View File

@ -57,6 +57,7 @@ public class ActivityWidgetUnified extends ActivityBase {
private Spinner spFolder; private Spinner spFolder;
private CheckBox cbUnseen; private CheckBox cbUnseen;
private CheckBox cbFlagged; private CheckBox cbFlagged;
private CheckBox cbDayNight;
private CheckBox cbHighlight; private CheckBox cbHighlight;
private ViewButtonColor btnHighlight; private ViewButtonColor btnHighlight;
private CheckBox cbSeparatorLines; private CheckBox cbSeparatorLines;
@ -94,6 +95,7 @@ public class ActivityWidgetUnified extends ActivityBase {
long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L); long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L);
boolean unseen = prefs.getBoolean("widget." + appWidgetId + ".unseen", false); boolean unseen = prefs.getBoolean("widget." + appWidgetId + ".unseen", false);
boolean flagged = prefs.getBoolean("widget." + appWidgetId + ".flagged", false); boolean flagged = prefs.getBoolean("widget." + appWidgetId + ".flagged", false);
boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false);
boolean highlight = prefs.getBoolean("widget." + appWidgetId + ".highlight", false); boolean highlight = prefs.getBoolean("widget." + appWidgetId + ".highlight", false);
int highlight_color = prefs.getInt("widget." + appWidgetId + ".highlight_color", Color.TRANSPARENT); int highlight_color = prefs.getInt("widget." + appWidgetId + ".highlight_color", Color.TRANSPARENT);
boolean separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true); boolean separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true);
@ -113,6 +115,7 @@ public class ActivityWidgetUnified extends ActivityBase {
spFolder = findViewById(R.id.spFolder); spFolder = findViewById(R.id.spFolder);
cbUnseen = findViewById(R.id.cbUnseen); cbUnseen = findViewById(R.id.cbUnseen);
cbFlagged = findViewById(R.id.cbFlagged); cbFlagged = findViewById(R.id.cbFlagged);
cbDayNight = findViewById(R.id.cbDayNight);
cbHighlight = findViewById(R.id.cbHighlight); cbHighlight = findViewById(R.id.cbHighlight);
btnHighlight = findViewById(R.id.btnHighlight); btnHighlight = findViewById(R.id.btnHighlight);
cbSeparatorLines = findViewById(R.id.cbSeparatorLines); cbSeparatorLines = findViewById(R.id.cbSeparatorLines);
@ -130,10 +133,20 @@ public class ActivityWidgetUnified extends ActivityBase {
final Intent resultValue = new Intent(); final Intent resultValue = new Intent();
resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
cbDayNight.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
cbHighlight.setEnabled(!checked);
btnHighlight.setEnabled(cbHighlight.isChecked() && !checked);
cbSemiTransparent.setEnabled(!checked);
btnColor.setEnabled(!checked);
}
});
cbHighlight.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbHighlight.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
btnHighlight.setVisibility(checked ? View.VISIBLE : View.GONE); btnHighlight.setVisibility(checked && cbHighlight.isEnabled() ? View.VISIBLE : View.GONE);
} }
}); });
@ -222,6 +235,7 @@ public class ActivityWidgetUnified extends ActivityBase {
editor.putLong("widget." + appWidgetId + ".folder", folder == null ? -1L : folder.id); editor.putLong("widget." + appWidgetId + ".folder", folder == null ? -1L : folder.id);
editor.putString("widget." + appWidgetId + ".type", folder == null ? null : folder.type); editor.putString("widget." + appWidgetId + ".type", folder == null ? null : folder.type);
editor.putBoolean("widget." + appWidgetId + ".unseen", cbUnseen.isChecked()); editor.putBoolean("widget." + appWidgetId + ".unseen", cbUnseen.isChecked());
editor.putBoolean("widget." + appWidgetId + ".daynight", cbDayNight.isChecked());
editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked()); editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked());
editor.putBoolean("widget." + appWidgetId + ".highlight", cbHighlight.isChecked()); editor.putBoolean("widget." + appWidgetId + ".highlight", cbHighlight.isChecked());
editor.putInt("widget." + appWidgetId + ".highlight_color", btnHighlight.getColor()); editor.putInt("widget." + appWidgetId + ".highlight_color", btnHighlight.getColor());
@ -346,12 +360,17 @@ public class ActivityWidgetUnified extends ActivityBase {
// Initialize // Initialize
cbUnseen.setChecked(unseen); cbUnseen.setChecked(unseen);
cbFlagged.setChecked(flagged); cbFlagged.setChecked(flagged);
cbDayNight.setChecked(daynight);
cbHighlight.setChecked(highlight); cbHighlight.setChecked(highlight);
cbHighlight.setEnabled(!daynight);
btnHighlight.setVisibility(highlight ? View.VISIBLE : View.GONE); btnHighlight.setVisibility(highlight ? View.VISIBLE : View.GONE);
btnHighlight.setColor(highlight_color); btnHighlight.setColor(highlight_color);
btnHighlight.setEnabled(highlight && !daynight);
cbSeparatorLines.setChecked(separators); cbSeparatorLines.setChecked(separators);
cbSemiTransparent.setChecked(semi); cbSemiTransparent.setChecked(semi);
cbSemiTransparent.setEnabled(!daynight);
btnColor.setColor(background); btnColor.setColor(background);
btnColor.setEnabled(!daynight);
spFontSize.setSelection(tinyIn(font)); spFontSize.setSelection(tinyIn(font));
spPadding.setSelection(tinyIn(padding)); spPadding.setSelection(tinyIn(padding));
cbAvatars.setChecked(avatars); cbAvatars.setChecked(avatars);

70
app/src/main/java/eu/faircode/email/WidgetUnified.java
Unescape View File

@ -49,6 +49,7 @@ public class WidgetUnified extends AppWidgetProvider {
long account = prefs.getLong("widget." + appWidgetId + ".account", -1L); long account = prefs.getLong("widget." + appWidgetId + ".account", -1L);
long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L); long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L);
String type = prefs.getString("widget." + appWidgetId + ".type", null); String type = prefs.getString("widget." + appWidgetId + ".type", null);
boolean daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false);
boolean separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true); boolean separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true);
boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true); boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true);
int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT); int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT);
@ -132,42 +133,43 @@ public class WidgetUnified extends AppWidgetProvider {
boolean syncing = prefs.getBoolean("widget." + appWidgetId + ".syncing", false); boolean syncing = prefs.getBoolean("widget." + appWidgetId + ".syncing", false);
if (background == Color.TRANSPARENT) { if (!daynight)
if (semi) if (background == Color.TRANSPARENT) {
views.setInt(R.id.background, "setBackgroundResource", R.drawable.widget_background); if (semi)
else views.setInt(R.id.background, "setBackgroundResource", R.drawable.widget_background);
else
views.setInt(R.id.background, "setBackgroundColor", background);
views.setTextColor(R.id.title, colorWidgetForeground);
views.setInt(R.id.separator, "setBackgroundColor", lightColorSeparator);
views.setImageViewResource(R.id.refresh, syncing
? R.drawable.twotone_compare_arrows_24_white
: R.drawable.twotone_sync_24_white);
views.setImageViewResource(R.id.compose, R.drawable.twotone_edit_24_white);
} else {
float lum = (float) ColorUtils.calculateLuminance(background);
if (semi)
background = ColorUtils.setAlphaComponent(background, 127);
views.setInt(R.id.background, "setBackgroundColor", background); views.setInt(R.id.background, "setBackgroundColor", background);
views.setTextColor(R.id.title, colorWidgetForeground); int fg = (lum > 0.7f ? Color.BLACK : colorWidgetForeground);
views.setInt(R.id.separator, "setBackgroundColor", lightColorSeparator); views.setTextColor(R.id.title, fg);
views.setImageViewResource(R.id.refresh, syncing views.setInt(R.id.separator, "setBackgroundColor",
? R.drawable.twotone_compare_arrows_24_white lum > 0.7f ? darkColorSeparator : lightColorSeparator);
: R.drawable.twotone_sync_24_white); if (syncing)
views.setImageViewResource(R.id.compose, R.drawable.twotone_edit_24_white); views.setImageViewResource(R.id.refresh, lum > 0.7f
} else { ? R.drawable.twotone_compare_arrows_24_black
float lum = (float) ColorUtils.calculateLuminance(background); : R.drawable.twotone_compare_arrows_24_white);
else
if (semi) views.setImageViewResource(R.id.refresh, lum > 0.7f
background = ColorUtils.setAlphaComponent(background, 127); ? R.drawable.twotone_sync_24_black
: R.drawable.twotone_sync_24_white);
views.setInt(R.id.background, "setBackgroundColor", background); views.setImageViewResource(R.id.compose, lum > 0.7f
? R.drawable.twotone_edit_24_black
int fg = (lum > 0.7f ? Color.BLACK : colorWidgetForeground); : R.drawable.twotone_edit_24_white);
views.setTextColor(R.id.title, fg); }
views.setInt(R.id.separator, "setBackgroundColor",
lum > 0.7f ? darkColorSeparator : lightColorSeparator);
if (syncing)
views.setImageViewResource(R.id.refresh, lum > 0.7f
? R.drawable.twotone_compare_arrows_24_black
: R.drawable.twotone_compare_arrows_24_white);
else
views.setImageViewResource(R.id.refresh, lum > 0.7f
? R.drawable.twotone_sync_24_black
: R.drawable.twotone_sync_24_white);
views.setImageViewResource(R.id.compose, lum > 0.7f
? R.drawable.twotone_edit_24_black
: R.drawable.twotone_edit_24_white);
}
views.setViewVisibility(R.id.separator, separators ? View.VISIBLE : View.GONE); views.setViewVisibility(R.id.separator, separators ? View.VISIBLE : View.GONE);

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

@ -57,6 +57,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
private long account; private long account;
private boolean unseen; private boolean unseen;
private boolean flagged; private boolean flagged;
private boolean daynight = true;
private boolean highlight; private boolean highlight;
private int highlight_color; private int highlight_color;
private boolean separators; private boolean separators;
@ -106,6 +107,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L); folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L);
unseen = prefs.getBoolean("widget." + appWidgetId + ".unseen", false); unseen = prefs.getBoolean("widget." + appWidgetId + ".unseen", false);
flagged = prefs.getBoolean("widget." + appWidgetId + ".flagged", false); flagged = prefs.getBoolean("widget." + appWidgetId + ".flagged", false);
daynight = prefs.getBoolean("widget." + appWidgetId + ".daynight", false);
highlight = prefs.getBoolean("widget." + appWidgetId + ".highlight", false); highlight = prefs.getBoolean("widget." + appWidgetId + ".highlight", false);
highlight_color = prefs.getInt("widget." + appWidgetId + ".highlight_color", Color.TRANSPARENT); highlight_color = prefs.getInt("widget." + appWidgetId + ".highlight_color", Color.TRANSPARENT);
separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true); separators = prefs.getBoolean("widget." + appWidgetId + ".separators", true);
@ -256,13 +258,16 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
views.setTextViewText(idSubject, ssSubject); views.setTextViewText(idSubject, ssSubject);
views.setTextViewText(idAccount, ssAccount); views.setTextViewText(idAccount, ssAccount);
int textColor = (message.ui_seen ? colorWidgetRead : colorWidgetUnread); if (!daynight) {
views.setTextColor(idFrom, textColor); int textColor = (message.ui_seen ? colorWidgetRead : colorWidgetUnread);
views.setTextColor(idTime, textColor); views.setTextColor(idFrom, textColor);
views.setTextColor(idSubject, textColor); views.setTextColor(idTime, textColor);
views.setTextColor(idAccount, textColor); views.setTextColor(idSubject, textColor);
views.setTextColor(idAccount, textColor);
}
views.setInt(R.id.separator, "setBackgroundColor", colorSeparator); if (!daynight)
views.setInt(R.id.separator, "setBackgroundColor", colorSeparator);
views.setViewVisibility(R.id.separator, separators ? View.VISIBLE : View.GONE); views.setViewVisibility(R.id.separator, separators ? View.VISIBLE : View.GONE);
views.setViewVisibility(idAccount, account < 0 && !allColors ? View.VISIBLE : View.GONE); views.setViewVisibility(idAccount, account < 0 && !allColors ? View.VISIBLE : View.GONE);

12
app/src/main/res/layout/activity_widget_unified.xml
Unescape View File

@ -65,6 +65,16 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbUnseen" /> app:layout_constraintTop_toBottomOf="@id/cbUnseen" />
<CheckBox
android:id="@+id/cbDayNight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_widget_day_night"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbFlagged" />
<CheckBox <CheckBox
android:id="@+id/cbHighlight" android:id="@+id/cbHighlight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -73,7 +83,7 @@
android:checked="true" android:checked="true"
android:text="@string/title_advanced_highlight_unread" android:text="@string/title_advanced_highlight_unread"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbFlagged" /> app:layout_constraintTop_toBottomOf="@id/cbDayNight" />
<eu.faircode.email.ViewButtonColor <eu.faircode.email.ViewButtonColor
android:id="@+id/btnHighlight" android:id="@+id/btnHighlight"

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

@ -49,7 +49,7 @@
android:maxLines="1" android:maxLines="1"
android:text="From" android:text="From"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground" /> android:textColor="?android:textColorPrimary" />
<TextView <TextView
android:id="@+id/tvTime" android:id="@+id/tvTime"
@ -59,7 +59,7 @@
android:maxLines="1" android:maxLines="1"
android:text="12:34" android:text="12:34"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground" /> android:textColor="?android:textColorPrimary" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -76,7 +76,7 @@
android:maxLines="1" android:maxLines="1"
android:text="Subject" android:text="Subject"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground" /> android:textColor="?android:textColorPrimary" />
<TextView <TextView
android:id="@+id/tvAccount" android:id="@+id/tvAccount"
@ -86,7 +86,7 @@
android:maxLines="1" android:maxLines="1"
android:text="Account" android:text="Account"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground" /> android:textColor="?android:textColorPrimary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -95,5 +95,5 @@
android:id="@+id/separator" android:id="@+id/separator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/grey" /> android:background="?android:colorControlNormal" />
</LinearLayout> </LinearLayout>

19
app/src/main/res/layout/widget_unified.xml
Unescape View File

@ -4,7 +4,8 @@
android:id="@+id/background" android:id="@+id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/widget_background"> android:background="?android:colorBackground"
android:theme="@style/Theme.AppCompat.DayNight">
<LinearLayout <LinearLayout
android:id="@+id/content" android:id="@+id/content"
@ -28,7 +29,7 @@
android:padding="6dp" android:padding="6dp"
android:text="@string/title_widget_title_list" android:text="@string/title_widget_title_list"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/colorWidgetForeground" android:textColor="?android:textColorPrimary"
android:textStyle="bold" /> android:textStyle="bold" />
<ImageView <ImageView
@ -38,8 +39,10 @@
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/tile_synchronize" android:contentDescription="@string/tile_synchronize"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/twotone_sync_24_white" android:src="@drawable/twotone_sync_24"
android:visibility="gone" /> android:tint="?android:textColorPrimary"
android:visibility="visible"
app:tint="?android:textColorPrimary" />
<ImageView <ImageView
android:id="@+id/compose" android:id="@+id/compose"
@ -48,15 +51,17 @@
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/title_compose" android:contentDescription="@string/title_compose"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/twotone_edit_24_white" android:src="@drawable/twotone_edit_24"
android:visibility="gone" /> android:tint="?android:textColorPrimary"
android:visibility="visible"
app:tint="?android:textColorPrimary" />
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/separator" android:id="@+id/separator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/grey" /> android:background="?android:colorControlNormal" />
<ListView <ListView
android:id="@+id/lv" android:id="@+id/lv"

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

@ -1939,6 +1939,7 @@
<string name="title_widget_refresh">Show refresh messages button</string> <string name="title_widget_refresh">Show refresh messages button</string>
<string name="title_widget_compose">Show compose new message button</string> <string name="title_widget_compose">Show compose new message button</string>
<string name="title_widget_background">Background color</string> <string name="title_widget_background">Background color</string>
<string name="title_widget_day_night">Use day/night mode (if available)</string>
<string name="title_accessibility_collapsed">Collapsed</string> <string name="title_accessibility_collapsed">Collapsed</string>
<string name="title_accessibility_expanded">Expanded</string> <string name="title_accessibility_expanded">Expanded</string>

Write Preview
Loading…
Cancel
Save