From e9b75119b3f02382327e66c4fb66bac3bd17409d Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 28 Apr 2022 20:39:06 +0200
Subject: [PATCH] improve bot badge (#2466)

* improve bot badge

* change badge corner radius
---
 .../tusky/adapter/AccountViewHolder.java            |  3 +--
 .../tusky/adapter/NotificationsAdapter.java         |  3 +--
 .../tusky/adapter/StatusBaseViewHolder.java         |  7 ++++---
 app/src/main/res/drawable/bot_badge.xml             | 13 +++++++++++++
 app/src/main/res/values-night/theme_colors.xml      |  3 +++
 app/src/main/res/values/theme_colors.xml            |  3 +++
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/bot_badge.xml

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java
index f48243899..6672fff39 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java
@@ -45,8 +45,7 @@ public class AccountViewHolder extends RecyclerView.ViewHolder {
         ImageLoadingHelper.loadAvatar(account.getAvatar(), avatar, avatarRadius, animateAvatar);
         if (showBotOverlay && account.getBot()) {
             avatarInset.setVisibility(View.VISIBLE);
-            avatarInset.setImageResource(R.drawable.ic_bot_24dp);
-            avatarInset.setBackgroundColor(0x50ffffff);
+            avatarInset.setImageResource(R.drawable.bot_badge);
         } else {
             avatarInset.setVisibility(View.GONE);
         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
index f8885f362..f681e64fd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
@@ -575,9 +575,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
 
             if (statusDisplayOptions.showBotOverlay() && isBot) {
                 notificationAvatar.setVisibility(View.VISIBLE);
-                notificationAvatar.setBackgroundColor(0x50ffffff);
                 Glide.with(notificationAvatar)
-                        .load(R.drawable.ic_bot_24dp)
+                        .load(ContextCompat.getDrawable(notificationAvatar.getContext(), R.drawable.bot_badge))
                         .into(notificationAvatar);
 
             } else {
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index c7427450a..2a5b3f2c6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -21,6 +21,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -28,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
 import com.google.android.material.button.MaterialButton;
@@ -287,11 +289,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
 
             if (statusDisplayOptions.showBotOverlay() && isBot) {
                 avatarInset.setVisibility(View.VISIBLE);
-                avatarInset.setBackgroundColor(0x50ffffff);
                 Glide.with(avatarInset)
-                        .load(R.drawable.ic_bot_24dp)
+                        // passing the drawable id directly into .load() ignores night mode https://github.com/bumptech/glide/issues/4692
+                        .load(ContextCompat.getDrawable(avatarInset.getContext(), R.drawable.bot_badge))
                         .into(avatarInset);
-
             } else {
                 avatarInset.setVisibility(View.GONE);
             }
diff --git a/app/src/main/res/drawable/bot_badge.xml b/app/src/main/res/drawable/bot_badge.xml
new file mode 100644
index 000000000..6f857df56
--- /dev/null
+++ b/app/src/main/res/drawable/bot_badge.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M5.7407,0L18.2593,0A5.7407,5.7407 0,0 1,24 5.7407L24,18.2593A5.7407,5.7407 0,0 1,18.2593 24L5.7407,24A5.7407,5.7407 0,0 1,0 18.2593L0,5.7407A5.7407,5.7407 0,0 1,5.7407 0z"
+        android:fillAlpha="0.75"
+        android:fillColor="@color/botBadgeBackground" />
+    <path
+        android:fillColor="@color/botBadgeForeground"
+        android:pathData="m12,3.1674a1.6059,1.6059 0,0 1,1.6059 1.6059c0,0.5942 -0.3212,1.1161 -0.803,1.3891v1.0198h0.803a5.6207,5.6207 0,0 1,5.6207 5.6207h0.803a0.803,0.803 0,0 1,0.803 0.803v2.4089a0.803,0.803 0,0 1,-0.803 0.803h-0.803v0.803a1.6059,1.6059 0,0 1,-1.6059 1.6059H6.3793A1.6059,1.6059 0,0 1,4.7733 17.6207V16.8178H3.9704A0.803,0.803 0,0 1,3.1674 16.0148V13.6059A0.803,0.803 0,0 1,3.9704 12.803H4.7733a5.6207,5.6207 0,0 1,5.6207 -5.6207h0.803V6.1625C10.7153,5.8894 10.3941,5.3675 10.3941,4.7733A1.6059,1.6059 0,0 1,12 3.1674M8.3867,12A2.0074,2.0074 0,0 0,6.3793 14.0074,2.0074 2.0074,0 0,0 8.3867,16.0148 2.0074,2.0074 0,0 0,10.3941 14.0074,2.0074 2.0074,0 0,0 8.3867,12m7.2267,0a2.0074,2.0074 0,0 0,-2.0074 2.0074,2.0074 2.0074,0 0,0 2.0074,2.0074 2.0074,2.0074 0,0 0,2.0074 -2.0074A2.0074,2.0074 0,0 0,15.6133 12Z" />
+</vector>
diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml
index e45c45fbc..21e56190a 100644
--- a/app/src/main/res/values-night/theme_colors.xml
+++ b/app/src/main/res/values-night/theme_colors.xml
@@ -24,4 +24,7 @@
 
     <bool name="lightNavigationBar">false</bool>
 
+    <color name="botBadgeForeground">@color/white</color>
+    <color name="botBadgeBackground">@color/tusky_grey_10</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index bf5b79fce..657363d86 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -24,4 +24,7 @@
 
     <bool name="lightNavigationBar">true</bool>
 
+    <color name="botBadgeForeground">@color/tusky_grey_20</color>
+    <color name="botBadgeBackground">@color/white</color>
+
 </resources>
\ No newline at end of file