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

Finish migration away from global app bar (#3297)

Browse source
This commit is contained in:
Phil Oliver 2025-10-03 12:06:51 -04:00 • committed by GitHub
parent ee74d4700a
commit 47f3961f3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 563 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/google/java/com/geeksville/mesh/ui/node/NodeMapScreen.kt
View file

@ -26,7 +26,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavHostController
import com.geeksville.mesh.model.MetricsViewModel
import com.geeksville.mesh.ui.map.MapView
import com.geeksville.mesh.ui.map.NodeMapViewModel
@ -36,9 +35,9 @@ const val DEG_D = 1e-7
@Composable
fun NodeMapScreen(
navController: NavHostController,
metricsViewModel: MetricsViewModel = hiltViewModel(),
nodeMapViewModel: NodeMapViewModel = hiltViewModel(),
onNavigateUp: () -> Unit,
) {
val state by metricsViewModel.state.collectAsState()
val positions = state.positionLogs
@ -52,7 +51,7 @@ fun NodeMapScreen(
ourNode = ourNodeInfo,
showNodeChip = false,
canNavigateUp = true,
onNavigateUp = navController::navigateUp,
onNavigateUp = onNavigateUp,
actions = {},
onClickChip = {},
)