From ba7b57afbb9e33110d8fdd24351223078d5a1866 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 11 Apr 2020 10:53:31 +0200
Subject: [PATCH] Improved layout of new message count widget

---
 .../main/java/eu/faircode/email/Widget.java   | 11 ++-
 .../baseline_mail_outline_widget_24.xml       | 14 ++++
 .../res/drawable/baseline_mail_widget_24.xml  | 15 ++++
 app/src/main/res/layout/widget_new.xml        | 69 +++++++++----------
 4 files changed, 68 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_mail_outline_widget_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_mail_widget_24.xml

diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java
index c9d8b72d08..ca4b965a0c 100644
--- a/app/src/main/java/eu/faircode/email/Widget.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -101,9 +101,14 @@ public class Widget extends AppWidgetProvider {
                     if (!semi)
                         views.setInt(R.id.widget, "setBackgroundColor", Color.TRANSPARENT);
 
-                    views.setImageViewResource(R.id.ivMessage, unseen == 0
-                            ? R.drawable.baseline_mail_outline_24
-                            : R.drawable.baseline_mail_24);
+                    if (layout == 1)
+                        views.setImageViewResource(R.id.ivMessage, unseen == 0
+                                ? R.drawable.baseline_mail_outline_widget_24
+                                : R.drawable.baseline_mail_widget_24);
+                    else
+                        views.setImageViewResource(R.id.ivMessage, unseen == 0
+                                ? R.drawable.baseline_mail_outline_24
+                                : R.drawable.baseline_mail_24);
                     views.setTextViewText(R.id.tvCount, unseen < 100 ? nf.format(unseen) : "99+");
                     views.setViewVisibility(R.id.tvCount, layout == 1 && unseen == 0 ? View.GONE : View.VISIBLE);
 
diff --git a/app/src/main/res/drawable/baseline_mail_outline_widget_24.xml b/app/src/main/res/drawable/baseline_mail_outline_widget_24.xml
new file mode 100644
index 0000000000..4efc53e68c
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_mail_outline_widget_24.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="16dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="20.0"
+    android:viewportHeight="16.0">
+    <group
+        android:translateX="-2.0"
+        android:translateY="-4.0">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8l8,5 8,-5v10zM12,11L4,6h16l-8,5z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_mail_widget_24.xml b/app/src/main/res/drawable/baseline_mail_widget_24.xml
new file mode 100644
index 0000000000..3b34dad0d2
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_mail_widget_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="16dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="20.0"
+    android:viewportHeight="16.0">
+    <group
+        android:translateX="-2.0"
+        android:translateY="-4.0">
+
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/widget_new.xml b/app/src/main/res/layout/widget_new.xml
index e6af9d2072..44ee835bd3 100644
--- a/app/src/main/res/layout/widget_new.xml
+++ b/app/src/main/res/layout/widget_new.xml
@@ -1,53 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/widget"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/widget_background"
-    android:orientation="vertical"
     android:padding="3dp">
 
-    <RelativeLayout
+    <ImageView
+        android:id="@+id/ivMessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:paddingBottom="3dp">
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/title_legend_count"
+        android:padding="3dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/baseline_mail_widget_24"
+        android:tint="@color/colorWidgetForeground" />
 
-        <ImageView
-            android:id="@+id/ivMessage"
-            android:layout_width="36dp"
-            android:layout_height="32dp"
-            android:layout_centerHorizontal="true"
-            android:contentDescription="@string/title_legend_count"
-            android:scaleType="fitXY"
-            android:src="@drawable/baseline_mail_24"
-            android:tint="@color/colorWidgetForeground" />
-
-        <TextView
-            android:id="@+id/tvCount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignEnd="@id/ivMessage"
-            android:layout_alignBottom="@id/ivMessage"
-            android:background="@drawable/widget_background_unread"
-            android:includeFontPadding="false"
-            android:lines="1"
-            android:paddingStart="3dp"
-            android:paddingEnd="3dp"
-            android:text="\?"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="@color/colorWidgetForeground"
-            android:textSize="12dp"
-            android:textStyle="bold" />
-    </RelativeLayout>
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@id/ivMessage"
+        android:layout_alignBottom="@id/ivMessage"
+        android:background="@drawable/widget_background_unread"
+        android:includeFontPadding="false"
+        android:lines="1"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp"
+        android:text="\?"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/colorWidgetForeground"
+        android:textSize="12dp"
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/tvAccount"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/ivMessage"
         android:ellipsize="end"
+        android:gravity="center_horizontal"
         android:includeFontPadding="false"
         android:lines="1"
         android:text="account"
@@ -55,4 +48,4 @@
         android:textColor="@color/colorWidgetForeground"
         android:textSize="12dp"
         android:visibility="gone" />
-</LinearLayout>
+</RelativeLayout>