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 #911 from meshtastic/waypointform-drop-maps-pin

Browse source 
Waypointform drop maps pin
This commit is contained in:
Garth Vander Houwen 2024-09-02 22:26:32 -07:00 • committed by GitHub
commit ebdc9b058b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Localizable.xcstrings
View file

@ -6728,6 +6728,9 @@
},
"Drag & Drop is the recommended way to update firmware for NRF devices. If your iPhone or iPad is USB-C it will work with your regular USB-C charging cable, for lightning devices you need the Apple Lightning to USB camera adaptor." : {
},
"Drop Pin in Maps" : {
},
"echo" : {
"localizations" : {
@ -15389,6 +15392,9 @@
},
"Never" : {
},
"New Key%@" : {
},
"Newer firmware is available" : {
@ -16756,6 +16762,9 @@
},
"Public Key Mismatch" : {
},
"Public Key%@" : {
},
"PWD" : {

25
Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
View file

@ -269,10 +269,8 @@ struct WaypointForm: View {
.fixedSize(horizontal: false, vertical: true)
} icon: {
Image(systemName: "doc.plaintext")
.symbolRenderingMode(.hierarchical)
.frame(width: 35)
}
.padding(.bottom, 5)
.padding(.bottom)
}
/// Coordinate
Label {
@ -280,11 +278,18 @@ struct WaypointForm: View {
.textSelection(.enabled)
.foregroundColor(.primary)
} icon: {
Image(systemName: "mappin.and.ellipse")
.symbolRenderingMode(.hierarchical)
.frame(width: 35)
Image(systemName: "mappin.circle")
}
.padding(.bottom, 5)
.padding(.bottom)
// Drop Maps Pin
Button(action: {
if let url = URL(string: "http://maps.apple.com/?ll=\(waypoint.coordinate.latitude),\(waypoint.coordinate.longitude)&q=\(waypoint.name ?? "Dropped Pin")") {
UIApplication.shared.open(url)
}
}) {
Label("Drop Pin in Maps", systemImage: "mappin.and.ellipse")
}
.padding(.bottom)
/// Created
Label {
Text("Created: \(waypoint.created?.formatted() ?? "?")")
@ -292,9 +297,8 @@ struct WaypointForm: View {
} icon: {
Image(systemName: "clock.badge.checkmark")
.symbolRenderingMode(.hierarchical)
.frame(width: 35)
}
.padding(.bottom, 5)
.padding(.bottom)
/// Updated
if waypoint.lastUpdated != nil {
Label {
@ -303,9 +307,8 @@ struct WaypointForm: View {
} icon: {
Image(systemName: "clock.arrow.circlepath")
.symbolRenderingMode(.hierarchical)
.frame(width: 35)
}
.padding(.bottom, 5)
.padding(.bottom)
}
/// Expires
if waypoint.expire != nil {

6
Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
View file

@ -54,6 +54,12 @@ struct NodeDetail: View {
Text("The public key does not match the recorded key. You may delete the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.")
.font(.caption)
.foregroundStyle(.red)
Text("Public Key\(user.publicKey?.base64EncodedString() ?? "Empty Key")")
.monospaced()
.allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/)
Text("New Key\(user.newPublicKey?.base64EncodedString() ?? "Empty Key")")
.monospaced()
.allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/)
}
} icon: {
Image(systemName: "key.slash.fill")