filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exchange emoji and attachments button back to familiar layout 

Also drop the layout_goneMarginEnd attribute.

Change-Id: I0782a92947a470e233e2596a721d7a652fa37c7e
This commit is contained in:
SpiritCroc 2020-12-22 18:32:34 +01:00
parent 89c8c86ec0
commit f5054106e8
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
View File

@ -114,8 +114,8 @@
android:src="@drawable/ic_attachment"
android:tint="?android:textColorHint"
app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/composer_shield"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/sendButton"
app:layout_constraintStart_toEndOf="@id/composerEditText"
app:layout_constraintTop_toTopOf="@id/sendButton"
tools:ignore="MissingPrefix" />
@ -125,7 +125,7 @@
android:layout_height="16dp"
app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/composerEditText"
app:layout_constraintStart_toEndOf="@+id/attachmentButton"
app:layout_constraintStart_toEndOf="@+id/composer_emoji"
app:layout_constraintTop_toTopOf="@id/sendButton"
tools:src="@drawable/ic_shield_black"
tools:visibility="visible" />
@ -139,7 +139,7 @@
android:nextFocusLeft="@id/composerEditText"
android:nextFocusUp="@id/composerEditText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/composer_emoji"
app:layout_constraintEnd_toStartOf="@+id/attachmentButton"
app:layout_constraintStart_toEndOf="@+id/composer_shield"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem/random" />
@ -153,10 +153,9 @@
android:src="@drawable/ic_insert_emoji"
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_goneMarginEnd="8dp" />
app:layout_constraintEnd_toStartOf="@+id/composer_shield"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/sendButton" />
<ImageButton
android:id="@+id/sendButton"
@ -167,7 +166,7 @@
android:src="@drawable/ic_send"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/composer_emoji"
app:layout_constraintStart_toEndOf="@id/attachmentButton"
tools:ignore="MissingPrefix" />
</androidx.constraintlayout.widget.ConstraintLayout>

17
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View File

@ -118,9 +118,10 @@
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_attachment"
android:tint="?android:textColorHint"
app:layout_constraintBottom_toBottomOf="@+id/sendButton"
app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/sendButton"
app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/sendButton"
app:layout_constraintStart_toEndOf="@id/composerEditText"
app:layout_constraintTop_toTopOf="@id/sendButton"
tools:ignore="MissingPrefix" />
<ImageView
@ -142,7 +143,7 @@
android:nextFocusLeft="@id/composerEditText"
android:nextFocusUp="@id/composerEditText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/composer_emoji"
app:layout_constraintEnd_toStartOf="@+id/attachmentButton"
app:layout_constraintStart_toEndOf="@+id/composer_shield"
app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
tools:text="@tools:sample/lorem/random" />
@ -155,11 +156,9 @@
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_insert_emoji"
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_goneMarginEnd="8dp" />
app:layout_constraintTop_toTopOf="@+id/sendButton"
app:layout_constraintBottom_toBottomOf="@+id/sendButton"
app:layout_constraintEnd_toStartOf="parent" />
<ImageButton
android:id="@+id/sendButton"