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/node notes (#3014)

Browse source
This commit is contained in:
DaneEvans 2025-09-09 07:37:56 +10:00 • committed by GitHub
parent 363764c5ce
commit f2680d37ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 889 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,6 +91,7 @@ import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MaterialTheme.colorScheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
@ -331,9 +332,35 @@ private fun NodeDetailContent(
},
modifier = modifier,
availableLogs = availableLogs,
onSaveNotes = { num, notes -> uiViewModel.setNodeNotes(num, notes) },
)
}
@Composable
private fun notesSection(node: Node, onSaveNotes: (Int, String) -> Unit) {
if (node.isFavorite) {
TitledCard(title = stringResource(R.string.notes)) {
val originalNotes = node.notes
var notes by remember(node.notes) { mutableStateOf(node.notes) }
OutlinedTextField(
value = notes,
onValueChange = { notes = it },
modifier = Modifier.fillMaxWidth(),
placeholder = { Text(stringResource(id = R.string.add_a_note)) },
)
Spacer(modifier = Modifier.height(8.dp))
val edited = notes.trim() != originalNotes.trim()
if (edited) {
NodeActionButton(
title = stringResource(id = R.string.save),
enabled = true,
onClick = { onSaveNotes(node.num, notes.trim()) },
)
}
}
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun NodeDetailList(
@ -344,6 +371,7 @@ private fun NodeDetailList(
metricsState: MetricsState,
onAction: (NodeDetailAction) -> Unit,
availableLogs: Set<LogsType>,
onSaveNotes: (Int, String) -> Unit,
) {
var showFirmwareSheet by remember { mutableStateOf(false) }
var selectedFirmware by remember { mutableStateOf<FirmwareRelease?>(null) }
@ -369,6 +397,7 @@ private fun NodeDetailList(
TitledCard(title = stringResource(R.string.details)) {
NodeDetailsContent(node, ourNode, metricsState.displayUnits)
}
notesSection(node = node, onSaveNotes = onSaveNotes)
DeviceActions(
isLocal = metricsState.isLocal,
@ -1067,6 +1096,7 @@ private fun NodeDetailsPreview(@PreviewParameter(NodePreviewParameterProvider::c
metricsState = MetricsState.Empty,
availableLogs = emptySet(),
onAction = {},
onSaveNotes = { _, _ -> },
)
}
}