Remove some duplicate logic

meshtastic · Aug 5, 2024 · 30f1115 · 30f1115
1 parent ce65d07
commit 30f1115
Showing 1 changed file with 27 additions and 29 deletions.
diff --git a/Meshtastic/Views/Helpers/LoRaSignalStrength.swift b/Meshtastic/Views/Helpers/LoRaSignalStrength.swift
@@ -14,36 +14,34 @@ struct LoRaSignalStrengthMeter: View {
 	var compact: Bool
 	var body: some View {
 
-		if snr != 0.0 && rssi != 0 {
-			let signalStrength = getLoRaSignalStrength(snr: snr, rssi: rssi, preset: preset)
-			let gradient = Gradient(colors: [.red, .orange, .yellow, .green])
-			if !compact {
-				VStack {
-					LoRaSignalStrengthIndicator(signalStrength: signalStrength)
-					Text("Signal \(signalStrength.description)").font(.footnote)
-					Text("SNR \(String(format: "%.2f", snr))dB")
-						.foregroundColor(getSnrColor(snr: snr, preset: ModemPresets.longFast))
-						.font(.caption2)
-					Text("RSSI \(rssi)dB")
-						.foregroundColor(getRssiColor(rssi: rssi))
-						.font(.caption2)
-				}
-			} else {
-				VStack {
-					Gauge(value: Double(signalStrength.rawValue), in: 0...3) {
-					} currentValueLabel: {
-						Image(systemName: "dot.radiowaves.left.and.right")
-							.font(.callout)
-							.frame(width: 30)
-						Text("Signal \(signalStrength.description)")
-							.font(UIDevice.current.userInterfaceIdiom == .phone ? .callout : .caption)
-							.foregroundColor(.gray)
-							.fixedSize()
-					}
-					.gaugeStyle(.accessoryLinear)
-					.tint(gradient)
-					.font(.caption)
+		let signalStrength = getLoRaSignalStrength(snr: snr, rssi: rssi, preset: preset)
+		let gradient = Gradient(colors: [.red, .orange, .yellow, .green])
+		if !compact {
+			VStack {
+				LoRaSignalStrengthIndicator(signalStrength: signalStrength)
+				Text("Signal \(signalStrength.description)").font(.footnote)
+				Text("SNR \(String(format: "%.2f", snr))dB")
+					.foregroundColor(getSnrColor(snr: snr, preset: ModemPresets.longFast))
+					.font(.caption2)
+				Text("RSSI \(rssi)dB")
+					.foregroundColor(getRssiColor(rssi: rssi))
+					.font(.caption2)
+			}
+		} else {
+			VStack {
+				Gauge(value: Double(signalStrength.rawValue), in: 0...3) {
+				} currentValueLabel: {
+					Image(systemName: "dot.radiowaves.left.and.right")
+						.font(.callout)
+						.frame(width: 30)
+					Text("Signal \(signalStrength.description)")
+						.font(UIDevice.current.userInterfaceIdiom == .phone ? .callout : .caption)
+						.foregroundColor(.gray)
+						.fixedSize()
 				}
+				.gaugeStyle(.accessoryLinear)
+				.tint(gradient)
+				.font(.caption)
 			}
 		}
 	}