Version 0.2.0

Accelerometer/AccelerometerApp.swift

@@ -17,7 +17,7 @@ struct AccelerometerApp: App {
 
     init() {
         self.measurer = Measurer(settings: settings)
-        self.recorder = Recorder(measurer: measurer)
+        self.recorder = Recorder(measurer: measurer, settings: settings)
     }
 
     var body: some Scene {

Accelerometer/ContentView.swift

@@ -8,44 +8,50 @@
 import SwiftUI
 
 struct ContentView: View {
-
+    @EnvironmentObject var recorder: Recorder
+    @State private var selectedTab = 0
+
     var body: some View {
-        TabView {
+        TabView(selection: $selectedTab) {
             NavigationView {
                 MeasurementsView()
-                    .navigationTitle(Text("Measurements"))
+                    .navigationTitle("Measurements")
             }
             .phoneOnlyStackNavigationView()
             .tabItem {
                 Label("Measurements", systemImage: "list.bullet")
             }
-
+            .tag(0)
+
             NavigationView {
                 RecordingsView()
-                    .navigationTitle(Text("Recordings"))
+                    .navigationTitle("Recordings")
             }
             .phoneOnlyStackNavigationView()
             .tabItem {
                 Label("Recordings", systemImage: "play")
             }
-
+            .tag(1)
+
             NavigationView {
                 SettingsView()
-                    .navigationTitle(Text("Settings"))
+                    .navigationTitle("Settings")
             }
             .navigationViewStyle(.stack)
             .tabItem {
                 Label("Settings", systemImage: "gear")
             }
+            .tag(2)
         }
     }
 }
 
+
 struct ContentView_Previews: PreviewProvider {
 
     static let settings = Settings()
     static let measurer = Measurer(settings: settings)
-    static let recorder = Recorder(measurer: measurer)
+    static let recorder = Recorder(measurer: measurer, settings: settings)
 
     static var previews: some View {
         ContentView()

Accelerometer/Extensions/Bool.swift

@@ -6,9 +6,29 @@
 //
 
 import Foundation
+import Charts
 
-extension Bool: Comparable {
+extension Bool: @retroactive Comparable {
     public static func < (lhs: Bool, rhs: Bool) -> Bool {
         (lhs == false) && (rhs == true)
     }
 }
+
+extension Bool: @retroactive Plottable {
+    public typealias PrimitivePlottable = Double
+
+    public var primitivePlottable: Double {
+        self ? 1.0 : 0.0
+    }
+
+    public init?(primitivePlottable: Double) {
+        switch primitivePlottable {
+        case 0.0:
+            self = false
+        case 1.0:
+            self = true
+        default:
+            return nil
+        }
+    }
+}

Accelerometer/Extensions/View.swift

@@ -23,11 +23,11 @@ extension View {
     var statusBarOrientation: UIInterfaceOrientation? {
         get {
             guard let orientation = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation else {
-                #if DEBUG
+#if DEBUG
                 fatalError("Could not obtain UIInterfaceOrientation from a valid windowScene")
-                #else
+#else
                 return nil
-                #endif
+#endif
             }
             return orientation
         }
@@ -40,6 +40,30 @@ extension View {
             self
         }
     }
+
+    func exportable(
+        isPresented: Binding<Bool>,
+        url: Binding<URL?>,
+        filename: String
+    ) -> some View {
+        modifier(ExportModifier(
+            isPresented: isPresented,
+            url: url,
+            filename: filename
+        ))
+    }
+
+    func exportable(
+        isPresented: Binding<Bool>,
+        url: Binding<URL?>,
+        measurementType: MeasurementType
+    ) -> some View {
+        modifier(ExportModifier(
+            isPresented: isPresented,
+            url: url,
+            measurementType: measurementType
+        ))
+    }
 }
 
 struct RoundedCorner: Shape {

Accelerometer/Measurements/Axes/AxesSummaryViewExtended.swift

@@ -66,113 +66,75 @@ struct AxesSummaryViewExtended: View {
     }
 }
 
+// MARK: - Previews
+
 struct AxesSummaryViewExtended_Previews: PreviewProvider {
 
-    static let settings = Settings()
+    // MARK: Test Measurers
 
-    // TODO: refactor this
-    static let measurer1: Measurer = {
-        let measurer = Measurer(settings: settings)
-        var axes = TriangleAxes.zero
-        axes.displayableAbsMax = 1.0
-        measurer.saveData(
-            axesType: TriangleAxes.self,
-            measurementType: .userAcceleration,
-            values: [
-                .x: 0,
-                .y: 0,
-                .z: 0
-            ]
-        )
-        measurer.saveData(
-            axesType: TriangleAxes.self,
-            measurementType: .magneticField,
-            values: [
-                .x: 0,
-                .y: 0,
-                .z: 0
-            ]
-        )
-        return measurer
-    }()
+    struct MeasurerScenario {
+        let title: String
+        let measurer: Measurer
+    }
 
-    static let measurer2: Measurer = {
-        let measurer = Measurer(settings: settings)
-        var axes = TriangleAxes.zero
-        axes.displayableAbsMax = 1.0
-        measurer.saveData(
-            axesType: TriangleAxes.self,
-            measurementType: .userAcceleration,
-            values: [
-                .x: 0.5,
-                .y: 0.5,
-                .z: 0.5
-            ]
-        )
-        measurer.saveData(
-            axesType: TriangleAxes.self,
-            measurementType: .magneticField,
-            values: [
-                .x: 100,
-                .y: 100,
-                .z: 100
-            ]
-        )
-        return measurer
-    }()
+    private static let settings = Settings()
 
-    static let measurer3: Measurer = {
-        let measurer = Measurer(settings: settings)
-        var axes = TriangleAxes.zero
-        axes.displayableAbsMax = 1.0
-        measurer.saveData(
-            axesType: TriangleAxes.self,
-            measurementType: .userAcceleration,
-            values: [
-                .x: 1,
-                .y: 1,
-                .z: 1
-            ]
-        )
-        measurer.saveData(
-            axesType: TriangleAxes.self,
-            measurementType: .magneticField,
-            values: [
-                .x: 200,
-                .y: 200,
-                .z: 200
-            ]
-        )
-        return measurer
-    }()
+    private static func makeMeasurer(x: Double, y: Double, z: Double) -> Measurer {
+        let m = Measurer(settings: settings)
+        m.saveData(axesType: TriangleAxes.self, measurementType: .userAcceleration,
+                   values: [.x: x, .y: y, .z: z])
+        m.saveData(axesType: TriangleAxes.self, measurementType: .magneticField,
+                   values: [.x: x * 200, .y: y * 200, .z: z * 200])
+        return m
+    }
+
+    private static let scenarios: [MeasurerScenario] = [
+        MeasurerScenario(title: "Zero",    measurer: makeMeasurer(x: 0,   y: 0,   z: 0)),
+        MeasurerScenario(title: "Half-Max",measurer: makeMeasurer(x: 0.5, y: 0.5, z: 0.5)),
+        MeasurerScenario(title: "Full-Max",measurer: makeMeasurer(x: 1,   y: 1,   z: 1))
+    ]
+
+    // MARK: Preview
 
     static var previews: some View {
         Group {
-            AxesSummaryViewExtended(type: .userAcceleration)
-                .padding()
-                .previewLayout(.sizeThatFits)
-                .environmentObject(measurer1)
-            AxesSummaryViewExtended(type: .userAcceleration)
-                .padding()
-                .previewLayout(.sizeThatFits)
-                .environmentObject(measurer2)
-            AxesSummaryViewExtended(type: .userAcceleration)
-                .padding()
-                .previewLayout(.sizeThatFits)
-                .environmentObject(measurer3)
-            AxesSummaryViewExtended(type: .magneticField)
-                .padding()
-                .previewLayout(.sizeThatFits)
-                .environmentObject(measurer1)
-            AxesSummaryViewExtended(type: .magneticField)
-                .padding()
-                .previewLayout(.sizeThatFits)
-                .environmentObject(measurer2)
-            AxesSummaryViewExtended(type: .magneticField)
-                .padding()
-                .previewLayout(.sizeThatFits)
-                .environmentObject(measurer3)
+            ForEach([MeasurementType.userAcceleration, .magneticField], id: \.self) { type in
+                PreviewSection(type: type, scenarios: scenarios)
+            }
         }
         .environmentObject(settings)
     }
 }
+
+// MARK: Helper Views
+
+private struct PreviewSection: View {
+    let type: MeasurementType
+    let scenarios: [AxesSummaryViewExtended_Previews.MeasurerScenario]
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            Text(type.name.capitalizingFirstLetter())
+                .font(.title2)
+                .padding(.bottom)
+
+            VStack(spacing: 20) {
+                ForEach(scenarios, id: \.title) { scenario in
+                    VStack(spacing: 8) {
+                        Text(scenario.title)
+                            .font(.caption)
+                        AxesSummaryViewExtended(type: type)
+                            .environmentObject(scenario.measurer)
+                            .padding()
+                            .background(Color(.systemBackground))
+                            .cornerRadius(6)
+                            .shadow(radius: 1)
+                    }
+                }
+            }
+        }
+        .padding()
+        .previewDisplayName(type.name.capitalizingFirstLetter())
+        .previewLayout(.sizeThatFits)
+    }
+}

Accelerometer/Measurements/MeasurementSummaryView.swift

@@ -23,9 +23,15 @@ struct MeasurementSummaryView: View {
     }
 
     var recordButton: some View {
-        let enabled = !recorder.recordingInProgress
-        let text = enabled ? "Start recording this value" : "Recording is already enabled"
-        let backgroundColor: Color = enabled ? .enabledButton : .disabledButton
+        let enabled = !recorder.recordingInProgress && recorder.hasEnoughMemory
+
+        let text = if !recorder.hasEnoughMemory {
+            "Not enough memory"
+        } else if recorder.recordingInProgress {
+            "Recording is already started"
+        } else {
+            "Start recording this value"
+        }
 
         return Button(
             action: {
@@ -35,10 +41,10 @@ struct MeasurementSummaryView: View {
                     .foregroundColor(.background)
             }
         )
+        .buttonStyle(.glassProminent)
+        .controlSize(.large)
         .disabled(!enabled)
         .padding(.defaultPadding)
-        .background(backgroundColor)
-        .cornerRadius(.defaultCornerRadius)
     }
 
     var body: some View {
@@ -99,12 +105,12 @@ struct MeasurementSummaryView_Previews: PreviewProvider {
     }()
 
     static let recorder1: Recorder = {
-        let recorder = Recorder(measurer: measurer)
+        let recorder = Recorder(measurer: measurer, settings: settings)
         return recorder
     }()
 
     static let recorder2: Recorder = {
-        let recorder = Recorder(measurer: measurer)
+        let recorder = Recorder(measurer: measurer, settings: settings)
         recorder.record(measurements: [.acceleration])
         return recorder
     }()