1 files changed, 18 insertions, 15 deletions

diff --git a/app/src/main/res/layout/drawer_status_console.xml b/app/src/main/res/layout/drawer_status_console.xml
index 16f746374..e12160ec8 100644
--- a/app/src/main/res/layout/drawer_status_console.xml
+++ b/app/src/main/res/layout/drawer_status_console.xml
@@ -246,13 +246,13 @@
                 android:drawableLeft="@drawable/ic_remove_red_eye"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
-                android:singleLine="true"
                 android:paddingStart="10dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="5dp"
                 android:paddingEnd="10dp"
                 android:paddingRight="10dp"
                 android:paddingBottom="5dp"
+                android:singleLine="true"
                 android:text="@string/load_attachment_spoiler"
                 android:textAllCaps="false" />
         </LinearLayout>
@@ -278,9 +278,9 @@
                 android:drawableLeft="@drawable/ic_more_toot_content"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
-                android:singleLine="true"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
+                android:singleLine="true"
                 android:text="@string/display_toot_truncate"
                 android:textAllCaps="false"
                 android:visibility="gone" />
@@ -428,8 +428,7 @@
                         android:layout_height="30dp"
                         android:layout_centerInParent="true"
                         android:contentDescription="@string/play_video"
-                        android:src="@drawable/ic_play_arrow"
-                         />
+                        android:src="@drawable/ic_play_arrow" />
                 </RelativeLayout>
 
                 <app.fedilab.android.webview.CustomWebview
@@ -769,16 +768,18 @@
             android:id="@+id/status_reactions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
             android:orientation="horizontal"
-            android:layout_gravity="center"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent">
+
             <LinearLayout
-                android:visibility="gone"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:visibility="gone">
+
                 <app.fedilab.android.helper.MastalabAutoCompleteTextView
                     android:id="@+id/fake_edittext"
                     android:layout_width="wrap_content"
@@ -791,31 +792,33 @@
                 android:id="@+id/status_add_reaction"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:src="@drawable/ic_add"
                 android:layout_marginEnd="10dp"
-                app:tint="?attr/iconColor"
+                android:contentDescription="@string/add_reaction"
+                android:src="@drawable/ic_add"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:contentDescription="@string/add_reaction" />
+                app:tint="?attr/iconColor" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/reactions_view"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
+
             <ImageView
                 android:id="@+id/status_add_custom_emoji"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:src="@drawable/ic_insert_emoticon"
                 android:layout_marginStart="10dp"
-                app:tint="?attr/iconColor"
+                android:contentDescription="@string/add_reaction"
+                android:src="@drawable/ic_insert_emoticon"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:contentDescription="@string/add_reaction" />
+                app:tint="?attr/iconColor" />
         </LinearLayout>
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/status_action_container"
             android:layout_width="match_parent"
@@ -827,8 +830,8 @@
                 android:id="@+id/new_element"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/new_toot"
                 android:backgroundTint="?attr/colorAccent"
+                android:contentDescription="@string/new_toot"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"