From e8721cdd077a7401601160db8a210e77641cbc23 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sat, 30 Jan 2021 21:14:55 +0800
Subject: [PATCH] add a few constraints to fix new message layout

---
 app/src/main/res/layout/adapter_message_layout.xml | 11 +++++++++--
 app/src/main/res/values/strings.xml                |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/adapter_message_layout.xml b/app/src/main/res/layout/adapter_message_layout.xml
index 6a4648933..9d9f5db77 100644
--- a/app/src/main/res/layout/adapter_message_layout.xml
+++ b/app/src/main/res/layout/adapter_message_layout.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:contentDescription="Message delivery status">
+    android:contentDescription="@string/message_delivery_status">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/Card"
@@ -25,10 +25,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:text="@string/some_username"
                 android:visibility="visible"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/messageText"
@@ -49,6 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:contentDescription="@string/message_reception_state"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/messageText"
                 app:srcCompat="@drawable/cloud_on" />
@@ -58,7 +62,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:contentDescription="@string/message_reception_time"
                 android:text="3 minutes ago"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/messageStatusIcon"
                 app:layout_constraintTop_toBottomOf="@id/messageText" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 427e2efb9..3c3b111cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,4 +80,7 @@
     <string name="updating_firmware">Updating firmware, wait up to eight minutes...</string>
     <string name="update_successful">Update successful</string>
     <string name="update_failed">Update failed</string>
+    <string name="message_reception_time">message reception time</string>
+    <string name="message_reception_state">message reception state</string>
+    <string name="message_delivery_status">Message delivery status</string>
 </resources>