From 728d1fdeb0d120f4b32fd42e31bb58506218080a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 29 Sep 2020 12:57:28 +0200
Subject: [PATCH] Use solid stars

---
 .../main/java/eu/faircode/email/AdapterContact.java    |  2 +-
 app/src/main/java/eu/faircode/email/AdapterFolder.java |  2 +-
 .../main/java/eu/faircode/email/AdapterMessage.java    |  2 +-
 app/src/main/java/eu/faircode/email/Core.java          |  2 +-
 .../main/java/eu/faircode/email/FragmentMessages.java  |  4 ++--
 app/src/main/res/drawable/baseline_star_24.xml         | 10 ++++++++++
 app/src/main/res/layout/dialog_search.xml              |  2 +-
 app/src/main/res/layout/fragment_legend_folders.xml    |  2 +-
 app/src/main/res/layout/fragment_legend_messages.xml   |  2 +-
 app/src/main/res/layout/fragment_messages.xml          |  2 +-
 app/src/main/res/layout/include_message_compact.xml    |  2 +-
 app/src/main/res/layout/include_message_normal.xml     |  2 +-
 app/src/main/res/layout/item_account.xml               |  2 +-
 app/src/main/res/layout/item_answer.xml                |  2 +-
 app/src/main/res/layout/item_contact.xml               |  2 +-
 app/src/main/res/layout/item_folder.xml                |  2 +-
 app/src/main/res/layout/item_identity.xml              |  2 +-
 17 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_star_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index 765e172cd7..33db422f8f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -147,7 +147,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
                     : Helper.getRelativeTimeSpanString(context, contact.last_contacted));
 
             ivFavorite.setImageResource(contact.state == EntityContact.STATE_FAVORITE
-                    ? R.drawable.twotone_star_24 : R.drawable.twotone_star_border_24);
+                    ? R.drawable.baseline_star_24 : R.drawable.twotone_star_border_24);
             ivFavorite.setImageTintList(ColorStateList.valueOf(
                     contact.state == EntityContact.STATE_FAVORITE ? colorAccent : textColorSecondary));
             ivFavorite.setContentDescription(contact.state == EntityContact.STATE_FAVORITE
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index d54777b770..4fcf2c5f49 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -349,7 +349,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                 tvFlagged.setText(NF.format(folder.flagged));
                 ibFlagged.setImageResource(folder.flagged == 0
-                        ? R.drawable.twotone_star_border_24 : R.drawable.twotone_star_24);
+                        ? R.drawable.twotone_star_border_24 : R.drawable.baseline_star_24);
                 tvFlagged.setEnabled(folder.flagged > 0);
                 ibFlagged.setEnabled(folder.flagged > 0);
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ac6e908daa..dc38f369d4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1374,7 +1374,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             if (!Objects.equals(ibFlagged.getTag(), flagged)) {
                 ibFlagged.setTag(flagged);
-                ibFlagged.setImageResource(flagged ? R.drawable.twotone_star_24 : R.drawable.twotone_star_border_24);
+                ibFlagged.setImageResource(flagged ? R.drawable.baseline_star_24 : R.drawable.twotone_star_border_24);
             }
 
             ColorStateList csl = ibFlagged.getImageTintList();
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 85d1b513a2..38728ce2f3 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3879,7 +3879,7 @@ class Core {
                         .putExtra("group", group);
                 PendingIntent piFlag = PendingIntent.getService(context, ServiceUI.PI_FLAG, flag, PendingIntent.FLAG_UPDATE_CURRENT);
                 NotificationCompat.Action.Builder actionFlag = new NotificationCompat.Action.Builder(
-                        R.drawable.twotone_star_24,
+                        R.drawable.baseline_star_24,
                         context.getString(R.string.title_advanced_notify_action_flag),
                         piFlag)
                         .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_THUMBS_UP)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d063b975d9..cdce1ae7ed 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1948,7 +1948,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             else if (EntityMessage.SWIPE_ACTION_SEEN.equals(action))
                 icon = (message.ui_seen ? R.drawable.twotone_visibility_off_24 : R.drawable.twotone_visibility_24);
             else if (EntityMessage.SWIPE_ACTION_FLAG.equals(action))
-                icon = (message.ui_flagged ? R.drawable.twotone_star_border_24 : R.drawable.twotone_star_24);
+                icon = (message.ui_flagged ? R.drawable.twotone_star_border_24 : R.drawable.baseline_star_24);
             else if (EntityMessage.SWIPE_ACTION_SNOOZE.equals(action))
                 icon = (message.ui_snoozed == null ? R.drawable.twotone_timelapse_24 : R.drawable.twotone_timer_off_24);
             else if (EntityMessage.SWIPE_ACTION_HIDE.equals(action))
@@ -3924,7 +3924,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         menu.findItem(R.id.menu_force_send).setVisible(outbox);
 
         ibSeen.setImageResource(filter_seen ? R.drawable.twotone_drafts_24 : R.drawable.twotone_mail_24);
