From 77739ce0f17e260bdbaa152d2fb0fee5d688a46d Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 3 Aug 2024 16:11:11 -0700 Subject: [PATCH 1/3] Remove padding from node hardware battery indicator, bump rssi and snr font back up to caption --- Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift index e1626b6b..b7fee092 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift @@ -32,11 +32,11 @@ struct NodeInfoItem: View { Image(user.hardwareImage ?? "UNSET") .resizable() .aspectRatio(contentMode: .fit) - .frame(width: 75, height: 75) + .frame(width: 65, height: 65) .cornerRadius(5) Text(String(node.user!.hwModel ?? "unset".localized)) .font(.caption2) - .frame(maxWidth: 100) + .frame(maxWidth: 80) } else { Image(systemName: "person.crop.circle.badge.questionmark") .resizable() @@ -57,20 +57,18 @@ struct NodeInfoItem: View { Text("Signal \(signalStrength.description)").font(.footnote) Text("SNR \(String(format: "%.2f", node.snr))dB") .foregroundColor(getSnrColor(snr: node.snr, preset: modemPreset)) - .font(.caption2) + .font(.caption) Text("RSSI \(node.rssi)dB") .foregroundColor(getRssiColor(rssi: node.rssi)) - .font(.caption2) + .font(.caption) } - .frame(minWidth: 100, maxWidth: 140) + .frame(minWidth: 110, maxWidth: 175) } if node.telemetries?.count ?? 0 > 0 { BatteryGauge(node: node) - .padding() } Spacer() } - .padding(.leading) } } From e4470375dce93a64de3fc7dfcca045bcda77fbef Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 3 Aug 2024 16:14:18 -0700 Subject: [PATCH 2/3] Bump version --- Meshtastic.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index dca5ef1c..8e478691 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -1600,7 +1600,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4.1; + MARKETING_VERSION = 2.4.2; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1635,7 +1635,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4.1; + MARKETING_VERSION = 2.4.2; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1667,7 +1667,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.1; + MARKETING_VERSION = 2.4.2; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1700,7 +1700,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.1; + MARKETING_VERSION = 2.4.2; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; From 829f1f8a256a6fcd7ee700a6b805880d0e762bc3 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 3 Aug 2024 18:52:25 -0700 Subject: [PATCH 3/3] Smaller snr font --- Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift index b7fee092..1355ce57 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift @@ -57,7 +57,7 @@ struct NodeInfoItem: View { Text("Signal \(signalStrength.description)").font(.footnote) Text("SNR \(String(format: "%.2f", node.snr))dB") .foregroundColor(getSnrColor(snr: node.snr, preset: modemPreset)) - .font(.caption) + .font(.caption2) Text("RSSI \(node.rssi)dB") .foregroundColor(getRssiColor(rssi: node.rssi)) .font(.caption)