From c6965b28ce8fcd960a15990cb78c4b9dc104df73 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 27 Apr 2024 18:55:51 -0700 Subject: [PATCH] Remove power values from environment metrics add a little space to the user info in channel messages --- Meshtastic/Export/WriteCsvFile.swift | 6 +----- Meshtastic/Views/Messages/ChannelMessageList.swift | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Meshtastic/Export/WriteCsvFile.swift b/Meshtastic/Export/WriteCsvFile.swift index 396c00fe..1048846c 100644 --- a/Meshtastic/Export/WriteCsvFile.swift +++ b/Meshtastic/Export/WriteCsvFile.swift @@ -32,7 +32,7 @@ func telemetryToCsvFile(telemetry: [TelemetryEntity], metricsType: Int) -> Strin } } else if metricsType == 1 { // Create Environment Telemetry Header - csvString = "Temperature, Relative Humidity, Barometric Pressure, Indoor Air Quality, Gas Resistance, \("voltage".localized), \("current".localized), \("timestamp".localized)" + csvString = "Temperature, Relative Humidity, Barometric Pressure, Indoor Air Quality, Gas Resistance, \("timestamp".localized)" for dm in telemetry { if dm.metricsType == 1 { csvString += "\n" @@ -46,10 +46,6 @@ func telemetryToCsvFile(telemetry: [TelemetryEntity], metricsType: Int) -> Strin csvString += ", " csvString += String(dm.gasResistance) csvString += ", " - csvString += String(dm.voltage) - csvString += ", " - csvString += String(dm.current) - csvString += ", " csvString += dm.time?.formattedDate(format: dateFormatString) ?? "unknown.age".localized } } diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index da0d7c48..7d7a7962 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -58,10 +58,10 @@ struct ChannelMessageList: View { Text("\(message.fromUser?.longName ?? "unknown".localized ) (\(message.fromUser?.userId ?? "?"))") .font(.caption) .foregroundColor(.gray) - .offset(y: 5) + .offset(y: 8) } + HStack { - MessageText( message: message, tapBackDestination: .channel(channel), @@ -75,7 +75,7 @@ struct ChannelMessageList: View { RetryButton(message: message, destination: .channel(channel)) } } - + TapbackResponses(message: message) { appState.unreadChannelMessages = myInfo.unreadMessages UIApplication.shared.applicationIconBadgeNumber = appState.unreadChannelMessages + appState.unreadDirectMessages