feat(nav): rename tab labels to canonical order by jamesarich · Pull Request #5551 · meshtastic/Meshtastic-Android

jamesarich · 2026-05-20T21:23:59Z

Summary

Aligns bottom navigation tab labels with the cross-platform canonical naming defined in the Menu Alignment Audit.

The Android app already had the correct tab order -- this PR updates two labels to match the canonical names used across all Meshtastic clients:

"Conversations" -> "Messages" (position 1)
"Connections" -> "Connect" (position 5)

Approach

Renamed the TopLevelDestination enum entries (Conversations -> Messages, Connections -> Connect) and pointed them at new string resource keys (messages, connect). The old string keys are retained since they are still used for screen titles in the Contacts and Connections feature modules.

All changes are in commonMain source sets -- no platform-specific code was modified. Navigation routes (ContactsRoute, ConnectionsRoute) are unchanged, so deep links and state restoration are unaffected.

Changes

core/navigation -- enum entries renamed, MultiBackstack default updated
core/ui -- icon mapping and nav suite references updated
androidApp / desktopApp -- reference updates in shell composables
Tests updated in MultiBackstackTest and DesktopTopLevelDestinationParityTest
Localization deferred to Crowdin (only English strings.xml touched)

Verification

spotlessCheck + detekt: pass
assembleDebug: pass
test + allTests: pass (all existing tests green)

Fixes: #5543

github-actions · 2026-05-20T21:24:14Z

📄 Docs staleness check — advisory

This PR modifies user-facing UI source files but does not update any page under docs/en/user/ or docs/en/developer/.

⚠️ Doc changes propagate to 3 consumers: in-app docs browser, Jekyll site (GitHub Pages), and meshtastic.org (Docusaurus sync). Updating a page in docs/en/ automatically flows to all three.

Changed source files:

core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/MeshtasticNavigationSuite.kt
core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/navigation/TopLevelDestinationExt.kt

What to check:

Changed area	Likely doc page
`feature/messaging/`	`docs/en/user/messages-and-channels.md`
`feature/node/`	`docs/en/user/nodes.md` or `docs/en/user/node-metrics.md`
`feature/map/`	`docs/en/user/map-and-waypoints.md`
`feature/connections/`	`docs/en/user/connections.md`
`feature/settings/`	`docs/en/user/settings-radio-user.md` or `docs/en/user/settings-module-admin.md`
`feature/firmware/`	`docs/en/user/firmware.md`
`feature/intro/`	`docs/en/user/onboarding.md`
`feature/discovery/`	`docs/en/user/discovery.md`
`feature/docs/`	Internal docs infrastructure
`core/ui/`	`docs/en/developer/codebase.md` or component-specific user pages

New page checklist (if adding a new doc page):

Create the .md file in docs/en/user/ or docs/en/developer/ with last_updated frontmatter
Register in DocBundleLoader.kt with string resources (in-app browser)
Jekyll and Docusaurus sync pick up new pages automatically — no config change needed

If this PR does not require a doc update (e.g., internal refactor, bug fix, test change), add the skip-docs-check label to dismiss this check.

Cross-platform note: This check is advisory while doc coverage matures. Both Android and Apple repos use the same skip-docs-check label and advisory severity. See meshtastic/design standards for shared conventions.

Align bottom navigation tab labels with the cross-platform canonical order defined in the Menu Alignment Audit (meshtastic/design). - Rename TopLevelDestination.Conversations → Messages - Rename TopLevelDestination.Connections → Connect - Use new string resource keys (messages, connect) for nav labels - Retain old keys (conversations, connections) for screen titles - Update all references across Android, Desktop, and tests - Tab order unchanged: Messages, Nodes, Map, Settings, Connect Closes #5543 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

codecov · 2026-05-20T23:12:00Z

❌ 1 Tests Failed:

Tests completed	Failed	Passed	Skipped
2446	1	2445	0

View the top 1 failed test(s) by shortest run time

org.meshtastic.core.database.DatabaseManagerWithDbRetryTest::withDb retries against current database when previous pool closes during switch

Stack Traces | 18.9s run time

