awesome-bookmarks/Meshtastic-Android
3
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-06-02 06:24:16 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

feat(nav): rename tab labels to canonical order (#5551)

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
James Rich
2026-05-20 15:57:08 -07:00
committed by GitHub
parent 9d5e20c742
commit ea85b906e8
18 changed files with 675 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktopApp/src/main/kotlin/org/meshtastic/desktop/Main.kt
+3 -3
View File
@@ -285,7 +285,7 @@ private fun ApplicationScope.MeshtasticWindow(
rememberMultiBackstack(
// Land on Connections for first-run / no-device-selected; otherwise on Nodes.
if (uiViewModel.currentDeviceAddressFlow.value.let { it.isNullOrBlank() || it == "n" }) {
TopLevelDestination.Connections.route
TopLevelDestination.Connect.route
} else {
TopLevelDestination.Nodes.route
},
@@ -360,7 +360,7 @@ private fun handleKeyboardShortcut(
}
Key.One -> {
multiBackstack.navigateTopLevel(TopLevelDestination.Conversations.route)
multiBackstack.navigateTopLevel(TopLevelDestination.Messages.route)
true
}
@@ -375,7 +375,7 @@ private fun handleKeyboardShortcut(
}
Key.Four -> {
multiBackstack.navigateTopLevel(TopLevelDestination.Connections.route)
multiBackstack.navigateTopLevel(TopLevelDestination.Connect.route)
true
}
desktopApp/src/main/kotlin/org/meshtastic/desktop/navigation/DesktopNavigation.kt
+1 -1
View File
@@ -47,7 +47,7 @@ fun EntryProviderScope<NavKey>.desktopNavGraph(
backStack = backStack,
scrollToTopEvents = uiViewModel.scrollToTopEventFlow,
onHandleDeepLink = uiViewModel::handleDeepLink,
onNavigateToConnections = { multiBackstack.navigateTopLevel(TopLevelDestination.Connections.route) },
onNavigateToConnections = { multiBackstack.navigateTopLevel(TopLevelDestination.Connect.route) },
)
contactsGraph(backStack, uiViewModel.scrollToTopEventFlow)
mapGraph(backStack)
desktopApp/src/test/kotlin/org/meshtastic/desktop/ui/DesktopTopLevelDestinationParityTest.kt
+2 -2
View File
@@ -30,8 +30,8 @@ import kotlin.test.assertEquals
import kotlin.test.assertFalse
/**
* Keeps Desktop top-level destinations aligned with Android top-level navigation (Conversations, Nodes, Map, Settings,
* Connections).
* Keeps Desktop top-level destinations aligned with Android top-level navigation (Messages, Nodes, Map, Settings,
* Connect).
*/
class DesktopTopLevelDestinationParityTest {