From b8104daf2d627f52146e5983d1433305d42e309b Mon Sep 17 00:00:00 2001 From: gavine99 Date: Wed, 29 Jan 2025 12:30:54 +1100 Subject: [PATCH] change layouts for delayed send send now and cancel buttons. remove button shadows. make buttons float bottom --- .../src/main/res/layout/compose_activity.xml | 2 - .../main/res/layout/message_list_item_in.xml | 167 ++++++++++-------- .../main/res/layout/message_list_item_out.xml | 112 ++++++------ 3 files changed, 148 insertions(+), 133 deletions(-) diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index c8cf1ea5..9da2deb6 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -32,8 +32,6 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="12dp" - android:clipChildren="false" - android:clipToPadding="false" android:paddingTop="8dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintBottom_toTopOf="@id/messageBackground" diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index fe7b9403..5dd6eea9 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -17,96 +17,107 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + android:layout_marginEnd="36dp" + android:background="?attr/selectableItemBackground" + android:orientation="vertical"> - + android:background="?attr/selectableItemBackground"> - + - + - + + + + + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent"> - + - + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 33e4fe38..eebf3117 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -22,6 +22,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="36dp" + android:layout_marginEnd="12dp" android:background="?attr/selectableItemBackground" android:orientation="vertical"> @@ -69,41 +71,35 @@ app:textSize="tertiary" tools:text="1" /> - - - + android:layout_gravity="end" + android:layout_marginBottom="2dp" + android:gravity="end" + android:nestedScrollingEnabled="false" + android:orientation="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="1" + tools:listitem="@layout/mms_image_preview_list_item" /> + + + android:visibility="gone" + tools:visibility="visible"> + tools:progressTint="@color/tools_theme" + tools:visibility="visible" /> - - - + android:layout_toStartOf="@id/sendNowIcon" + android:layout_toEndOf="@id/cancelFrame" + android:orientation="horizontal"> + + + + + - + android:visibility="gone" + tools:tint="@color/tools_theme" + tools:visibility="visible" /> + + - \ No newline at end of file