-        ibUnflagged.setImageResource(filter_unflagged ? R.drawable.twotone_star_border_24 : R.drawable.twotone_star_24);
+        ibUnflagged.setImageResource(filter_unflagged ? R.drawable.twotone_star_border_24 : R.drawable.baseline_star_24);
         ibSnoozed.setImageResource(filter_snoozed ? R.drawable.twotone_visibility_off_24 : R.drawable.twotone_visibility_24);
 
         ibSeen.setVisibility(quick_filter && folder ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/drawable/baseline_star_24.xml b/app/src/main/res/drawable/baseline_star_24.xml
new file mode 100644
index 0000000000..33832947ef
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_star_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index bff031d5d5..a4c535dede 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -72,7 +72,7 @@
             android:tooltipText="@string/title_search_flag_flagged"
             app:layout_constraintEnd_toStartOf="@+id/ibInfo"
             app:layout_constraintTop_toBottomOf="@id/tvCaption"
-            app:srcCompat="@drawable/twotone_star_24" />
+            app:srcCompat="@drawable/baseline_star_24" />
 
         <ImageButton
             android:id="@+id/ibInfo"
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index f0cdc52f75..ffa84952a0 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -174,7 +174,7 @@
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivJunk"
-            app:srcCompat="@drawable/twotone_star_24" />
+            app:srcCompat="@drawable/baseline_star_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPrimary"
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 5830dcc48a..7414ed43cb 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -419,7 +419,7 @@
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAttachment"
-            app:srcCompat="@drawable/twotone_star_24" />
+            app:srcCompat="@drawable/baseline_star_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvStarred"
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 92b7fe7002..55497186ea 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -259,7 +259,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
                 app:layout_constraintEnd_toStartOf="@+id/ibSnoozed"
                 app:layout_constraintStart_toEndOf="@id/ibSeen"
-                app:srcCompat="@drawable/twotone_star_24" />
+                app:srcCompat="@drawable/baseline_star_24" />
 
             <ImageButton
                 android:id="@+id/ibSnoozed"
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 51157ad6a4..f0a15357e3 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -285,7 +285,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
         app:layout_constraintEnd_toStartOf="@id/paddingEnd"
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
-        app:srcCompat="@drawable/twotone_star_24" />
+        app:srcCompat="@drawable/baseline_star_24" />
 
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvKeywords"
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 572f2001fd..a3d7829b21 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -205,7 +205,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
         app:layout_constraintEnd_toStartOf="@id/paddingEnd"
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
-        app:srcCompat="@drawable/twotone_star_24" />
+        app:srcCompat="@drawable/baseline_star_24" />
 
     <ImageView
         android:id="@+id/ivType"
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index a9d4f0f6c6..15462fe9b7 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -64,7 +64,7 @@
                 app:layout_constraintBottom_toBottomOf="@+id/tvName"
                 app:layout_constraintStart_toEndOf="@id/ivOAuth"
                 app:layout_constraintTop_toTopOf="@+id/tvName"
-                app:srcCompat="@drawable/twotone_star_24" />
+                app:srcCompat="@drawable/baseline_star_24" />
 
             <ImageView
                 android:id="@+id/ivNotify"
diff --git a/app/src/main/res/layout/item_answer.xml b/app/src/main/res/layout/item_answer.xml
index f8fd7b6ede..26b98e9f45 100644
--- a/app/src/main/res/layout/item_answer.xml
+++ b/app/src/main/res/layout/item_answer.xml
@@ -59,7 +59,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/twotone_star_24" />
+                app:srcCompat="@drawable/baseline_star_24" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ViewCardOptional>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index 98c34038ab..7bc464115c 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -90,6 +90,6 @@
             app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/ivAvatar"
-            app:srcCompat="@drawable/twotone_star_24" />
+            app:srcCompat="@drawable/baseline_star_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index 760e77b3a3..edb5cf21af 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -246,7 +246,7 @@
                 app:layout_constraintBottom_toBottomOf="@id/tvKeywords"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/tvKeywords"
-                app:srcCompat="@drawable/twotone_star_24" />
+                app:srcCompat="@drawable/baseline_star_24" />
 
             <eu.faircode.email.FixedTextView
                 android:id="@+id/tvError"
diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml
index fd47b25682..b1ea1a002c 100644
--- a/app/src/main/res/layout/item_identity.xml
+++ b/app/src/main/res/layout/item_identity.xml
@@ -64,7 +64,7 @@
                 app:layout_constraintBottom_toBottomOf="@+id/tvName"
                 app:layout_constraintStart_toEndOf="@id/ivOAuth"
                 app:layout_constraintTop_toTopOf="@+id/tvName"
-                app:srcCompat="@drawable/twotone_star_24" />
+                app:srcCompat="@drawable/baseline_star_24" />
 
             <ImageView
                 android:id="@+id/ivGroup"