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

fix: Make node details selectable (#4151)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2026-01-06 16:46:54 -06:00 • committed by GitHub
parent 8a026c2b88
commit 7d60c20dd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

60
feature/node/src/main/kotlin/org/meshtastic/feature/node/component/DeviceDetailsSection.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2025 Meshtastic LLC
* Copyright (c) 2025-2026 Meshtastic LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,7 +14,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.meshtastic.feature.node.component
import androidx.compose.foundation.background
@ -27,6 +26,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Router
import androidx.compose.material.icons.twotone.Verified
@ -72,36 +72,38 @@ fun DeviceDetailsSection(state: MetricsState, modifier: Modifier = Modifier) {
colors = CardDefaults.elevatedCardColors(containerColor = colorScheme.surfaceContainerHigh),
shape = MaterialTheme.shapes.extraLarge,
) {
Column(modifier = Modifier.padding(vertical = 16.dp)) {
Text(
text = stringResource(Res.string.device),
style = MaterialTheme.typography.titleMedium,
color = colorScheme.primary,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(horizontal = 16.dp),
)
SelectionContainer {
Column(modifier = Modifier.padding(vertical = 16.dp)) {
Text(
text = stringResource(Res.string.device),
style = MaterialTheme.typography.titleMedium,
color = colorScheme.primary,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(horizontal = 16.dp),
)
Spacer(modifier = Modifier.height(16.dp))
Spacer(modifier = Modifier.height(16.dp))
Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
DeviceAvatar(node.colors.second.toLong(), deviceHardware)
Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
DeviceAvatar(node.colors.second.toLong(), deviceHardware)
}
Spacer(modifier = Modifier.height(16.dp))
InsetDivider()
ListItem(
text = stringResource(Res.string.hardware),
leadingIcon = Icons.Default.Router,
supportingText = deviceHardware.displayName,
copyable = true,
trailingIcon = null,
)
InsetDivider()
SupportStatusItem(deviceHardware.activelySupported)
}
Spacer(modifier = Modifier.height(16.dp))
InsetDivider()
ListItem(
text = stringResource(Res.string.hardware),
leadingIcon = Icons.Default.Router,
supportingText = deviceHardware.displayName,
copyable = true,
trailingIcon = null,
)
InsetDivider()
SupportStatusItem(deviceHardware.activelySupported)
}
}
}

32
feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeDetailsSection.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2025 Meshtastic LLC
* Copyright (c) 2025-2026 Meshtastic LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,7 +14,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.meshtastic.feature.node.component
import androidx.compose.foundation.layout.Arrangement
@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.History
@ -69,22 +69,24 @@ fun NodeDetailsSection(node: Node, modifier: Modifier = Modifier) {
colors = CardDefaults.elevatedCardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh),
shape = MaterialTheme.shapes.extraLarge,
) {
Column(modifier = Modifier.padding(20.dp)) {
Text(
text = stringResource(Res.string.details),
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.primary,
fontWeight = FontWeight.Bold,
)
SelectionContainer {
Column(modifier = Modifier.padding(20.dp)) {
Text(
text = stringResource(Res.string.details),
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.primary,
fontWeight = FontWeight.Bold,
)
Spacer(Modifier.height(20.dp))
if (node.mismatchKey) {
MismatchKeyWarning()
Spacer(Modifier.height(20.dp))
}
MainNodeDetails(node)
if (node.mismatchKey) {
MismatchKeyWarning()
Spacer(Modifier.height(20.dp))
}
MainNodeDetails(node)
}
}
}
}