Skip to content

refactor(node): migrate to non-deprecated Vico chart APIs #5737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesarich merged 1 commit into from
Jun 3, 2026
Merged

refactor(node): migrate to non-deprecated Vico chart APIs #5737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/BaseMetricChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fun GenericMetricChart(
// x-step, Vico computes the GCD of consecutive x-value differences which can
// be as small as 1 second, making the chart logically enormous. A 60-second
// floor keeps the internal slot count reasonable for any practical interval.
getXStep = { model -> maxOf(model.getXDeltaGcd(), MIN_X_STEP_SECONDS) },
getXStep = { model, _, _ -> maxOf(model.getXDeltaGcd(), MIN_X_STEP_SECONDS) },
),
modelProducer = modelProducer,
modifier = modifier,
Expand Down
6 changes: 3 additions & 3 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/DeviceMetrics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import com.patrykandpatrick.vico.compose.cartesian.VicoScrollState
import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.CartesianLayerRangeProvider
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import com.patrykandpatrick.vico.compose.cartesian.rememberVicoScrollState
import org.jetbrains.compose.resources.stringResource
Expand Down Expand Up @@ -274,7 +274,7 @@ private fun DeviceMetricsChart(
modelProducer.runTransaction {
/* Series for Left Axis (0-100%) */
if (leftLayerSeriesStyles.isNotEmpty()) {
lineSeries {
lineModel {
if (batteryData.isNotEmpty()) {
series(
x = batteryData.map { it.time },
Expand All @@ -297,7 +297,7 @@ private fun DeviceMetricsChart(
}
/* Series for Right Axis (Voltage) */
if (voltageData.isNotEmpty()) {
lineSeries {
lineModel {
series(
x = voltageData.map { it.time },
y = voltageData.map { it.device_metrics?.voltage ?: 0f },
Expand Down
6 changes: 3 additions & 3 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/EnvironmentCharts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.CartesianChartModelProducer
import com.patrykandpatrick.vico.compose.cartesian.data.CartesianLayerRangeProvider
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import com.patrykandpatrick.vico.compose.cartesian.layer.rememberLineCartesianLayer
import org.jetbrains.compose.resources.stringResource
Expand Down Expand Up @@ -205,7 +205,7 @@ fun EnvironmentMetricsChart(
modelProducer.runTransaction {
/* Pressure on its own layer/axis */
if (showPressure && pressureData.isNotEmpty()) {
lineSeries {
lineModel {
series(
x = pressureData.map { it.time },
y = pressureData.map { Environment.BAROMETRIC_PRESSURE.getValue(it)!! },
Expand All @@ -216,7 +216,7 @@ fun EnvironmentMetricsChart(
otherMetrics.forEach { metric ->
val metricData = otherMetricsData[metric] ?: emptyList()
if (metricData.isNotEmpty()) {
lineSeries {
lineModel {
series(x = metricData.map { it.time }, y = metricData.map { metric.getValue(it)!! })
}
}
Expand Down
6 changes: 3 additions & 3 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/HostMetricsChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import com.patrykandpatrick.vico.compose.cartesian.VicoScrollState
import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.CartesianLayerRangeProvider
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import org.meshtastic.core.common.util.formatString
import org.meshtastic.core.resources.Res
Expand Down Expand Up @@ -155,7 +155,7 @@ internal fun HostMetricsChart(
LaunchedEffect(chartData) {
modelProducer.runTransaction {
if (chartData.hasLoad) {
lineSeries {
lineModel {
if (load1Data.isNotEmpty()) {
series(x = load1Data.map { it.time }, y = load1Data.map { it.value })
}
Expand All @@ -168,7 +168,7 @@ internal fun HostMetricsChart(
}
}
if (memData.isNotEmpty()) {
lineSeries { series(x = memData.map { it.time }, y = memData.map { it.value }) }
lineModel { series(x = memData.map { it.time }, y = memData.map { it.value }) }
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PaxMetrics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.patrykandpatrick.vico.compose.cartesian.VicoScrollState
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.CartesianLayerRangeProvider
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import com.patrykandpatrick.vico.compose.cartesian.layer.rememberLineCartesianLayer
import org.jetbrains.compose.resources.StringResource
Expand Down Expand Up @@ -107,7 +107,7 @@ private fun PaxMetricsChart(

LaunchedEffect(totalSeries, bleSeries, wifiSeries) {
modelProducer.runTransaction {
lineSeries {
lineModel {
series(x = bleSeries.map { it.first }, y = bleSeries.map { it.second })
series(x = wifiSeries.map { it.first }, y = wifiSeries.map { it.second })
series(x = totalSeries.map { it.first }, y = totalSeries.map { it.second })
Expand Down
6 changes: 3 additions & 3 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PowerMetrics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.patrykandpatrick.vico.compose.cartesian.VicoScrollState
import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.stringResource
Expand Down Expand Up @@ -211,15 +211,15 @@ private fun PowerMetricsChart(
LaunchedEffect(selectedChannel, currentData, voltageData) {
modelProducer.runTransaction {
if (currentData.isNotEmpty()) {
lineSeries {
lineModel {
series(
x = currentData.map { it.time },
y = currentData.map { retrieveCurrent(selectedChannel, it) },
)
}
}
if (voltageData.isNotEmpty()) {
lineSeries {
lineModel {
series(
x = voltageData.map { it.time },
y = voltageData.map { retrieveVoltage(selectedChannel, it) },
Expand Down
8 changes: 4 additions & 4 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/SignalMetrics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.patrykandpatrick.vico.compose.cartesian.VicoScrollState
import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import org.meshtastic.core.common.util.DateFormatter
import org.meshtastic.core.common.util.MetricFormatter
Expand Down Expand Up @@ -143,11 +143,11 @@ private fun SignalMetricsChart(
LaunchedEffect(rssiData, snrData) {
modelProducer.runTransaction {
if (rssiData.isNotEmpty()) {
/* Use separate lineSeries calls to associate them with different vertical axes */
lineSeries { series(x = rssiData.map { it.rx_time }, y = rssiData.map { it.rx_rssi }) }
/* Use separate lineModel calls to associate them with different vertical axes */
lineModel { series(x = rssiData.map { it.rx_time }, y = rssiData.map { it.rx_rssi }) }
}
if (snrData.isNotEmpty()) {
lineSeries { series(x = snrData.map { it.rx_time }, y = snrData.map { it.rx_snr }) }
lineModel { series(x = snrData.map { it.rx_time }, y = snrData.map { it.rx_snr }) }
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/TracerouteChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import com.patrykandpatrick.vico.compose.cartesian.VicoScrollState
import com.patrykandpatrick.vico.compose.cartesian.axis.Axis
import com.patrykandpatrick.vico.compose.cartesian.axis.VerticalAxis
import com.patrykandpatrick.vico.compose.cartesian.data.CartesianLayerRangeProvider
import com.patrykandpatrick.vico.compose.cartesian.data.lineSeries
import com.patrykandpatrick.vico.compose.cartesian.data.lineModel
import com.patrykandpatrick.vico.compose.cartesian.layer.LineCartesianLayer
import org.meshtastic.core.common.util.formatString
import org.meshtastic.core.model.MeshLog
Expand Down Expand Up @@ -157,15 +157,15 @@ internal fun TracerouteMetricsChart(
LaunchedEffect(forwardData, returnData, rttData) {
modelProducer.runTransaction {
if (forwardData.isNotEmpty()) {
lineSeries {
lineModel {
series(x = forwardData.map { it.timeSeconds }, y = forwardData.map { it.forwardHops!! })
}
}
if (returnData.isNotEmpty()) {
lineSeries { series(x = returnData.map { it.timeSeconds }, y = returnData.map { it.returnHops!! }) }
lineModel { series(x = returnData.map { it.timeSeconds }, y = returnData.map { it.returnHops!! }) }
}
if (rttData.isNotEmpty()) {
lineSeries { series(x = rttData.map { it.timeSeconds }, y = rttData.map { it.roundTripSeconds!! }) }
lineModel { series(x = rttData.map { it.timeSeconds }, y = rttData.map { it.roundTripSeconds!! }) }
}
}
}
Expand Down