Add Timed Walk Test & Improve Rendering Possibilities for the QuestionnaireView

Sources/SpeziQuestionnaire/ORKOrderedTaskView.swift

@@ -16,12 +16,12 @@ import UIKit
 struct ORKOrderedTaskView: UIViewControllerRepresentable {
     class Coordinator: NSObject, ORKTaskViewControllerDelegate, ObservableObject {
         private let isPresented: Binding<Bool>
-        private let questionnaireResponse: @MainActor (QuestionnaireResponse) async -> Void
+        private let timedWalkResponse: @MainActor (ORKTimedWalkResult) async -> Void
 
 
-        init(isPresented: Binding<Bool>, questionnaireResponse: @escaping @MainActor (QuestionnaireResponse) async -> Void) {
+        init(isPresented: Binding<Bool>, timedWalkResponse: @escaping @MainActor (ORKTimedWalkResult) async -> Void) {
             self.isPresented = isPresented
-            self.questionnaireResponse = questionnaireResponse
+            self.timedWalkResponse = timedWalkResponse
         }
 
 
@@ -35,10 +35,10 @@ struct ORKOrderedTaskView: UIViewControllerRepresentable {
 
                 switch reason {
                 case .completed:
-                    let fhirResponse = taskViewController.result.fhirResponse
-                    fhirResponse.subject = Reference(reference: FHIRPrimitive(FHIRString("My Patient")))
+                    let response = taskViewController.result
 
-                    await questionnaireResponse(fhirResponse)
+                    // what is this doing down here?
+                    await timedWalkResponse(response)
                 default:
                     break
                 }
@@ -49,7 +49,7 @@ struct ORKOrderedTaskView: UIViewControllerRepresentable {
 
     private let tasks: ORKOrderedTask
     private let tintColor: Color
-    private let questionnaireResponse: @MainActor (QuestionnaireResponse) async -> Void
+    private let timedWalkResponse: @MainActor (ORKTimedWalkResult) async -> Void
 
     @Binding private var isPresented: Bool
 
@@ -60,18 +60,18 @@ struct ORKOrderedTaskView: UIViewControllerRepresentable {
     init(
         tasks: ORKOrderedTask,
         isPresented: Binding<Bool>,
-        questionnaireResponse: @escaping @MainActor (QuestionnaireResponse) async -> Void,
+        timedWalkResponse: @escaping @MainActor (ORKTimedWalkResult) async -> Void,
         tintColor: Color = Color(UIColor(named: "AccentColor") ?? .systemBlue)
     ) {
         self.tasks = tasks
         self._isPresented = isPresented
         self.tintColor = tintColor
-        self.questionnaireResponse = questionnaireResponse
+        self.timedWalkResponse = timedWalkResponse
     }
 
 
     func makeCoordinator() -> Coordinator {
-        Coordinator(isPresented: $isPresented, questionnaireResponse: questionnaireResponse)
+        Coordinator(isPresented: $isPresented, timedWalkResponse: timedWalkResponse)
     }
 
     func updateUIViewController(_ uiViewController: ORKTaskViewController, context: Context) {

Sources/SpeziQuestionnaire/TimedWalkView.swift

@@ -0,0 +1,91 @@
+//
+// This source file is part of the Stanford Spezi open-source project
+//
+// SPDX-FileCopyrightText: 2022 Stanford University and the project authors (see CONTRIBUTORS.md)
+//
+// SPDX-License-Identifier: MIT
+//
+
+import FHIRQuestionnaires
+import ModelsR4
+import ResearchKit
+import ResearchKitOnFHIR
+import SwiftUI
+
+
+/// Renders a FHIR `Questionnaire`.
+public struct TimedWalkView: View {
+    @EnvironmentObject private var questionnaireDataSource: QuestionnaireDataSource
+
+    @Binding private var isPresented: Bool
+
+    private let identifier: String?
+    private let distanceInMeters: Double?
+    private let timeLimit: TimeInterval?
+    private let turnAroundTimeLimit: TimeInterval?
+    private let timedWalkResponse: ((ORKTimedWalkResult) async -> Void)?
+
+
+    public var body: some View {
+        if let task = createTask() {
+            ORKOrderedTaskView(
+                tasks: task,
+                isPresented: $isPresented,
+                timedWalkResponse: { response in
+                    await timedWalkResponse?(response)
+                    await questionnaireDataSource.add(response)
+                },
+                tintColor: .accentColor
+            )
+                .ignoresSafeArea(.container, edges: .bottom)
+                .ignoresSafeArea(.keyboard, edges: .bottom)
+        } else {
+            Text("QUESTIONNAIRE_LOADING_ERROR_MESSAGE")
+        }
+    }
+
+
+    /// - Parameters:
+    ///   - questionnaire: The  `Questionnaire` that should be displayed.
+    ///   - isPresented: Indication from the questionnaire view if should be presented (not "Done" pressed or cancelled).
+    ///   - completionStepMessage: Optional completion message that can be appended at the end of the questionnaire.
+    ///   - questionnaireResponse: Optional response closure that can be used to manually obtain the `QuestionnaireResponse`.
+    public init(
+        identifier: String?,
+        distanceInMeters: Double?,
+        timeLimit: TimeInterval?,
+        turnAroundTimeLimit: TimeInterval?,
+        isPresented: Binding<Bool> = .constant(true),
+        timedWalkResponse: (@MainActor (ORKTimedWalkResult) async -> Void)? = nil
+    ) {
+        self.identifier = identifier
+        self.distanceInMeters = distanceInMeters
+        self.timeLimit = timeLimit
+        self.turnAroundTimeLimit = turnAroundTimeLimit
+        self._isPresented = isPresented
+        self.timedWalkResponse = timedWalkResponse
+    }
+
+
+    /// Creates a ResearchKit navigable task from a questionnaire
+    /// - Parameter questionnaire: a questionnaire
+    /// - Returns: a ResearchKit ordered task
+    private func createTask() -> ORKOrderedTask? {
+        // Create a navigable task from the Questionnaire
+        do {
+            return try timedWalk(withIdentifier: identifier, intendedUseDescription: "", distanceInMeters: distanceInMeters, timeLimit: timeLimit, turnAroundTimeLimit: turnAroundTimeLimit, includeAssistiveDeviceForm: false, options: ORKPredefinedTaskOption(rawValue: 0))
+        } catch {
+            print("Error creating task: \(error)")
+            return nil
+        }
+    }
+}
+
+
+#if DEBUG
+struct TimedWalkView_Previews: PreviewProvider {
+    static var previews: some View {
+        QuestionnaireView(questionnaire: Questionnaire.dateTimeExample, isPresented: .constant(false))
+    }
+}
+#endif

Tests/UITests/UITests.xcodeproj/project.pbxproj

@@ -388,7 +388,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = 64FJ2MWNP4;
+				DEVELOPMENT_TEAM = 4DR2J9J8WP;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -419,7 +419,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = 64FJ2MWNP4;
+				DEVELOPMENT_TEAM = 4DR2J9J8WP;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -548,7 +548,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = 64FJ2MWNP4;
+				DEVELOPMENT_TEAM = 4DR2J9J8WP;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				GENERATE_INFOPLIST_FILE = YES;