From 723ee251089fb806cfc61ccea66d78bbd27d2418 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 12 Jul 2024 12:27:18 -0700 Subject: [PATCH] Hide humidity, pressure and wind weather widgets if the value is <= 0 --- Meshtastic/Views/Nodes/Helpers/NodeDetail.swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift index 5d312641..2af664ab 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift @@ -169,9 +169,15 @@ struct NodeDetail: View { .padding(.vertical) LazyVGrid(columns: gridItemLayout) { WeatherConditionsCompactWidget(temperature: String(node.latestEnvironmentMetrics?.temperature.shortFormattedTemperature() ?? "99°"), symbolName: "cloud.sun", description: "TEMP") - HumidityCompactWidget(humidity: Int(node.latestEnvironmentMetrics?.relativeHumidity ?? 0.0), dewPoint: String(format: "%.0f", calculateDewPoint(temp: node.latestEnvironmentMetrics?.temperature ?? 0.0, relativeHumidity: node.latestEnvironmentMetrics?.relativeHumidity ?? 0.0)) + "°") - PressureCompactWidget(pressure: String(format: "%.2f", node.latestEnvironmentMetrics?.barometricPressure ?? 0.0), unit: "mbar", low: node.latestEnvironmentMetrics?.barometricPressure ?? 0.0 <= 1009.144) // hectopascal - WindCompactWidget(speed: String(node.latestEnvironmentMetrics?.windSpeed ?? 0.0), gust: String(node.latestEnvironmentMetrics?.windGust ?? 0.0), direction: "") + if node.latestEnvironmentMetrics?.relativeHumidity ?? 0.0 > 0.0 { + HumidityCompactWidget(humidity: Int(node.latestEnvironmentMetrics?.relativeHumidity ?? 0.0), dewPoint: String(format: "%.0f", calculateDewPoint(temp: node.latestEnvironmentMetrics?.temperature ?? 0.0, relativeHumidity: node.latestEnvironmentMetrics?.relativeHumidity ?? 0.0)) + "°") + } + if node.latestEnvironmentMetrics?.barometricPressure ?? 0.0 > 0.0 { + PressureCompactWidget(pressure: String(format: "%.2f", node.latestEnvironmentMetrics?.barometricPressure ?? 0.0), unit: "mbar", low: node.latestEnvironmentMetrics?.barometricPressure ?? 0.0 <= 1009.144) + } + if node.latestEnvironmentMetrics?.windSpeed ?? 0.0 > 0.0 { + WindCompactWidget(speed: String(node.latestEnvironmentMetrics?.windSpeed ?? 0.0), gust: String(node.latestEnvironmentMetrics?.windGust ?? 0.0), direction: "") + } } .padding(.bottom) }