Merge remote-tracking branch 'origin/develop' into develop

1 files changed, 44 insertions, 32 deletions

diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 7392f525d..8fe2e6f9e 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2017 Thomas Schneider
 
     This file is a part of Mastalab
@@ -16,36 +15,39 @@
     see <http://www.gnu.org/licenses>.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fillViewport="true"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
     <LinearLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="20dp"
-        android:paddingBottom="20dp"
+        android:orientation="vertical"
         android:paddingLeft="@dimen/toot_padding"
+        android:paddingTop="@dimen/toot_padding"
         android:paddingRight="@dimen/toot_padding"
-        android:orientation="vertical">
+        android:paddingBottom="@dimen/toot_padding">
+
         <EditText
             android:id="@+id/toot_cw_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:animateLayoutChanges="true"
-            android:visibility="gone"
             android:hint="@string/toot_cw_placeholder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:visibility="gone" />
+
         <fr.gouv.etalab.mastodon.helper.MastalabAutoCompleteTextView
-            android:layout_marginTop="10dp"
             android:id="@+id/toot_content"
-            android:gravity="top|start"
-            android:inputType="textMultiLine|textCapSentences"
-            android:hint="@string/toot_placeholder"
             android:layout_width="match_parent"
-            android:minLines="4"
+            android:layout_height="0dp"
+            android:layout_marginTop="10dp"
             android:layout_weight="1"
-            android:layout_height="0dp" />
+            android:gravity="top|start"
+            android:hint="@string/toot_placeholder"
+            android:inputType="textMultiLine|textCapSentences"
+            android:minLines="4" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -101,42 +103,51 @@
 
                 <ImageButton
                     android:id="@+id/toot_picture"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_gravity="center"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:contentDescription="@string/toot_select_image"
-                    android:padding="5dp"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_insert_photo" />
 
                 <ImageButton
                     android:id="@+id/poll_action"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:contentDescription="@string/poll"
-                    android:padding="5dp"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_view_list_poll"
                     android:visibility="gone" />
 
                 <ImageButton
                     android:id="@+id/toot_visibility"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:contentDescription="@string/toot_visibility_tilte"
-                    android:padding="5dp"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_public" />
 
                 <Button
                     android:id="@+id/toot_cw"
                     android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_height="28dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:text="@string/cw"
@@ -144,17 +155,18 @@
 
                 <ImageButton
                     android:id="@+id/toot_emoji"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
                     android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:contentDescription="@string/emoji_picker"
                     android:minWidth="0dp"
                     android:minHeight="0dp"
-                    android:padding="5dp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_emoji_selector" />
+                    android:src="@drawable/ic_insert_emoticon" />
 
                 <TextView
                     android:id="@+id/toot_space_left"
@@ -169,10 +181,10 @@
                     android:id="@+id/toot_it"
                     style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="wrap_content"
-                    android:layout_height="40dp"
+                    android:layout_height="45dp"
                     android:layout_gravity="end"
                     android:gravity="center"
-                    android:padding="5dp"
+                    android:padding="0dp"
                     android:text="@string/toot_it" />
 
             </LinearLayout>