From 55b571f45572213946ae2f54d7b7e9fb19d4df24 Mon Sep 17 00:00:00 2001
From: Kasun <k-a-s-u-n@tuta.io>
Date: Sat, 18 May 2019 17:43:11 +0530
Subject: [PATCH 1/2] bot indicator changes

---
 .../drawable/bot_background_round_corner.xml  |  6 +++++
 app/src/main/res/drawable/ic_bot.xml          | 22 +++++++++---------
 app/src/main/res/layout/drawer_status.xml     | 21 +++++++++--------
 .../main/res/layout/drawer_status_compact.xml | 23 ++++++++++---------
 .../main/res/layout/drawer_status_focused.xml | 22 ++++++++++--------
 app/src/main/res/values/colors.xml            |  2 ++
 6 files changed, 54 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/res/drawable/bot_background_round_corner.xml

diff --git a/app/src/main/res/drawable/bot_background_round_corner.xml b/app/src/main/res/drawable/bot_background_round_corner.xml
new file mode 100644
index 000000000..c2e14f6bd
--- /dev/null
+++ b/app/src/main/res/drawable/bot_background_round_corner.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/bot_background"/>
+    <corners android:radius="4dp"/>
+</shape>
+
diff --git a/app/src/main/res/drawable/ic_bot.xml b/app/src/main/res/drawable/ic_bot.xml
index 16419d19d..c9887221f 100644
--- a/app/src/main/res/drawable/ic_bot.xml
+++ b/app/src/main/res/drawable/ic_bot.xml
@@ -2,36 +2,36 @@
     android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000"
         android:pathData="M26,27H12A11,11 0,0 1,12 5H26A11,11 0,0 1,37 16"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000"
         android:pathData="M26,23H12A7,7 0,0 1,12 9H26a7,7 0,0 1,7 7"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
-    <path android:fillColor="#2b90d9" android:pathData="M25.9091,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
-    <path android:fillColor="#2b90d9" android:pathData="M9.5,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
+    <path android:fillColor="#B6E9FF" android:pathData="M25.9091,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
+    <path android:fillColor="#B6E9FF" android:pathData="M9.5,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
     <path android:fillColor="#00000000"
         android:pathData="M14.6818,16.1789a5.4972,5.4972 0,0 0,8.6364 0"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000"
         android:pathData="M38,26.8792m-1.1776,8.9216a8.999,8.999 52.5191,1 1,2.3552 -17.8432a8.999,8.999 52.5191,1 1,-2.3552 17.8432"
-        android:strokeColor="#2b90d9" android:strokeWidth="2"/>
+        android:strokeColor="#B6E9FF" android:strokeWidth="2"/>
     <path android:fillColor="#00000000"
         android:pathData="M33.3333,34.6667L30,40.6667"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000" android:pathData="M19,1L19,5"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000"
         android:pathData="M6,40H27.302a3.6336,3.6336 0,0 1,3.6931 3.3118A3.5002,3.5002 0,0 1,27.5 47H6a5,5 0,0 1,-5 -5V32a5,5 0,0 1,5 -5H16"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000" android:pathData="M8,31h8v4h-8z"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000" android:pathData="M24,40L24,47"
-        android:strokeColor="#2b90d9" android:strokeLineCap="round"
+        android:strokeColor="#B6E9FF" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
 </vector>
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 4b6a3ce63..7fefede4b 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -38,16 +38,6 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 >
-                <ImageView
-                    android:visibility="gone"
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:src="@drawable/ic_bot"
-                    android:id="@+id/status_account_bot"
-                    android:layout_alignParentStart="true" />
                 <ImageView
                     android:layout_width="50dp"
                     android:layout_height="50dp"
@@ -55,6 +45,17 @@
                     android:layout_centerHorizontal="true"
                     android:id="@+id/status_account_profile"
                     android:contentDescription="@string/profile_picture"/>
+                <ImageView
+                    android:id="@+id/status_account_bot"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:background="@drawable/bot_background_round_corner"
+                    android:padding="3dp"
+                    android:src="@drawable/ic_bot"
+                    android:visibility="gone" />
                 <LinearLayout
                     android:id="@+id/conversation_pp"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index a93c5880b..176327994 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -42,16 +42,6 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 >
-                <ImageView
-                    android:visibility="gone"
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:src="@drawable/ic_bot"
-                    android:id="@+id/status_account_bot"
-                    android:layout_alignParentStart="true" />
                 <ImageView
                     android:layout_width="40dp"
                     android:layout_height="40dp"
@@ -59,7 +49,18 @@
                     android:layout_centerHorizontal="true"
                     android:id="@+id/status_account_profile"
                     android:contentDescription="@string/profile_picture" />
-
+                <ImageView
+                    android:id="@+id/status_account_bot"
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:padding="3dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginTop="5dp"
+                    android:background="@drawable/bot_background_round_corner"
+                    android:src="@drawable/ic_bot"
+                    android:visibility="gone" />
                 <LinearLayout
                     android:id="@+id/conversation_pp"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index c60af63cc..331ae692a 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -43,16 +43,6 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 >
-                <ImageView
-                    android:visibility="gone"
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:src="@drawable/ic_bot"
-                    android:id="@+id/status_account_bot"
-                    android:layout_alignParentStart="true" />
                 <ImageView
                     android:layout_width="50dp"
                     android:layout_height="50dp"
@@ -60,6 +50,18 @@
                     android:layout_centerHorizontal="true"
                     android:id="@+id/status_account_profile"
                     android:contentDescription="@string/profile_picture" />
+                <ImageView
+                    android:id="@+id/status_account_bot"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginTop="5dp"
+                    android:background="@drawable/bot_background_round_corner"
+                    android:padding="3dp"
+                    android:src="@drawable/ic_bot"
+                    android:visibility="gone" />
                 <ImageView
                     android:layout_width="45dp"
                     android:layout_height="45dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ef81edf4d..9f1e90c11 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -122,4 +122,6 @@
     <color name="console_name">#5E8D87</color>
     <color name="console_reblog_name">#5F819D</color>
     <color name="console_marker">#CC6666</color>
+
+    <color name="bot_background">#B3808080</color>
 </resources>

From 12b4477acb11f2268afcb2a0ff9624982e51b33a Mon Sep 17 00:00:00 2001
From: Kasun <k-a-s-u-n@tuta.io>
Date: Sat, 18 May 2019 17:43:55 +0530
Subject: [PATCH 2/2] show account address when muting from a status

---
 .../java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 6e2a0dd06..972fcddf0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -2351,6 +2351,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 case R.id.action_mute:
                                     builderInner = new AlertDialog.Builder(context, style);
                                     builderInner.setTitle(stringArrayConf[0]);
+                                    builderInner.setMessage(status.getAccount().getAcct());
                                     doAction = API.StatusAction.MUTE;
                                     break;
                                 case R.id.action_bookmark: