diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java index 4546f4c388..e1388e8eac 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java @@ -41,6 +41,8 @@ public class WidgetUnified extends AppWidgetProvider { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground); + int lightColorSeparator = context.getResources().getColor(R.color.lightColorSeparator); + int darkColorSeparator = context.getResources().getColor(R.color.darkColorSeparator); for (int appWidgetId : appWidgetIds) { String name = prefs.getString("widget." + appWidgetId + ".name", null); @@ -138,6 +140,7 @@ public class WidgetUnified extends AppWidgetProvider { 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, R.drawable.twotone_sync_24_white); views.setImageViewResource(R.id.compose, R.drawable.twotone_edit_24_white); } else { @@ -150,6 +153,8 @@ public class WidgetUnified extends AppWidgetProvider { int fg = (lum > 0.7f ? Color.BLACK : colorWidgetForeground); views.setTextColor(R.id.title, fg); + views.setInt(R.id.separator, "setBackgroundColor", + lum > 0.7f ? darkColorSeparator : lightColorSeparator); 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 diff --git a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java index 11ac073b2e..8eb7ee7919 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java @@ -116,6 +116,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot if (lum > 0.7f) { colorWidgetForeground = ColorUtils.blendARGB(colorWidgetForeground, Color.BLACK, 1.0f); colorWidgetRead = ColorUtils.blendARGB(colorWidgetRead, Color.BLACK, 1.0f); + colorSeparator = ContextCompat.getColor(context, R.color.darkColorSeparator); } pro = ActivityBilling.isPro(context); @@ -232,6 +233,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot views.setTextColor(idTime, textColor); views.setTextColor(idSubject, textColor); views.setTextColor(idAccount, textColor); + views.setInt(R.id.separator, "setBackgroundColor", colorSeparator); views.setViewVisibility(idAccount, account < 0 ? View.VISIBLE : View.GONE); diff --git a/app/src/main/res/layout/item_widget_unified.xml b/app/src/main/res/layout/item_widget_unified.xml index 15bf32e46c..2a072d5549 100644 --- a/app/src/main/res/layout/item_widget_unified.xml +++ b/app/src/main/res/layout/item_widget_unified.xml @@ -3,74 +3,86 @@ android:id="@+id/llMessage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - - + android:orientation="vertical"> + android:orientation="horizontal"> + + + android:orientation="vertical" + android:paddingTop="6dp" + android:paddingBottom="6dp"> - + android:orientation="horizontal"> - - + - + + - + android:orientation="horizontal"> - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/widget_unified.xml b/app/src/main/res/layout/widget_unified.xml index 6a990a0add..f5c36d8809 100644 --- a/app/src/main/res/layout/widget_unified.xml +++ b/app/src/main/res/layout/widget_unified.xml @@ -54,14 +54,13 @@ android:id="@+id/separator" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/colorWidgetRead" /> + android:background="@color/grey" /> + android:divider="@null" /> \ No newline at end of file