change layouts for delayed send send now and cancel buttons. remove button shadows. make buttons float bottom

This commit is contained in:
gavine99
2025-01-29 12:30:54 +11:00
parent cd55051a17
commit b8104daf2d
3 changed files with 148 additions and 133 deletions
@@ -32,8 +32,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="8dp" android:paddingTop="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/messageBackground" app:layout_constraintBottom_toTopOf="@id/messageBackground"
@@ -17,96 +17,107 @@
~ You should have received a copy of the GNU General Public License ~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>. ~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
--> -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"> android:layout_marginEnd="36dp"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
<dev.octoshrimpy.quik.common.widget.QkTextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/timestamp" android:layout_width="match_parent"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:background="?attr/selectableItemBackground">
android:padding="8dp"
app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Tue at 11:39pm" />
<ImageView <dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/sim" android:id="@+id/timestamp"
android:layout_width="16dp" style="@style/TextSecondary"
android:layout_height="16dp" android:layout_width="wrap_content"
android:layout_marginEnd="2dp" android:layout_height="wrap_content"
android:src="@drawable/ic_sim_card_black_24dp" android:gravity="center"
android:tint="?android:attr/textColorSecondary" android:padding="8dp"
app:layout_constraintBottom_toBottomOf="@id/timestamp" app:layout_constraintEnd_toStartOf="@id/sim"
app:layout_constraintEnd_toStartOf="@id/simIndex" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/timestamp" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/timestamp" /> app:layout_constraintTop_toTopOf="parent"
tools:text="Tue at 11:39pm" />
<dev.octoshrimpy.quik.common.widget.QkTextView <ImageView
android:id="@+id/simIndex" android:id="@+id/sim"
android:layout_width="wrap_content" android:layout_width="16dp"
android:layout_height="wrap_content" android:layout_height="16dp"
android:textColor="?android:attr/textColorSecondary" android:layout_marginEnd="2dp"
app:layout_constraintBottom_toBottomOf="@id/timestamp" android:src="@drawable/ic_sim_card_black_24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintStart_toEndOf="@id/sim" app:layout_constraintEnd_toStartOf="@id/simIndex"
app:layout_constraintTop_toTopOf="@id/timestamp" app:layout_constraintStart_toEndOf="@id/timestamp"
app:textSize="tertiary" app:layout_constraintTop_toTopOf="@id/timestamp"
tools:text="1" /> app:tint="?android:attr/textColorSecondary" />
<androidx.recyclerview.widget.RecyclerView <dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/attachments" android:id="@+id/simIndex"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/timestamp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/sim"
app:layout_constraintTop_toTopOf="@id/timestamp"
app:textSize="tertiary"
tools:text="1" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginEnd="12dp" android:orientation="horizontal"
android:nestedScrollingEnabled="false" app:layout_constraintBottom_toBottomOf="parent">
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/timestamp"
tools:itemCount="1"
tools:listitem="@layout/mms_image_preview_list_item" />
<dev.octoshrimpy.quik.common.widget.AvatarView <dev.octoshrimpy.quik.common.widget.AvatarView
android:id="@+id/avatar" android:id="@+id/avatar"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginStart="12dp" android:layout_gravity="bottom"
app:layout_constraintBottom_toBottomOf="@id/body" app:layout_constraintBottom_toBottomOf="@id/body"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<dev.octoshrimpy.quik.common.widget.TightTextView <LinearLayout
android:id="@+id/body" android:layout_width="match_parent"
style="@style/TextPrimary" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginStart="12dp"
android:layout_height="wrap_content" android:orientation="vertical">
android:layout_marginStart="12dp"
android:layout_marginTop="2dp" <androidx.recyclerview.widget.RecyclerView
android:layout_marginEnd="12dp" android:id="@+id/attachments"
android:autoLink="email|phone|web" android:layout_width="wrap_content"
android:background="@drawable/message_only" android:layout_height="wrap_content"
android:gravity="start|center_vertical" android:nestedScrollingEnabled="false"
android:minHeight="36dp" android:orientation="vertical"
android:textIsSelectable="true" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constrainedWidth="true" tools:itemCount="1"
app:layout_constraintEnd_toEndOf="parent" tools:listitem="@layout/mms_image_preview_list_item" />
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar" <dev.octoshrimpy.quik.common.widget.TightTextView
app:layout_constraintTop_toBottomOf="@id/attachments" android:id="@+id/body"
app:layout_constraintWidth_max="384dp" style="@style/TextPrimary"
tools:backgroundTint="@color/tools_theme" android:layout_width="wrap_content"
tools:text="@tools:sample/lorem/random" /> android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
tools:backgroundTint="@color/tools_theme"
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
</LinearLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView <dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status" android:id="@+id/status"
@@ -123,4 +134,4 @@
app:textSize="tertiary" app:textSize="tertiary"
tools:text="Sending..." /> tools:text="Sending..." />
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>
@@ -22,6 +22,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="36dp"
android:layout_marginEnd="12dp"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:orientation="vertical"> android:orientation="vertical">
@@ -69,41 +71,35 @@
app:textSize="tertiary" app:textSize="tertiary"
tools:text="1" /> tools:text="1" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginStart="60dp"
android:layout_marginEnd="12dp"
android:gravity="end"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintTop_toBottomOf="@id/timestamp"
tools:itemCount="1"
tools:listitem="@layout/mms_preview_list_item" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent" android:id="@+id/attachments"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipToPadding="false" android:layout_gravity="end"
android:orientation="horizontal" android:layout_marginBottom="2dp"
app:layout_constraintBottom_toBottomOf="parent"> 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" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout <FrameLayout
android:id="@+id/cancelFrame" android:id="@+id/cancelFrame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_alignBottom="@id/bodyBox"
android:layout_alignParentStart="true"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingBottom="6dp"> android:visibility="gone"
tools:visibility="visible">
<ProgressBar <ProgressBar
android:id="@+id/cancel" android:id="@+id/cancel"
@@ -113,12 +109,12 @@
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor" android:backgroundTint="?attr/bubbleColor"
android:clickable="false" android:clickable="false"
android:elevation="4dp"
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:indeterminate="false" android:indeterminate="false"
android:progressDrawable="@drawable/circular_progress_bar" android:progressDrawable="@drawable/circular_progress_bar"
tools:progress="45" tools:progress="45"
tools:progressTint="@color/tools_theme" /> tools:progressTint="@color/tools_theme"
tools:visibility="visible" />
<ImageView <ImageView
android:id="@+id/cancelIcon" android:id="@+id/cancelIcon"
@@ -126,53 +122,64 @@
android:layout_height="36dp" android:layout_height="36dp"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/compose_message_cancel" android:contentDescription="@string/compose_message_cancel"
android:elevation="4dp"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/ic_stop_black_24dp" android:src="@drawable/ic_stop_black_24dp"
tools:tint="@color/tools_theme" /> tools:tint="@color/tools_theme" />
</FrameLayout> </FrameLayout>
<View <LinearLayout
android:layout_width="0dp" android:id="@+id/bodyBox"
android:layout_height="match_parent" android:layout_width="match_parent"
android:layout_weight="1" />
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_toStartOf="@id/sendNowIcon"
android:layout_marginTop="2dp" android:layout_toEndOf="@id/cancelFrame"
android:layout_marginEnd="12dp" android:orientation="horizontal">
android:autoLink="email|phone|web"
android:background="@drawable/message_only" <View
android:backgroundTint="?attr/bubbleColor" android:layout_width="0dp"
android:gravity="start|center_vertical" android:layout_height="match_parent"
android:minHeight="36dp" android:layout_weight="1" />
android:textIsSelectable="true"
app:layout_constrainedWidth="true" <dev.octoshrimpy.quik.common.widget.TightTextView
tools:text="Hey! How's it going?" /> android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
tools:text="@tools:sample/lorem/random[0]" />
</LinearLayout>
<ImageView <ImageView
android:id="@+id/sendNowIcon" android:id="@+id/sendNowIcon"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginEnd="12dp" android:layout_alignBottom="@id/bodyBox"
android:layout_alignParentEnd="true"
android:layout_marginStart="12dp"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:baselineAlignBottom="true"
android:contentDescription="@string/compose_message_send_now" android:contentDescription="@string/compose_message_send_now"
android:elevation="4dp"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/ic_send_black_24dp" android:src="@drawable/ic_send_black_24dp"
tools:tint="@color/tools_theme" /> android:visibility="gone"
</LinearLayout> tools:tint="@color/tools_theme"
tools:visibility="visible" />
</RelativeLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView <dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status" android:id="@+id/status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:contentDescription="@string/compose_message_attachment" android:contentDescription="@string/compose_message_attachment"
@@ -180,5 +187,4 @@
app:textSize="tertiary" app:textSize="tertiary"
tools:text="Sending..." /> tools:text="Sending..." />
</LinearLayout> </LinearLayout>