From 43561cabe952747aed23504a2f958b24b8608154 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Sun, 22 Dec 2024 03:56:40 -0600 Subject: [PATCH] refactor: Improve device details layout (#1489) - Device details section visible only if device hardware is available. - Added spacing between icon, label, and value in node details rows. - Right-aligned the values in node details rows for better readability. --- .../main/java/com/geeksville/mesh/ui/NodeDetail.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt b/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt index ac7165273..250b3795e 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt @@ -140,9 +140,11 @@ private fun NodeDetailList( modifier = modifier.fillMaxSize(), contentPadding = PaddingValues(horizontal = 16.dp), ) { - item { - PreferenceCategory("Device") { - DeviceDetailsContent(metricsState) + if (metricsState.deviceHardware != null) { + item { + PreferenceCategory("Device") { + DeviceDetailsContent(metricsState) + } } } item { @@ -198,7 +200,8 @@ private fun NodeDetailRow( modifier = Modifier .fillMaxWidth() .padding(vertical = 8.dp), - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) ) { Icon( imageVector = icon, @@ -206,10 +209,9 @@ private fun NodeDetailRow( modifier = Modifier.size(24.dp), tint = iconTint ) - Spacer(modifier = Modifier.width(8.dp)) Text(label) Spacer(modifier = Modifier.weight(1f)) - Text(value) + Text(textAlign = TextAlign.End, text = value) } }