From 8aef61ff0964bfbdf1ca63fdf1fa08de678a6bb9 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sun, 1 Jan 2023 19:12:29 -0300
Subject: [PATCH] Second iteration of the bot icon

---
 .../res/drawable/ic_fluent_bot_20_regular.xml |  9 ++++
 .../res/drawable/ic_fluent_bot_24_regular.xml |  2 +-
 .../src/main/res/layout/fragment_profile.xml  | 50 +++++++++++--------
 3 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_bot_20_regular.xml

diff --git a/mastodon/src/main/res/drawable/ic_fluent_bot_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_bot_20_regular.xml
new file mode 100644
index 000000000..5464f5d35
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bot_20_regular.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M12,5.5C11.448,5.5 11,5.948 11,6.5C11,7.052 11.448,7.5 12,7.5C12.552,7.5 13,7.052 13,6.5C13,5.948 12.552,5.5 12,5.5ZM7,6.5C7,5.948 7.448,5.5 8,5.5C8.552,5.5 9,5.948 9,6.5C9,7.052 8.552,7.5 8,7.5C7.448,7.5 7,7.052 7,6.5ZM10.5,2.5C10.5,2.224 10.276,2 10,2C9.724,2 9.5,2.224 9.5,2.5V3H6.5C5.672,3 5,3.672 5,4.5V8.5C5,9.328 5.672,10 6.5,10H13.5C14.328,10 15,9.328 15,8.5V4.5C15,3.672 14.328,3 13.5,3H10.5V2.5ZM6.5,4H13.5C13.776,4 14,4.224 14,4.5V8.5C14,8.776 13.776,9 13.5,9H6.5C6.224,9 6,8.776 6,8.5V4.5C6,4.224 6.224,4 6.5,4ZM10.25,17.998C12.866,17.965 14.445,17.403 15.372,16.557C16.247,15.759 16.461,14.781 16.495,14.002H16.5V13.312C16.5,12.313 15.69,11.503 14.691,11.503H11.5V11.5H8.5V11.503H5.309C4.31,11.503 3.5,12.313 3.5,13.312V14.002H3.505C3.539,14.781 3.753,15.759 4.628,16.557C5.555,17.403 7.134,17.965 9.75,17.998V18H10.25V17.998ZM5.309,12.503H14.691C15.138,12.503 15.5,12.865 15.5,13.312V13.75C15.5,14.44 15.369,15.206 14.698,15.819C14.01,16.446 12.66,17 10,17C7.339,17 5.99,16.446 5.302,15.819C4.631,15.206 4.5,14.44 4.5,13.75V13.312C4.5,12.865 4.862,12.503 5.309,12.503Z"
+      android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml
index fc4a8d74f..540503341 100644
--- a/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_bot_24_regular.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.753,13.999C18.996,13.999 20.003,15.007 20.003,16.249V17.154C20.003,18.248 19.526,19.287 18.696,20C17.131,21.344 14.89,22.001 12,22.001C9.111,22.001 6.872,21.344 5.309,20C4.481,19.288 4.004,18.25 4.004,17.157V16.249C4.004,15.007 5.011,13.999 6.254,13.999H17.753ZM17.753,15.499H6.254C5.84,15.499 5.504,15.835 5.504,16.249V17.157C5.504,17.812 5.79,18.435 6.287,18.863C7.545,19.944 9.441,20.501 12,20.501C14.56,20.501 16.458,19.944 17.719,18.862C18.217,18.434 18.503,17.811 18.503,17.154V16.249C18.503,15.835 18.168,15.499 17.753,15.499ZM11.899,2.007L12.001,2C12.38,2 12.694,2.282 12.744,2.648L12.751,2.75L12.75,3.499L16.25,3.5C17.493,3.5 18.5,4.507 18.5,5.75V10.254C18.5,11.497 17.493,12.504 16.25,12.504H7.75C6.508,12.504 5.5,11.497 5.5,10.254V5.75C5.5,4.507 6.508,3.5 7.75,3.5L11.25,3.499L11.251,2.75C11.251,2.37 11.533,2.057 11.899,2.007L12.001,2L11.899,2.007ZM16.25,5H7.75C7.336,5 7,5.335 7,5.75V10.254C7,10.668 7.336,11.004 7.75,11.004H16.25C16.665,11.004 17,10.668 17,10.254V5.75C17,5.335 16.665,5 16.25,5ZM9.75,6.5C10.44,6.5 10.999,7.059 10.999,7.749C10.999,8.439 10.44,8.998 9.75,8.998C9.06,8.998 8.5,8.439 8.5,7.749C8.5,7.059 9.06,6.5 9.75,6.5ZM14.242,6.5C14.932,6.5 15.492,7.059 15.492,7.749C15.492,8.439 14.932,8.998 14.242,8.998C13.552,8.998 12.993,8.439 12.993,7.749C12.993,7.059 13.552,6.5 14.242,6.5Z"
-      android:fillColor="?colorButtonText"/>
+      android:fillColor="@color/fluent_default_icon_tint"/>
 </vector>
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 7d11baf50..450db62b7 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -173,15 +173,6 @@
 						android:layout_below="@id/profile_counters"
 						android:layout_alignParentEnd="true">
 
-						<Button
-							android:id="@+id/bot_icon"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center"
-							android:paddingHorizontal="8dp"
-							android:drawableStart="@drawable/ic_fluent_bot_24_regular"
-							/>
-
 						<FrameLayout
 							android:clipToPadding="false"
 							android:paddingVertical="16dp"
@@ -194,8 +185,9 @@
 								android:id="@+id/notify_btn"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
+								android:drawableStart="@drawable/ic_fluent_alert_24_selector"
 								android:paddingHorizontal="8dp"
-								android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
+								tools:ignore="SpeakableTextPresentCheck" />
 
 							<ProgressBar
 								android:id="@+id/notify_progress"
@@ -239,26 +231,44 @@
 						</FrameLayout>
 					</LinearLayout>
 
-					<TextView
-						android:id="@+id/name"
-						android:layout_width="match_parent"
+					<LinearLayout
+						android:id="@id/name_wrap"
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
-						android:layout_marginStart="16dp"
-						android:layout_marginTop="17dp"
-						android:layout_marginBottom="0.4dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
-						android:textAlignment="viewStart"
-						android:textAppearance="@style/m3_headline_small"
-						tools:text="Eugen" />
+						android:layout_alignParentEnd="true">
+
+						<TextView
+							android:id="@+id/name"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginStart="16dp"
+							android:layout_marginTop="17dp"
+							android:layout_marginBottom="0.4dp"
+							android:layout_marginEnd="0dp"
+							android:textAlignment="viewStart"
+							android:textAppearance="@style/m3_headline_small"
+							tools:text="Eugen" />
+
+						<Button
+							android:id="@+id/bot_icon"
+							android:layout_width="wrap_content"
+							android:layout_height="28dp"
+							android:layout_marginTop="14dp"
+							android:paddingHorizontal="8dp"
+							android:background="?colorWindowBackground"
+							android:drawableStart="@drawable/ic_fluent_bot_24_regular"
+							/>
+					</LinearLayout>
 
 					<TextView
 						android:id="@+id/username"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_marginStart="16dp"
-						android:layout_below="@id/name"
+						android:layout_below="@id/name_wrap"
 						android:paddingTop="4dp"
 						android:paddingBottom="8dp"
 						android:textAppearance="@style/m3_title_medium"