mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-03-28 10:42:31 -04:00
02ea30d665
This commit refactors the navigation logic across `feature:node` and `feature:messaging` to use more robust backstack manipulation helpers and decouple screen implementations from navigation parameters.
Specific changes include:
- **Navigation Helpers**: Added `replaceLast` and `replaceAll` extensions to `MutableList<NavKey>` in `core:navigation` to allow more granular control over backstack mutations while minimizing structural changes.
- **Node Feature**:
- Updated `NodesRoutes.NodeDetail` entry to directly instantiate `NodeDetailViewModel` and `CompassViewModel` using Koin, removing the reliance on `AdaptiveNodeListScreen` for detail rendering.
- Simplified `AdaptiveNodeListScreen` by removing unused navigation and initialization parameters.
- **Messaging Feature**:
- Refactored `ContactsRoutes.Messages` entry to handle ViewModel lifecycle and contact key initialization directly within the navigation graph.
- Updated `ShareScreen` to use the new `replaceLast` helper for smoother transitions to message screens.
- Simplified `AdaptiveContactsScreen` and `ContactsEntryContent` by removing unused `detailPaneCustom` and initialization logic.
- **Deep Linking**: Updated `MeshtasticAppShell` to use `backStack.replaceAll(navKeys)` when handling deep links, ensuring a cleaner backstack state transition.
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
:core:ui
Overview
The :core:ui module contains shared Jetpack Compose components, themes, and utility functions used across the entire Meshtastic Android application. It ensures a consistent look and feel following Material 3 guidelines.
Key Components
1. Alert Dialogs (org.meshtastic.core.ui.component.AlertDialogs.kt)
MeshtasticDialog: The base dialog component for all alerts.MeshtasticResourceDialog: Optimized for dialogs with resource-only content.MeshtasticTextDialog: Optimized for dialogs with mixed resource and raw text content.
2. Common UI Elements
LastHeardInfo: Displays when a node was last seen.TelemetryInfo: Displays battery, voltage, and other telemetry data.TransportIcon: Shows the connection type (BLE, USB, TCP).MainAppBar: The standard top app bar used in the app.
3. Preferences
Standardized Material 3 preference components for settings screens:
RegularPreferenceSwitchPreferenceDropDownPreferenceSliderPreferenceEditTextPreference
4. Utilities
ModifierExtensions.kt: Useful Compose Modifiers (e.g., conditional modifiers).ProtoExtensions.kt: Extensions for mapping Protobuf models to UI-friendly strings or icons.
Usage
Most components are designed to be used with the Compose Multiplatform Resource library for strings.
import org.meshtastic.core.ui.component.MeshtasticResourceDialog
import org.meshtastic.core.resources.Res
import org.meshtastic.core.resources.ok
MeshtasticResourceDialog(
title = Res.string.your_title,
message = Res.string.your_message,
onDismissRequest = { /* ... */ },
confirmButtonText = Res.string.ok
)
Module dependency graph
graph TB
:core:ui[ui]:::kmp-library-compose
classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
classDef android-application-compose fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
classDef compose-desktop-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
classDef android-feature fill:#FFD6A5,stroke:#000,stroke-width:2px,color:#000;
classDef android-library fill:#9BF6FF,stroke:#000,stroke-width:2px,color:#000;
classDef android-library-compose fill:#9BF6FF,stroke:#000,stroke-width:2px,color:#000;
classDef android-test fill:#A0C4FF,stroke:#000,stroke-width:2px,color:#000;
classDef jvm-library fill:#BDB2FF,stroke:#000,stroke-width:2px,color:#000;
classDef kmp-feature fill:#FFD6A5,stroke:#000,stroke-width:2px,color:#000;
classDef kmp-library-compose fill:#FFC1CC,stroke:#000,stroke-width:2px,color:#000;
classDef kmp-library fill:#FFC1CC,stroke:#000,stroke-width:2px,color:#000;
classDef unknown fill:#FFADAD,stroke:#000,stroke-width:2px,color:#000;