mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
229 lines
6.9 KiB
Swift
229 lines
6.9 KiB
Swift
//
|
|
// MapSettingsForm.swift
|
|
// Meshtastic
|
|
//
|
|
// Created by Garth Vander Houwen on 10/3/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
import MapKit
|
|
import OSLog
|
|
|
|
struct MapSettingsForm: View {
|
|
@Environment(\.dismiss) private var dismiss
|
|
@State private var currentDetent = PresentationDetent.medium
|
|
@AppStorage("meshMapShowNodeHistory") private var nodeHistory = false
|
|
@AppStorage("meshMapShowRouteLines") private var enableMapRouteLines = false
|
|
@AppStorage("enableMapConvexHull") private var convexHull = false
|
|
@AppStorage("enableMapWaypoints") private var enableMapWaypoints = true
|
|
@AppStorage("enableMapShowFavorites") private var enableMapShowFavorites = false
|
|
@AppStorage("mapOverlaysEnabled") private var mapOverlaysEnabled = false
|
|
@ObservedObject private var mapDataManager = MapDataManager.shared
|
|
@Binding var traffic: Bool
|
|
@Binding var pointsOfInterest: Bool
|
|
@Binding var mapLayer: MapLayer
|
|
@AppStorage("meshMapDistance") private var meshMapDistance: Double = 800000
|
|
@Binding var meshMap: Bool
|
|
@Binding var enabledOverlayConfigs: Set<UUID>
|
|
|
|
var body: some View {
|
|
|
|
NavigationStack {
|
|
Form {
|
|
Section(header: Text("Map Options")) {
|
|
Picker(selection: $mapLayer, label: Text("")) {
|
|
ForEach(MapLayer.allCases, id: \.self) { layer in
|
|
if layer != MapLayer.offline {
|
|
Text(layer.localized.capitalized)
|
|
}
|
|
}
|
|
}
|
|
.pickerStyle(SegmentedPickerStyle())
|
|
.padding(.top, 5)
|
|
.padding(.bottom, 5)
|
|
.onChange(of: mapLayer) { _, newMapLayer in
|
|
UserDefaults.mapLayer = newMapLayer
|
|
}
|
|
if meshMap {
|
|
HStack {
|
|
Label("Show nodes", systemImage: "lines.measurement.horizontal")
|
|
Picker("", selection: $meshMapDistance) {
|
|
ForEach(MeshMapDistances.allCases) { di in
|
|
Text(di.description)
|
|
.tag(di.id)
|
|
}
|
|
}
|
|
.pickerStyle(DefaultPickerStyle())
|
|
}
|
|
.onChange(of: meshMapDistance) { _, newMeshMapDistance in
|
|
UserDefaults.meshMapDistance = newMeshMapDistance
|
|
}
|
|
Toggle(isOn: $enableMapWaypoints) {
|
|
Label {
|
|
Text("Show Waypoints")
|
|
} icon: {
|
|
Image(systemName: "signpost.right.and.left")
|
|
.symbolRenderingMode(.multicolor)
|
|
}
|
|
}
|
|
.tint(.accentColor)
|
|
}
|
|
Toggle(isOn: $enableMapShowFavorites) {
|
|
Label {
|
|
Text("Favorites")
|
|
} icon: {
|
|
Image(systemName: "star.fill")
|
|
.symbolRenderingMode(.multicolor)
|
|
}
|
|
}
|
|
.tint(.accentColor)
|
|
Toggle(isOn: $nodeHistory) {
|
|
Label("Node History", systemImage: "building.columns.fill")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
.onTapGesture {
|
|
self.nodeHistory.toggle()
|
|
UserDefaults.enableMapNodeHistoryPins = self.nodeHistory
|
|
}
|
|
Toggle(isOn: $enableMapRouteLines) {
|
|
Label("Route Lines", systemImage: "road.lanes")
|
|
}
|
|
.tint(.accentColor)
|
|
Toggle(isOn: $convexHull) {
|
|
Label("Convex Hull", systemImage: "button.angledbottom.horizontal.right")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
.onTapGesture {
|
|
self.convexHull.toggle()
|
|
UserDefaults.enableMapConvexHull = self.convexHull
|
|
}
|
|
Toggle(isOn: $traffic) {
|
|
Label("Traffic", systemImage: "car")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
.onTapGesture {
|
|
self.traffic.toggle()
|
|
UserDefaults.enableMapTraffic = self.traffic
|
|
}
|
|
Toggle(isOn: $pointsOfInterest) {
|
|
Label {
|
|
Text("Points of Interest")
|
|
} icon: {
|
|
Image(systemName: "mappin.and.ellipse")
|
|
.symbolRenderingMode(.multicolor)
|
|
}
|
|
}
|
|
.tint(.accentColor)
|
|
.onTapGesture {
|
|
self.pointsOfInterest.toggle()
|
|
UserDefaults.enableMapPointsOfInterest = self.pointsOfInterest
|
|
}
|
|
}
|
|
|
|
Section(header: Text("Map Overlays")) {
|
|
let hasUserData = GeoJSONOverlayManager.shared.hasUserData()
|
|
// Master toggle for map overlays
|
|
Toggle(isOn: $mapOverlaysEnabled) {
|
|
Label {
|
|
VStack(alignment: .leading) {
|
|
Text("Map Overlays")
|
|
Text(GeoJSONOverlayManager.shared.getActiveDataSource())
|
|
.font(.caption)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
} icon: {
|
|
Image(systemName: "map")
|
|
.symbolRenderingMode(.multicolor)
|
|
}
|
|
}
|
|
.tint(.accentColor)
|
|
.disabled(!hasUserData && !mapOverlaysEnabled)
|
|
|
|
// Show individual file toggles when overlays are enabled
|
|
if mapOverlaysEnabled && hasUserData {
|
|
if !mapDataManager.getUploadedFiles().isEmpty {
|
|
// Individual file toggles
|
|
ForEach(mapDataManager.getUploadedFiles()) { file in
|
|
Toggle(isOn: Binding(
|
|
get: {
|
|
return enabledOverlayConfigs.contains(file.id)
|
|
},
|
|
set: { newValue in
|
|
if newValue {
|
|
enabledOverlayConfigs.insert(file.id)
|
|
} else {
|
|
enabledOverlayConfigs.remove(file.id)
|
|
}
|
|
}
|
|
)) {
|
|
Label {
|
|
VStack(alignment: .leading) {
|
|
Text(file.originalName)
|
|
.font(.subheadline)
|
|
HStack {
|
|
Text("\(file.overlayCount) \(file.overlayCount > 1 ? "features".localized : "feature".localized)")
|
|
.font(.caption2)
|
|
.foregroundColor(.secondary)
|
|
Spacer()
|
|
Text(ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .file))
|
|
.font(.caption2)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
}
|
|
} icon: {
|
|
let isEnabled = enabledOverlayConfigs.contains(file.id)
|
|
Image(systemName: isEnabled ? "doc.fill" : "doc")
|
|
.foregroundColor(isEnabled ? .accentColor : .secondary)
|
|
}
|
|
}
|
|
.tint(.accentColor)
|
|
}
|
|
NavigationLink(destination: MapDataFiles()) {
|
|
Label {
|
|
Text("Manage map data")
|
|
} icon: {
|
|
Image(systemName: "folder")
|
|
.symbolRenderingMode(.multicolor)
|
|
}
|
|
}
|
|
} else {
|
|
ContentUnavailableView("No map data files uploaded", systemImage: "exclamationmark.triangle")
|
|
}
|
|
} else if !hasUserData {
|
|
// Upload prompt when no data available
|
|
NavigationLink(destination: MapDataFiles()) {
|
|
Label {
|
|
Text("Upload map data to enable overlays")
|
|
} icon: {
|
|
Image(systemName: "arrow.up.doc")
|
|
.symbolRenderingMode(.multicolor)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#if targetEnvironment(macCatalyst)
|
|
Spacer()
|
|
Button {
|
|
dismiss()
|
|
} label: {
|
|
Label("Close", systemImage: "xmark")
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.large)
|
|
.padding(.bottom)
|
|
#endif
|
|
}
|
|
.presentationDetents([.medium, .large], selection: $currentDetent)
|
|
.presentationContentInteraction(.scrolls)
|
|
.presentationDragIndicator(.visible)
|
|
.presentationBackgroundInteraction(.enabled(upThrough: .medium))
|
|
.onAppear {
|
|
// Initialize map data manager
|
|
mapDataManager.initialize()
|
|
}
|
|
|
|
}
|
|
}
|