Merge pull request #229 from meshtastic/2.0_Alpha_Launch

New tbeam images

Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "tbeam-2.jpg",
+      "filename" : "tbeam 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "tbeam-1.jpg",
+      "filename" : "tbeam 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tbeam.jpg",
+      "filename" : "tbeam.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "tbeam.jpg",
+      "filename" : "tbeam 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "tbeam-1.jpg",
+      "filename" : "tbeam 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tbeam-2.jpg",
+      "filename" : "tbeam.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Meshtastic/Views/ContentView.swift

@@ -30,45 +30,30 @@ struct ContentView: View {
 				Contacts()
 				.tabItem {
 					Label("Messages", systemImage: "message")
-						.symbolRenderingMode(.hierarchical)
-						.symbolVariant(.none)
-					
 				}
 				.tag(Tab.contacts)
 			}
 			Connect()
 				.tabItem {
 					Label("Bluetooth", systemImage: "antenna.radiowaves.left.and.right")
-						.symbolRenderingMode(.hierarchical)
-						.symbolVariant(.none)
 				}
 				.tag(Tab.ble)
 			NodeList()
 				.tabItem {
 					Label("Nodes", systemImage: "flipphone")
-						.symbolRenderingMode(.hierarchical)
-						.symbolVariant(.none)
 				}
 				.tag(Tab.nodes)
 			NodeMap()
 				.tabItem {
 					Label("Mesh Map", systemImage: "map")
-						.symbolRenderingMode(.hierarchical)
-						.symbolVariant(.none)
 				}
 				.tag(Tab.map)
 			Settings()
 				.tabItem {
 					Label("Settings", systemImage: "gear")
-						.symbolRenderingMode(.hierarchical)
-						.symbolVariant(.none)
 				}
 				.tag(Tab.settings)
-			
         }
-		.onAppear(
-		
-		)
     }
 }
 

Meshtastic/Views/Messages/ChannelMessageList.swift

@@ -106,7 +106,7 @@ struct ChannelMessageList: View {
 												}
 												if !currentUser {
 													VStack {
-														Text("SNR \(message.snr)")
+														Text("SNR \(String(format: "%.2f", message.snr)) dB")
 													}
 												}
 												if currentUser && message.receivedACK {
@@ -133,7 +133,7 @@ struct ChannelMessageList: View {
 												}
 												if message.ackSNR != 0 {
 													VStack {
-														Text("Ack SNR \(String(message.ackSNR))")
+														Text("Ack SNR\(String(format: "%.2f", message.ackSNR)) dB")
 															.font(.caption2)
 															.foregroundColor(.gray)
 													}

Meshtastic/Views/Messages/UserMessageList.swift

@@ -17,13 +17,12 @@ struct UserMessageList: View {
 	enum Field: Hashable {
 		case messageText
 	}
-	
 	// Keyboard State
 	@State var typingMessage: String = ""
 	@State private var totalBytes = 0
 	var maxbytes = 228
 	@FocusState var focusedField: Field?
-	
+	// View State Items
 	@ObservedObject var user: UserEntity
 	@State var showDeleteMessageAlert = false
 	@State private var deleteMessageId: Int64 = 0
@@ -108,7 +107,7 @@ struct UserMessageList: View {
 													}
 													if !currentUser {
 														VStack {
-															Text("SNR \(message.snr)")
+															Text("SNR \(String(format: "%.2f", message.snr)) dB")
 														}
 													}
 													if currentUser && message.receivedACK {
@@ -135,7 +134,7 @@ struct UserMessageList: View {
 													}
 													if message.ackSNR != 0 {
 														VStack {
-															Text("Ack SNR \(String(message.ackSNR))")
+															Text("Ack SNR\(String(format: "%.2f", message.ackSNR)) dB")
 																.font(.caption2)
 																.foregroundColor(.gray)
 														}
@@ -213,7 +212,6 @@ struct UserMessageList: View {
 										}
 									}, secondaryButton: .cancel())
 								}
-
 							}
 						}
 					}
@@ -264,23 +262,15 @@ struct UserMessageList: View {
 									let userLongName = bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown"
 									sendPositionWithMessage = true
 									if user.num == bleManager.broadcastNodeNum {
-										
 										if userSettings.meshtasticUsername.count > 0 {
-										
 											typingMessage =  "📍 " + userSettings.meshtasticUsername + " has shared their position with the mesh from node " + userLongName
 										} else {
-											
 											typingMessage =  "📍 " + userLongName + " has shared their position with the mesh."
 										}
-										
 									} else {
-										
 										if userSettings.meshtasticUsername.count > 0 {
-											
 											typingMessage =  "📍 " + userSettings.meshtasticUsername + " has shared their position with you from node " + userLongName
-											
 										} else {
-											
 											typingMessage =  "📍 " + userLongName + " has shared their position with you."
 										}
 									}
@@ -289,7 +279,6 @@ struct UserMessageList: View {
 										.symbolRenderingMode(.hierarchical)
 										.imageScale(.large).foregroundColor(.accentColor)
 								}
-
 								ProgressView("Bytes: \(totalBytes) / \(maxbytes)", value: Double(totalBytes), total: Double(maxbytes))
 									.frame(width: 130)
 									.padding(5)
@@ -301,9 +290,7 @@ struct UserMessageList: View {
 						.focused($focusedField, equals: .messageText)
 						.multilineTextAlignment(.leading)
 						.frame(minHeight: 50)
-
 					Text(typingMessage).opacity(0).padding(.all, 0)
-
 				}
 				.overlay(RoundedRectangle(cornerRadius: 20).stroke(.tertiary, lineWidth: 1))
 				.padding(.bottom, 15)

Meshtastic/Views/Nodes/NodeDetail.swift

@@ -104,7 +104,7 @@ struct NodeDetail: View {
 											.symbolRenderingMode(.hierarchical)
 											.padding(.bottom, 10)
 										Text("SNR").font(.largeTitle).fixedSize()
-										Text(String(node.snr))
+										Text("\(String(format: "%.2f", node.snr)) dB")
 											.font(.largeTitle)
 											.foregroundColor(.gray)
 											.fixedSize()
@@ -222,7 +222,7 @@ struct NodeDetail: View {
 											.foregroundColor(.accentColor)
 											.symbolRenderingMode(.hierarchical)
 										Text("SNR").font(.title2).fixedSize()
-										Text(String(node.snr))
+										Text("\(String(format: "%.2f", node.snr)) dB")
 											.font(.title2)
 											.foregroundColor(.gray)
 											.fixedSize()

Meshtastic/Views/Nodes/PositionLog.swift

@@ -47,7 +47,7 @@ struct PositionLog: View {
 						Text(String(position.heading))
 					}
 					TableColumn("SNR") { position in
-						Text(String(position.snr))
+						Text("\(String(format: "%.2f", position.snr)) dB")
 					}
 					TableColumn("Time Stamp") { position in
 						Text(position.time?.formattedDate(format: "MM/dd/yy hh:mm") ?? "Unknown time")