ch/TempTrack-iOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ch:740f776af61da22d961c243fdb4a7e2ca2af1c21
Branches Tags
ch:master
...
compare: ch:e9f6bafe334f9c2a8c3625ee3a13ed535a2fe06b
Branches Tags
ch:master

2 Commits
740f776af6 ... e9f6bafe33

Author SHA1 Message Date
Christoph Hagen
e9f6bafe33 Add CSV export for days 2025-01-31 13:37:44 +01:00
Christoph Hagen
00e4da3f21 Add export function 2025-01-31 13:06:11 +01:00
13 changed files with 362 additions and 19 deletions
Show Stats Expand all files Collapse all files

35
TempTrack.xcodeproj/project.pbxproj
View File

@ -47,6 +47,10 @@
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 */; };
E2FD1D712D4CF5EB00B48627 /* CsvConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D702D4CF5E700B48627 /* CsvConverter.swift */; };
E2FD1D732D4CF82100B48627 /* ShareCsvSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D722D4CF81900B48627 /* ShareCsvSheet.swift */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -90,6 +94,9 @@
E2E69B612A4D7C3100C6035E /* BluetoothScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothScanner.swift; sourceTree = "<group>"; };
E2E69B652A4DA48B00C6035E /* BluetoothDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothDevice.swift; sourceTree = "<group>"; };
E2E69B672A529FA800C6035E /* TransferHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransferHandler.swift; sourceTree = "<group>"; };
E2FD1D6E2D4CE83700B48627 /* ExportSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportSheet.swift; sourceTree = "<group>"; };
E2FD1D702D4CF5E700B48627 /* CsvConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CsvConverter.swift; sourceTree = "<group>"; };
E2FD1D722D4CF81900B48627 /* ShareCsvSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareCsvSheet.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -99,6 +106,7 @@
files = (
88404DD02A2E718B00D30244 /* BinaryCodable in Frameworks */,
88CDE0662A25D08F00114294 /* SFSafeSymbols in Frameworks */,
E2FD1D6B2D4CE64300B48627 /* ZIPFoundation in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -108,6 +116,7 @@
88404DD92A2F4DB100D30244 /* Storage */ = {
isa = PBXGroup;
children = (
E2FD1D702D4CF5E700B48627 /* CsvConverter.swift */,
88404DDA2A2F4DCA00D30244 /* MeasurementDailyCount.swift */,
88CDE0672A2698B400114294 /* PersistentStorage.swift */,
E2A553F82A399F58005204C3 /* Log.swift */,
@ -191,6 +200,8 @@
E2A553FE2A3A1024005204C3 /* DayView.swift */,
E2A554042A4ADA93005204C3 /* TransferView.swift */,
E2E69B5F2A4CD48F00C6035E /* IconAndTextView.swift */,
E2FD1D6E2D4CE83700B48627 /* ExportSheet.swift */,
E2FD1D722D4CF81900B48627 /* ShareCsvSheet.swift */,
);
path = Views;
sourceTree = "<group>";
@ -242,6 +253,7 @@
packageProductDependencies = (
88CDE0652A25D08F00114294 /* SFSafeSymbols */,
88404DCF2A2E718B00D30244 /* BinaryCodable */,
E2FD1D6A2D4CE64300B48627 /* ZIPFoundation */,
);
productName = TempTrack;
productReference = 88CDE04B2A2508E900114294 /* TempTrack.app */;
@ -255,7 +267,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1430;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1620;
TargetAttributes = {
88CDE04A2A2508E800114294 = {
CreatedOnToolsVersion = 14.3;
@ -274,6 +286,7 @@
packageReferences = (
88CDE0642A25D08F00114294 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */,
88404DCE2A2E718B00D30244 /* XCRemoteSwiftPackageReference "BinaryCodable" */,
E2FD1D692D4CE64300B48627 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
);
productRefGroup = 88CDE04C2A2508E900114294 /* Products */;
projectDirPath = "";
@ -305,6 +318,7 @@
E2A554142A4C9C96005204C3 /* DeviceDataRequest.swift in Sources */,
88CDE0512A2508E900114294 /* ContentView.swift in Sources */,
88CDE0702A28AEA300114294 /* TemperatureMeasurement.swift in Sources */,
E2FD1D732D4CF82100B48627 /* ShareCsvSheet.swift in Sources */,
E2A554162A4C9D2E005204C3 /* DeviceDataResetRequest.swift in Sources */,
88404DE12A31CA6B00D30244 /* BluetoothResponseType.swift in Sources */,
88404DDF2A2F68E100D30244 /* TemperatureDayOverview.swift in Sources */,
@ -316,6 +330,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 */,
@ -329,6 +344,7 @@
88404DD22A2F0D8F00D30244 /* Double+Extensions.swift in Sources */,
E2A554102A4C9C68005204C3 /* DeviceRequest.swift in Sources */,
E253A9222A2B39B700EC6B28 /* Color+Extensions.swift in Sources */,
E2FD1D712D4CF5EB00B48627 /* CsvConverter.swift in Sources */,
E2E69B682A529FA800C6035E /* TransferHandler.swift in Sources */,
88404DEB2A37BE3000D30244 /* DeviceWakeCause.swift in Sources */,
88CDE06D2A28A92000114294 /* DeviceInfo.swift in Sources */,
@ -347,6 +363,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 +396,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 +425,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 +458,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 +579,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 +600,11 @@
package = 88CDE0642A25D08F00114294 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */;
productName = SFSafeSymbols;
};
E2FD1D6A2D4CE64300B48627 /* ZIPFoundation */ = {
isa = XCSwiftPackageProductDependency;
package = E2FD1D692D4CE64300B48627 /* XCRemoteSwiftPackageReference "ZIPFoundation" */;
productName = ZIPFoundation;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 88CDE0432A2508E800114294 /* Project object */;

12
TempTrack.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -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
}

BIN
TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

7
TempTrack/Connection/BluetoothDevice.swift
View File

@ -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)
}

