Skip to content

Conversation

poliver
Copy link
Member

@poliver poliver commented Sep 17, 2025

Removes global top app bar in favor of local ones for the following screens. A new extension function NavDestination.hasGlobalAppBar() was added to Main.kt to exclude screens from global top app bar usage to support incremental migration. There are no visual changes. This should unblock #3010.

  • ConnectionsRoutes.Connections
  • ContactsRoutes.Contacts
  • MapRoutes.Map
  • NodeDetailRoutes.NodeMap
  • NodesRoutes.Nodes
  • NodesRoutes.NodeDetail
  • SettingsRoutes.Settings
Screen_recording_20250917_164852.webm

@poliver poliver requested a review from jamesarich September 17, 2025 20:49
Copy link
Collaborator

@jamesarich jamesarich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of nits - looks good 👍

},
)
}
}*/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this go away now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, removed here #3129

},
) { paddingValues ->
if (node != null) {
@Suppress("ViewModelForwarding")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably want to address this at some point and hoist appropriately.

Copy link
Member Author

@poliver poliver Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't introduced by this PR. I was actually starting on decoupling screens from UiViewModel, but I noticed some screens using UiViewModel.setTitle(). Global app bar seemed reasonable to tackle first.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds like a plan.

Copy link

codecov bot commented Sep 17, 2025

Codecov Report

❌ Patch coverage is 0% with 456 lines in your changes missing coverage. Please review.
✅ Project coverage is 0.09%. Comparing base (e4bfce0) to head (8b3f3b0).
⚠️ Report is 13 commits behind head on main.
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
.../com/geeksville/mesh/ui/settings/SettingsScreen.kt 0.00% 135 Missing ⚠️
...eeksville/mesh/ui/connections/ConnectionsScreen.kt 0.00% 129 Missing ⚠️
...i/connections/components/CurrentlyConnectedInfo.kt 0.00% 39 Missing ⚠️
...ain/java/com/geeksville/mesh/ui/node/NodeDetail.kt 0.00% 36 Missing ⚠️
...in/java/com/geeksville/mesh/ui/contact/Contacts.kt 0.00% 31 Missing ⚠️
...va/com/geeksville/mesh/navigation/MapNavigation.kt 0.00% 24 Missing ⚠️
app/src/main/java/com/geeksville/mesh/ui/Main.kt 0.00% 15 Missing ⚠️
...ain/java/com/geeksville/mesh/ui/node/NodeScreen.kt 0.00% 13 Missing ⚠️
.../com/geeksville/mesh/navigation/NodesNavigation.kt 0.00% 11 Missing ⚠️
...m/geeksville/mesh/navigation/SettingsNavigation.kt 0.00% 8 Missing ⚠️
... and 5 more
Additional details and impacted files
@@           Coverage Diff            @@
##            main   #3132      +/-   ##
========================================
- Coverage   0.09%   0.09%   -0.01%     
========================================
  Files        322     322              
  Lines      21920   22026     +106     
  Branches    2537    2545       +8     
========================================
  Hits          21      21              
- Misses     21896   22002     +106     
  Partials       3       3              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@poliver poliver added enhancement New feature or request ui Something to do with the UI of the Android app labels Sep 17, 2025
@poliver poliver enabled auto-merge September 17, 2025 22:37
@poliver poliver added this pull request to the merge queue Sep 17, 2025
Merged via the queue into main with commit fed3ebb Sep 17, 2025
6 checks passed
@poliver poliver deleted the toplevel_appbar branch September 17, 2025 22:47
@poliver poliver added the modularization Related to project modularization label Sep 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request modularization Related to project modularization ui Something to do with the UI of the Android app
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants