Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
614576b
Watch rest screen: Coaich look, big accent countdown, outlined chips
cubetes Nov 9, 2026
70ca0be
Watch rest screen: Up next under the effort chips, RIR label on 45-49 mm
cubetes Nov 9, 2026
ac360f2
Watch rest screen: buttons sit right under the countdown
cubetes Nov 9, 2026
dc568ea
Watch rest screen: heart rate and workout time, demo switches for a r…
cubetes Nov 9, 2026
5a98fcc
Merge branch 'release-1.4.5' of https://github.com/DuarteSantos8/open…
cubetes Nov 9, 2026
9dda329
Watch settings: rest timer pictures show the new rest screen
cubetes Nov 9, 2026
1b097b6
Watch: bigger rest countdown, larger Metrics and Pulse, full-screen g…
cubetes Nov 9, 2026
9a330ee
Watch strings: max and min come from watch-strings.mjs
cubetes Nov 9, 2026
36a6604
Watch set page: the Crown turns Apple's wheel, as in Coaich
cubetes Nov 9, 2026
a73cb9f
Watch Metrics: keep clear of the page dots on the Crown's side
cubetes Nov 9, 2026
5eb3500
Watch: no text under 12 pt, bigger set numbers, Effort names wrap
cubetes Nov 9, 2026
3a2f921
Watch set page: the Crown one grid step per detent, one outline
cubetes Nov 9, 2026
7a93216
Watch settings: rest timer pictures retaken from the new rest screen
cubetes Nov 9, 2026
707b57c
Watch: Liquid Glass on every control
cubetes Nov 9, 2026
a0ed542
Watch Metrics: a Zones page, time in each heart-rate zone
cubetes Nov 9, 2026
fe41c33
Watch Zones: keep clear of the page dots on the Crown's side
cubetes Nov 9, 2026
ad0c64e
Watch set page in Apple Workout's style
cubetes Nov 9, 2026
3ff1b97
Zones: ask for the birth date from the watch and from the iPhone's Ap…
cubetes Nov 10, 2026
efa08ef
Zones: a switch on the iPhone's Apple Health page, like the rows arou…
cubetes Nov 10, 2026
fa57297
Watch Metrics: Apple Workout's summary, Zone 1 below 60 %, zones as b…
cubetes Nov 10, 2026
21911ab
Watch Metrics: the summary's time inline again, so the pause check st…
cubetes Nov 10, 2026
704032f
Watch rest: fixes from CodeRabbit's second review (#1100)
cubetes Nov 12, 2026
b25938a
Merge branch 'watch/rest-coaich' into watch/liquid-glass
cubetes Nov 12, 2026
551a81c
Merge branch 'watch/liquid-glass' into watch/metrics-zones
cubetes Nov 12, 2026
00cda4b
Watch rest and Metrics: fixes from CodeRabbit's third review (#1187)
cubetes Nov 13, 2026
3f7f7b0
Merge branch 'watch/rest-coaich' into watch/liquid-glass
cubetes Nov 13, 2026
1dab2d0
Merge branch 'watch/liquid-glass' into watch/metrics-zones
cubetes Nov 13, 2026
a295560
Zones switch: name it for screen readers (CodeRabbit, #1187)
cubetes Nov 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions frontend/ios/App/App/AppleHealthPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class AppleHealthPlugin: CAPPlugin, CAPBridgedPlugin {
CAPPluginMethod(name: "readBody", returnType: CAPPluginReturnPromise),
CAPPluginMethod(name: "readVitals", returnType: CAPPluginReturnPromise),
CAPPluginMethod(name: "readWorkouts", returnType: CAPPluginReturnPromise),
CAPPluginMethod(name: "allowBirthDate", returnType: CAPPluginReturnPromise),
]

static let enabledKey = "healthEnabled"
Expand Down Expand Up @@ -109,6 +110,24 @@ public class AppleHealthPlugin: CAPPlugin, CAPBridgedPlugin {
}
}

