mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 01:20:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix hiding attachment-button, not emoji-button for replies

Browse source 
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
This commit is contained in:
SpiritCroc 2020-12-24 11:37:56 +01:00
parent a5c84c4f32
commit b6f2ca85f7
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View file

@ -118,20 +118,17 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
android:tint="?android:textColorHint" android:tint="?android:textColorHint"
app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/sendButton" app:layout_constraintEnd_toStartOf="@+id/sendButton"
app:layout_constraintStart_toEndOf="@id/composerEditText" app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="@id/sendButton"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<ImageView <ImageView
android:id="@+id/composer_shield" android:id="@+id/composer_shield"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toBottomOf="@+id/sendButton" app:layout_constraintBottom_toBottomOf="@+id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/composerEditText" app:layout_constraintEnd_toStartOf="@+id/composerEditText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/composer_emoji"
app:layout_constraintTop_toTopOf="@+id/sendButton" app:layout_constraintTop_toTopOf="@+id/sendButton"
tools:src="@drawable/ic_shield_black" /> tools:src="@drawable/ic_shield_black" />
@ -143,7 +140,7 @@
android:nextFocusLeft="@id/composerEditText" android:nextFocusLeft="@id/composerEditText"
android:nextFocusUp="@id/composerEditText" android:nextFocusUp="@id/composerEditText"
app:layout_constraintBottom_toBottomOf="parent" 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_constraintStart_toEndOf="@+id/composer_shield"
app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier" app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
tools:text="@tools:sample/lorem/random" /> tools:text="@tools:sample/lorem/random" />
@ -158,7 +155,8 @@
android:tint="?android:textColorHint" android:tint="?android:textColorHint"
app:layout_constraintTop_toTopOf="@+id/sendButton" app:layout_constraintTop_toTopOf="@+id/sendButton"
app:layout_constraintBottom_toBottomOf="@+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 <ImageButton
android:id="@+id/sendButton" android:id="@+id/sendButton"