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

feat: Add request metadata action to NodeDetail (#1896)

Browse source
This commit is contained in:
James Rich 2025-05-21 10:50:33 -05:00 • committed by GitHub
parent 6fa329751d
commit 0057a6f2de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 52 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

49
app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt
View file

@ -98,6 +98,7 @@ import com.geeksville.mesh.model.Node
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.model.isUnmessageableRole
import com.geeksville.mesh.navigation.Route
import com.geeksville.mesh.service.ServiceAction
import com.geeksville.mesh.ui.components.PreferenceCategory
import com.geeksville.mesh.ui.preview.NodePreviewParameterProvider
import com.geeksville.mesh.ui.radioconfig.NavCard
@ -158,7 +159,12 @@ fun NodeDetailScreen(
NodeDetailList(
node = node,
metricsState = state,
onNavigate = onNavigate,
onAction = { action ->
when (action) {
is Route -> onNavigate(action)
is ServiceAction -> viewModel.onServiceAction(action)
}
},
modifier = modifier,
metricsAvailability = availabilities,
onShared = {
@ -181,7 +187,7 @@ private fun NodeDetailList(
modifier: Modifier = Modifier,
node: Node,
metricsState: MetricsState,
onNavigate: (Route) -> Unit = {},
onAction: (Any) -> Unit = {},
metricsAvailability: BooleanArray,
onShared: () -> Unit = {}
) {
@ -203,11 +209,11 @@ private fun NodeDetailList(
}
item {
NavCard(
title = stringResource(id = R.string.share_contact),
icon = Icons.Default.Share,
enabled = true,
onClick = onShared
DeviceActions(
isLocal = metricsState.isLocal,
node = node,
onShared = onShared,
onAction = onAction
)
}
@ -236,7 +242,7 @@ private fun NodeDetailList(
icon = type.icon,
enabled = metricsAvailability[type.ordinal]
) {
onNavigate(type.route)
onAction(type.route)
}
}
}
@ -249,7 +255,7 @@ private fun NodeDetailList(
icon = Icons.Default.Settings,
enabled = true
) {
onNavigate(Route.RadioConfig(node.num))
onAction(Route.RadioConfig(node.num))
}
}
}
@ -282,6 +288,31 @@ private fun NodeDetailRow(
}
}
@Composable
private fun DeviceActions(
isLocal: Boolean = false,
node: Node,
onShared: () -> Unit,
onAction: (ServiceAction) -> Unit,
) {
PreferenceCategory(text = stringResource(R.string.actions))
NavCard(
title = stringResource(id = R.string.share_contact),
icon = Icons.Default.Share,
enabled = true,
onClick = onShared
)
if (!isLocal) {
NavCard(
title = stringResource(id = R.string.request_metadata),
icon = Icons.Default.Memory,
enabled = true,
onClick = { onAction(ServiceAction.GetDeviceMetadata(node.num)) }
)
}
}
@Composable
private fun DeviceDetailsContent(
state: MetricsState,