mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* feat: improve routing performance with split state, fetch batching, node cache, and debounce - Split Router's single @Published navigationState into per-tab properties to reduce spurious re-renders across unrelated views - Add fetchBatchSize=50 and relationshipKeyPathsForPrefetching to node list - Optimize in-body array re-sort from 2 filter passes to single pass - Add in-memory node object ID cache on Router for O(1) lookups - Add fetchLimit=1 to getNodeInfo for early termination - Debounce rapid node selection changes with 100ms Task delay Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/9bfe91f2-8ed7-4d2c-bb2e-4ed3dfd3a16c Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Address code review: add debounce constant and thread-safety comment Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/9bfe91f2-8ed7-4d2c-bb2e-4ed3dfd3a16c Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Migrate test project to Swift Testing and add connect view and router tests (#1643) * Migrate to Swift Testing and add connect view tests - Convert RouterTests.swift from XCTest to Swift Testing (@Suite, @Test, #expect, #require) - Create ConnectViewTests.swift with tests for connect view child types: - Device struct (creation, signal strength, RSSI, description, codable) - TransportType enum (cases, raw values, codable) - ConnectionState enum (equality, codable) - BLESignalStrength enum (raw values, init) - TransportStatus enum (equality) - NavigationState (defaults, tabs, sub-states) - InvalidVersion view (creation with versions) - ConnectedDevice view (connected/disconnected/MQTT states) - CircleText view (default/custom sizes, emoji) - BatteryCompact view (levels, nil, charging, plugged in) - SignalStrengthIndicator view (dimensions, strength levels) - Update Xcode project to include new test file Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/d7bb7a89-2105-4fcb-96bc-7ec794467c74 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Fix signal strength test boundary conditions The getSignalStrength() method uses NSNumber.compare(.orderedDescending), which is a strict greater-than check. Fix the boundary test cases: - RSSI -65 is .normal (not .strong), since -65 is not > -65 - RSSI -85 is .weak (not .normal), since -85 is not > -85 - Add -64 → .strong and -84 → .normal as adjacent boundary tests Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/4fcbc01e-cbea-4d11-b2c0-e923c6730d69 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Improve and complete router tests with comprehensive coverage Added tests for: - Custom initial state - Invalid scheme / unknown path handling (state unchanged) - navigateToNodeDetail public method - Messages edge cases: channelId only, userNum only, messageId only, non-numeric params - Nodes with non-numeric nodenum - Map with both nodenum+waypointId (nodeId priority), non-numeric params - Parameterized settings test covering all 31 SettingsNavigationState cases - State transitions: consecutive routes, invalid scheme preserves existing state Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/f69b7352-21aa-494c-8864-31fc0f4b21b8 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Localizable update * Merge translations file --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Fix merge conflicts in PR #1614 (Spanish translations) (#1644) * 20% of strings translated to spanish * add more translations * add rest of translations * small fixes --------- Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * fix typo in hop limit option description (#1631) O hop -> 0 hop Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Tak server improvements (#1603) * added read only mode cot to meshtastic parsing and warning to not enable on pub channel * better icons * fully fixed markers * telemetry support * Update Meshtastic/Helpers/TAK/TAKServerManager.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fixes * fixes * Resolve merge conflicts for PR #1603 (TAK server improvements) (#1645) * Delete Messages fix * Bump version to 2.7.9 * Bump widgets version * TAK Server channel index picker Create a settings picker for the TAK Server's channel index. This allows users to specify TAK traffic to use the non-primary channel to help reduce channel congestion. * Changed capitalization from 'environment' to 'Environment' for section header. (#1591) * Add Danish (da) translations — resolves merge conflicts from PR #1609 (#1612) * Initial plan * Add Danish (da) translations from PR #1609 Resolves merge conflicts from PR #1609 by adding Danish translations to the Localizable.xcstrings file. The PR adds Danish translation strings throughout the app while preserving all existing translations for other languages. Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Migrate test project to Swift Testing and add connect view and router tests (#1643) * Migrate to Swift Testing and add connect view tests - Convert RouterTests.swift from XCTest to Swift Testing (@Suite, @Test, #expect, #require) - Create ConnectViewTests.swift with tests for connect view child types: - Device struct (creation, signal strength, RSSI, description, codable) - TransportType enum (cases, raw values, codable) - ConnectionState enum (equality, codable) - BLESignalStrength enum (raw values, init) - TransportStatus enum (equality) - NavigationState (defaults, tabs, sub-states) - InvalidVersion view (creation with versions) - ConnectedDevice view (connected/disconnected/MQTT states) - CircleText view (default/custom sizes, emoji) - BatteryCompact view (levels, nil, charging, plugged in) - SignalStrengthIndicator view (dimensions, strength levels) - Update Xcode project to include new test file Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/d7bb7a89-2105-4fcb-96bc-7ec794467c74 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Fix signal strength test boundary conditions The getSignalStrength() method uses NSNumber.compare(.orderedDescending), which is a strict greater-than check. Fix the boundary test cases: - RSSI -65 is .normal (not .strong), since -65 is not > -65 - RSSI -85 is .weak (not .normal), since -85 is not > -85 - Add -64 → .strong and -84 → .normal as adjacent boundary tests Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/4fcbc01e-cbea-4d11-b2c0-e923c6730d69 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Improve and complete router tests with comprehensive coverage Added tests for: - Custom initial state - Invalid scheme / unknown path handling (state unchanged) - navigateToNodeDetail public method - Messages edge cases: channelId only, userNum only, messageId only, non-numeric params - Nodes with non-numeric nodenum - Map with both nodenum+waypointId (nodeId priority), non-numeric params - Parameterized settings test covering all 31 SettingsNavigationState cases - State transitions: consecutive routes, invalid scheme preserves existing state Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/f69b7352-21aa-494c-8864-31fc0f4b21b8 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Localizable update * Merge translations file --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Fix merge conflicts in PR #1614 (Spanish translations) (#1644) * 20% of strings translated to spanish * add more translations * add rest of translations * small fixes --------- Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * fix typo in hop limit option description (#1631) O hop -> 0 hop --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> Co-authored-by: Austin Hargis <25471876+austinhargis@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: axunes <axunes@axunes.net> * Fix merge conflicts * Merge main into tak-server-improvements to resolve PR #1603 conflicts (#1646) * Delete Messages fix * Bump version to 2.7.9 * Bump widgets version * TAK Server channel index picker Create a settings picker for the TAK Server's channel index. This allows users to specify TAK traffic to use the non-primary channel to help reduce channel congestion. * Changed capitalization from 'environment' to 'Environment' for section header. (#1591) * Add Danish (da) translations — resolves merge conflicts from PR #1609 (#1612) * Initial plan * Add Danish (da) translations from PR #1609 Resolves merge conflicts from PR #1609 by adding Danish translations to the Localizable.xcstrings file. The PR adds Danish translation strings throughout the app while preserving all existing translations for other languages. Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Migrate test project to Swift Testing and add connect view and router tests (#1643) * Migrate to Swift Testing and add connect view tests - Convert RouterTests.swift from XCTest to Swift Testing (@Suite, @Test, #expect, #require) - Create ConnectViewTests.swift with tests for connect view child types: - Device struct (creation, signal strength, RSSI, description, codable) - TransportType enum (cases, raw values, codable) - ConnectionState enum (equality, codable) - BLESignalStrength enum (raw values, init) - TransportStatus enum (equality) - NavigationState (defaults, tabs, sub-states) - InvalidVersion view (creation with versions) - ConnectedDevice view (connected/disconnected/MQTT states) - CircleText view (default/custom sizes, emoji) - BatteryCompact view (levels, nil, charging, plugged in) - SignalStrengthIndicator view (dimensions, strength levels) - Update Xcode project to include new test file Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/d7bb7a89-2105-4fcb-96bc-7ec794467c74 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Fix signal strength test boundary conditions The getSignalStrength() method uses NSNumber.compare(.orderedDescending), which is a strict greater-than check. Fix the boundary test cases: - RSSI -65 is .normal (not .strong), since -65 is not > -65 - RSSI -85 is .weak (not .normal), since -85 is not > -85 - Add -64 → .strong and -84 → .normal as adjacent boundary tests Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/4fcbc01e-cbea-4d11-b2c0-e923c6730d69 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Improve and complete router tests with comprehensive coverage Added tests for: - Custom initial state - Invalid scheme / unknown path handling (state unchanged) - navigateToNodeDetail public method - Messages edge cases: channelId only, userNum only, messageId only, non-numeric params - Nodes with non-numeric nodenum - Map with both nodenum+waypointId (nodeId priority), non-numeric params - Parameterized settings test covering all 31 SettingsNavigationState cases - State transitions: consecutive routes, invalid scheme preserves existing state Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/f69b7352-21aa-494c-8864-31fc0f4b21b8 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Localizable update * Merge translations file --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Fix merge conflicts in PR #1614 (Spanish translations) (#1644) * 20% of strings translated to spanish * add more translations * add rest of translations * small fixes --------- Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * fix typo in hop limit option description (#1631) O hop -> 0 hop --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> Co-authored-by: Austin Hargis <25471876+austinhargis@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: axunes <axunes@axunes.net> * Merge main into tak-server-improvements to resolve PR #1603 conflicts (#1647) * Delete Messages fix * Bump version to 2.7.9 * Bump widgets version * TAK Server channel index picker Create a settings picker for the TAK Server's channel index. This allows users to specify TAK traffic to use the non-primary channel to help reduce channel congestion. * Changed capitalization from 'environment' to 'Environment' for section header. (#1591) * Add Danish (da) translations — resolves merge conflicts from PR #1609 (#1612) * Initial plan * Add Danish (da) translations from PR #1609 Resolves merge conflicts from PR #1609 by adding Danish translations to the Localizable.xcstrings file. The PR adds Danish translation strings throughout the app while preserving all existing translations for other languages. Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Migrate test project to Swift Testing and add connect view and router tests (#1643) * Migrate to Swift Testing and add connect view tests - Convert RouterTests.swift from XCTest to Swift Testing (@Suite, @Test, #expect, #require) - Create ConnectViewTests.swift with tests for connect view child types: - Device struct (creation, signal strength, RSSI, description, codable) - TransportType enum (cases, raw values, codable) - ConnectionState enum (equality, codable) - BLESignalStrength enum (raw values, init) - TransportStatus enum (equality) - NavigationState (defaults, tabs, sub-states) - InvalidVersion view (creation with versions) - ConnectedDevice view (connected/disconnected/MQTT states) - CircleText view (default/custom sizes, emoji) - BatteryCompact view (levels, nil, charging, plugged in) - SignalStrengthIndicator view (dimensions, strength levels) - Update Xcode project to include new test file Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/d7bb7a89-2105-4fcb-96bc-7ec794467c74 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Fix signal strength test boundary conditions The getSignalStrength() method uses NSNumber.compare(.orderedDescending), which is a strict greater-than check. Fix the boundary test cases: - RSSI -65 is .normal (not .strong), since -65 is not > -65 - RSSI -85 is .weak (not .normal), since -85 is not > -85 - Add -64 → .strong and -84 → .normal as adjacent boundary tests Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/4fcbc01e-cbea-4d11-b2c0-e923c6730d69 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Improve and complete router tests with comprehensive coverage Added tests for: - Custom initial state - Invalid scheme / unknown path handling (state unchanged) - navigateToNodeDetail public method - Messages edge cases: channelId only, userNum only, messageId only, non-numeric params - Nodes with non-numeric nodenum - Map with both nodenum+waypointId (nodeId priority), non-numeric params - Parameterized settings test covering all 31 SettingsNavigationState cases - State transitions: consecutive routes, invalid scheme preserves existing state Agent-Logs-Url: https://github.com/meshtastic/Meshtastic-Apple/sessions/f69b7352-21aa-494c-8864-31fc0f4b21b8 Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Localizable update * Merge translations file --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Fix merge conflicts in PR #1614 (Spanish translations) (#1644) * 20% of strings translated to spanish * add more translations * add rest of translations * small fixes --------- Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * fix typo in hop limit option description (#1631) O hop -> 0 hop --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> Co-authored-by: Austin Hargis <25471876+austinhargis@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: axunes <axunes@axunes.net> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> Co-authored-by: Austin Hargis <25471876+austinhargis@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: axunes <axunes@axunes.net> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> Co-authored-by: Joel Pérez Izquierdo <joelperez91@gmail.com> Co-authored-by: axunes <axunes@axunes.net> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: niccellular <79813408+niccellular@users.noreply.github.com> Co-authored-by: Austin Hargis <25471876+austinhargis@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
419 lines
13 KiB
Swift
419 lines
13 KiB
Swift
//
|
||
// NodeList.swift
|
||
// Meshtastic
|
||
//
|
||
// Copyright(c) Garth Vander Houwen 9/8/23.
|
||
//
|
||
import SwiftUI
|
||
import CoreLocation
|
||
import OSLog
|
||
import CoreData
|
||
import Foundation
|
||
|
||
struct NodeList: View {
|
||
/// Debounce delay for node selection changes (100ms)
|
||
private static let nodeSelectionDebounceNs: UInt64 = 100_000_000
|
||
|
||
@Environment(\.managedObjectContext) var context
|
||
@EnvironmentObject var accessoryManager: AccessoryManager
|
||
@StateObject var router: Router
|
||
@State private var selectedNode: NodeInfoEntity?
|
||
@State private var nodeSelectionTask: Task<Void, Never>?
|
||
@State private var isPresentingTraceRouteSentAlert = false
|
||
@State private var isPresentingPositionSentAlert = false
|
||
@State private var isPresentingPositionFailedAlert = false
|
||
@State private var isPresentingDeleteNodeAlert = false
|
||
@State private var deleteNodeId: Int64 = 0
|
||
@State private var shareContactNode: NodeInfoEntity?
|
||
@StateObject var filters = NodeFilterParameters()
|
||
@State var isEditingFilters = false
|
||
@SceneStorage("selectedDetailView") var selectedDetailView: String?
|
||
|
||
var connectedNode: NodeInfoEntity? {
|
||
if let num = accessoryManager.activeDeviceNum {
|
||
return getNodeInfo(id: num, context: context)
|
||
}
|
||
return nil
|
||
}
|
||
|
||
var body: some View {
|
||
NavigationSplitView {
|
||
FilteredNodeList(
|
||
router: router,
|
||
withFilters: filters,
|
||
selectedNode: $selectedNode,
|
||
connectedNode: connectedNode,
|
||
isPresentingDeleteNodeAlert: $isPresentingDeleteNodeAlert,
|
||
deleteNodeId: $deleteNodeId,
|
||
shareContactNode: $shareContactNode
|
||
)
|
||
.sheet(isPresented: $isEditingFilters) {
|
||
NodeListFilter(
|
||
filters: filters
|
||
)
|
||
}
|
||
.safeAreaInset(edge: .bottom, alignment: .trailing) {
|
||
HStack {
|
||
Button(action: {
|
||
withAnimation {
|
||
isEditingFilters = !isEditingFilters
|
||
}
|
||
}) {
|
||
Image(systemName: !isEditingFilters ? "line.3.horizontal.decrease.circle" : "line.3.horizontal.decrease.circle.fill")
|
||
.padding(.vertical, 5)
|
||
}
|
||
.tint(Color(UIColor.secondarySystemBackground))
|
||
.foregroundColor(.accentColor)
|
||
.buttonStyle(.borderedProminent)
|
||
}
|
||
.controlSize(.regular)
|
||
.padding(5)
|
||
}
|
||
.searchable(text: $filters.searchText, placement: .navigationBarDrawer(displayMode: .always), prompt: "Find a node")
|
||
.autocorrectionDisabled(true)
|
||
.scrollDismissesKeyboard(.immediately)
|
||
.navigationTitle(String.localizedStringWithFormat("Nodes (%@)".localized, String(getNodeCount())))
|
||
.listStyle(.plain)
|
||
.alert("Position Exchange Requested", isPresented: $isPresentingPositionSentAlert) {
|
||
Button("OK") { }.keyboardShortcut(.defaultAction)
|
||
} message: {
|
||
Text("Your position has been sent with a request for a response with their position. You will receive a notification when a position is returned.")
|
||
}
|
||
.alert("Position Exchange Failed", isPresented: $isPresentingPositionFailedAlert) {
|
||
Button("OK") { }.keyboardShortcut(.defaultAction)
|
||
} message: {
|
||
Text("Failed to get a valid position to exchange")
|
||
}
|
||
.alert("Trace Route Sent", isPresented: $isPresentingTraceRouteSentAlert) {
|
||
Button("OK") { }.keyboardShortcut(.defaultAction)
|
||
} message: {
|
||
Text("This could take a while, response will appear in the trace route log for the node it was sent to.")
|
||
}
|
||
.confirmationDialog("Are you sure?", isPresented: $isPresentingDeleteNodeAlert, titleVisibility: .visible) {
|
||
Button("Delete Node", role: .destructive) {
|
||
let deleteNode = getNodeInfo(id: deleteNodeId, context: context)
|
||
if connectedNode != nil {
|
||
if let node = deleteNode {
|
||
Task {
|
||
do {
|
||
try await accessoryManager.removeNode(node: node, connectedNodeNum: Int64(accessoryManager.activeDeviceNum ?? -1))
|
||
} catch {
|
||
Logger.data.error("Failed to delete node \(node.user?.longName ?? "Unknown".localized, privacy: .public)")
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
.sheet(item: $shareContactNode) { selectedNode in
|
||
ShareContactQRDialog(node: selectedNode.toProto())
|
||
}
|
||
.navigationSplitViewColumnWidth(min: 100, ideal: 300, max: .infinity)
|
||
.navigationBarItems(leading: MeshtasticLogo(), trailing: ZStack {
|
||
ConnectedDevice(
|
||
deviceConnected: accessoryManager.isConnected,
|
||
name: accessoryManager.activeConnection?.device.shortName ?? "?",
|
||
phoneOnly: true
|
||
)
|
||
}
|
||
.accessibilityElement(children: .contain))
|
||
} detail: {
|
||
if let node = selectedNode {
|
||
NodeDetail(
|
||
connectedNode: connectedNode,
|
||
node: node
|
||
)
|
||
} else {
|
||
ContentUnavailableView("Select a Node", systemImage: "flipphone")
|
||
}
|
||
}
|
||
.onChange(of: router.nodeListSelectedNodeNum) { _, newNum in
|
||
// Debounce rapid route changes — only process the last selection after a short delay
|
||
nodeSelectionTask?.cancel()
|
||
nodeSelectionTask = Task {
|
||
do {
|
||
try await Task.sleep(nanoseconds: Self.nodeSelectionDebounceNs)
|
||
} catch {
|
||
return // Cancelled by a newer selection
|
||
}
|
||
if let num = newNum {
|
||
self.selectedNode = router.cachedNodeInfo(id: num, context: context)
|
||
} else {
|
||
self.selectedNode = nil
|
||
}
|
||
}
|
||
}
|
||
.onChange(of: selectedNode) { _, node in
|
||
if let num = node?.num {
|
||
router.nodeListSelectedNodeNum = num
|
||
} else {
|
||
router.nodeListSelectedNodeNum = nil
|
||
}
|
||
}
|
||
}
|
||
|
||
// Helper to get the count of nodes for the navigation title
|
||
private func getNodeCount() -> Int {
|
||
let request: NSFetchRequest<NodeInfoEntity> = NodeInfoEntity.fetchRequest()
|
||
request.predicate = filters.buildPredicate()
|
||
return (try? context.count(for: request)) ?? 0
|
||
}
|
||
}
|
||
|
||
//
|
||
// FilteredNodeList.swift
|
||
// Meshtastic
|
||
//
|
||
fileprivate struct FilteredNodeList: View {
|
||
@EnvironmentObject var accessoryManager: AccessoryManager
|
||
@FetchRequest private var nodes: FetchedResults<NodeInfoEntity>
|
||
@Environment(\.managedObjectContext) var context
|
||
var router: Router
|
||
|
||
@Binding var selectedNode: NodeInfoEntity?
|
||
var connectedNode: NodeInfoEntity?
|
||
@Binding var isPresentingDeleteNodeAlert: Bool
|
||
@Binding var deleteNodeId: Int64
|
||
@Binding var shareContactNode: NodeInfoEntity?
|
||
|
||
// The initializer for the FetchRequest
|
||
init(
|
||
router: Router,
|
||
withFilters: NodeFilterParameters,
|
||
selectedNode: Binding<NodeInfoEntity?>,
|
||
connectedNode: NodeInfoEntity?,
|
||
isPresentingDeleteNodeAlert: Binding<Bool>,
|
||
deleteNodeId: Binding<Int64>,
|
||
shareContactNode: Binding<NodeInfoEntity?>
|
||
) {
|
||
self.router = router
|
||
let request: NSFetchRequest<NodeInfoEntity> = NodeInfoEntity.fetchRequest()
|
||
request.sortDescriptors = [
|
||
NSSortDescriptor(key: "ignored", ascending: true),
|
||
NSSortDescriptor(key: "favorite", ascending: false),
|
||
NSSortDescriptor(key: "lastHeard", ascending: false),
|
||
NSSortDescriptor(key: "user.longName", ascending: true)
|
||
]
|
||
request.predicate = withFilters.buildPredicate()
|
||
request.fetchBatchSize = 50
|
||
request.relationshipKeyPathsForPrefetching = ["user"]
|
||
self._nodes = FetchRequest(fetchRequest: request)
|
||
|
||
self._selectedNode = selectedNode
|
||
self.connectedNode = connectedNode
|
||
self._isPresentingDeleteNodeAlert = isPresentingDeleteNodeAlert
|
||
self._deleteNodeId = deleteNodeId
|
||
self._shareContactNode = shareContactNode
|
||
}
|
||
|
||
// The body of the view
|
||
var body: some View {
|
||
// If the connected node passes filters, always show it first (single-pass)
|
||
let nodesWithConnectedFirst: [NodeInfoEntity] = {
|
||
let activeNum = accessoryManager.activeDeviceNum
|
||
var result: [NodeInfoEntity] = []
|
||
result.reserveCapacity(nodes.count)
|
||
var connectedNode: NodeInfoEntity?
|
||
for node in nodes {
|
||
if node.num == activeNum {
|
||
connectedNode = node
|
||
} else {
|
||
result.append(node)
|
||
}
|
||
}
|
||
if let connectedNode {
|
||
result.insert(connectedNode, at: 0)
|
||
}
|
||
return result
|
||
}()
|
||
List(nodesWithConnectedFirst, id: \.self, selection: $selectedNode) { node in
|
||
NavigationLink(value: node) {
|
||
NodeListItem(
|
||
node: node,
|
||
isDirectlyConnected: node.num == accessoryManager.activeDeviceNum,
|
||
connectedNode: accessoryManager.activeConnection?.device.num ?? -1
|
||
)
|
||
}
|
||
.contextMenu {
|
||
contextMenuActions(
|
||
node: node,
|
||
connectedNode: connectedNode
|
||
)
|
||
}
|
||
}
|
||
.onAppear {
|
||
router.updateNodeIndex(from: nodes)
|
||
}
|
||
.onChange(of: nodes.count) { _, _ in
|
||
router.updateNodeIndex(from: nodes)
|
||
}
|
||
}
|
||
|
||
@ViewBuilder
|
||
func contextMenuActions(
|
||
node: NodeInfoEntity,
|
||
connectedNode: NodeInfoEntity?
|
||
) -> some View {
|
||
if let user = node.user {
|
||
NodeAlertsButton(context: context, node: node, user: user)
|
||
if !user.unmessagable && user.num == UserDefaults.preferredPeripheralNum {
|
||
Button(action: {
|
||
shareContactNode = node
|
||
}) {
|
||
Label("Share Contact QR", systemImage: "qrcode")
|
||
}
|
||
}
|
||
}
|
||
if let connectedNode {
|
||
FavoriteNodeButton(node: node)
|
||
if connectedNode.num != node.num {
|
||
if !(node.user?.unmessagable ?? true) {
|
||
Button(action: {
|
||
if let url = URL(string: "meshtastic:///messages?userNum=\(node.num)") {
|
||
UIApplication.shared.open(url)
|
||
}
|
||
}) {
|
||
Label("Message", systemImage: "message")
|
||
}
|
||
}
|
||
Button {
|
||
Task {
|
||
do {
|
||
try await accessoryManager.sendPosition(
|
||
channel: node.channel,
|
||
destNum: node.num,
|
||
wantResponse: true
|
||
)
|
||
Task { @MainActor in
|
||
// Update state to show alert
|
||
}
|
||
} catch {
|
||
Logger.mesh.warning("Failed to sendPosition")
|
||
}
|
||
}
|
||
} label: {
|
||
Label("Exchange Positions", systemImage: "arrow.triangle.2.circlepath")
|
||
}
|
||
Button {
|
||
Task {
|
||
if let fromUser = connectedNode.user, let toUser = node.user {
|
||
do {
|
||
_ = try await accessoryManager.exchangeUserInfo(fromUser: fromUser, toUser: toUser)
|
||
} catch {
|
||
Logger.mesh.warning("Failed to exchange user info")
|
||
}
|
||
}
|
||
}
|
||
} label: {
|
||
Label("Exchange User Info", systemImage: "person.2.badge.gearshape")
|
||
}
|
||
TraceRouteButton(
|
||
node: node
|
||
)
|
||
IgnoreNodeButton(
|
||
node: node
|
||
)
|
||
Button(role: .destructive) {
|
||
deleteNodeId = node.num
|
||
isPresentingDeleteNodeAlert = true
|
||
} label: {
|
||
Label("Delete Node", systemImage: "trash")
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
//
|
||
// NodeFilterParameters+Predicate.swift
|
||
// Meshtastic
|
||
//
|
||
|
||
fileprivate extension NodeFilterParameters {
|
||
func buildPredicate() -> NSPredicate? {
|
||
var predicates: [NSPredicate] = []
|
||
|
||
// Search text predicates
|
||
if !searchText.isEmpty {
|
||
let searchKeys = [
|
||
"user.userId", "user.numString", "user.hwModel",
|
||
"user.hwDisplayName", "user.longName", "user.shortName"
|
||
]
|
||
let textPredicates = searchKeys.map {
|
||
NSPredicate(format: "%K CONTAINS[c] %@", $0, searchText)
|
||
}
|
||
predicates.append(NSCompoundPredicate(orPredicateWithSubpredicates: textPredicates))
|
||
}
|
||
|
||
// Favorite filter
|
||
if isFavorite {
|
||
predicates.append(NSPredicate(format: "favorite == YES"))
|
||
}
|
||
|
||
// Via Lora/MQTT filters
|
||
if viaLora && !viaMqtt {
|
||
predicates.append(NSPredicate(format: "viaMqtt == NO"))
|
||
} else if !viaLora && viaMqtt {
|
||
predicates.append(NSPredicate(format: "viaMqtt == YES"))
|
||
}
|
||
|
||
// Role filter
|
||
if roleFilter && !deviceRoles.isEmpty {
|
||
let rolesPredicates = deviceRoles.map {
|
||
NSPredicate(format: "user.role == %i", Int32($0))
|
||
}
|
||
predicates.append(NSCompoundPredicate(type: .or, subpredicates: rolesPredicates))
|
||
}
|
||
|
||
// Hops Away filter
|
||
if hopsAway == 0.0 {
|
||
predicates.append(NSPredicate(format: "hopsAway == %i", 0))
|
||
} else if hopsAway > 0.0 {
|
||
predicates.append(NSPredicate(format: "hopsAway > 0 AND hopsAway <= %i", Int32(hopsAway)))
|
||
}
|
||
|
||
// Online filter
|
||
if isOnline {
|
||
let isOnlinePredicate = NSPredicate(format: "lastHeard >= %@", Calendar.current.date(byAdding: .minute, value: -120, to: Date())! as NSDate)
|
||
predicates.append(isOnlinePredicate)
|
||
}
|
||
|
||
// Encrypted filter
|
||
if isPkiEncrypted {
|
||
predicates.append(NSPredicate(format: "user.pkiEncrypted == YES"))
|
||
}
|
||
|
||
// Ignored filter
|
||
if isIgnored {
|
||
predicates.append(NSPredicate(format: "ignored == YES"))
|
||
} else {
|
||
predicates.append(NSPredicate(format: "ignored == NO"))
|
||
}
|
||
|
||
// Environment filter
|
||
if isEnvironment {
|
||
predicates.append(NSPredicate(format: "SUBQUERY(telemetries, $tel, $tel.metricsType == 1).@count > 0"))
|
||
}
|
||
|
||
// Distance filter
|
||
if distanceFilter {
|
||
if let pointOfInterest = LocationsHandler.currentLocation {
|
||
|
||
if pointOfInterest.latitude != LocationsHandler.DefaultLocation.latitude && pointOfInterest.longitude != LocationsHandler.DefaultLocation.longitude {
|
||
let d: Double = maxDistance * 1.1
|
||
let r: Double = 6371009
|
||
let meanLatitidue = pointOfInterest.latitude * .pi / 180
|
||
let deltaLatitude = d / r * 180 / .pi
|
||
let deltaLongitude = d / (r * cos(meanLatitidue)) * 180 / .pi
|
||
let minLatitude: Double = pointOfInterest.latitude - deltaLatitude
|
||
let maxLatitude: Double = pointOfInterest.latitude + deltaLatitude
|
||
let minLongitude: Double = pointOfInterest.longitude - deltaLongitude
|
||
let maxLongitude: Double = pointOfInterest.longitude + deltaLongitude
|
||
let distancePredicate = NSPredicate(format: "(SUBQUERY(positions, $position, $position.latest == TRUE && (%lf <= ($position.longitudeI / 1e7)) AND (($position.longitudeI / 1e7) <= %lf) AND (%lf <= ($position.latitudeI / 1e7)) AND (($position.latitudeI / 1e7) <= %lf))).@count > 0", minLongitude, maxLongitude, minLatitude, maxLatitude)
|
||
predicates.append(distancePredicate)
|
||
}
|
||
}
|
||
}
|
||
return predicates.isEmpty ? nil : NSCompoundPredicate(type: .and, subpredicates: predicates)
|
||
}
|
||
}
|