feat(ui): Refactor node position details into separate section (#3382)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

app/src/main/java/com/geeksville/mesh/model/EnvironmentMetricsState.kt

@@ -29,6 +29,7 @@ import org.meshtastic.core.ui.theme.GraphColors.Pink
 import org.meshtastic.core.ui.theme.GraphColors.Purple
 import org.meshtastic.core.ui.theme.GraphColors.Red
 import org.meshtastic.core.ui.theme.GraphColors.Yellow
+import org.meshtastic.feature.node.model.TimeFrame
 
 @Suppress("MagicNumber")
 enum class Environment(val color: Color) {
@@ -83,7 +84,7 @@ data class EnvironmentMetricsState(val environmentMetrics: List<TelemetryProtos.
     fun hasEnvironmentMetrics() = environmentMetrics.isNotEmpty()
 
     /**
-     * Filters [environmentMetrics] based on a [TimeFrame].
+     * Filters [environmentMetrics] based on a [org.meshtastic.feature.node.model.TimeFrame].
      *
      * @param timeFrame used to filter
      * @return [EnvironmentGraphingData]

app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt

@@ -19,21 +19,15 @@ package com.geeksville.mesh.model
 
 import android.app.Application
 import android.net.Uri
-import androidx.annotation.StringRes
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
-import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits
 import com.geeksville.mesh.CoroutineDispatchers
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.MeshProtos.MeshPacket
-import com.geeksville.mesh.MeshProtos.Position
 import com.geeksville.mesh.Portnums
 import com.geeksville.mesh.Portnums.PortNum
-import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.util.safeNumber
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -55,11 +49,9 @@ import org.meshtastic.core.data.repository.FirmwareReleaseRepository
 import org.meshtastic.core.data.repository.MeshLogRepository
 import org.meshtastic.core.data.repository.NodeRepository
 import org.meshtastic.core.data.repository.RadioConfigRepository
-import org.meshtastic.core.database.entity.FirmwareRelease
 import org.meshtastic.core.database.entity.MeshLog
 import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.model.DataPacket
-import org.meshtastic.core.model.DeviceHardware
 import org.meshtastic.core.navigation.NodesRoutes
 import org.meshtastic.core.prefs.map.MapPrefs
 import org.meshtastic.core.proto.toPosition
@@ -67,127 +59,18 @@ import org.meshtastic.core.service.ServiceAction
 import org.meshtastic.core.service.ServiceRepository
 import org.meshtastic.core.strings.R
 import org.meshtastic.feature.map.model.CustomTileSource
+import org.meshtastic.feature.node.model.MetricsState
+import org.meshtastic.feature.node.model.TimeFrame
 import timber.log.Timber
 import java.io.BufferedWriter
 import java.io.FileNotFoundException
 import java.io.FileWriter
 import java.text.SimpleDateFormat
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 private const val DEFAULT_ID_SUFFIX_LENGTH = 4
 
-data class MetricsState(
-    val isLocal: Boolean = false,
-    val isManaged: Boolean = true,
-    val isFahrenheit: Boolean = false,
-    val displayUnits: DisplayUnits = DisplayUnits.METRIC,
-    val node: Node? = null,
-    val deviceMetrics: List<Telemetry> = emptyList(),
-    val signalMetrics: List<MeshPacket> = emptyList(),
-    val powerMetrics: List<Telemetry> = emptyList(),
-    val hostMetrics: List<Telemetry> = emptyList(),
-    val tracerouteRequests: List<MeshLog> = emptyList(),
-    val tracerouteResults: List<MeshLog> = emptyList(),
-    val positionLogs: List<Position> = emptyList(),
-    val deviceHardware: DeviceHardware? = null,
-    val isLocalDevice: Boolean = false,
-    val firmwareEdition: MeshProtos.FirmwareEdition? = null,
-    val latestStableFirmware: FirmwareRelease = FirmwareRelease(),
-    val latestAlphaFirmware: FirmwareRelease = FirmwareRelease(),
-    val paxMetrics: List<MeshLog> = emptyList(),
-) {
-    fun hasDeviceMetrics() = deviceMetrics.isNotEmpty()
-
-    fun hasSignalMetrics() = signalMetrics.isNotEmpty()
-
-    fun hasPowerMetrics() = powerMetrics.isNotEmpty()
-
-    fun hasTracerouteLogs() = tracerouteRequests.isNotEmpty()
-
-    fun hasPositionLogs() = positionLogs.isNotEmpty()
-
-    fun hasHostMetrics() = hostMetrics.isNotEmpty()
-
-    fun hasPaxMetrics() = paxMetrics.isNotEmpty()
-
-    fun deviceMetricsFiltered(timeFrame: TimeFrame): List<Telemetry> {
-        val oldestTime = timeFrame.calculateOldestTime()
-        return deviceMetrics.filter { it.time >= oldestTime }
-    }
-
-    fun signalMetricsFiltered(timeFrame: TimeFrame): List<MeshPacket> {
-        val oldestTime = timeFrame.calculateOldestTime()
-        return signalMetrics.filter { it.rxTime >= oldestTime }
-    }
-
-    fun powerMetricsFiltered(timeFrame: TimeFrame): List<Telemetry> {
-        val oldestTime = timeFrame.calculateOldestTime()
-        return powerMetrics.filter { it.time >= oldestTime }
-    }
-
-    companion object {
-        val Empty = MetricsState()
-    }
-}
-
-/** Supported time frames used to display data. */
-@Suppress("MagicNumber")
-enum class TimeFrame(val seconds: Long, @StringRes val strRes: Int) {
-    TWENTY_FOUR_HOURS(TimeUnit.DAYS.toSeconds(1), R.string.twenty_four_hours),
-    FORTY_EIGHT_HOURS(TimeUnit.DAYS.toSeconds(2), R.string.forty_eight_hours),
-    ONE_WEEK(TimeUnit.DAYS.toSeconds(7), R.string.one_week),
-    TWO_WEEKS(TimeUnit.DAYS.toSeconds(14), R.string.two_weeks),
-    FOUR_WEEKS(TimeUnit.DAYS.toSeconds(28), R.string.four_weeks),
-    MAX(0L, R.string.max),
-    ;
-
-    fun calculateOldestTime(): Long = if (this == MAX) {
-        MAX.seconds
-    } else {
-        System.currentTimeMillis() / 1000 - this.seconds
-    }
-
-    /**
-     * The time interval to draw the vertical lines representing time on the x-axis.
-     *
-     * @return seconds epoch seconds
-     */
-    fun lineInterval(): Long = when (this.ordinal) {
-        TWENTY_FOUR_HOURS.ordinal -> TimeUnit.HOURS.toSeconds(6)
-
-        FORTY_EIGHT_HOURS.ordinal -> TimeUnit.HOURS.toSeconds(12)
-
-        ONE_WEEK.ordinal,
-        TWO_WEEKS.ordinal,
-        -> TimeUnit.DAYS.toSeconds(1)
-
-        else -> TimeUnit.DAYS.toSeconds(7)
-    }
-
-    /** Used to detect a significant time separation between [Telemetry]s. */
-    fun timeThreshold(): Long = when (this.ordinal) {
-        TWENTY_FOUR_HOURS.ordinal -> TimeUnit.HOURS.toSeconds(6)
-
-        FORTY_EIGHT_HOURS.ordinal -> TimeUnit.HOURS.toSeconds(12)
-
-        else -> TimeUnit.DAYS.toSeconds(1)
-    }
-
-    /**
-     * Calculates the needed [Dp] depending on the amount of time being plotted.
-     *
-     * @param time in seconds
-     */
-    fun dp(screenWidth: Int, time: Long): Dp {
-        val timePerScreen = this.lineInterval()
-        val multiplier = time / timePerScreen
-        val dp = (screenWidth * multiplier).toInt().dp
-        return dp.takeIf { it != 0.dp } ?: screenWidth.dp
-    }
-}
-
 private fun MeshPacket.hasValidSignal(): Boolean =
     rxTime > 0 && (rxSnr != 0f && rxRssi != 0) && (hopStart > 0 && hopStart - hopLimit == 0)
 

app/src/main/java/com/geeksville/mesh/ui/metrics/DeviceMetrics.kt

@@ -63,7 +63,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.TelemetryProtos
 import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT
 import com.geeksville.mesh.ui.metrics.CommonCharts.MAX_PERCENT_VALUE
 import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC
@@ -79,6 +78,7 @@ import org.meshtastic.core.ui.theme.AppTheme
 import org.meshtastic.core.ui.theme.GraphColors.Cyan
 import org.meshtastic.core.ui.theme.GraphColors.Green
 import org.meshtastic.core.ui.theme.GraphColors.Magenta
+import org.meshtastic.feature.node.model.TimeFrame
 
 private const val CHART_WEIGHT = 1f
 private const val Y_AXIS_WEIGHT = 0.1f

app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentCharts.kt

@@ -43,10 +43,10 @@ import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.model.Environment
 import com.geeksville.mesh.model.EnvironmentGraphingData
-import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.util.GraphUtil.createPath
 import com.geeksville.mesh.util.GraphUtil.drawPathWithGradient
 import org.meshtastic.core.strings.R
+import org.meshtastic.feature.node.model.TimeFrame
 
 private const val CHART_WEIGHT = 1f
 private const val Y_AXIS_WEIGHT = 0.1f

app/src/main/java/com/geeksville/mesh/ui/metrics/EnvironmentMetrics.kt

@@ -53,7 +53,6 @@ import com.geeksville.mesh.TelemetryProtos
 import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.copy
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT
 import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC
 import org.meshtastic.core.model.util.UnitConversions.celsiusToFahrenheit
@@ -63,6 +62,7 @@ import org.meshtastic.core.ui.component.IndoorAirQuality
 import org.meshtastic.core.ui.component.MainAppBar
 import org.meshtastic.core.ui.component.OptionLabel
 import org.meshtastic.core.ui.component.SlidingSelector
+import org.meshtastic.feature.node.model.TimeFrame
 
 @Composable
 fun EnvironmentMetricsScreen(viewModel: MetricsViewModel = hiltViewModel(), onNavigateUp: () -> Unit) {

app/src/main/java/com/geeksville/mesh/ui/metrics/PaxMetrics.kt

@@ -57,13 +57,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.PaxcountProtos
 import com.geeksville.mesh.Portnums.PortNum
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.model.TimeFrame
 import org.meshtastic.core.database.entity.MeshLog
 import org.meshtastic.core.model.util.formatUptime
 import org.meshtastic.core.strings.R
 import org.meshtastic.core.ui.component.MainAppBar
 import org.meshtastic.core.ui.component.OptionLabel
 import org.meshtastic.core.ui.component.SlidingSelector
+import org.meshtastic.feature.node.model.TimeFrame
 import java.text.DateFormat
 import java.util.Date
 

app/src/main/java/com/geeksville/mesh/ui/metrics/PowerMetrics.kt

@@ -62,7 +62,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT
 import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC
 import com.geeksville.mesh.util.GraphUtil
@@ -73,6 +72,7 @@ import org.meshtastic.core.ui.component.OptionLabel
 import org.meshtastic.core.ui.component.SlidingSelector
 import org.meshtastic.core.ui.theme.GraphColors.InfantryBlue
 import org.meshtastic.core.ui.theme.GraphColors.Red
+import org.meshtastic.feature.node.model.TimeFrame
 import kotlin.math.ceil
 import kotlin.math.floor
 

app/src/main/java/com/geeksville/mesh/ui/metrics/SignalMetrics.kt

@@ -59,7 +59,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.MeshProtos.MeshPacket
 import com.geeksville.mesh.model.MetricsViewModel
-import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.ui.metrics.CommonCharts.DATE_TIME_FORMAT
 import com.geeksville.mesh.ui.metrics.CommonCharts.MS_PER_SEC
 import com.geeksville.mesh.util.GraphUtil.plotPoint
@@ -69,6 +68,7 @@ import org.meshtastic.core.ui.component.MainAppBar
 import org.meshtastic.core.ui.component.OptionLabel
 import org.meshtastic.core.ui.component.SlidingSelector
 import org.meshtastic.core.ui.component.SnrAndRssi
+import org.meshtastic.feature.node.model.TimeFrame
 
 @Suppress("MagicNumber")
 private enum class Metric(val color: Color, val min: Float, val max: Float) {

app/src/main/java/com/geeksville/mesh/ui/node/NodeDetailList.kt

@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2025 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 com.geeksville.mesh.ui.node
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import com.geeksville.mesh.ui.sharing.SharedContactDialog
+import org.meshtastic.core.database.entity.FirmwareRelease
+import org.meshtastic.core.database.model.Node
+import org.meshtastic.core.strings.R
+import org.meshtastic.core.ui.component.TitledCard
+import org.meshtastic.core.ui.component.preview.NodePreviewParameterProvider
+import org.meshtastic.core.ui.theme.AppTheme
+import org.meshtastic.feature.node.component.AdministrationSection
+import org.meshtastic.feature.node.component.DeviceActions
+import org.meshtastic.feature.node.component.DeviceDetailsSection
+import org.meshtastic.feature.node.component.FirmwareReleaseSheetContent
+import org.meshtastic.feature.node.component.MetricsSection
+import org.meshtastic.feature.node.component.NodeDetailsSection
+import org.meshtastic.feature.node.component.NotesSection
+import org.meshtastic.feature.node.component.PositionSection
+import org.meshtastic.feature.node.model.LogsType
+import org.meshtastic.feature.node.model.MetricsState
+import org.meshtastic.feature.node.model.NodeDetailAction
+
+@Composable
+fun NodeDetailContent(
+    node: Node,
+    ourNode: Node?,
+    metricsState: MetricsState,
+    lastTracerouteTime: Long?,
+    availableLogs: Set<LogsType>,
+    onAction: (NodeDetailAction) -> Unit,
+    onSaveNotes: (nodeNum: Int, notes: String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var showShareDialog by remember { mutableStateOf(false) }
+    if (showShareDialog) {
+        SharedContactDialog(node) { showShareDialog = false }
+    }
+
+    NodeDetailList(
+        node = node,
+        lastTracerouteTime = lastTracerouteTime,
+        ourNode = ourNode,
+        metricsState = metricsState,
+        onAction = { action ->
+            if (action is NodeDetailAction.ShareContact) {
+                showShareDialog = true
+            } else {
+                onAction(action)
+            }
+        },
+        modifier = modifier,
+        availableLogs = availableLogs,
+        onSaveNotes = onSaveNotes,
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun NodeDetailList(
+    node: Node,
+    lastTracerouteTime: Long?,
+    ourNode: Node?,
+    metricsState: MetricsState,
+    onAction: (NodeDetailAction) -> Unit,
+    availableLogs: Set<LogsType>,
+    onSaveNotes: (Int, String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var showFirmwareSheet by remember { mutableStateOf(false) }
+    var selectedFirmware by remember { mutableStateOf<FirmwareRelease?>(null) }
+
+    if (showFirmwareSheet) {
+        val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
+        ModalBottomSheet(onDismissRequest = { showFirmwareSheet = false }, sheetState = sheetState) {
+            selectedFirmware?.let { FirmwareReleaseSheetContent(firmwareRelease = it) }
+        }
+    }
+
+    Column(
+        modifier = modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        if (metricsState.deviceHardware != null) {
+            TitledCard(title = stringResource(R.string.device)) { DeviceDetailsSection(metricsState) }
+        }
+
+        NodeDetailsSection(node)
+        NotesSection(node = node, onSaveNotes = onSaveNotes)
+
+        DeviceActions(
+            isLocal = metricsState.isLocal,
+            lastTracerouteTime = lastTracerouteTime,
+            node = node,
+            onAction = onAction,
+        )
+
+        PositionSection(
+            node = node,
+            ourNode = ourNode,
+            metricsState = metricsState,
+            availableLogs = availableLogs,
+            onAction = onAction,
+        )
+
+        MetricsSection(node, metricsState, availableLogs, onAction)
+
+        if (!metricsState.isManaged) {
+            AdministrationSection(
+                node = node,
+                metricsState = metricsState,
+                onAction = onAction,
+                onFirmwareSelect = { firmware ->
+                    selectedFirmware = firmware
+                    showFirmwareSheet = true
+                },
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun NodeDetailsPreview(@PreviewParameter(NodePreviewParameterProvider::class) node: Node) {
+    AppTheme {
+        NodeDetailList(
+            node = node,
+            ourNode = node,
+            lastTracerouteTime = null,
+            metricsState = MetricsState.Companion.Empty,
+            availableLogs = emptySet(),
+            onAction = {},
+            onSaveNotes = { _, _ -> },
+        )
+    }
+}