update bottom buttons style on ToolActivity

1 files changed, 30 insertions, 25 deletions

diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index f59cd8680..52f58b0dc 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -98,49 +98,53 @@
                 android:layout_height="wrap_content">
                 <ImageButton
                     android:id="@+id/toot_picture"
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    style="@style/AppTheme.RoundedCornerMaterialButton"
                     android:src="@drawable/ic_insert_photo"
                     android:contentDescription="@string/toot_select_image" />
                 <ImageButton
                     android:id="@+id/poll_action"
                     android:visibility="gone"
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    style="@style/AppTheme.RoundedCornerMaterialButton"
                     android:src="@drawable/ic_view_list_poll"
                     android:contentDescription="@string/poll"  />
                 <ImageButton
                     android:layout_marginLeft="5dp"
                     android:layout_marginStart="5dp"
                     android:id="@+id/toot_visibility"
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    style="@style/AppTheme.RoundedCornerMaterialButton"
                     android:src="@drawable/ic_public"
                     android:contentDescription="@string/toot_visibility_tilte" />
                 <Button
+                    android:layout_marginLeft="5dp"
                     android:id="@+id/toot_cw"
                     android:padding="5dp"
                     android:text="@string/cw"
                     android:layout_gravity="center"
-                    style="?attr/borderlessColored"
+                    style="@style/AppTheme.RoundedCornerMaterialButton"
                     android:layout_width="40dp"
-                    android:layout_height="40dp" />
+                    android:layout_height="40dp"
+                    android:layout_marginStart="5dp" />
+
                 <ImageButton
                     android:id="@+id/toot_emoji"
-                    android:minHeight="0dp"
-                    android:minWidth="0dp"
+                    style="@style/AppTheme.RoundedCornerMaterialButton"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center"
-                    android:padding="2dp"
-                    android:scaleType="fitXY"
-                    android:src="@drawable/emoji_one_category_smileysandpeople"
-                    style="?attr/borderlessColored"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginLeft="5dp"
                     android:contentDescription="@string/emoji_picker"
-                    />
+                    android:minWidth="0dp"
+                    android:minHeight="0dp"
+                    android:padding="6dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_emoji_selector" />
                 <TextView
                     android:id="@+id/toot_space_left"
                     android:layout_width="0dp"
@@ -149,15 +153,16 @@
                     android:gravity="center"
                     android:layout_gravity="center"
                     android:layout_height="40dp" />
+
                 <Button
                     android:id="@+id/toot_it"
-                    android:padding="5dp"
-                    android:text="@string/toot_it"
+                    style="@style/AppTheme.RoundedCornerMaterialButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="40dp"
                     android:layout_gravity="end"
                     android:gravity="center"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:padding="5dp"
+                    android:text="@string/toot_it" />
 
             </LinearLayout>
             <CheckBox