meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix label: Messages -> Conversations (#2822)

Browse source
This commit is contained in:
Phil Oliver 2025-08-23 15:30:57 -04:00 • committed by GitHub
parent f09a46ebad
commit 380a69f63e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/ui/Main.kt
View file

@ -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),

14
app/src/main/java/com/geeksville/mesh/ui/common/icons/Messages.kt
View file

@ -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