java.lang.AssertionError: expected:<42424242> but was:<null>
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.failNotEquals(Assert.java:835)
	at org.junit.Assert.assertEquals(Assert.java:120)
	at kotlin.test.junit.JUnitAsserter.assertEquals(JUnitSupport.kt:32)
	at kotlin.test.AssertionsKt__AssertionsKt.assertEquals(Assertions.kt:63)
	at kotlin.test.AssertionsKt.assertEquals(Unknown Source)
	at kotlin.test.AssertionsKt__AssertionsKt.assertEquals$default(Assertions.kt:62)
	at kotlin.test.AssertionsKt.assertEquals$default(Unknown Source)
	at org.meshtastic.core.database.DatabaseManagerWithDbRetryTest$withDb retries against current database when previous pool closes during switch$1.invokeSuspend(DatabaseManagerWithDbRetryTest.kt:99)
	at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:34)
	at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:100)
	at kotlinx.coroutines.test.TestDispatcher.processEvent$kotlinx_coroutines_test(TestDispatcher.kt:24)
	at kotlinx.coroutines.test.TestCoroutineScheduler.tryRunNextTaskUnless$kotlinx_coroutines_test(TestCoroutineScheduler.kt:98)
	at kotlinx.coroutines.test.TestBuildersKt__TestBuildersKt$runTest$2$1$workRunner$1.invokeSuspend(TestBuilders.kt:326)
	at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:34)
	at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:100)
	at kotlinx.coroutines.EventLoopImplBase.processNextEvent(EventLoop.common.kt:256)
	at kotlinx.coroutines.BlockingCoroutine.joinBlocking(Builders.kt:54)
	at kotlinx.coroutines.BuildersKt__BuildersKt.runBlockingImpl(Builders.kt:30)
	at kotlinx.coroutines.BuildersKt.runBlockingImpl(Unknown Source)
	at kotlinx.coroutines.BuildersKt__Builders_concurrentKt.runBlockingK(Builders.concurrent.kt:172)
	at kotlinx.coroutines.BuildersKt.runBlockingK(Unknown Source)
	at kotlinx.coroutines.BuildersKt__Builders_concurrentKt.runBlockingK$default(Builders.concurrent.kt:157)
	at kotlinx.coroutines.BuildersKt.runBlockingK$default(Unknown Source)
	at kotlinx.coroutines.test.TestBuildersJvmKt.createTestResult(TestBuildersJvm.kt:10)
	at kotlinx.coroutines.test.TestBuildersKt__TestBuildersKt.runTest-8Mi8wO0(TestBuilders.kt:309)
	at kotlinx.coroutines.test.TestBuildersKt.runTest-8Mi8wO0(TestBuilders.kt:1)
	at kotlinx.coroutines.test.TestBuildersKt__TestBuildersKt.runTest-8Mi8wO0(TestBuilders.kt:167)
	at kotlinx.coroutines.test.TestBuildersKt.runTest-8Mi8wO0(TestBuilders.kt:1)
	at kotlinx.coroutines.test.TestBuildersKt__TestBuildersKt.runTest-8Mi8wO0$default(TestBuilders.kt:159)
	at kotlinx.coroutines.test.TestBuildersKt.runTest-8Mi8wO0$default(TestBuilders.kt:1)
	at org.meshtastic.core.database.DatabaseManagerWithDbRetryTest.withDb retries against current database when previous pool closes during switch(DatabaseManagerWithDbRetryTest.kt:69)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)
	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
	at org.robolectric.RobolectricTestRunner$HelperTestRunner$1.evaluate(RobolectricTestRunner.java:524)
	at org.robolectric.internal.SandboxTestRunner.executeInSandbox(SandboxTestRunner.java:494)
	at org.robolectric.internal.SandboxTestRunner.access$900(SandboxTestRunner.java:67)
	at org.robolectric.internal.SandboxTestRunner$7.evaluate(SandboxTestRunner.java:442)
	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
	at org.robolectric.internal.SandboxTestRunner.access$600(SandboxTestRunner.java:67)
	at org.robolectric.internal.SandboxTestRunner$6.evaluate(SandboxTestRunner.java:333)
	at org.robolectric.internal.SandboxTestRunner$3.evaluate(SandboxTestRunner.java:233)
	at org.robolectric.internal.SandboxTestRunner$5.lambda$evaluate$0(SandboxTestRunner.java:317)
	at org.robolectric.internal.bytecode.Sandbox.lambda$runOnMainThread$0(Sandbox.java:101)
	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
	at java.base/java.lang.Thread.run(Thread.java:1583)

To view more test analytics, go to the Test Analytics Dashboard
_{📋 Got 3 mins? Take this short survey to help us improve Test Analytics.}

github-actions Bot added enhancement New feature or request repo Repository maintenance labels May 20, 2026

jamesarich force-pushed the jamesarich/issue-5543-alignment-reorder-bottom-navigation-tab-91d55d branch from 8d93427 to 072e57e Compare May 20, 2026 21:35

jamesarich added this pull request to the merge queue May 20, 2026

github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch May 20, 2026

jamesarich force-pushed the jamesarich/issue-5543-alignment-reorder-bottom-navigation-tab-91d55d branch from 072e57e to b2ca6d5 Compare May 20, 2026 22:14

jamesarich added this pull request to the merge queue May 20, 2026

github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch May 20, 2026

jamesarich force-pushed the jamesarich/issue-5543-alignment-reorder-bottom-navigation-tab-91d55d branch from b2ca6d5 to 323ffe7 Compare May 20, 2026 22:54

jamesarich merged commit ea85b90 into main May 20, 2026
7 checks passed

jamesarich deleted the jamesarich/issue-5543-alignment-reorder-bottom-navigation-tab-91d55d branch May 20, 2026 22:57

garthvh mentioned this pull request May 21, 2026

audits: May 2026 30-day update — Apple & Android PRs meshtastic/design#107

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

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

feat(nav): rename tab labels to canonical order#5551
jamesarich merged 1 commit into
mainfrom
jamesarich/issue-5543-alignment-reorder-bottom-navigation-tab-91d55d

jamesarich commented May 20, 2026

Uh oh!

github-actions Bot commented May 20, 2026 •

edited

Loading

Uh oh!

Uh oh!

codecov Bot commented May 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Uh oh!

Conversation

jamesarich commented May 20, 2026

Summary

Approach

Changes

Verification

Uh oh!

github-actions Bot commented May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📄 Docs staleness check — advisory

Uh oh!

Uh oh!

codecov Bot commented May 20, 2026

❌ 1 Tests Failed:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

github-actions Bot commented May 20, 2026 •

edited

Loading