Resize boundaries for the send/attach button

rocket-chat-android-widgets/src/main/res/layout/message_composer.xml

@@ -32,11 +32,11 @@
             android:id="@+id/reply_icon"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:adjustViewBounds="true"
             app:srcCompat="@drawable/ic_reply"
             app:tint="@color/color_accent" />
@@ -45,11 +45,11 @@
             android:id="@+id/reply_cancel"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_centerVertical="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
             android:adjustViewBounds="true"
             app:srcCompat="@drawable/ic_close"
             app:tint="@color/color_icon_composer" />
@@ -59,10 +59,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/reply_username"
+            android:layout_toEndOf="@+id/reply_thumb"
             android:layout_toLeftOf="@+id/reply_cancel"
-            android:layout_toStartOf="@id/reply_cancel"
             android:layout_toRightOf="@+id/reply_thumb"
-            android:layout_toEndOf="@+id/reply_thumb"
+            android:layout_toStartOf="@id/reply_cancel"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/color_accent"
@@ -73,13 +73,13 @@
             android:id="@+id/reply_thumb"
             android:layout_width="32dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="4dp"
-            android:layout_marginEnd="4dp"
-            android:layout_toRightOf="@+id/reply_icon"
-            android:layout_toEndOf="@+id/reply_icon"
             android:layout_alignBottom="@+id/reply_message"
             android:layout_alignTop="@+id/reply_username"
             android:layout_centerVertical="true"
+            android:layout_marginEnd="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_toEndOf="@+id/reply_icon"
+            android:layout_toRightOf="@+id/reply_icon"
             android:visibility="gone"
             fresco:actualImageScaleType="fitCenter" />
 
@@ -88,10 +88,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/reply_username"
+            android:layout_toEndOf="@+id/reply_thumb"
             android:layout_toLeftOf="@+id/reply_cancel"
-            android:layout_toStartOf="@id/reply_cancel"
             android:layout_toRightOf="@+id/reply_thumb"
-            android:layout_toEndOf="@+id/reply_thumb"
+            android:layout_toStartOf="@id/reply_cancel"
             android:ellipsize="end"
             android:maxLines="1"
             tools:text="Message" />
@@ -128,29 +128,34 @@
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
-            app:layout_constraintBottom_toBottomOf="@+id/editor"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/editor"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/editor">
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageButton
                 android:id="@+id/button_attach"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
                 android:background="?attr/selectableItemBackgroundBorderless"
+                android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingStart="16dp"
                 android:tint="@color/color_icon_composer"
                 app:srcCompat="@drawable/ic_attach_file_black_24dp" />
 
             <ImageButton
                 android:id="@+id/button_send"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackgroundBorderless"
+                android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingStart="16dp"
                 android:tint="@color/color_accent"
                 app:srcCompat="@drawable/ic_send_black_24dp" />
         </FrameLayout>