Meshtastic-Apple/Meshtastic/Views/Nodes/Helpers/Map/MapSettingsForm.swift

231 lines
6.7 KiB
Swift
Raw Normal View History

//
// MapSettingsForm.swift
// Meshtastic
//
// Created by Garth Vander Houwen on 10/3/23.
//
import SwiftUI
import MapKit
2025-07-22 00:48:50 +00:00
import OSLog
struct MapSettingsForm: View {
@Environment(\.dismiss) private var dismiss
2024-07-17 21:43:06 -07:00
@State private var currentDetent = PresentationDetent.medium
@AppStorage("meshMapShowNodeHistory") private var nodeHistory = false
2025-05-24 00:19:00 -07:00
@AppStorage("meshMapShowRouteLines") private var enableMapRouteLines = false
@AppStorage("enableMapConvexHull") private var convexHull = false
2025-05-24 00:19:00 -07:00
@AppStorage("enableMapWaypoints") private var enableMapWaypoints = true
@AppStorage("enableMapShowFavorites") private var enableMapShowFavorites = false
2025-07-22 00:48:50 +00:00
@AppStorage("mapOverlaysEnabled") private var mapOverlaysEnabled = false
2025-07-22 04:13:54 +00:00
@ObservedObject private var mapDataManager = MapDataManager.shared
2023-11-09 17:43:38 -08:00
@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 {
2023-11-26 10:45:03 -08:00
NavigationStack {
Form {
Section(header: Text("Map Options")) {
Picker(selection: $mapLayer, label: Text("")) {
ForEach(MapLayer.allCases, id: \.self) { layer in
if layer != MapLayer.offline {
2025-05-23 23:41:32 -07:00
Text(layer.localized.capitalized)
}
}
}
.pickerStyle(SegmentedPickerStyle())
.padding(.top, 5)
.padding(.bottom, 5)
2024-10-05 15:50:57 -07:00
.onChange(of: mapLayer) { _, newMapLayer in
2023-11-09 17:43:38 -08:00
UserDefaults.mapLayer = newMapLayer
}
if meshMap {
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
if LocationsHandler.currentLocation != nil {
HStack {
Label("Distance", systemImage: "lines.measurement.horizontal")
Picker("", selection: $meshMapDistance) {
ForEach(MeshMapDistances.allCases) { di in
Text(di.description)
.tag(di.id)
}
2024-03-24 22:23:55 -07:00
}
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
.pickerStyle(DefaultPickerStyle())
}
.onChange(of: meshMapDistance) { _, newMeshMapDistance in
UserDefaults.meshMapDistance = newMeshMapDistance
2024-03-24 22:23:55 -07:00
}
}
2025-05-24 00:19:00 -07:00
Toggle(isOn: $enableMapWaypoints) {
Label {
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
Text("Waypoints")
2025-05-24 00:19:00 -07:00
} icon: {
Image(systemName: "signpost.right.and.left")
.symbolRenderingMode(.multicolor)
}
2024-03-25 19:20:36 -07:00
}
2025-05-24 00:19:00 -07:00
.tint(.accentColor)
}
2025-05-24 00:19:00 -07:00
Toggle(isOn: $enableMapShowFavorites) {
Label {
Text("Favorites")
} icon: {
Image(systemName: "star.fill")
.symbolRenderingMode(.multicolor)
}
2025-05-23 20:53:31 -07:00
}
2025-05-24 00:19:00 -07:00
.tint(.accentColor)
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
if !meshMap {
Toggle(isOn: $nodeHistory) {
Label("Node History", systemImage: "building.columns.fill")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
2025-10-21 06:03:01 -07:00
Toggle(isOn: $enableMapRouteLines) {
Label("Route Lines", systemImage: "road.lanes")
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
}
2025-10-21 06:03:01 -07:00
.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) {
2025-05-24 00:19:00 -07:00
Label {
Text("Points of Interest")
} icon: {
Image(systemName: "mappin.and.ellipse")
.symbolRenderingMode(.multicolor)
}
}
2025-05-24 00:19:00 -07:00
.tint(.accentColor)
.onTapGesture {
self.pointsOfInterest.toggle()
UserDefaults.enableMapPointsOfInterest = self.pointsOfInterest
}
}
Section(header: Text("Map Overlays")) {
2025-07-21 21:42:36 +00:00
let hasUserData = GeoJSONOverlayManager.shared.hasUserData()
// Master toggle for map overlays
2025-07-22 00:48:50 +00:00
Toggle(isOn: $mapOverlaysEnabled) {
2025-07-16 02:45:17 +00:00
Label {
2025-07-21 21:42:36 +00:00
VStack(alignment: .leading) {
Text("Map Overlays")
Text(GeoJSONOverlayManager.shared.getActiveDataSource())
.font(.caption)
.foregroundColor(.secondary)
}
2025-07-16 02:45:17 +00:00
} icon: {
2025-07-21 21:42:36 +00:00
Image(systemName: "map")
.symbolRenderingMode(.multicolor)
2025-07-16 02:45:17 +00:00
}
}
.tint(.accentColor)
.disabled(!hasUserData && !mapOverlaysEnabled)
2025-07-22 00:48:50 +00:00
// Show individual file toggles when overlays are enabled
if mapOverlaysEnabled && hasUserData {
2025-07-22 04:13:54 +00:00
if !mapDataManager.getUploadedFiles().isEmpty {
2025-07-22 00:48:50 +00:00
// Individual file toggles
2025-07-22 04:13:54 +00:00
ForEach(mapDataManager.getUploadedFiles()) { file in
2025-07-22 00:48:50 +00:00
Toggle(isOn: Binding(
2025-07-23 20:26:50 +00:00
get: {
2025-07-22 02:18:00 +00:00
return enabledOverlayConfigs.contains(file.id)
2025-07-22 00:48:50 +00:00
},
set: { newValue in
if newValue {
enabledOverlayConfigs.insert(file.id)
} else {
enabledOverlayConfigs.remove(file.id)
}
2025-07-22 00:48:50 +00:00
}
)) {
Label {
VStack(alignment: .leading) {
Text(file.originalName)
.font(.subheadline)
HStack {
Text("\(file.overlayCount) features")
2025-07-22 00:48:50 +00:00
.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)
2025-07-22 00:48:50 +00:00
}
}
.tint(.accentColor)
}
2025-07-22 04:13:54 +00:00
NavigationLink(destination: MapDataFiles()) {
Label {
Text("Manage map data")
} icon: {
2025-07-22 00:48:50 +00:00
Image(systemName: "folder")
.symbolRenderingMode(.multicolor)
2025-07-22 00:48:50 +00:00
}
}
} else {
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) * 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>
2025-08-27 08:09:02 -07:00
ContentUnavailableView("No map data files uploaded", systemImage: "exclamationmark.triangle")
2025-07-21 21:42:36 +00:00
}
} else if !hasUserData {
2025-07-22 00:48:50 +00:00
// Upload prompt when no data available
2025-07-22 04:13:54 +00:00
NavigationLink(destination: MapDataFiles()) {
Label {
Text("Upload map data to enable overlays")
} icon: {
2025-07-21 21:42:36 +00:00
Image(systemName: "arrow.up.doc")
.symbolRenderingMode(.multicolor)
2025-07-21 21:42:36 +00:00
}
}
}
2025-07-16 02:45:17 +00:00
}
}
#if targetEnvironment(macCatalyst)
Spacer()
Button {
dismiss()
} label: {
Label("Close", systemImage: "xmark")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
.controlSize(.large)
.padding(.bottom)
#endif
}
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
.presentationDetents([.large], selection: $currentDetent)
2024-07-17 21:43:06 -07:00
.presentationContentInteraction(.scrolls)
2023-11-09 17:43:38 -08:00
.presentationDragIndicator(.visible)
2024-07-17 21:43:06 -07:00
.presentationBackgroundInteraction(.enabled(upThrough: .medium))
2025-07-22 00:48:50 +00:00
.onAppear {
2025-07-22 04:13:54 +00:00
// Initialize map data manager
mapDataManager.initialize()
2025-07-22 00:48:50 +00:00
}
}
}