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>
222 lines
5.3 KiB
Swift
222 lines
5.3 KiB
Swift
import SwiftUI
|
|
import UniformTypeIdentifiers
|
|
import OSLog
|
|
|
|
struct MapDataFiles: View {
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
@ObservedObject private var mapDataManager = MapDataManager.shared
|
|
|
|
@State private var isShowingFilePicker = false
|
|
@State private var isProcessing = false
|
|
@State private var processingProgress: Double = 0.0
|
|
@State private var showError = false
|
|
@State private var errorMessage = ""
|
|
@State private var showSuccess = false
|
|
@State private var successMessage = ""
|
|
|
|
var body: some View {
|
|
Form {
|
|
Section(header: Text("Upload Map Overlays")) {
|
|
Text("Upload GeoJSON files to display custom map overlays. Files are stored locally and can be up to 10MB.")
|
|
.font(.callout)
|
|
.foregroundColor(.secondary)
|
|
// Upload Button
|
|
Button(action: {
|
|
isShowingFilePicker = true
|
|
}) {
|
|
HStack {
|
|
Image(systemName: "doc.badge.plus")
|
|
.font(.title2)
|
|
Text("Select Map File")
|
|
.fontWeight(.medium)
|
|
}
|
|
.frame(maxWidth: .infinity)
|
|
.padding()
|
|
.background(Color.accentColor)
|
|
.foregroundColor(.white)
|
|
.cornerRadius(10)
|
|
}
|
|
.disabled(isProcessing)
|
|
.padding(.horizontal)
|
|
|
|
// Processing Indicator
|
|
if isProcessing {
|
|
VStack(spacing: 12) {
|
|
ProgressView(value: processingProgress)
|
|
.progressViewStyle(LinearProgressViewStyle())
|
|
.padding(.horizontal)
|
|
|
|
Text("Processing file...")
|
|
.font(.caption)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
}
|
|
}
|
|
Section(header: Text("Uploaded Map Overlays")) {
|
|
|
|
let uploadedFiles = mapDataManager.getUploadedFiles()
|
|
|
|
if uploadedFiles.isEmpty {
|
|
ContentUnavailableView("No files uploaded", systemImage: "doc.text")
|
|
} else {
|
|
ScrollView {
|
|
LazyVStack {
|
|
ForEach(Array(uploadedFiles.enumerated()), id: \.offset) { index, file in
|
|
MapDataFileRow(file: file, showDivider: index < uploadedFiles.count - 1) {
|
|
deleteFile(file)
|
|
}
|
|
}
|
|
}
|
|
.padding(.horizontal)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.fileImporter(
|
|
isPresented: $isShowingFilePicker,
|
|
allowedContentTypes: [
|
|
UTType.json,
|
|
UTType(filenameExtension: "geojson") ?? UTType.json
|
|
],
|
|
allowsMultipleSelection: false
|
|
) { result in
|
|
handleFileSelection(result)
|
|
}
|
|
.alert("Upload Error", isPresented: $showError) {
|
|
Button("Ok") { }
|
|
} message: {
|
|
Text(errorMessage)
|
|
}
|
|
.alert("Upload Success", isPresented: $showSuccess) {
|
|
Button("Ok") { }
|
|
} message: {
|
|
Text(successMessage)
|
|
}
|
|
.onAppear {
|
|
// Initialize map data manager if needed
|
|
mapDataManager.initialize()
|
|
}
|
|
}
|
|
|
|
// MARK: - File Handling
|
|
|
|
private func handleFileSelection(_ result: Result<[URL], Error>) {
|
|
do {
|
|
guard let selectedFile = try result.get().first else { return }
|
|
|
|
// Start processing
|
|
isProcessing = true
|
|
processingProgress = 0.0
|
|
|
|
// Process file asynchronously
|
|
Task {
|
|
do {
|
|
// Simulate progress
|
|
await simulateProgress()
|
|
|
|
let metadata = try await mapDataManager.processUploadedFile(from: selectedFile)
|
|
|
|
await MainActor.run {
|
|
isProcessing = false
|
|
processingProgress = 1.0
|
|
|
|
successMessage = "Successfully uploaded '\(metadata.originalName)' with \(metadata.overlayCount) overlays".localized
|
|
showSuccess = true
|
|
}
|
|
} catch {
|
|
await MainActor.run {
|
|
isProcessing = false
|
|
processingProgress = 0.0
|
|
|
|
errorMessage = error.localizedDescription
|
|
showError = true
|
|
}
|
|
}
|
|
}
|
|
} catch {
|
|
errorMessage = "Failed to access file: \(error.localizedDescription)".localized
|
|
showError = true
|
|
}
|
|
}
|
|
|
|
private func simulateProgress() async {
|
|
for i in 1...10 {
|
|
await MainActor.run {
|
|
processingProgress = Double(i) / 10.0
|
|
}
|
|
try? await Task.sleep(nanoseconds: 200_000_000) // 0.2 seconds
|
|
}
|
|
}
|
|
|
|
private func deleteFile(_ file: MapDataMetadata) {
|
|
Task {
|
|
do {
|
|
try await mapDataManager.deleteFile(file)
|
|
} catch {
|
|
await MainActor.run {
|
|
errorMessage = "Failed to delete file: \(error.localizedDescription)".localized
|
|
showError = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Supporting Views
|
|
|
|
struct MapDataFileRow: View {
|
|
let file: MapDataMetadata
|
|
let showDivider: Bool
|
|
let onDelete: () -> Void
|
|
|
|
var body: some View {
|
|
HStack {
|
|
VStack {
|
|
HStack {
|
|
Text(file.originalName)
|
|
.font(.headline)
|
|
.lineLimit(1)
|
|
|
|
Spacer()
|
|
Text(file.fileSizeString)
|
|
.font(.caption)
|
|
.foregroundColor(.secondary)
|
|
Button(action: onDelete) {
|
|
Image(systemName: "trash")
|
|
.foregroundColor(.red)
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.small)
|
|
}
|
|
HStack {
|
|
Text(file.format.uppercased())
|
|
.font(.caption2)
|
|
.fixedSize()
|
|
.padding(.horizontal, 8)
|
|
.padding(.vertical, 2)
|
|
.background(Color.secondary.opacity(0.2))
|
|
.cornerRadius(4)
|
|
|
|
Text("\(file.overlayCount) \(file.overlayCount > 1 ? "features".localized : "feature".localized)")
|
|
.font(.caption2)
|
|
.foregroundColor(.secondary)
|
|
Spacer()
|
|
Text(file.uploadDate.formatted())
|
|
.font(.caption2)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
}
|
|
}
|
|
if showDivider {
|
|
Divider()
|
|
}
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
NavigationView {
|
|
MapDataFiles()
|
|
}
|
|
}
|