diff --git a/TempTrack.xcodeproj/project.pbxproj b/TempTrack.xcodeproj/project.pbxproj index a7fe1dd..6e2087f 100644 --- a/TempTrack.xcodeproj/project.pbxproj +++ b/TempTrack.xcodeproj/project.pbxproj @@ -47,6 +47,8 @@ E2E69B622A4D7C3100C6035E /* BluetoothScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E69B612A4D7C3100C6035E /* BluetoothScanner.swift */; }; E2E69B662A4DA48B00C6035E /* BluetoothDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E69B652A4DA48B00C6035E /* BluetoothDevice.swift */; }; E2E69B682A529FA800C6035E /* TransferHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E69B672A529FA800C6035E /* TransferHandler.swift */; }; + E2FD1D6B2D4CE64300B48627 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = E2FD1D6A2D4CE64300B48627 /* ZIPFoundation */; }; + E2FD1D6F2D4CE83700B48627 /* ExportSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D6E2D4CE83700B48627 /* ExportSheet.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -90,6 +92,7 @@ E2E69B612A4D7C3100C6035E /* BluetoothScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothScanner.swift; sourceTree = ""; }; E2E69B652A4DA48B00C6035E /* BluetoothDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDevice.swift; sourceTree = ""; }; E2E69B672A529FA800C6035E /* TransferHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransferHandler.swift; sourceTree = ""; }; + E2FD1D6E2D4CE83700B48627 /* ExportSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportSheet.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -99,6 +102,7 @@ files = ( 88404DD02A2E718B00D30244 /* BinaryCodable in Frameworks */, 88CDE0662A25D08F00114294 /* SFSafeSymbols in Frameworks */, + E2FD1D6B2D4CE64300B48627 /* ZIPFoundation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -191,6 +195,7 @@ E2A553FE2A3A1024005204C3 /* DayView.swift */, E2A554042A4ADA93005204C3 /* TransferView.swift */, E2E69B5F2A4CD48F00C6035E /* IconAndTextView.swift */, + E2FD1D6E2D4CE83700B48627 /* ExportSheet.swift */, ); path = Views; sourceTree = ""; @@ -242,6 +247,7 @@ packageProductDependencies = ( 88CDE0652A25D08F00114294 /* SFSafeSymbols */, 88404DCF2A2E718B00D30244 /* BinaryCodable */, + E2FD1D6A2D4CE64300B48627 /* ZIPFoundation */, ); productName = TempTrack; productReference = 88CDE04B2A2508E900114294 /* TempTrack.app */; @@ -255,7 +261,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1430; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1620; TargetAttributes = { 88CDE04A2A2508E800114294 = { CreatedOnToolsVersion = 14.3; @@ -274,6 +280,7 @@ packageReferences = ( 88CDE0642A25D08F00114294 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */, 88404DCE2A2E718B00D30244 /* XCRemoteSwiftPackageReference "BinaryCodable" */, + E2FD1D692D4CE64300B48627 /* XCRemoteSwiftPackageReference "ZIPFoundation" */, ); productRefGroup = 88CDE04C2A2508E900114294 /* Products */; projectDirPath = ""; @@ -316,6 +323,7 @@ 88CDE0682A2698B400114294 /* PersistentStorage.swift in Sources */, 88404DE92A31F7D500D30244 /* Data+Extensions.swift in Sources */, 88404DE52A31F23E00D30244 /* UInt16+Extensions.swift in Sources */, + E2FD1D6F2D4CE83700B48627 /* ExportSheet.swift in Sources */, 88404DD42A2F0DB100D30244 /* Date+Extensions.swift in Sources */, 88CDE0762A28AF0900114294 /* TemperatureValue.swift in Sources */, E2E69B622A4D7C3100C6035E /* BluetoothScanner.swift in Sources */, @@ -347,6 +355,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; @@ -379,6 +388,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -407,6 +417,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; @@ -439,6 +450,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -559,6 +571,14 @@ minimumVersion = 4.0.0; }; }; + E2FD1D692D4CE64300B48627 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.9.19; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -572,6 +592,11 @@ package = 88CDE0642A25D08F00114294 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */; productName = SFSafeSymbols; }; + E2FD1D6A2D4CE64300B48627 /* ZIPFoundation */ = { + isa = XCSwiftPackageProductDependency; + package = E2FD1D692D4CE64300B48627 /* XCRemoteSwiftPackageReference "ZIPFoundation" */; + productName = ZIPFoundation; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 88CDE0432A2508E800114294 /* Project object */; diff --git a/TempTrack.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TempTrack.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b4fdc68..5045d0d 100644 --- a/TempTrack.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/TempTrack.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "4621142a3796c58656af35df5ada2f08fe05daffacc1a501de8eebaaafda9339", "pins" : [ { "identity" : "binarycodable", @@ -17,7 +18,16 @@ "revision" : "7cca2d60925876b5953a2cf7341cd80fbeac983c", "version" : "4.1.1" } + }, + { + "identity" : "zipfoundation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/weichsel/ZIPFoundation.git", + "state" : { + "revision" : "02b6abe5f6eef7e3cbd5f247c5cc24e246efcfe0", + "version" : "0.9.19" + } } ], - "version" : 2 + "version" : 3 } diff --git a/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate b/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate index 4e782c2..fa979f4 100644 Binary files a/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate and b/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TempTrack/Connection/BluetoothDevice.swift b/TempTrack/Connection/BluetoothDevice.swift index 578f732..79fa665 100644 --- a/TempTrack/Connection/BluetoothDevice.swift +++ b/TempTrack/Connection/BluetoothDevice.swift @@ -8,6 +8,8 @@ protocol BluetoothDeviceDelegate: AnyObject { actor BluetoothDevice: NSObject, ObservableObject { + private let storage: PersistentStorage! + let peripheral: CBPeripheral! private let characteristic: CBCharacteristic! @@ -24,9 +26,10 @@ actor BluetoothDevice: NSObject, ObservableObject { self.delegate = delegate } - init(peripheral: CBPeripheral, characteristic: CBCharacteristic) { + init(storage: PersistentStorage, peripheral: CBPeripheral, characteristic: CBCharacteristic) { self.peripheral = peripheral self.characteristic = characteristic + self.storage = storage super.init() peripheral.delegate = self @@ -35,6 +38,7 @@ actor BluetoothDevice: NSObject, ObservableObject { override init() { self.peripheral = nil self.characteristic = nil + self.storage = nil super.init() } @@ -46,7 +50,6 @@ actor BluetoothDevice: NSObject, ObservableObject { } lastDeviceInfo = info delegate?.bluetoothDevice(didUpdate: info) - #warning("Don't use global variable") storage.save(deviceInfo: info) } diff --git a/TempTrack/Connection/BluetoothScanner.swift b/TempTrack/Connection/BluetoothScanner.swift index ac9212d..c6a05cd 100644 --- a/TempTrack/Connection/BluetoothScanner.swift +++ b/TempTrack/Connection/BluetoothScanner.swift @@ -15,6 +15,8 @@ final class BluetoothScanner: NSObject, CBCentralManagerDelegate, ObservableObje private let characteristicUUID = CBUUID(string: "22071991-cccc-cccc-cccc-000000000002") + let storage: PersistentStorage! + private var manager: CBCentralManager! = nil @Published @@ -71,7 +73,8 @@ final class BluetoothScanner: NSObject, CBCentralManagerDelegate, ObservableObje } } - override init() { + init(storage: PersistentStorage) { + self.storage = storage connectionState = .noDeviceFound super.init() self.manager = CBCentralManager(delegate: self, queue: nil) @@ -200,7 +203,7 @@ extension BluetoothScanner: CBPeripheralDelegate { return } - configuredDevice = .init(peripheral: peripheral, characteristic: desiredCharacteristic) + configuredDevice = .init(storage: storage, peripheral: peripheral, characteristic: desiredCharacteristic) Task { await configuredDevice?.set(delegate: self) } diff --git a/TempTrack/ContentView.swift b/TempTrack/ContentView.swift index ba17acf..c6350ac 100644 --- a/TempTrack/ContentView.swift +++ b/TempTrack/ContentView.swift @@ -271,7 +271,7 @@ struct ContentView: View { struct ContentView_Previews: PreviewProvider { static var previews: some View { let storage = PersistentStorage(lastMeasurements: TemperatureMeasurement.mockData) - ContentView(scanner: .init()) + ContentView(scanner: .init(storage: storage)) .environmentObject(storage) } } diff --git a/TempTrack/Storage/PersistentStorage.swift b/TempTrack/Storage/PersistentStorage.swift index 57d8c56..c3be288 100644 --- a/TempTrack/Storage/PersistentStorage.swift +++ b/TempTrack/Storage/PersistentStorage.swift @@ -2,6 +2,7 @@ import Foundation import Combine import BinaryCodable import SwiftUI +import ZIPFoundation final class PersistentStorage: ObservableObject { @@ -353,6 +354,34 @@ final class PersistentStorage: ObservableObject { defer { updateTransferCount() } return save(data: data, date: date, in: "transfers") } + + // MARK: Export + + private var zipArchive: URL { + FileManager.default.temporaryDirectory.appendingPathComponent("data.zip") + } + + func createZip() throws -> URL { + // Define the destination zip file path + let archive = zipArchive + + // Create the zip file + try FileManager.default.zipItem( + at: PersistentStorage.documentDirectory, + to: archive, + shouldKeepParent: false, + compressionMethod: .deflate) + return archive + } + + func removeZipArchive() throws { + let archive = zipArchive + // Remove existing zip file if it exists + if FileManager.default.fileExists(atPath: archive.path) { + print("Removing archive file") + try FileManager.default.removeItem(at: archive) + } + } } private extension Array where Element == TemperatureMeasurement { diff --git a/TempTrack/TempTrackApp.swift b/TempTrack/TempTrackApp.swift index 8bef630..3514afa 100644 --- a/TempTrack/TempTrackApp.swift +++ b/TempTrack/TempTrackApp.swift @@ -1,14 +1,25 @@ import SwiftUI -let storage = PersistentStorage() -private let scanner = BluetoothScanner() - -private let transfer = TransferHandler() @main struct TempTrackApp: App { - + + @StateObject + private var storage: PersistentStorage + + @StateObject + private var scanner: BluetoothScanner + + @StateObject + private var transfer = TransferHandler() + + init() { + let storage = PersistentStorage() + self._scanner = .init(wrappedValue: .init(storage: storage)) + self._storage = .init(wrappedValue: storage) + } + var body: some Scene { WindowGroup { ContentView(scanner: scanner) diff --git a/TempTrack/Views/ExportSheet.swift b/TempTrack/Views/ExportSheet.swift new file mode 100644 index 0000000..1517a67 --- /dev/null +++ b/TempTrack/Views/ExportSheet.swift @@ -0,0 +1,81 @@ +import SwiftUI + +struct ExportSheet: View { + + @Binding var isPresented: Bool + + @State + private var isCreatingArchive = false + + @State var url: URL? + + @State var error: String? + + @EnvironmentObject + private var storage: PersistentStorage + + var body: some View { + VStack { + Text("Export") + .font(.title) + Text("Create a zip file of all stored data and share it.") + if isCreatingArchive { + ProgressView() + Text("Creating archive...") + } + if let error { + Text(error) + .foregroundStyle(.red) + } + Spacer() + Button("Create archive", action: createArchive) + .disabled(isCreatingArchive) + .padding() + if let url { + ShareLink(item: url) { + Label("Share archive", systemImage: "square.and.arrow.up") + } + .padding() + Button("Delete archive", action: deleteArchive) + .padding() + } + } + .padding() + } + + private func createArchive() { + guard !isCreatingArchive else { + return + } + isCreatingArchive = true + DispatchQueue.main.async { + do { + let url = try storage.createZip() + DispatchQueue.main.async { + self.url = url + self.error = nil + self.isCreatingArchive = false + } + } catch { + DispatchQueue.main.async { + self.error = "Failed to create archive: \(error.localizedDescription)" + self.isCreatingArchive = false + } + } + } + } + + private func deleteArchive() { + do { + try storage.removeZipArchive() + self.error = nil + self.url = nil + } catch { + self.error = "Failed to delete archive: \(error.localizedDescription)" + } + } +} + +#Preview { + ExportSheet(isPresented: .constant(true)) +} diff --git a/TempTrack/Views/HistoryList.swift b/TempTrack/Views/HistoryList.swift index 7c3a1af..c6f4574 100644 --- a/TempTrack/Views/HistoryList.swift +++ b/TempTrack/Views/HistoryList.swift @@ -1,10 +1,14 @@ import SwiftUI +import SFSafeSymbols struct HistoryList: View { @EnvironmentObject var storage: PersistentStorage - + + @State + private var showExportSheet = false + var body: some View { NavigationView { List(storage.dailyMeasurementCounts) { day in @@ -25,6 +29,16 @@ struct HistoryList: View { } .navigationTitle("History") .navigationBarTitleDisplayMode(.large) + .toolbar { + ToolbarItem { + Button(action: { showExportSheet = true }) { + Label("Export", systemSymbol: .arrowUpDoc) + } + } + } + .sheet(isPresented: $showExportSheet) { + ExportSheet(isPresented: $showExportSheet) + } } }