7
TempTrack/Connection/BluetoothScanner.swift
View File

@ -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)
}

2
TempTrack/ContentView.swift
View File

@ -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)
}
}

40
TempTrack/Storage/CsvConverter.swift Normal file
View File

@ -0,0 +1,40 @@
import Foundation
struct CsvConverter {
private let dateFormatter: DateFormatter
init() {
dateFormatter = .init()
dateFormatter.dateStyle = .short
dateFormatter.timeStyle = .medium
}
private var header: String {
"Index;Date;Sensor 0;Sensor 1\n"
}
func convert(measurements: [TemperatureMeasurement]) -> String {
header + measurements.enumerated().map { (index, measurement) -> String in
let parts: [String] = [
"\(index)",
dateFormatter.string(from: measurement.date),
convert(measurement.sensor0),
convert(measurement.sensor1)
]
return parts.joined(separator: ";")
}.joined(separator: "\n")
}
private func convert(_ value: TemperatureValue) -> String {
switch value {
case .notFound:
return ""
case .invalidMeasurement:
return "?"
case .value(let value):
return String(format:"%.1f", value)
}
}
}

29
TempTrack/Storage/PersistentStorage.swift
View File

@ -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 {

19
TempTrack/TempTrackApp.swift
View File

@ -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)

29
TempTrack/Views/DayView.swift
View File

@ -1,4 +1,5 @@
import SwiftUI
import SFSafeSymbols
private let df: DateFormatter = {
let df = DateFormatter()
@ -21,20 +22,46 @@ struct DayView: View {
@EnvironmentObject
var storage: PersistentStorage
@State
private var showShareSheet = false
private let title: String
init(dateIndex: Int) {
self.dateIndex = dateIndex
self.title = Date(dateIndex: dateIndex)
.formatted(date: .abbreviated, time: .omitted)
}
var entries: [TemperatureMeasurement] {
storage.loadMeasurements(for: dateIndex)
}
var body: some View {
VStack {
TemperatureDayOverview(points: entries)
List(entries) { entry in
HStack {
Text(df.string(from: entry.date))
Text(entry.date.formatted(date: .omitted, time: .standard))
Spacer()
Text(entry.displayText)
}
}
}
.navigationTitle(title)
.navigationBarTitleDisplayMode(.large)
.toolbar {
ToolbarItem {
Button(action: { showShareSheet = true }) {
Label("Export", systemSymbol: .arrowUpDoc)
}
}
}
.sheet(isPresented: $showShareSheet) {
ShareCsvSheet(isPresented: $showShareSheet,
measurements: entries)
}
}
}
struct DayView_Previews: PreviewProvider {

82
TempTrack/Views/ExportSheet.swift Normal file
View File

@ -0,0 +1,82 @@
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()
}
Button("Dismiss", action: { isPresented = false })
}
.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))
}

14
TempTrack/Views/HistoryList.swift
View File

@ -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)
}
}
}

91
TempTrack/Views/ShareCsvSheet.swift Normal file
View File

@ -0,0 +1,91 @@
import SwiftUI
struct ShareCsvSheet: View {
@Binding var isPresented: Bool
@State
private var isCreatingFile = false
@State var url: URL?
@State var error: String?
@EnvironmentObject
private var storage: PersistentStorage
let measurements: [TemperatureMeasurement]
var body: some View {
VStack {
Text("Export")
.font(.title)
Text("Create a CSV file of all measurements for the day")
if isCreatingFile {
ProgressView()
Text("Creating file...")
}
if let error {
Text(error)
.foregroundStyle(.red)
}
Spacer()
Button("Create file", action: createFile)
.disabled(isCreatingFile)
.padding()
if let url {
ShareLink(item: url) {
Label("Share file", systemImage: "square.and.arrow.up")
}
.padding()
Button("Delete file", action: deleteFile)
.padding()
}
Button("Dismiss", action: { isPresented = false })
}
.padding()
}
private func createFile() {
guard !isCreatingFile else {
return
}
isCreatingFile = true
DispatchQueue.main.async {
do {
let url = FileManager.default.temporaryDirectory.appendingPathComponent("export.csv")
let converter = CsvConverter()
let content = converter.convert(measurements: measurements)
try content.write(to: url, atomically: true, encoding: .utf8)
DispatchQueue.main.async {
self.url = url
self.error = nil
self.isCreatingFile = false
}
} catch {
DispatchQueue.main.async {
self.error = "Failed to save file: \(error.localizedDescription)"
self.isCreatingFile = false
}
}
}
}
private func deleteFile() {
guard let url else {
return
}
do {
try FileManager.default.removeItem(at: url)
self.error = nil
self.url = nil
} catch {
self.error = "Failed to delete archive: \(error.localizedDescription)"
}
}
}
#Preview {
ShareCsvSheet(isPresented: .constant(true),
measurements: [])
}