"Update Health Conditions" button; Vo2Max; LDL tile fixes

MyHeartCounts.xcodeproj/project.pbxproj

@@ -1306,8 +1306,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SchmiedmayerLab/Spezi.git";
 			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 0.1.6;
+				kind = exactVersion;
+				version = 0.1.6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

MyHeartCounts/Account/AccountSheet.swift

@@ -179,6 +179,7 @@ struct AccountSheet: View {
             .foregroundStyle(.textLabel)
         }
         PostTrialNudgesToggle()
+        UpdateComorbiditiesButton()
         NavigationLink("Review Consent Forms") {
             SignedConsentForms()
         }

MyHeartCounts/Account/Demographics/DemographicsData.swift

@@ -122,6 +122,14 @@ final class DemographicsData {
         populate(from: account.details ?? AccountDetails())
     }
 
+    /// Populates the instance, unless it already has been populated before.
+    func populateIfEmpty(from account: Account) {
+        guard self.account == nil else {
+            return
+        }
+        populate(from: account)
+    }
+
     private func populate(from details: AccountDetails) {
         shouldHandleUpdates = false
         defer {

MyHeartCounts/Account/UpdateComorbiditiesButton.swift

@@ -0,0 +1,71 @@
+//
+// This source file is part of the My Heart Counts iOS application based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2026 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import SFSafeSymbols
+import SpeziAccount
+import SpeziViews
+import SwiftUI
+
+
+struct UpdateComorbiditiesButton: View {
+    @Environment(Account.self)
+    private var account
+
+    @State private var showSheet = false
+    @State private var demographicsData = DemographicsData()
+    @State private var viewState: ViewState = .idle
+
+    var body: some View {
+        Button {
+            showSheet = true
+        } label: {
+            HStack {
+                Text("UPDATE_COMORBIDITIES_BUTTON_TITLE")
+                    .foregroundStyle(.textLabel)
+                Spacer()
+                DisclosureIndicator()
+            }
+        }
+        .disabled(account.details == nil)
+        .sheet(isPresented: $showSheet) {
+            @Bindable var data = demographicsData
+            NavigationStack {
+                ComorbiditiesPicker(selection: $data[\.comorbidities].withDefault(Comorbidities()))
+                    .navigationBarTitleDisplayMode(.inline)
+                    .interactiveDismissDisabled()
+                    .toolbar {
+                        ToolbarItem(placement: .confirmationAction) {
+                            closeSheetButton
+                        }
+                    }
+            }
+            .onAppear {
+                demographicsData.populateIfEmpty(from: account)
+            }
+        }
+    }
+
+    @ViewBuilder private var closeSheetButton: some View {
+        if #available(iOS 26, *) {
+            AsyncButton(role: .confirm, state: $viewState) {
+                try await closeSheet()
+            } label: {
+                Label("Done", systemSymbol: .checkmark)
+            }
+        } else {
+            AsyncButton("Done", state: $viewState) {
+                try await closeSheet()
+            }
+        }
+    }
+
+    private func closeSheet() async throws {
+        showSheet = false
+        try await demographicsData.flush()
+    }
+}

MyHeartCounts/Heart Health Dashboard/CVHScore.swift

@@ -400,12 +400,15 @@ extension ScoreDefinition {
         ])
     }()
 
