From b6f2ca85f78a2601678365f2eb184e2f23aff2a8 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 24 Dec 2020 11:37:56 +0100
Subject: [PATCH] Fix hiding attachment-button, not emoji-button for replies

Broken in f5054106e8:
"Exchange emoji and attachments button back to familiar layout"

We cannot animate attachments view out to the side as elegantly as before,
but we can move it out at the bottom.

Change-Id: I1060a95ee583bb1e73259bb86f85741ef5b27f31
---
 .../composer_layout_constraint_set_expanded.xml      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index cad771f1e2..d06256472f 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -118,20 +118,17 @@
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_attachment"
         android:tint="?android:textColorHint"
-        app:layout_constraintBottom_toBottomOf="@id/sendButton"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintStart_toEndOf="@id/composerEditText"
-        app:layout_constraintTop_toTopOf="@id/sendButton"
+        app:layout_constraintTop_toBottomOf="parent"
         tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/composer_shield"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:layout_marginStart="8dp"
         app:layout_constraintBottom_toBottomOf="@+id/sendButton"
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/composer_emoji"
         app:layout_constraintTop_toTopOf="@+id/sendButton"
         tools:src="@drawable/ic_shield_black" />
 
@@ -143,7 +140,7 @@
         android:nextFocusLeft="@id/composerEditText"
         android:nextFocusUp="@id/composerEditText"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/attachmentButton"
+        app:layout_constraintEnd_toStartOf="@+id/sendButton"
         app:layout_constraintStart_toEndOf="@+id/composer_shield"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
         tools:text="@tools:sample/lorem/random" />
@@ -158,7 +155,8 @@
         android:tint="?android:textColorHint"
         app:layout_constraintTop_toTopOf="@+id/sendButton"
         app:layout_constraintBottom_toBottomOf="@+id/sendButton"
-        app:layout_constraintEnd_toStartOf="parent" />
+        app:layout_constraintEnd_toStartOf="@+id/composer_shield"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageButton
         android:id="@+id/sendButton"