From 380a69f63ede4a67ceba30a42b2a96887fa9aae7 Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Sat, 23 Aug 2025 15:30:57 -0400
Subject: [PATCH] Fix label: Messages -> Conversations (#2822)

---
 app/src/main/java/com/geeksville/mesh/ui/Main.kt   |  4 ++--
 .../geeksville/mesh/ui/common/icons/Messages.kt    | 14 +++++++-------
 app/src/main/res/values/strings.xml                |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/Main.kt b/app/src/main/java/com/geeksville/mesh/ui/Main.kt
index 1c2be4ef4..ad4920dec 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Main.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Main.kt
@@ -100,9 +100,9 @@ import com.geeksville.mesh.ui.common.components.MainMenuAction
 import com.geeksville.mesh.ui.common.components.MultipleChoiceAlertDialog
 import com.geeksville.mesh.ui.common.components.ScannedQrCodeDialog
 import com.geeksville.mesh.ui.common.components.SimpleAlertDialog
+import com.geeksville.mesh.ui.common.icons.Conversations
 import com.geeksville.mesh.ui.common.icons.Map
 import com.geeksville.mesh.ui.common.icons.MeshtasticIcons
-import com.geeksville.mesh.ui.common.icons.Messages
 import com.geeksville.mesh.ui.common.icons.Nodes
 import com.geeksville.mesh.ui.common.theme.StatusColors.StatusBlue
 import com.geeksville.mesh.ui.common.theme.StatusColors.StatusGreen
@@ -117,7 +117,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
 enum class TopLevelDestination(@StringRes val label: Int, val icon: ImageVector, val route: Route) {
-    Messages(R.string.contacts, MeshtasticIcons.Messages, ContactsRoutes.ContactsGraph),
+    Conversations(R.string.conversations, MeshtasticIcons.Conversations, ContactsRoutes.ContactsGraph),
     Nodes(R.string.nodes, MeshtasticIcons.Nodes, NodesRoutes.NodesGraph),
     Map(R.string.map, MeshtasticIcons.Map, MapRoutes.Map),
     Share(R.string.bottom_nav_share, Icons.Rounded.QrCode2, ChannelsRoutes.ChannelsGraph),
diff --git a/app/src/main/java/com/geeksville/mesh/ui/common/icons/Messages.kt b/app/src/main/java/com/geeksville/mesh/ui/common/icons/Messages.kt
index 3d4dfd9d3..d46c77d06 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/common/icons/Messages.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/common/icons/Messages.kt
@@ -29,14 +29,14 @@ import androidx.compose.ui.unit.dp
  * @see
  *   [forum](https://fonts.google.com/icons?selected=Material+Symbols+Rounded:forum:FILL@0;wght@400;GRAD@0;opsz@24&icon.query=forum&icon.size=24&icon.color=%23e3e3e3&icon.platform=android&icon.style=Rounded)
  */
-val MeshtasticIcons.Messages: ImageVector
+val MeshtasticIcons.Conversations: ImageVector
     get() {
-        if (messages != null) {
-            return messages!!
+        if (conversations != null) {
+            return conversations!!
         }
-        messages =
+        conversations =
             ImageVector.Builder(
-                name = "Outlined.Messages",
+                name = "Outlined.Conversations",
                 defaultWidth = 24.dp,
                 defaultHeight = 24.dp,
                 viewportWidth = 960f,
@@ -95,7 +95,7 @@ val MeshtasticIcons.Messages: ImageVector
                 }
                 .build()
 
-        return messages!!
+        return conversations!!
     }
 
-private var messages: ImageVector? = null
+private var conversations: ImageVector? = null
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b087d36a..0be2519a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -626,7 +626,7 @@
     <string name="navigate_into_label">Navigate Into</string>
     <string name="connections">Connection</string>
     <string name="map">Mesh Map</string>
-    <string name="contacts">Messages</string>
+    <string name="conversations">Conversations</string>
     <string name="nodes">Nodes</string>
     <string name="bottom_nav_share">Share</string>
     <string name="set_your_region">Set your region</string>