meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #775 from meshtastic/2.3.16

Browse source 
2.3.16 Specific Updates
This commit is contained in:
Garth Vander Houwen 2024-07-09 18:32:52 -07:00 • committed by GitHub
commit 9db0dc81c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Meshtastic/MeshtasticApp.swift
View file

@ -40,11 +40,18 @@ struct MeshtasticAppleApp: App {
if (self.incomingUrl?.absoluteString.lowercased().contains("meshtastic.org/e/#")) != nil {
if let components = self.incomingUrl?.absoluteString.components(separatedBy: "#") {
guard let cs = components.last!.components(separatedBy: "?").first else {
return
}
self.channelSettings = cs
self.addChannels = Bool(self.incomingUrl?["add"] ?? "false") ?? false
if ((self.incomingUrl?.absoluteString.lowercased().contains("?")) != nil) {
guard let cs = components.last!.components(separatedBy: "?").first else {
return
}
self.channelSettings = cs
} else {
guard let cs = components.first else {
return
}
self.channelSettings = cs
}
Logger.services.debug("Add Channel \(self.addChannels)")
}
self.saveChannels = true
@ -60,7 +67,19 @@ struct MeshtasticAppleApp: App {
self.incomingUrl = url
if url.absoluteString.lowercased().contains("meshtastic.org/e/#") {
if let components = self.incomingUrl?.absoluteString.components(separatedBy: "#") {
self.channelSettings = components.last!
self.addChannels = Bool(self.incomingUrl?["add"] ?? "false") ?? false
if ((self.incomingUrl?.absoluteString.lowercased().contains("?")) != nil) {
guard let cs = components.last!.components(separatedBy: "?").first else {
return
}
self.channelSettings = cs
} else {
guard let cs = components.first else {
return
}
self.channelSettings = cs
}
Logger.services.debug("Add Channel \(self.addChannels)")
}
self.saveChannels = true
Logger.mesh.debug("User wants to open a Channel Settings URL: \(self.incomingUrl?.absoluteString ?? "No QR Code Link")")

3
Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
View file

@ -61,13 +61,14 @@ struct NodeInfoItem: View {
.foregroundColor(getRssiColor(rssi: node.rssi))
.font(.caption2)
}
.frame(minWidth: 90, maxWidth: 180)
}
if node.telemetries?.count ?? 0 > 0 {
BatteryGauge(node: node)
.padding()
}
Spacer()
}
.padding(.leading)
}
}

2
Meshtastic/Views/Settings/ShareChannels.swift
View file

@ -319,7 +319,7 @@ struct ShareChannels: View {
guard let settingsString = try? channelSet.serializedData().base64EncodedString() else {
return
}
channelsUrl = ("https://meshtastic.org/e/#" + settingsString.base64ToBase64url() + (replaceChannels ? "" : "?add=true"))
channelsUrl = ("https://meshtastic.org/e/\(replaceChannels ? "" : "?add=true")#" + settingsString.base64ToBase64url())
}
}
}