Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

AppleHealth: requestPermissions overrides Capacitor's own; imports and main actor for the widget views

Duarte Santosca3fcbfe26cf
diff --git a/frontend/ios/App/App/AppleHealthPlugin.swift b/frontend/ios/App/App/AppleHealthPlugin.swift
index a4e277aac..d22883632 100644
--- a/frontend/ios/App/App/AppleHealthPlugin.swift
+++ b/frontend/ios/App/App/AppleHealthPlugin.swift
@@ -50,7 +50,7 @@ public class AppleHealthPlugin: CAPPlugin, CAPBridgedPlugin {
call.resolve(["status": "available", "granted": granted])
}
- @objc func requestPermissions(_ call: CAPPluginCall) {
+ @objc override public func requestPermissions(_ call: CAPPluginCall) {
guard HKHealthStore.isHealthDataAvailable() else { call.resolve(["granted": false]); return }
store.requestAuthorization(toShare: shareTypes, read: readTypes) { _, _ in
call.resolve(["granted": self.granted])
diff --git a/frontend/ios/App/App/WidgetPreview.swift b/frontend/ios/App/App/WidgetPreview.swift
index 54794f454..9c54879d8 100644
--- a/frontend/ios/App/App/WidgetPreview.swift
+++ b/frontend/ios/App/App/WidgetPreview.swift
@@ -15,7 +15,10 @@ enum WidgetPreview {
static func runIfAsked() {
guard ProcessInfo.processInfo.arguments.contains(argument) else { return }
if #available(iOS 17.0, *) {
- DispatchQueue.main.asyncAfter(deadline: .now() + 1) { render() }
+ Task { @MainActor in
+ try? await Task.sleep(nanoseconds: 1_000_000_000)
+ render()
+ }
}
}
diff --git a/frontend/ios/App/App/WidgetViews.swift b/frontend/ios/App/App/WidgetViews.swift
index 95b9bee6b..5399a8b92 100644
--- a/frontend/ios/App/App/WidgetViews.swift
+++ b/frontend/ios/App/App/WidgetViews.swift
@@ -1,3 +1,4 @@
+import AppIntents
import SwiftUI
import UIKit
import WidgetKit
diff --git a/frontend/ios/App/OpenGymWidgets/OpenGymWidgets.swift b/frontend/ios/App/OpenGymWidgets/OpenGymWidgets.swift
index 71fe85fd6..0d83390f9 100644
--- a/frontend/ios/App/OpenGymWidgets/OpenGymWidgets.swift
+++ b/frontend/ios/App/OpenGymWidgets/OpenGymWidgets.swift
@@ -1,4 +1,5 @@
import SwiftUI
+import UIKit
import WidgetKit
/*