From 49cad8feec7096612a339fb7b97a7891d4dee0a7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 11 Dec 2020 11:49:46 +0100 Subject: [PATCH 1/6] Rename files. --- .../features/home/room/detail/RoomDetailFragment.kt | 2 +- .../home/room/detail/composer/TextComposerView.kt | 12 ++++++------ ...merge_composer_layout.xml => composer_layout.xml} | 2 +- ...ml => composer_layout_constraint_set_compact.xml} | 0 ...l => composer_layout_constraint_set_expanded.xml} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename vector/src/main/res/layout/{merge_composer_layout.xml => composer_layout.xml} (98%) rename vector/src/main/res/layout/{constraint_set_composer_layout_compact.xml => composer_layout_constraint_set_compact.xml} (100%) rename vector/src/main/res/layout/{constraint_set_composer_layout_expanded.xml => composer_layout_constraint_set_expanded.xml} (100%) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt index 93b2b69ba5..a8cd8590c4 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt @@ -165,7 +165,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_room_detail.* -import kotlinx.android.synthetic.main.merge_composer_layout.view.* +import kotlinx.android.synthetic.main.composer_layout.view.* import kotlinx.android.synthetic.main.merge_overlay_waiting_view.* import org.billcarsonfr.jsonviewer.JSonViewerDialog import org.commonmark.parser.Parser diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt index af0e1a91f0..f232e9a65e 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt @@ -36,7 +36,7 @@ import androidx.transition.TransitionSet import butterknife.BindView import butterknife.ButterKnife import im.vector.app.R -import kotlinx.android.synthetic.main.merge_composer_layout.view.* +import kotlinx.android.synthetic.main.composer_layout.view.* import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel /** @@ -86,7 +86,7 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib get() = composerEditText.text init { - inflate(context, R.layout.merge_composer_layout, this) + inflate(context, R.layout.composer_layout, this) ButterKnife.bind(this) collapse(false) composerEditText.callback = object : ComposerEditText.Callback { @@ -110,20 +110,20 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib } fun collapse(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) { - if (currentConstraintSetId == R.layout.constraint_set_composer_layout_compact) { + if (currentConstraintSetId == R.layout.composer_layout_constraint_set_compact) { // ignore we good return } - currentConstraintSetId = R.layout.constraint_set_composer_layout_compact + currentConstraintSetId = R.layout.composer_layout_constraint_set_compact applyNewConstraintSet(animate, transitionComplete) } fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) { - if (currentConstraintSetId == R.layout.constraint_set_composer_layout_expanded) { + if (currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded) { // ignore we good return } - currentConstraintSetId = R.layout.constraint_set_composer_layout_expanded + currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded applyNewConstraintSet(animate, transitionComplete) } diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml similarity index 98% rename from vector/src/main/res/layout/merge_composer_layout.xml rename to vector/src/main/res/layout/composer_layout.xml index ea2bc1bf30..cb5dcbc42c 100644 --- a/vector/src/main/res/layout/merge_composer_layout.xml +++ b/vector/src/main/res/layout/composer_layout.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - tools:constraintSet="@layout/constraint_set_composer_layout_compact" + tools:constraintSet="@layout/composer_layout_constraint_set_compact" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + app:layout_constraintEnd_toEndOf="@id/related_message_background" + app:layout_constraintStart_toStartOf="@+id/related_message_background" + app:layout_constraintTop_toTopOf="@id/related_message_background" /> + app:layout_constraintBottom_toBottomOf="@id/related_message_background" + app:layout_constraintEnd_toEndOf="@id/related_message_background" + app:layout_constraintStart_toStartOf="@+id/related_message_background" /> Date: Fri, 11 Dec 2020 12:17:23 +0100 Subject: [PATCH 3/6] Fix Layout issue (visible only on RTL) (#2523) --- .../main/res/layout/composer_layout_constraint_set_compact.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml index 4c91ba6b38..e1eb0f01c3 100644 --- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml +++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml @@ -113,7 +113,7 @@ android:layout_width="16dp" android:layout_height="16dp" app:layout_constraintBottom_toBottomOf="@id/attachmentButton" - app:layout_constraintEnd_toStartOf="@+id/attachmentButton" + app:layout_constraintEnd_toStartOf="@+id/composerEditText" app:layout_constraintStart_toEndOf="@+id/attachmentButton" app:layout_constraintTop_toTopOf="@id/attachmentButton" tools:src="@drawable/ic_shield_black" From 32fd3be73235cd6392ac911237f6b10bb6d5dc79 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 11 Dec 2020 12:41:35 +0100 Subject: [PATCH 4/6] Better alignment of button and animation, bigger touch area for send button --- vector/src/main/res/drawable/bg_send.xml | 6 +++++- .../composer_layout_constraint_set_compact.xml | 16 ++++++++-------- ...composer_layout_constraint_set_expanded.xml | 18 +++++++++--------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/vector/src/main/res/drawable/bg_send.xml b/vector/src/main/res/drawable/bg_send.xml index 4b357d7ab1..8ab95bf5c5 100644 --- a/vector/src/main/res/drawable/bg_send.xml +++ b/vector/src/main/res/drawable/bg_send.xml @@ -1,6 +1,10 @@ - + diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml index e1eb0f01c3..231e58c68a 100644 --- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml +++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml @@ -102,20 +102,20 @@ android:layout_margin="12dp" android:background="?android:attr/selectableItemBackground" android:src="@drawable/ic_attachment" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toBottomOf="@id/sendButton" app:layout_constraintEnd_toStartOf="@+id/composer_shield" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@id/sendButton" tools:ignore="MissingPrefix" /> @@ -145,11 +145,11 @@ Date: Fri, 11 Dec 2020 12:46:44 +0100 Subject: [PATCH 5/6] Bigger touch area for the other buttons --- .../composer_layout_constraint_set_compact.xml | 13 ++++++------- .../composer_layout_constraint_set_expanded.xml | 12 ++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml index 231e58c68a..2de3efc8ee 100644 --- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml +++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml @@ -97,9 +97,9 @@ Date: Fri, 11 Dec 2020 13:18:22 +0100 Subject: [PATCH 6/6] Reorder Views (no other change) --- .../src/main/res/layout/composer_layout.xml | 56 +++++++-------- ...composer_layout_constraint_set_compact.xml | 72 +++++++++---------- ...omposer_layout_constraint_set_expanded.xml | 46 ++++++------ 3 files changed, 87 insertions(+), 87 deletions(-) diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml index a1d6675278..cb0b37d844 100644 --- a/vector/src/main/res/layout/composer_layout.xml +++ b/vector/src/main/res/layout/composer_layout.xml @@ -39,13 +39,6 @@ tools:ignore="MissingConstraints" tools:src="@tools:sample/avatars" /> - - - - - - + + + + + + diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml index 2de3efc8ee..a4dfcf019c 100644 --- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml +++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml @@ -95,6 +95,16 @@ tools:ignore="MissingPrefix" tools:visibility="visible" /> + + - - - - - - + + + + \ No newline at end of file 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 75dbdfd2a8..8a76c0547e 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 @@ -100,6 +100,16 @@ app:tint="@color/riotx_notice" tools:ignore="MissingPrefix" /> + + + + - - - - \ No newline at end of file