mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
58da532d32
This change modifies the process for generating and integrating the Meshtastic protobufs into the client application. * The generated Swift code is now in a local SPM package `MeshtasticProtobufs` * An Xcode Workspace file `Meshtastic.xcworkspace` was created to more easily manage the new build targets. * The code generation script for the protos was modified to generate the Swift code into the new location. * The README.md was updated to reflect these changes. NOTE: After merging this PR, do not open the project file `Meshtastic.xcodeproj`. You must use the workspace `Meshtastic.xcworkspace` Extracting out the generated protobuf code into its own library enables several opportunities for the project. This is just a first step, but with some more modularization, a standalone Apple Watch app or other targets starts to become a little bit more achievable to implement. After extracting the protobufs into a Swift package, I validate these changes by building and running the Meshtastic app to an iPhone 15 Pro Max, and tried changing some settings on a local node. I then messaged back and forth using two local nodes connected to two different iOS devices.
384 lines
11 KiB
Swift
384 lines
11 KiB
Swift
//
|
|
// WaypointForm.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright Garth Vander Houwen 1/10/23.
|
|
//
|
|
|
|
import CoreLocation
|
|
import MapKit
|
|
import MeshtasticProtobufs
|
|
import OSLog
|
|
import SwiftUI
|
|
|
|
struct WaypointForm: View {
|
|
|
|
@EnvironmentObject var bleManager: BLEManager
|
|
@Environment(\.dismiss) private var dismiss
|
|
@State var waypoint: WaypointEntity
|
|
let distanceFormatter = MKDistanceFormatter()
|
|
@State var editMode: Bool = false
|
|
@FocusState private var iconIsFocused: Bool
|
|
@State private var name: String = ""
|
|
@State private var description: String = ""
|
|
@State private var icon: String = "📍"
|
|
@State private var latitude: Double = 0
|
|
@State private var longitude: Double = 0
|
|
@State private var expires: Bool = false
|
|
@State private var expire: Date = Date.now.addingTimeInterval(60 * 480) // 1 minute * 480 = 8 Hours
|
|
@State private var locked: Bool = false
|
|
@State private var lockedTo: Int64 = 0
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
if editMode {
|
|
Text((waypoint.id > 0) ? "Editing Waypoint" : "Create Waypoint")
|
|
.font(.largeTitle)
|
|
Divider()
|
|
Form {
|
|
let distance = CLLocation(latitude: LocationHelper.currentLocation.latitude, longitude: LocationHelper.currentLocation.longitude).distance(from: CLLocation(latitude: waypoint.coordinate.latitude, longitude: waypoint.coordinate.longitude ))
|
|
Section(header: Text("Coordinate") ) {
|
|
HStack {
|
|
Text("Location: \(String(format: "%.5f", waypoint.coordinate.latitude) + "," + String(format: "%.5f", waypoint.coordinate.longitude))")
|
|
.textSelection(.enabled)
|
|
.foregroundColor(Color.gray)
|
|
}
|
|
HStack {
|
|
if waypoint.coordinate.latitude != 0 && waypoint.coordinate.longitude != 0 {
|
|
DistanceText(meters: distance)
|
|
.foregroundColor(Color.gray)
|
|
}
|
|
}
|
|
}
|
|
Section(header: Text("Waypoint Options")) {
|
|
HStack {
|
|
Text("Name")
|
|
Spacer()
|
|
TextField(
|
|
"Name",
|
|
text: $name,
|
|
axis: .vertical
|
|
)
|
|
.foregroundColor(Color.gray)
|
|
.onChange(of: name, perform: { _ in
|
|
let totalBytes = name.utf8.count
|
|
// Only mess with the value if it is too big
|
|
if totalBytes > 30 {
|
|
name = String(name.dropLast())
|
|
}
|
|
})
|
|
}
|
|
HStack {
|
|
Text("Description")
|
|
Spacer()
|
|
TextField(
|
|
"Description",
|
|
text: $description,
|
|
axis: .vertical
|
|
)
|
|
.foregroundColor(Color.gray)
|
|
.onChange(of: description, perform: { _ in
|
|
let totalBytes = description.utf8.count
|
|
// Only mess with the value if it is too big
|
|
if totalBytes > 100 {
|
|
description = String(description.dropLast())
|
|
}
|
|
})
|
|
}
|
|
HStack {
|
|
Text("Icon")
|
|
Spacer()
|
|
EmojiOnlyTextField(text: $icon, placeholder: "Select an emoji")
|
|
.font(.title)
|
|
.focused($iconIsFocused)
|
|
.onChange(of: icon) { value in
|
|
|
|
// If you have anything other than emojis in your string make it empty
|
|
if !value.onlyEmojis() {
|
|
icon = ""
|
|
}
|
|
// If a second emoji is entered delete the first one
|
|
if value.count >= 1 {
|
|
|
|
if value.count > 1 {
|
|
let index = value.index(value.startIndex, offsetBy: 1)
|
|
icon = String(value[index])
|
|
}
|
|
iconIsFocused = false
|
|
}
|
|
}
|
|
|
|
}
|
|
Toggle(isOn: $expires) {
|
|
Label("Expires", systemImage: "clock.badge.xmark")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
if expires {
|
|
DatePicker("Expire", selection: $expire, in: Date.now...)
|
|
.datePickerStyle(.compact)
|
|
.font(.callout)
|
|
}
|
|
Toggle(isOn: $locked) {
|
|
Label("Locked", systemImage: "lock")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
}
|
|
}
|
|
HStack {
|
|
Button {
|
|
/// Send a new or exiting waypoint
|
|
var newWaypoint = Waypoint()
|
|
if waypoint.id == 0 {
|
|
newWaypoint.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
|
|
waypoint.id = Int64(newWaypoint.id)
|
|
} else {
|
|
newWaypoint.id = UInt32(waypoint.id)
|
|
}
|
|
newWaypoint.latitudeI = waypoint.latitudeI
|
|
newWaypoint.longitudeI = waypoint.longitudeI
|
|
newWaypoint.name = name.count > 0 ? name : "Dropped Pin"
|
|
newWaypoint.description_p = description
|
|
// Unicode scalar value for the icon emoji string
|
|
let unicodeScalers = icon.unicodeScalars
|
|
// First element as an UInt32
|
|
let unicode = unicodeScalers[unicodeScalers.startIndex].value
|
|
newWaypoint.icon = unicode
|
|
if locked {
|
|
if lockedTo == 0 {
|
|
newWaypoint.lockedTo = UInt32(bleManager.connectedPeripheral!.num)
|
|
} else {
|
|
newWaypoint.lockedTo = UInt32(lockedTo)
|
|
}
|
|
}
|
|
if expires {
|
|
newWaypoint.expire = UInt32(expire.timeIntervalSince1970)
|
|
} else {
|
|
newWaypoint.expire = 0
|
|
}
|
|
if bleManager.sendWaypoint(waypoint: newWaypoint) {
|
|
dismiss()
|
|
} else {
|
|
dismiss()
|
|
Logger.mesh.warning("Send waypoint failed")
|
|
}
|
|
} label: {
|
|
Label("Send", systemImage: "arrow.up")
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.regular)
|
|
.disabled(bleManager.connectedPeripheral == nil)
|
|
.padding(.bottom)
|
|
|
|
Button(role: .cancel) {
|
|
dismiss()
|
|
} label: {
|
|
Label("cancel", systemImage: "x.circle")
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.regular)
|
|
.padding(.bottom)
|
|
|
|
if waypoint.id > 0 && bleManager.isConnected {
|
|
|
|
Menu {
|
|
Button("For me", action: {
|
|
bleManager.context!.delete(waypoint)
|
|
do {
|
|
try bleManager.context!.save()
|
|
} catch {
|
|
bleManager.context!.rollback()
|
|
}
|
|
dismiss() })
|
|
Button("For everyone", action: {
|
|
var newWaypoint = Waypoint()
|
|
newWaypoint.id = UInt32(waypoint.id)
|
|
newWaypoint.name = name.count > 0 ? name : "Dropped Pin"
|
|
newWaypoint.description_p = description
|
|
newWaypoint.latitudeI = waypoint.latitudeI
|
|
newWaypoint.longitudeI = waypoint.longitudeI
|
|
// Unicode scalar value for the icon emoji string
|
|
let unicodeScalers = icon.unicodeScalars
|
|
// First element as an UInt32
|
|
let unicode = unicodeScalers[unicodeScalers.startIndex].value
|
|
newWaypoint.icon = unicode
|
|
if locked {
|
|
if lockedTo == 0 {
|
|
newWaypoint.lockedTo = UInt32(bleManager.connectedPeripheral!.num)
|
|
} else {
|
|
newWaypoint.lockedTo = UInt32(lockedTo)
|
|
}
|
|
}
|
|
newWaypoint.expire = UInt32(1)
|
|
if bleManager.sendWaypoint(waypoint: newWaypoint) {
|
|
|
|
bleManager.context!.delete(waypoint)
|
|
do {
|
|
try bleManager.context!.save()
|
|
} catch {
|
|
bleManager.context!.rollback()
|
|
}
|
|
dismiss()
|
|
} else {
|
|
dismiss()
|
|
Logger.mesh.warning("Send waypoint failed")
|
|
}
|
|
})
|
|
}
|
|
label: {
|
|
Label("delete", systemImage: "trash")
|
|
.foregroundColor(.red)
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.regular)
|
|
.padding(.bottom)
|
|
}
|
|
}
|
|
} else {
|
|
VStack {
|
|
HStack {
|
|
CircleText(text: String(UnicodeScalar(Int(waypoint.icon)) ?? "📍"), color: Color.orange, circleSize: 65)
|
|
Spacer()
|
|
Text(waypoint.name ?? "?")
|
|
.font(.largeTitle)
|
|
Spacer()
|
|
if waypoint.locked > 0 {
|
|
Image(systemName: "lock.fill" )
|
|
.font(.largeTitle)
|
|
} else {
|
|
Button {
|
|
editMode = true
|
|
} label: {
|
|
Image(systemName: "square.and.pencil" )
|
|
.font(.largeTitle)
|
|
.symbolRenderingMode(.hierarchical)
|
|
.foregroundColor(.accentColor)
|
|
}
|
|
}
|
|
}
|
|
Divider()
|
|
VStack(alignment: .leading) {
|
|
// Description
|
|
if (waypoint.longDescription ?? "").count > 0 {
|
|
Label {
|
|
Text(waypoint.longDescription ?? "")
|
|
.foregroundColor(.primary)
|
|
.multilineTextAlignment(.leading)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
} icon: {
|
|
Image(systemName: "doc.plaintext")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.frame(width: 35)
|
|
}
|
|
.padding(.bottom, 5)
|
|
}
|
|
/// Coordinate
|
|
Label {
|
|
Text("Coordinates: \(String(format: "%.6f", waypoint.coordinate.latitude)), \(String(format: "%.6f", waypoint.coordinate.longitude))")
|
|
.textSelection(.enabled)
|
|
.foregroundColor(.primary)
|
|
} icon: {
|
|
Image(systemName: "mappin.and.ellipse")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.frame(width: 35)
|
|
}
|
|
.padding(.bottom, 5)
|
|
/// Created
|
|
Label {
|
|
Text("Created: \(waypoint.created?.formatted() ?? "?")")
|
|
.foregroundColor(.primary)
|
|
} icon: {
|
|
Image(systemName: "clock.badge.checkmark")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.frame(width: 35)
|
|
}
|
|
.padding(.bottom, 5)
|
|
/// Updated
|
|
if waypoint.lastUpdated != nil {
|
|
Label {
|
|
Text("Updated: \(waypoint.lastUpdated?.formatted() ?? "?")")
|
|
.foregroundColor(.primary)
|
|
} icon: {
|
|
Image(systemName: "clock.arrow.circlepath")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.frame(width: 35)
|
|
}
|
|
.padding(.bottom, 5)
|
|
}
|
|
/// Expires
|
|
if waypoint.expire != nil {
|
|
Label {
|
|
Text("Expires: \(waypoint.expire?.formatted() ?? "?")")
|
|
.foregroundColor(.primary)
|
|
} icon: {
|
|
Image(systemName: "hourglass.bottomhalf.filled")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.frame(width: 35)
|
|
}
|
|
.padding(.bottom, 5)
|
|
}
|
|
/// Distance
|
|
if LocationHelper.currentLocation.distance(from: LocationHelper.DefaultLocation) > 0.0 {
|
|
let metersAway = waypoint.coordinate.distance(from: LocationHelper.currentLocation)
|
|
Label {
|
|
Text("distance".localized + ": \(distanceFormatter.string(fromDistance: Double(metersAway)))")
|
|
.foregroundColor(.primary)
|
|
} icon: {
|
|
Image(systemName: "lines.measurement.horizontal")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.frame(width: 35)
|
|
}
|
|
.padding(.bottom, 5)
|
|
}
|
|
}
|
|
.padding(.top)
|
|
#if targetEnvironment(macCatalyst)
|
|
Spacer()
|
|
Button {
|
|
dismiss()
|
|
} label: {
|
|
Label("close", systemImage: "xmark")
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.large)
|
|
.padding()
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
.onAppear {
|
|
if waypoint.id > 0 {
|
|
let waypoint = getWaypoint(id: Int64(waypoint.id), context: bleManager.context!)
|
|
name = waypoint.name ?? "Dropped Pin"
|
|
description = waypoint.longDescription ?? ""
|
|
icon = String(UnicodeScalar(Int(waypoint.icon)) ?? "📍")
|
|
latitude = Double(waypoint.latitudeI) / 1e7
|
|
longitude = Double(waypoint.longitudeI) / 1e7
|
|
if waypoint.expire != nil {
|
|
expires = true
|
|
expire = waypoint.expire ?? Date()
|
|
} else {
|
|
expires = false
|
|
}
|
|
if waypoint.locked > 0 {
|
|
locked = true
|
|
lockedTo = waypoint.locked
|
|
}
|
|
} else {
|
|
name = ""
|
|
description = ""
|
|
locked = false
|
|
expires = false
|
|
expire = Date.now.addingTimeInterval(60 * 480)
|
|
icon = "📍"
|
|
latitude = waypoint.coordinate.latitude
|
|
longitude = waypoint.coordinate.longitude
|
|
}
|
|
}
|
|
.presentationDetents([.fraction(0.75)])
|
|
.presentationDragIndicator(.visible)
|
|
}
|
|
}
|