From 6f9f2c4b049706bb7dd04d261fa95966ae1b7275 Mon Sep 17 00:00:00 2001
From: wkawecki <wojtec@gmail.com>
Date: Tue, 12 Apr 2022 17:00:49 +0200
Subject: [PATCH 1/2]  meshtastic#73 'Resend Button' on message selection

---
 .../main/java/com/geeksville/mesh/ui/MessagesFragment.kt | 8 ++++++++
 app/src/main/res/drawable/ic_retry_24.xml                | 9 +++++++++
 app/src/main/res/menu/menu_messages.xml                  | 5 +++++
 app/src/main/res/values-pl/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                      | 1 +
 5 files changed, 24 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_retry_24.xml

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 332ceadaf..987380cde 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -305,6 +305,14 @@ class MessagesFragment : Fragment(), Logging {
                                     actionMode?.title = selectedList.size.toString()
                                     notifyDataSetChanged()
                                 }
+                                R.id.resendButton -> {
+                                    debug("User clicked resendButton")
+                                    var resendText:String = ""
+                                    selectedList.forEach {
+                                        resendText = resendText + it.text + System.lineSeparator()
+                                        binding.messageInputText.setText(resendText)
+                                    }
+                                }
                             }
                             return true
                         }
diff --git a/app/src/main/res/drawable/ic_retry_24.xml b/app/src/main/res/drawable/ic_retry_24.xml
new file mode 100644
index 000000000..d0d60ce13
--- /dev/null
+++ b/app/src/main/res/drawable/ic_retry_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="20"
+    android:viewportWidth="20"
+    android:width="24dp">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14.189,10.329l-1.4,-1.385 -1.061,1.061 3.9,3.884 3.865,-3.866 -1.06,-1.06 -1.055,1.055L16.5,11.344V10a7.75,7.75 0,1 0,-2.27 5.48l-1.061,-1.061A6.249,6.249 0,1 1,15 10v1.671Z"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index 1182d80a6..5d44a591f 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/resendButton"
+        android:icon="@drawable/ic_retry_24"
+        android:title="@string/resend"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/deleteButton"
         android:icon="@drawable/ic_twotone_delete_24"
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ca72a2ef2..f10ce0f73 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -137,4 +137,5 @@
     <string name="allow_will_show">Pozwól</string>
     <string name="preferences_language">Język (wymagany restart)</string>
     <string name="preferences_system_default">Domyślny systemu</string>
+    <string name="resend">Ponów</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fe586770..989d7aa75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -140,4 +140,5 @@
     <string name="download_failed">Unable to download style pack</string>
     <string name="preferences_language">Language (restart needed)</string>
     <string name="preferences_system_default">System default</string>
+    <string name="resend">Resend</string>
 </resources>
\ No newline at end of file

From 7e1e78fb642b753e8d4d0bf1526c24752c924334 Mon Sep 17 00:00:00 2001
From: wkawecki <wojtec@gmail.com>
Date: Tue, 19 Apr 2022 15:57:30 +0200
Subject: [PATCH 2/2]  meshtastic#73 change icon, bugfixes

---
 .../com/geeksville/mesh/ui/MessagesFragment.kt |  7 +++++--
 app/src/main/res/drawable/ic_retry_24.xml      |  9 ---------
 .../ic_twotone_content_paste_go_24.xml         | 18 ++++++++++++++++++
 app/src/main/res/menu/menu_messages.xml        |  2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_retry_24.xml
 create mode 100644 app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml

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 987380cde..7e30100f5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -307,11 +307,14 @@ class MessagesFragment : Fragment(), Logging {
                                 }
                                 R.id.resendButton -> {
                                     debug("User clicked resendButton")
-                                    var resendText:String = ""
+                                    var resendText = ""
                                     selectedList.forEach {
                                         resendText = resendText + it.text + System.lineSeparator()
-                                        binding.messageInputText.setText(resendText)
                                     }
+                                    if (resendText!="")
+                                        resendText = resendText.substring(0, resendText.length - 1)
+                                    binding.messageInputText.setText(resendText)
+                                    mode.finish()
                                 }
                             }
                             return true
diff --git a/app/src/main/res/drawable/ic_retry_24.xml b/app/src/main/res/drawable/ic_retry_24.xml
deleted file mode 100644
index d0d60ce13..000000000
--- a/app/src/main/res/drawable/ic_retry_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportHeight="20"
-    android:viewportWidth="20"
-    android:width="24dp">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M14.189,10.329l-1.4,-1.385 -1.061,1.061 3.9,3.884 3.865,-3.866 -1.06,-1.06 -1.055,1.055L16.5,11.344V10a7.75,7.75 0,1 0,-2.27 5.48l-1.061,-1.061A6.249,6.249 0,1 1,15 10v1.671Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml b/app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml
new file mode 100644
index 000000000..21fc0ae3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M10,17c0,-3.31 2.69,-6 6,-6h3V5h-2v3H7V5H5v14h5v-2z"
+      android:strokeAlpha="0.3"
+      android:fillColor="@android:color/white"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M10,19L5,19L5,5h2v3h10L17,5h2v6h2L21,5c0,-1.1 -0.9,-2 -2,-2h-4.18C14.4,1.84 13.3,1 12,1s-2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h5v-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1s-1,-0.45 -1,-1s0.45,-1 1,-1z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="m18.01,13l-1.42,1.41l1.58,1.58H12v2h6.17l-1.58,1.59l1.42,1.41l3.99,-4z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index 5d44a591f..902b9fdd8 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/resendButton"
-        android:icon="@drawable/ic_retry_24"
+        android:icon="@drawable/ic_twotone_content_paste_go_24"
         android:title="@string/resend"
         app:showAsAction="ifRoom" />
     <item