From 615f202583a98caca608d0d8c05ee46cd619698b Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Thu, 2 Sep 2021 12:18:54 -0300
Subject: [PATCH 1/4] minor adjustments, reformat & contentDescription added to
 messages_fragment.xml

---
 app/src/main/res/layout/messages_fragment.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml
index 8a2f54ff8..acbfe90d4 100644
--- a/app/src/main/res/layout/messages_fragment.xml
+++ b/app/src/main/res/layout/messages_fragment.xml
@@ -33,8 +33,8 @@
             android:id="@+id/messageInputText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxLength="200"
             android:imeOptions="actionDone"
+            android:maxLength="200"
             android:text="" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -42,15 +42,12 @@
     <ImageButton
         android:id="@+id/sendButton"
         android:layout_width="64dp"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_height="64dp"
+        android:layout_marginBottom="4dp"
+        android:contentDescription="@string/send_text"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/textInputLayout"
-        app:layout_constraintTop_toBottomOf="@+id/messageListView"
         app:srcCompat="@drawable/ic_send_24" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 15161862f335a173c71ae80a20b9e3df5fcf78b5 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sun, 5 Sep 2021 15:10:02 -0300
Subject: [PATCH 2/4] Fix: EditText with textMultiLine & IME_ACTION_SEND

---
 app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt | 5 ++++-
 app/src/main/res/layout/messages_fragment.xml                | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
index b483a5a3b..68f85c4df 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -1,6 +1,7 @@
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
+import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -28,6 +29,8 @@ import java.util.*
 
 // Allows usage like email.on(EditorInfo.IME_ACTION_NEXT, { confirm() })
 fun EditText.on(actionId: Int, func: () -> Unit) {
+    setImeOptions(EditorInfo.IME_ACTION_SEND) // Force "SEND" IME Action
+    setRawInputType(InputType.TYPE_CLASS_TEXT) // Suppress ENTER but allow textMultiLine
     setOnEditorActionListener { _, receivedActionId, _ ->
 
         if (actionId == receivedActionId) {
@@ -239,7 +242,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
             // requireActivity().hideKeyboard()
         }
 
-        binding.messageInputText.on(EditorInfo.IME_ACTION_DONE) {
+        binding.messageInputText.on(EditorInfo.IME_ACTION_SEND) {
             debug("did IME action")
 
             val str = binding.messageInputText.text.toString().trim()
diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml
index acbfe90d4..77c60101b 100644
--- a/app/src/main/res/layout/messages_fragment.xml
+++ b/app/src/main/res/layout/messages_fragment.xml
@@ -33,7 +33,7 @@
             android:id="@+id/messageInputText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
+            android:inputType="textMultiLine"
             android:maxLength="200"
             android:text="" />
 

From 0e20ec78db8bdb397c3bd0d549266f9513b1407b Mon Sep 17 00:00:00 2001
From: srichs <>
Date: Mon, 6 Sep 2021 22:43:33 -0600
Subject: [PATCH 3/4] removed hints from channel inputs

---
 app/src/main/res/layout/channel_fragment.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/channel_fragment.xml b/app/src/main/res/layout/channel_fragment.xml
index b834136f3..af5ea0dbb 100644
--- a/app/src/main/res/layout/channel_fragment.xml
+++ b/app/src/main/res/layout/channel_fragment.xml
@@ -22,7 +22,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890- "
-            android:hint="@string/channel_name"
             android:imeOptions="actionDone"
             android:maxLength="15"
             android:singleLine="true"
@@ -92,8 +91,7 @@
         <AutoCompleteTextView
             android:id="@+id/filled_exposed_dropdown"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/set_channel_options" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button

From f4c754e5995e1d83bfda1298a7ed137030c64adc Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Tue, 7 Sep 2021 22:17:14 -0300
Subject: [PATCH 4/4] Fix: MessagesFragment layout - fix our messages right
 margin; received left margin (compare "msg.from" to "^local" to "determine if
 this is my message (originated on this device)"; - night/colors.xml: changed
 colorMyMsg to #28463C; (colorMsg & colorMyMsg were the same on Dark theme); -
 fix val one_day typo (= 86400000 ms/day); - if errorMessage -->
 setCardBackgroundColor(Color.RED).

---
 .../main/java/com/geeksville/mesh/ui/MessagesFragment.kt  | 8 +++++---
 app/src/main/res/values-night/colors.xml                  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
index b483a5a3b..dfbbe8ee1 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -1,5 +1,6 @@
 package com.geeksville.mesh.ui
 
+import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -54,7 +55,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
 
     private fun getShortDateTime(time: Date): String {
         // return time if within 24 hours, otherwise date/time
-        val one_day = 60 * 60 * 24 * 100L
+        val one_day = 60 * 60 * 24 * 1000
         if (System.currentTimeMillis() - time.time > one_day) {
             return dateTimeFormat.format(time)
         } else return timeFormat.format(time)
@@ -142,7 +143,8 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
             val nodes = model.nodeDB.nodes.value!!
             val node = nodes.get(msg.from)
             // Determine if this is my message (originated on this device).
-            val isMe = model.myNodeInfo.value?.myNodeNum == node?.num
+            // val isMe = model.myNodeInfo.value?.myNodeNum == node?.num
+            val isMe = msg.from == "^local"
 
             // Set cardview offset and color.
             val marginParams = holder.card.layoutParams as ViewGroup.MarginLayoutParams
@@ -180,7 +182,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
                 holder.username.text = user?.shortName ?: msg.from
             }
             if (msg.errorMessage != null) {
-                // FIXME, set the style to show a red error message
+                context?.let { holder.card.setCardBackgroundColor(Color.RED) }
                 holder.messageText.text = msg.errorMessage
             } else {
                 holder.messageText.text = msg.text
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index df254d906..183c2a160 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -4,7 +4,7 @@
     <color name="colorPrimary">#141414</color>
     <color name="colorPrimaryDark">#141414</color>
     <color name="colorMsg">#212121</color>
-    <color name="colorMyMsg">#212121</color>
+    <color name="colorMyMsg">#28463C</color>
     <color name="colorDebugBackground">#141414</color>
     <color name="colorAdvancedBackground">#141414</color>
     <color name="colorIconTint">#FFFFFF</color>