+    /// LDL Cholesterol
     static let cvhBloodLipids = ScoreDefinition(default: 0, scoringBands: [
-        .inRange(..<130, score: 1, explainer: "< 130"),
-        .inRange(130..<160, score: 0.6, explainer: "130 – 159"),
-        .inRange(160..<190, score: 0.4, explainer: "160 – 189"),
-        .inRange(190..<220, score: 0.2, explainer: "190 – 219"),
-        .inRange(220..., score: 0, explainer: "220+")
+        .inRange(..<56, score: 1, explainer: "< 55"),
+        .inRange(56..<70, score: 0.9, explainer: "56 – 69"),
+        .inRange(70..<100, score: 0.8, explainer: "70 – 99"),
+        .inRange(100..<130, score: 0.6, explainer: "100 – 129"),
+        .inRange(130..<160, score: 0.4, explainer: "130 – 159"),
+        .inRange(160..<190, score: 0.2, explainer: "160 – 189"),
+        .inRange(190..., score: 0, explainer: "190+")
     ])
 
     static let cvhBloodGlucose = ScoreDefinition(default: 0, scoringBands: [

MyHeartCounts/Heart Health Dashboard/PastTimedWalkTestResultInfo.swift

@@ -0,0 +1,39 @@
+//
+// This source file is part of the My Heart Counts iOS application based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2026 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import Foundation
+import SpeziStudyDefinition
+import SwiftUI
+
+
+struct TimedWalkRunTestResultInfo: View {
+    let result: TimedWalkingTestResult
+
+    var body: some View {
+        LabeledContent("Date", value: result.startDate, format: .dateTime)
+        LabeledContent("Steps", value: result.numberOfSteps, format: .number)
+        LabeledContent(
+            "Distance",
+            value: Measurement<UnitLength>(value: result.distanceCovered, unit: .meters),
+            format: .measurement(width: .abbreviated)
+        )
+        switch result.test.kind {
+        case .walking:
+            let _ = () // swiftlint:disable:this redundant_discardable_let
+        case .running:
+            LabeledContent(
+                "VO2MAX_ESTIMATE_LABEL",
+                value: Measurement<UnitOxygenConsumption>(
+                    value: (result.distanceCovered - 504.9) / 44.73,
+                    unit: .mlPerKgPerMin
+                ),
+                format: .measurement(width: .abbreviated, usage: .asProvided, numberFormatStyle: .number.precision(.fractionLength(...1)))
+            )
+        }
+    }
+}

MyHeartCounts/Heart Health Dashboard/PastTimedWalkTestResults.swift

@@ -70,14 +70,7 @@ struct PastTimedWalkTestResults: View {
     @ViewBuilder
     private func makeDetailsView(for result: TimedWalkingTestResult) -> some View {
         Form {
-            LabeledContent("Start", value: result.startDate, format: .dateTime)
-            LabeledContent("End", value: result.endDate, format: .dateTime)
-            LabeledContent("Number of Steps", value: result.numberOfSteps, format: .number)
-            LabeledContent(
-                "Distance",
-                value: Measurement<UnitLength>(value: result.distanceCovered, unit: .meters),
-                format: .measurement(width: .abbreviated)
-            )
+            TimedWalkRunTestResultInfo(result: result)
         }
         .navigationTitle(result.test.displayTitle.localizedString())
         .navigationBarTitleDisplayMode(.inline)

MyHeartCounts/Modules/SetupTestEnvironment.swift

@@ -159,7 +159,7 @@ final class SetupTestEnvironment: Module, EnvironmentAccessible, Sendable {
     }
 
 
-    private func loginAndEnroll( // swiftlint:disable:this function_body_length
+    private func loginAndEnroll( // swiftlint:disable:this function_body_length cyclomatic_complexity
         _ credentials: SetupTestEnvironmentConfig.Credentials
     ) async throws {
         logger.notice("Logging in and enrolling into Study using credentials \(String(describing: credentials))")
@@ -245,7 +245,16 @@ final class SetupTestEnvironment: Module, EnvironmentAccessible, Sendable {
                 newDetails.weightInKG = 67
                 newDetails.raceEthnicity = .white
                 newDetails.latinoStatus = LatinoStatusOption.options[0]
-                newDetails.comorbidities = Comorbidities()
+                newDetails.comorbidities = { () -> Comorbidities in
+                    var value = Comorbidities()
+                    guard let heartFailureOption = Comorbidities.Comorbidity.primaryComorbidities.first(where: {
+                        $0.title.localizedString(for: .enUS).contains("Heart Failure")
+                    }) else {
+                        return value
+                    }
+                    value[heartFailureOption] = .selected(startDate: DateComponents())
+                    return value
+                }()
                 newDetails.usRegion = .dc
                 newDetails.householdIncomeUS = HouseholdIncomeUS.options[0]
                 newDetails.educationUS = EducationStatusUS.options[0]