/// The Apple Watch's Zones page takes the max heart rate from the age; the watch app shares this
/// app's Health permissions. Asks once; once answered, Apple Health is the only place to change
/// it, so it opens there. Answers { opened: Bool }.
@objc func allowBirthDate(_ call: CAPPluginCall) {
guard HKHealthStore.isHealthDataAvailable(),
let dob = HKObjectType.characteristicType(forIdentifier: .dateOfBirth) else { call.resolve(["opened": false]); return }
store.getRequestStatusForAuthorization(toShare: [], read: [dob]) { status, _ in
if status == .unnecessary {
DispatchQueue.main.async {
if let url = URL(string: "x-apple-health://") { UIApplication.shared.open(url) }
call.resolve(["opened": true])
}
} else {
self.store.requestAuthorization(toShare: [], read: [dob]) { _, _ in call.resolve(["opened": false]) }
}
}
}

@objc func setEnabled(_ call: CAPPluginCall) {
OpenGymGroup.defaults.set(call.getBool("on") ?? false, forKey: AppleHealthPlugin.enabledKey)
call.resolve()
Expand Down
2 changes: 1 addition & 1 deletion frontend/ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<key>NSSupportsLiveActivities</key>
<true/>
<key>NSHealthShareUsageDescription</key>
<string>Used to show your heart rate while you train, measured by your Apple Watch or by AirPods that track it, and, when you switch it on, to add the heart rate your watch saved, weigh-ins and the body fat and lean body mass from other apps to your log, to show your sleep, resting heart rate, heart rate variability and steps on this phone next to your training, to show the runs, rides and matches other apps saved in your calendar and recovery, and to take the calories a watch measured during a workout you logged on the phone.</string>
<string>Used to show your heart rate while you train, measured by your Apple Watch or by AirPods that track it, and, when you switch it on, to add the heart rate your watch saved, weigh-ins and the body fat and lean body mass from other apps to your log, to show your sleep, resting heart rate, heart rate variability and steps on this phone next to your training, to show the runs, rides and matches other apps saved in your calendar and recovery, to take the calories a watch measured during a workout you logged on the phone, and to use your birth date for your Apple Watch’s heart-rate zones.</string>
<key>NSHealthUpdateUsageDescription</key>
<string>Used to save your finished workouts (with the heart rate measured during them and an estimate of the calories they burned) and weigh-ins to Apple Health, when you switch it on.</string>
<!-- Gym reminder (#614): off until switched on in Settings. Region monitoring needs Always,
Expand Down
4 changes: 2 additions & 2 deletions frontend/ios/App/Watch/HomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct HomeView: View {
var body: some View {
NavigationStack {
content
.navigationTitle(store.ready?.today != nil ? Text("Today") : Text(verbatim: "openGym"))
.navigationTitle(store.ready?.today != nil ? Text("Today") : Text(verbatim: "")) // the logo says openGym, centred with the rest
}
// Hidden: a long press shows what arrived from the phone (animations, sync, heart rate).
.onLongPressGesture(minimumDuration: 2) { debug = true }
Expand Down Expand Up @@ -123,7 +123,7 @@ struct VersionLine: View {
let version = info?["CFBundleShortVersionString"] as? String ?? ""
let build = info?["CFBundleVersion"] as? String ?? ""
Text(verbatim: "openGym \(version)" + (build.isEmpty ? "" : " (\(build))"))
.font(.system(size: 10, design: .rounded))
.font(.system(size: 12, design: .rounded))
.foregroundStyle(Theme.label3)
.frame(maxWidth: .infinity)
.padding(.top, 8)
Expand Down
2 changes: 1 addition & 1 deletion frontend/ios/App/Watch/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHealthShareUsageDescription</key>
<string>openGym shows your heart rate during a workout and next to each set.</string>
<string>openGym shows your heart rate during a workout and next to each set, and uses your birth date for your heart-rate zones.</string>
<key>NSHealthUpdateUsageDescription</key>
<string>openGym saves your workouts to Apple Health when you switch it on.</string>
<key>WKBackgroundModes</key>
Expand Down
Loading
Loading