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.

Watch: end a forgotten workout at its last set

Adrián Fernándezbdea60e74bc3
diff --git a/frontend/ios/App/Watch/OpenGymWatchApp.swift b/frontend/ios/App/Watch/OpenGymWatchApp.swift
index e6db4f2ce..b2ed2e581 100644
--- a/frontend/ios/App/Watch/OpenGymWatchApp.swift
+++ b/frontend/ios/App/Watch/OpenGymWatchApp.swift
@@ -105,6 +105,14 @@ struct RootView: View {
// The app's language, as the phone sends it, not the watch's own (SwiftUI looks every
// Text's words up by this locale).
.environment(\.locale, store.locale)
+ // No set for 20 minutes. Never a finish in one tap: "Finish workout" goes to the Finish page.
+ .alert(Text("All done?"), isPresented: $store.askDone) {
+ Button("Continue workout", role: .cancel) { store.keepGoing() }
+ Button("Finish workout") {
+ store.keepGoing()
+ store.show(entry: store.workout?.entries.count ?? 0)
+ }
+ }
// Any touch: the rest-over alarm was noticed (it would tap once more otherwise).
.simultaneousGesture(TapGesture().onEnded { store.ackRestOver() })
// The complication's Start: today's workout, when none runs yet.
diff --git a/frontend/ios/App/Watch/SessionStore.swift b/frontend/ios/App/Watch/SessionStore.swift
index 7b11afbae..cefca5833 100644
--- a/frontend/ios/App/Watch/SessionStore.swift
+++ b/frontend/ios/App/Watch/SessionStore.swift
@@ -30,6 +30,7 @@ final class SessionStore: NSObject, ObservableObject, WCSessionDelegate, UNUserN
if !isDemo, state != oldValue { save() }
// The page changed without a swipe (Done moved on, a snapshot): a moment without taps.
if state.entryIndex != oldValue.entryIndex { touchLock.lock(at: Date()) }
+ if state.workout?.id != oldValue.workout?.id { watchIdle() }
}
}
@@ -95,6 +96,8 @@ final class SessionStore: NSObject, ObservableObject, WCSessionDelegate, UNUserN
private static let heardKey = "heardFromPhone"
@Published private(set) var restEndsAt: Date?
@Published private(set) var restStartedAt: Date?
+ /// "All done?": the workout has had no set logged for 20 minutes (WatchCore's Idle).
+ @Published var askDone = false
/// A set picked by hand in an exercise (entry index → set index); otherwise the first not done.
@Published private var picked: [Int: Int] = [:]
@@ -635,16 +638,61 @@ final class SessionStore: NSObject, ObservableObject, WCSessionDelegate, UNUserN
Haptics.start()
}
- /// Finishes the session: the phone saves it with its own Finish and save.
- func finish() {
- closeRest(at: Date())
+ /* ---------- a workout left running ---------- */
+
+ private var idleTimer: Timer?
+ /// "Keep going" answered: idle time counts from then.
+ private var idleSnooze: Date?
+
+ /// A workout runs: checked every 30 s (the Apple Health session keeps the app running with the
+ /// wrist down; without one, a suspended app checks when it wakes). No workout, no timer.
+ private func watchIdle() {
+ idleTimer?.invalidate()
+ idleTimer = nil
+ idleSnooze = nil
+ askDone = false
+ guard workout != nil, !isDemo else { return }
+ let t = Timer(timeInterval: 30, repeats: true) { [weak self] _ in self?.checkIdle() }
+ t.tolerance = 10
+ RunLoop.main.add(t, forMode: .common)
+ idleTimer = t
+ DispatchQueue.main.async { self.checkIdle() } // relaunched hours later: ended at once
+ }
+
+ private func checkIdle() {
+ guard let w = workout, holdEndsAt == nil else { return }
let now = Date().timeIntervalSince1970 * 1000
+ let seen = workoutSeenAt.map { $0.timeIntervalSince1970 * 1000 }
+ let last = Idle.lastSet(w) ?? seen ?? now
+ // Picked up from the phone or answered "keep going" since: counted from then, never ended earlier.
+ let since = [last, seen ?? 0, idleSnooze.map { $0.timeIntervalSince1970 * 1000 } ?? 0].max() ?? last
+ switch Idle.state(since: since, now: now) {
+ case .active: break
+ case .ask:
+ if !askDone { askDone = true; Haptics.ask() }
+ case .end:
+ askDone = false
+ finish(at: Date(timeIntervalSince1970: last / 1000))
+ }
+ }
+
+ /// "Continue workout" on "All done?".
+ func keepGoing() {
+ idleSnooze = Date()
+ askDone = false
+ }
+
+ /// Finishes the session: the phone saves it with its own Finish and save. `end`: when it really
+ /// ended (a workout left running ends at its last set), else now.
+ func finish(at end: Date = Date()) {
+ closeRest(at: end)
+ let now = end.timeIntervalSince1970 * 1000
let ended = workout
let (next, event) = SessionCore.finish(state, at: now, id: UUID().uuidString)
guard let ev = event else { return }
if let w = ended { summary = SessionCore.summary(w, end: now, startedAt: workoutSeenAt.map { $0.timeIntervalSince1970 * 1000 }) }
ran(ended?.id)
- health.end(save: true) { [weak self] totals in self?.addTotals(totals) }
+ health.end(save: true, at: end) { [weak self] totals in self?.addTotals(totals) }
stopHold()
skipRest()
dropClips()
@@ -941,6 +989,7 @@ final class SessionStore: NSObject, ObservableObject, WCSessionDelegate, UNUserN
* finished stop, then two successes: the workout is saved
* skip a soft one going down
* count a click each second of the 3-2-1 before a workout
+ * ask two taps: "All done?", nothing logged for 20 minutes
*/
enum Haptics {
private static var device: WKInterfaceDevice { WKInterfaceDevice.current() }
@@ -956,4 +1005,5 @@ enum Haptics {
static func finished() { play([(0, .stop), (0.5, .success), (0.9, .success)]) }
static func skip() { play([(0, .directionDown)]) }
static func count() { play([(0, .click)]) }
+ static func ask() { play([(0, .notification), (0.6, .notification)]) }
}
diff --git a/frontend/ios/App/Watch/WorkoutManager.swift b/frontend/ios/App/Watch/WorkoutManager.swift
index 814f309ac..742a9fecb 100644
--- a/frontend/ios/App/Watch/WorkoutManager.swift
+++ b/frontend/ios/App/Watch/WorkoutManager.swift
@@ -290,20 +290,23 @@ final class WorkoutManager: NSObject, ObservableObject, HKWorkoutSessionDelegate
}
/// The workout ended: saved to Apple Health, or dropped when `save` is false. `totals` gets the
- /// session's heart rate and calories (nothing when no session ran).
- func end(save: Bool, totals: ((Totals) -> Void)? = nil) {
+ /// session's heart rate and calories (nothing when no session ran). `at`: when it really ended
+ /// (a workout left running ends at its last set, not when the watch noticed), else now.
+ func end(save: Bool, at: Date? = nil, totals: ((Totals) -> Void)? = nil) {
wanted = false
workoutId = nil
prepared = false
if let q = query { store.stop(q); query = nil }
- let all = samples.map { $0.1 }
+ let endAt = at ?? Date()
+ let all = samples.filter { $0.0 <= endAt }.map { $0.1 }
let hr = Totals(hrAvg: all.isEmpty ? nil : (all.reduce(0, +) / Double(all.count)).rounded(), hrMax: all.max()?.rounded(), calories: nil)
guard let s = session, let b = builder else {
if let totals = totals { DispatchQueue.main.async { totals(Totals()) } }
return
}
s.end()
- b.endCollection(withEnd: Date()) { _, _ in
+ // Never before the session's own start (a workout picked up from the phone after its last set).
+ b.endCollection(withEnd: max(endAt, b.startDate ?? endAt)) { _, _ in
var out = hr
if let kcalType = HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned),
let kcal = b.statistics(for: kcalType)?.sumQuantity()?.doubleValue(for: .kilocalorie()), kcal > 0 {
diff --git a/frontend/ios/App/Watch/ar.lproj/Localizable.strings b/frontend/ios/App/Watch/ar.lproj/Localizable.strings
index 8186d4316..5340b9876 100644
--- a/frontend/ios/App/Watch/ar.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/ar.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "إنهاء التمرين";
"Finish workout?" = "إنهاء التمرين؟";
"Finish and save" = "إنهاء وحفظ";
+"Continue workout" = "متابعة التمرين";
"Cancel" = "إلغاء";
"Rest’s over. Next set!" = "انتهت الراحة. المجموعة التالية!";
"Left" = "يسار";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "اضغط نقطة لأداء مجموعة متخطاة.";
"Log this one on your iPhone." = "سجّل هذا على iPhone.";
"Saved on the watch, syncs later" = "حُفظ على الساعة، تتم المزامنة لاحقًا";
+"All done?" = "هل انتهيت؟";
"Skip this set?" = "تخطي هذه المجموعة؟";
"Turn the Digital Crown to change it." = "أدر Digital Crown للتغيير.";
"%lld done" = "%lld مكتملة";
diff --git a/frontend/ios/App/Watch/bn.lproj/Localizable.strings b/frontend/ios/App/Watch/bn.lproj/Localizable.strings
index 13ebe2d7b..8f2cb2b99 100644
--- a/frontend/ios/App/Watch/bn.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/bn.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "ওয়ার্কআউট শেষ করুন";
"Finish workout?" = "ওয়ার্কআউট শেষ করবেন?";
"Finish and save" = "শেষ করে সেভ করুন";
+"Continue workout" = "ওয়ার্কআউট চালিয়ে যান";
"Cancel" = "বাতিল";
"Rest’s over. Next set!" = "বিশ্রাম শেষ। পরের সেট!";
"Left" = "বাঁ";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "বাদ দেওয়া সেট করতে একটি বিন্দুতে ট্যাপ করুন।";
"Log this one on your iPhone." = "এটা iPhone-এ লিখুন।";
"Saved on the watch, syncs later" = "ঘড়িতে সেভ হয়েছে, পরে সিঙ্ক হবে";
+"All done?" = "শেষ হয়েছে?";
"Skip this set?" = "এই সেটটি বাদ দেবেন?";
"Turn the Digital Crown to change it." = "বদলাতে Digital Crown ঘোরান।";
"%lld done" = "%lldটি শেষ";
diff --git a/frontend/ios/App/Watch/de.lproj/Localizable.strings b/frontend/ios/App/Watch/de.lproj/Localizable.strings
index d37b7c417..9af39766b 100644
--- a/frontend/ios/App/Watch/de.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/de.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Training beenden";
"Finish workout?" = "Training beenden?";
"Finish and save" = "Beenden und speichern";
+"Continue workout" = "Weitertrainieren";
"Cancel" = "Abbrechen";
"Rest’s over. Next set!" = "Pause vorbei. Nächster Satz!";
"Left" = "Links";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Tippe auf einen Punkt, um einen übersprungenen Satz zu machen.";
"Log this one on your iPhone." = "Das hier trägst du am iPhone ein.";
"Saved on the watch, syncs later" = "Auf der Watch gespeichert, synct später";
+"All done?" = "Alles erledigt?";
"Skip this set?" = "Diesen Satz überspringen?";
"Turn the Digital Crown to change it." = "Dreh an der Digital Crown, um es zu ändern.";
"%lld done" = "%lld erledigt";
diff --git a/frontend/ios/App/Watch/en.lproj/Localizable.strings b/frontend/ios/App/Watch/en.lproj/Localizable.strings
index 8d4fbcddf..4f4e76c16 100644
--- a/frontend/ios/App/Watch/en.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/en.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Finish workout";
"Finish workout?" = "Finish workout?";
"Finish and save" = "Finish and save";
+"Continue workout" = "Continue workout";
"Cancel" = "Cancel";
"Rest’s over. Next set!" = "Rest’s over. Next set!";
"Left" = "Left";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Tap a dot to do a skipped set.";
"Log this one on your iPhone." = "Log this one on your iPhone.";
"Saved on the watch, syncs later" = "Saved on the watch, syncs later";
+"All done?" = "All done?";
"Skip this set?" = "Skip this set?";
"Turn the Digital Crown to change it." = "Turn the Digital Crown to change it.";
"%lld done" = "%lld done";
diff --git a/frontend/ios/App/Watch/es.lproj/Localizable.strings b/frontend/ios/App/Watch/es.lproj/Localizable.strings
index 8321bb2b5..a09c95d10 100644
--- a/frontend/ios/App/Watch/es.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/es.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminar entrenamiento";
"Finish workout?" = "¿Terminar entrenamiento?";
"Finish and save" = "Terminar y guardar";
+"Continue workout" = "Continuar entrenamiento";
"Cancel" = "Cancelar";
"Rest’s over. Next set!" = "Se acabó el descanso. ¡Siguiente serie!";
"Left" = "Izquierda";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Toca un punto para hacer una serie saltada.";
"Log this one on your iPhone." = "Este se registra en tu iPhone.";
"Saved on the watch, syncs later" = "Guardado en el reloj, se sincroniza luego";
+"All done?" = "¿Has terminado?";
"Skip this set?" = "¿Saltar esta serie?";
"Turn the Digital Crown to change it." = "Gira la Digital Crown para cambiarlo.";
"%lld done" = "%lld hechas";
diff --git a/frontend/ios/App/Watch/fr.lproj/Localizable.strings b/frontend/ios/App/Watch/fr.lproj/Localizable.strings
index 3a53f1e9d..c8da8658d 100644
--- a/frontend/ios/App/Watch/fr.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/fr.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminer la séance";
"Finish workout?" = "Terminer la séance ?";
"Finish and save" = "Terminer et enregistrer";
+"Continue workout" = "Continuer la séance";
"Cancel" = "Annuler";
"Rest’s over. Next set!" = "Repos terminé. Série suivante !";
"Left" = "Gauche";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Touche un point pour faire une série sautée.";
"Log this one on your iPhone." = "Celui-ci se note sur ton iPhone.";
"Saved on the watch, syncs later" = "Gardé sur la montre, synchro plus tard";
+"All done?" = "Terminé ?";
"Skip this set?" = "Sauter cette série ?";
"Turn the Digital Crown to change it." = "Tourne la Digital Crown pour le changer.";
"%lld done" = "%lld faites";
diff --git a/frontend/ios/App/Watch/hi.lproj/Localizable.strings b/frontend/ios/App/Watch/hi.lproj/Localizable.strings
index 99222f0e6..7508c4564 100644
--- a/frontend/ios/App/Watch/hi.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/hi.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "वर्कआउट समाप्त करें";
"Finish workout?" = "वर्कआउट समाप्त करें?";
"Finish and save" = "समाप्त करें और सहेजें";
+"Continue workout" = "वर्कआउट जारी रखें";
"Cancel" = "रद्द करें";
"Rest’s over. Next set!" = "आराम खत्म। अगला सेट!";
"Left" = "बायाँ";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "छूटा सेट करने के लिए एक बिंदु टैप करें।";
"Log this one on your iPhone." = "इसे iPhone पर दर्ज करें।";
"Saved on the watch, syncs later" = "वॉच पर सहेजा, बाद में सिंक होगा";
+"All done?" = "हो गया?";
"Skip this set?" = "यह सेट छोड़ें?";
"Turn the Digital Crown to change it." = "बदलने के लिए Digital Crown घुमाएँ।";
"%lld done" = "%lld पूरे";
diff --git a/frontend/ios/App/Watch/hu.lproj/Localizable.strings b/frontend/ios/App/Watch/hu.lproj/Localizable.strings
index 7f492f538..a6a737d1c 100644
--- a/frontend/ios/App/Watch/hu.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/hu.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Edzés befejezése";
"Finish workout?" = "Befejezed az edzést?";
"Finish and save" = "Befejezés és mentés";
+"Continue workout" = "Edzés folytatása";
"Cancel" = "Mégse";
"Rest’s over. Next set!" = "Vége a pihenőnek. Jöhet a következő sorozat!";
"Left" = "Bal";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Koppints egy pöttyre egy kihagyott sorozathoz.";
"Log this one on your iPhone." = "Ezt az iPhone-on rögzítsd.";
"Saved on the watch, syncs later" = "Az órán mentve, később szinkronizál";
+"All done?" = "Végeztél?";
"Skip this set?" = "Kihagyod ezt a sorozatot?";
"Turn the Digital Crown to change it." = "Forgasd a Digital Crownt a módosításhoz.";
"%lld done" = "%lld kész";
diff --git a/frontend/ios/App/Watch/it.lproj/Localizable.strings b/frontend/ios/App/Watch/it.lproj/Localizable.strings
index 6882d0032..f66fd6c57 100644
--- a/frontend/ios/App/Watch/it.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/it.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Termina allenamento";
"Finish workout?" = "Terminare l’allenamento?";
"Finish and save" = "Termina e salva";
+"Continue workout" = "Continua allenamento";
"Cancel" = "Annulla";
"Rest’s over. Next set!" = "Riposo finito. Prossima serie!";
"Left" = "Sinistra";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Tocca un punto per fare una serie saltata.";
"Log this one on your iPhone." = "Questo si registra sull’iPhone.";
"Saved on the watch, syncs later" = "Salvato sull’orologio, si sincronizza dopo";
+"All done?" = "Hai finito?";
"Skip this set?" = "Saltare questa serie?";
"Turn the Digital Crown to change it." = "Ruota la Digital Crown per cambiarlo.";
"%lld done" = "%lld fatte";
diff --git a/frontend/ios/App/Watch/ko.lproj/Localizable.strings b/frontend/ios/App/Watch/ko.lproj/Localizable.strings
index 5c96292dd..d9823d2fb 100644
--- a/frontend/ios/App/Watch/ko.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/ko.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "운동 마치기";
"Finish workout?" = "운동을 마칠까요?";
"Finish and save" = "마치고 저장";
+"Continue workout" = "운동 계속하기";
"Cancel" = "취소";
"Rest’s over. Next set!" = "휴식 끝. 다음 세트!";
"Left" = "왼쪽";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "건너뛴 세트를 하려면 점을 탭하세요.";
"Log this one on your iPhone." = "이건 iPhone에서 기록하세요.";
"Saved on the watch, syncs later" = "워치에 저장됨, 나중에 동기화돼요";
+"All done?" = "다 끝났나요?";
"Skip this set?" = "이 세트를 건너뛸까요?";
"Turn the Digital Crown to change it." = "바꾸려면 Digital Crown을 돌리세요.";
"%lld done" = "%lld개 완료";
diff --git a/frontend/ios/App/Watch/pl.lproj/Localizable.strings b/frontend/ios/App/Watch/pl.lproj/Localizable.strings
index 2443fac41..8d7650769 100644
--- a/frontend/ios/App/Watch/pl.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/pl.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Zakończ trening";
"Finish workout?" = "Zakończyć trening?";
"Finish and save" = "Zakończ i zapisz";
+"Continue workout" = "Kontynuuj trening";
"Cancel" = "Anuluj";
"Rest’s over. Next set!" = "Koniec przerwy. Następna seria!";
"Left" = "Lewa";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Stuknij kropkę, by zrobić pominiętą serię.";
"Log this one on your iPhone." = "To zapisz na iPhonie.";
"Saved on the watch, syncs later" = "Zapisano na zegarku, zsynchronizuje się później";
+"All done?" = "Koniec treningu?";
"Skip this set?" = "Pominąć tę serię?";
"Turn the Digital Crown to change it." = "Obróć Digital Crown, by zmienić.";
"%lld done" = "%lld zrobione";
diff --git a/frontend/ios/App/Watch/pt-BR.lproj/Localizable.strings b/frontend/ios/App/Watch/pt-BR.lproj/Localizable.strings
index 91ad95787..f65e55c24 100644
--- a/frontend/ios/App/Watch/pt-BR.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/pt-BR.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminar treino";
"Finish workout?" = "Terminar o treino?";
"Finish and save" = "Terminar e salvar";
+"Continue workout" = "Continuar treino";
"Cancel" = "Cancelar";
"Rest’s over. Next set!" = "Acabou o descanso. Próxima série!";
"Left" = "Esquerda";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Toque num ponto para fazer uma série pulada.";
"Log this one on your iPhone." = "Este você registra no iPhone.";
"Saved on the watch, syncs later" = "Salvo no relógio, sincroniza depois";
+"All done?" = "Terminou?";
"Skip this set?" = "Pular esta série?";
"Turn the Digital Crown to change it." = "Gire a Digital Crown para mudar.";
"%lld done" = "%lld feitas";
diff --git a/frontend/ios/App/Watch/pt-PT.lproj/Localizable.strings b/frontend/ios/App/Watch/pt-PT.lproj/Localizable.strings
index 347caf093..78a9d7db9 100644
--- a/frontend/ios/App/Watch/pt-PT.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/pt-PT.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminar treino";
"Finish workout?" = "Terminar o treino?";
"Finish and save" = "Terminar e guardar";
+"Continue workout" = "Continuar treino";
"Cancel" = "Cancelar";
"Rest’s over. Next set!" = "Acabou o descanso. Próxima série!";
"Left" = "Esquerda";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Toca num ponto para fazer uma série saltada.";
"Log this one on your iPhone." = "Este regista-se no iPhone.";
"Saved on the watch, syncs later" = "Guardado no relógio, sincroniza depois";
+"All done?" = "Terminaste?";
"Skip this set?" = "Saltar esta série?";
"Turn the Digital Crown to change it." = "Roda a Digital Crown para mudar.";
"%lld done" = "%lld feitas";
diff --git a/frontend/ios/App/Watch/ru.lproj/Localizable.strings b/frontend/ios/App/Watch/ru.lproj/Localizable.strings
index fe159f362..42df48dce 100644
--- a/frontend/ios/App/Watch/ru.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/ru.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Завершить тренировку";
"Finish workout?" = "Завершить тренировку?";
"Finish and save" = "Завершить и сохранить";
+"Continue workout" = "Продолжить тренировку";
"Cancel" = "Отмена";
"Rest’s over. Next set!" = "Отдых окончен. Следующий подход!";
"Left" = "Левая";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Нажмите на точку, чтобы сделать пропущенный подход.";
"Log this one on your iPhone." = "Это записывается на iPhone.";
"Saved on the watch, syncs later" = "Сохранено на часах, синхронизируется позже";
+"All done?" = "Тренировка окончена?";
"Skip this set?" = "Пропустить этот подход?";
"Turn the Digital Crown to change it." = "Поверните Digital Crown, чтобы изменить.";
"%lld done" = "%lld сделано";
diff --git a/frontend/ios/App/Watch/th.lproj/Localizable.strings b/frontend/ios/App/Watch/th.lproj/Localizable.strings
index b6d7d2079..5bc0f111d 100644
--- a/frontend/ios/App/Watch/th.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/th.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "จบการออกกำลังกาย";
"Finish workout?" = "จบการออกกำลังกายไหม?";
"Finish and save" = "จบและบันทึก";
+"Continue workout" = "ออกกำลังกายต่อ";
"Cancel" = "ยกเลิก";
"Rest’s over. Next set!" = "หมดเวลาพักแล้ว เซ็ตถัดไป!";
"Left" = "ซ้าย";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "แตะจุดเพื่อทำเซ็ตที่ข้ามไป";
"Log this one on your iPhone." = "อันนี้บันทึกบน iPhone";
"Saved on the watch, syncs later" = "บันทึกบนนาฬิกาแล้ว จะซิงค์ทีหลัง";
+"All done?" = "เสร็จแล้วหรือยัง";
"Skip this set?" = "ข้ามเซ็ตนี้ไหม";
"Turn the Digital Crown to change it." = "หมุน Digital Crown เพื่อเปลี่ยน";
"%lld done" = "เสร็จ %lld";
diff --git a/frontend/ios/App/Watch/tr.lproj/Localizable.strings b/frontend/ios/App/Watch/tr.lproj/Localizable.strings
index 8a762cf1e..33cc8fe2c 100644
--- a/frontend/ios/App/Watch/tr.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/tr.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Antrenmanı bitir";
"Finish workout?" = "Antrenman bitirilsin mi?";
"Finish and save" = "Bitir ve kaydet";
+"Continue workout" = "Antrenmana devam et";
"Cancel" = "İptal";
"Rest’s over. Next set!" = "Dinlenme bitti. Sıradaki set!";
"Left" = "Sol";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Atlanan bir set için bir noktaya dokun.";
"Log this one on your iPhone." = "Bunu iPhone’da kaydet.";
"Saved on the watch, syncs later" = "Saatte kaydedildi, sonra eşitlenir";
+"All done?" = "Bitirdin mi?";
"Skip this set?" = "Bu set atlansın mı?";
"Turn the Digital Crown to change it." = "Değiştirmek için Digital Crown’u çevir.";
"%lld done" = "%lld tamam";
diff --git a/frontend/ios/App/Watch/uk.lproj/Localizable.strings b/frontend/ios/App/Watch/uk.lproj/Localizable.strings
index e349386a9..3faf0a963 100644
--- a/frontend/ios/App/Watch/uk.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/uk.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Завершити тренування";
"Finish workout?" = "Завершити тренування?";
"Finish and save" = "Завершити й зберегти";
+"Continue workout" = "Продовжити тренування";
"Cancel" = "Скасувати";
"Rest’s over. Next set!" = "Відпочинок скінчився. Наступний підхід!";
"Left" = "Ліва";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Торкнись точки, щоб зробити пропущений підхід.";
"Log this one on your iPhone." = "Це записуй на iPhone.";
"Saved on the watch, syncs later" = "Збережено на годиннику, синхронізується пізніше";
+"All done?" = "Тренування завершено?";
"Skip this set?" = "Пропустити цей підхід?";
"Turn the Digital Crown to change it." = "Поверни Digital Crown, щоб змінити.";
"%lld done" = "%lld зроблено";
diff --git a/frontend/ios/App/Watch/zh-Hans.lproj/Localizable.strings b/frontend/ios/App/Watch/zh-Hans.lproj/Localizable.strings
index f6ef685e9..30f633906 100644
--- a/frontend/ios/App/Watch/zh-Hans.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/zh-Hans.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "结束训练";
"Finish workout?" = "结束训练?";
"Finish and save" = "结束并保存";
+"Continue workout" = "继续训练";
"Cancel" = "取消";
"Rest’s over. Next set!" = "休息结束,下一组!";
"Left" = "左侧";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "轻点圆点来做跳过的组。";
"Log this one on your iPhone." = "这个请在 iPhone 上记录。";
"Saved on the watch, syncs later" = "已存在手表上,稍后同步";
+"All done?" = "练完了吗?";
"Skip this set?" = "跳过这一组?";
"Turn the Digital Crown to change it." = "转动数码表冠来更改。";
"%lld done" = "已完成 %lld";
diff --git a/frontend/ios/App/Watch/zh-Hant.lproj/Localizable.strings b/frontend/ios/App/Watch/zh-Hant.lproj/Localizable.strings
index 4f13b454c..5d56bf434 100644
--- a/frontend/ios/App/Watch/zh-Hant.lproj/Localizable.strings
+++ b/frontend/ios/App/Watch/zh-Hant.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "結束訓練";
"Finish workout?" = "結束訓練?";
"Finish and save" = "結束並儲存";
+"Continue workout" = "繼續訓練";
"Cancel" = "取消";
"Rest’s over. Next set!" = "休息結束,下一組!";
"Left" = "左側";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "輕點圓點來做跳過的組。";
"Log this one on your iPhone." = "這個請在 iPhone 上記錄。";
"Saved on the watch, syncs later" = "已存在手錶上,稍後同步";
+"All done?" = "練完了嗎?";
"Skip this set?" = "跳過這一組?";
"Turn the Digital Crown to change it." = "轉動數位錶冠來更改。";
"%lld done" = "已完成 %lld";
diff --git a/frontend/ios/App/WatchCore/Sources/WatchCore/SessionCore.swift b/frontend/ios/App/WatchCore/Sources/WatchCore/SessionCore.swift
index 4023c0212..0e416dc49 100644
--- a/frontend/ios/App/WatchCore/Sources/WatchCore/SessionCore.swift
+++ b/frontend/ios/App/WatchCore/Sources/WatchCore/SessionCore.swift
@@ -408,3 +408,26 @@ enum Countdown {
max(seconds - Int(max(elapsed, 0).rounded(.down)), 0)
}
}
+
+/// A workout left running (the lifter walked out without Finish): "All done?" after 20 minutes
+/// without a logged set, ended and saved on its own after 45, at the time of its last set. Without
+/// it the Apple Health session goes on counting minutes and calories for hours. Times in ms.
+enum Idle: Equatable {
+ case active, ask, end
+
+ static let askAfter: Double = 20 * 60 * 1000
+ static let endAfter: Double = 45 * 60 * 1000
+
+ /// When the last set was logged, here or on the phone (one side of a per-side set counts),
+ /// else when the workout started; nil when it says neither.
+ static func lastSet(_ w: ActiveWorkout) -> Double? {
+ let ticks = w.entries.flatMap { $0.sets }.compactMap { $0.at }.filter { $0 > 0 }
+ return ticks.max() ?? w.start.flatMap { $0 > 0 ? $0 : nil }
+ }
+
+ /// `since`: the last thing that counts (the last set, or a "keep going" answered since).
+ static func state(since: Double, now: Double) -> Idle {
+ let idle = now - since
+ return idle >= endAfter ? .end : idle >= askAfter ? .ask : .active
+ }
+}
diff --git a/frontend/ios/App/WatchCore/Tests/WatchCoreTests/IdleTests.swift b/frontend/ios/App/WatchCore/Tests/WatchCoreTests/IdleTests.swift
new file mode 100644
index 000000000..efa270567
--- /dev/null
+++ b/frontend/ios/App/WatchCore/Tests/WatchCoreTests/IdleTests.swift
@@ -0,0 +1,38 @@
+import XCTest
+@testable import WatchCore
+
+/// A forgotten workout: asked about at 20 minutes, ended at 45, at its last set.
+final class IdleTests: XCTestCase {
+ let min: Double = 60 * 1000
+
+ func workout(start: Double?, ats: [Double?]) -> ActiveWorkout {
+ let sets = ats.map { SetRow(w: 60, r: 8, sec: nil, done: $0 != nil, warmup: false, at: $0) }
+ return ActiveWorkout(id: "w1", name: "Push", unit: "kg", cur: 0, restSec: 90, rest: nil,
+ entries: [Entry(id: "0025", name: "Bench Press", mode: "reps", restSec: nil, last: nil, sets: sets)],
+ start: start)
+ }
+
+ func testAsksAt20MinutesAndEndsAt45() {
+ XCTAssertEqual(Idle.state(since: 0, now: 19 * min), .active)
+ XCTAssertEqual(Idle.state(since: 0, now: 20 * min), .ask)
+ XCTAssertEqual(Idle.state(since: 0, now: 44 * min), .ask)
+ XCTAssertEqual(Idle.state(since: 0, now: 45 * min), .end)
+ }
+
+ func testTheLastSetIsTheNewestTickWhereverItIs() {
+ let w = workout(start: 1000, ats: [5 * min, 30 * min, nil, 12 * min])
+ XCTAssertEqual(Idle.lastSet(w), 30 * min, "the newest tick, not the last row")
+ }
+
+ func testOneSideOfAPerSideSetCounts() {
+ var w = workout(start: 1000, ats: [nil])
+ w.entries[0].sets[0].sides = Sides(L: SideRow(w: 20, r: 8, done: true), R: SideRow(w: 20, r: 8, done: false))
+ w.entries[0].sets[0].at = 7 * min
+ XCTAssertEqual(Idle.lastSet(w), 7 * min)
+ }
+
+ func testNothingLoggedFallsBackToTheStart() {
+ XCTAssertEqual(Idle.lastSet(workout(start: 1000, ats: [nil, nil])), 1000)
+ XCTAssertNil(Idle.lastSet(workout(start: 0, ats: [nil])), "a phone that sent no start: the watch's own time then")
+ }
+}
diff --git a/frontend/ios/App/WatchWidgets/ar.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/ar.lproj/Localizable.strings
index 8186d4316..5340b9876 100644
--- a/frontend/ios/App/WatchWidgets/ar.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/ar.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "إنهاء التمرين";
"Finish workout?" = "إنهاء التمرين؟";
"Finish and save" = "إنهاء وحفظ";
+"Continue workout" = "متابعة التمرين";
"Cancel" = "إلغاء";
"Rest’s over. Next set!" = "انتهت الراحة. المجموعة التالية!";
"Left" = "يسار";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "اضغط نقطة لأداء مجموعة متخطاة.";
"Log this one on your iPhone." = "سجّل هذا على iPhone.";
"Saved on the watch, syncs later" = "حُفظ على الساعة، تتم المزامنة لاحقًا";
+"All done?" = "هل انتهيت؟";
"Skip this set?" = "تخطي هذه المجموعة؟";
"Turn the Digital Crown to change it." = "أدر Digital Crown للتغيير.";
"%lld done" = "%lld مكتملة";
diff --git a/frontend/ios/App/WatchWidgets/bn.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/bn.lproj/Localizable.strings
index 13ebe2d7b..8f2cb2b99 100644
--- a/frontend/ios/App/WatchWidgets/bn.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/bn.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "ওয়ার্কআউট শেষ করুন";
"Finish workout?" = "ওয়ার্কআউট শেষ করবেন?";
"Finish and save" = "শেষ করে সেভ করুন";
+"Continue workout" = "ওয়ার্কআউট চালিয়ে যান";
"Cancel" = "বাতিল";
"Rest’s over. Next set!" = "বিশ্রাম শেষ। পরের সেট!";
"Left" = "বাঁ";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "বাদ দেওয়া সেট করতে একটি বিন্দুতে ট্যাপ করুন।";
"Log this one on your iPhone." = "এটা iPhone-এ লিখুন।";
"Saved on the watch, syncs later" = "ঘড়িতে সেভ হয়েছে, পরে সিঙ্ক হবে";
+"All done?" = "শেষ হয়েছে?";
"Skip this set?" = "এই সেটটি বাদ দেবেন?";
"Turn the Digital Crown to change it." = "বদলাতে Digital Crown ঘোরান।";
"%lld done" = "%lldটি শেষ";
diff --git a/frontend/ios/App/WatchWidgets/de.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/de.lproj/Localizable.strings
index d37b7c417..9af39766b 100644
--- a/frontend/ios/App/WatchWidgets/de.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/de.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Training beenden";
"Finish workout?" = "Training beenden?";
"Finish and save" = "Beenden und speichern";
+"Continue workout" = "Weitertrainieren";
"Cancel" = "Abbrechen";
"Rest’s over. Next set!" = "Pause vorbei. Nächster Satz!";
"Left" = "Links";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Tippe auf einen Punkt, um einen übersprungenen Satz zu machen.";
"Log this one on your iPhone." = "Das hier trägst du am iPhone ein.";
"Saved on the watch, syncs later" = "Auf der Watch gespeichert, synct später";
+"All done?" = "Alles erledigt?";
"Skip this set?" = "Diesen Satz überspringen?";
"Turn the Digital Crown to change it." = "Dreh an der Digital Crown, um es zu ändern.";
"%lld done" = "%lld erledigt";
diff --git a/frontend/ios/App/WatchWidgets/en.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/en.lproj/Localizable.strings
index 8d4fbcddf..4f4e76c16 100644
--- a/frontend/ios/App/WatchWidgets/en.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/en.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Finish workout";
"Finish workout?" = "Finish workout?";
"Finish and save" = "Finish and save";
+"Continue workout" = "Continue workout";
"Cancel" = "Cancel";
"Rest’s over. Next set!" = "Rest’s over. Next set!";
"Left" = "Left";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Tap a dot to do a skipped set.";
"Log this one on your iPhone." = "Log this one on your iPhone.";
"Saved on the watch, syncs later" = "Saved on the watch, syncs later";
+"All done?" = "All done?";
"Skip this set?" = "Skip this set?";
"Turn the Digital Crown to change it." = "Turn the Digital Crown to change it.";
"%lld done" = "%lld done";
diff --git a/frontend/ios/App/WatchWidgets/es.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/es.lproj/Localizable.strings
index 8321bb2b5..a09c95d10 100644
--- a/frontend/ios/App/WatchWidgets/es.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/es.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminar entrenamiento";
"Finish workout?" = "¿Terminar entrenamiento?";
"Finish and save" = "Terminar y guardar";
+"Continue workout" = "Continuar entrenamiento";
"Cancel" = "Cancelar";
"Rest’s over. Next set!" = "Se acabó el descanso. ¡Siguiente serie!";
"Left" = "Izquierda";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Toca un punto para hacer una serie saltada.";
"Log this one on your iPhone." = "Este se registra en tu iPhone.";
"Saved on the watch, syncs later" = "Guardado en el reloj, se sincroniza luego";
+"All done?" = "¿Has terminado?";
"Skip this set?" = "¿Saltar esta serie?";
"Turn the Digital Crown to change it." = "Gira la Digital Crown para cambiarlo.";
"%lld done" = "%lld hechas";
diff --git a/frontend/ios/App/WatchWidgets/fr.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/fr.lproj/Localizable.strings
index 3a53f1e9d..c8da8658d 100644
--- a/frontend/ios/App/WatchWidgets/fr.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/fr.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminer la séance";
"Finish workout?" = "Terminer la séance ?";
"Finish and save" = "Terminer et enregistrer";
+"Continue workout" = "Continuer la séance";
"Cancel" = "Annuler";
"Rest’s over. Next set!" = "Repos terminé. Série suivante !";
"Left" = "Gauche";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Touche un point pour faire une série sautée.";
"Log this one on your iPhone." = "Celui-ci se note sur ton iPhone.";
"Saved on the watch, syncs later" = "Gardé sur la montre, synchro plus tard";
+"All done?" = "Terminé ?";
"Skip this set?" = "Sauter cette série ?";
"Turn the Digital Crown to change it." = "Tourne la Digital Crown pour le changer.";
"%lld done" = "%lld faites";
diff --git a/frontend/ios/App/WatchWidgets/hi.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/hi.lproj/Localizable.strings
index 99222f0e6..7508c4564 100644
--- a/frontend/ios/App/WatchWidgets/hi.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/hi.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "वर्कआउट समाप्त करें";
"Finish workout?" = "वर्कआउट समाप्त करें?";
"Finish and save" = "समाप्त करें और सहेजें";
+"Continue workout" = "वर्कआउट जारी रखें";
"Cancel" = "रद्द करें";
"Rest’s over. Next set!" = "आराम खत्म। अगला सेट!";
"Left" = "बायाँ";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "छूटा सेट करने के लिए एक बिंदु टैप करें।";
"Log this one on your iPhone." = "इसे iPhone पर दर्ज करें।";
"Saved on the watch, syncs later" = "वॉच पर सहेजा, बाद में सिंक होगा";
+"All done?" = "हो गया?";
"Skip this set?" = "यह सेट छोड़ें?";
"Turn the Digital Crown to change it." = "बदलने के लिए Digital Crown घुमाएँ।";
"%lld done" = "%lld पूरे";
diff --git a/frontend/ios/App/WatchWidgets/hu.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/hu.lproj/Localizable.strings
index 7f492f538..a6a737d1c 100644
--- a/frontend/ios/App/WatchWidgets/hu.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/hu.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Edzés befejezése";
"Finish workout?" = "Befejezed az edzést?";
"Finish and save" = "Befejezés és mentés";
+"Continue workout" = "Edzés folytatása";
"Cancel" = "Mégse";
"Rest’s over. Next set!" = "Vége a pihenőnek. Jöhet a következő sorozat!";
"Left" = "Bal";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Koppints egy pöttyre egy kihagyott sorozathoz.";
"Log this one on your iPhone." = "Ezt az iPhone-on rögzítsd.";
"Saved on the watch, syncs later" = "Az órán mentve, később szinkronizál";
+"All done?" = "Végeztél?";
"Skip this set?" = "Kihagyod ezt a sorozatot?";
"Turn the Digital Crown to change it." = "Forgasd a Digital Crownt a módosításhoz.";
"%lld done" = "%lld kész";
diff --git a/frontend/ios/App/WatchWidgets/it.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/it.lproj/Localizable.strings
index 6882d0032..f66fd6c57 100644
--- a/frontend/ios/App/WatchWidgets/it.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/it.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Termina allenamento";
"Finish workout?" = "Terminare l’allenamento?";
"Finish and save" = "Termina e salva";
+"Continue workout" = "Continua allenamento";
"Cancel" = "Annulla";
"Rest’s over. Next set!" = "Riposo finito. Prossima serie!";
"Left" = "Sinistra";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Tocca un punto per fare una serie saltata.";
"Log this one on your iPhone." = "Questo si registra sull’iPhone.";
"Saved on the watch, syncs later" = "Salvato sull’orologio, si sincronizza dopo";
+"All done?" = "Hai finito?";
"Skip this set?" = "Saltare questa serie?";
"Turn the Digital Crown to change it." = "Ruota la Digital Crown per cambiarlo.";
"%lld done" = "%lld fatte";
diff --git a/frontend/ios/App/WatchWidgets/ko.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/ko.lproj/Localizable.strings
index 5c96292dd..d9823d2fb 100644
--- a/frontend/ios/App/WatchWidgets/ko.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/ko.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "운동 마치기";
"Finish workout?" = "운동을 마칠까요?";
"Finish and save" = "마치고 저장";
+"Continue workout" = "운동 계속하기";
"Cancel" = "취소";
"Rest’s over. Next set!" = "휴식 끝. 다음 세트!";
"Left" = "왼쪽";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "건너뛴 세트를 하려면 점을 탭하세요.";
"Log this one on your iPhone." = "이건 iPhone에서 기록하세요.";
"Saved on the watch, syncs later" = "워치에 저장됨, 나중에 동기화돼요";
+"All done?" = "다 끝났나요?";
"Skip this set?" = "이 세트를 건너뛸까요?";
"Turn the Digital Crown to change it." = "바꾸려면 Digital Crown을 돌리세요.";
"%lld done" = "%lld개 완료";
diff --git a/frontend/ios/App/WatchWidgets/pl.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/pl.lproj/Localizable.strings
index 2443fac41..8d7650769 100644
--- a/frontend/ios/App/WatchWidgets/pl.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/pl.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Zakończ trening";
"Finish workout?" = "Zakończyć trening?";
"Finish and save" = "Zakończ i zapisz";
+"Continue workout" = "Kontynuuj trening";
"Cancel" = "Anuluj";
"Rest’s over. Next set!" = "Koniec przerwy. Następna seria!";
"Left" = "Lewa";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Stuknij kropkę, by zrobić pominiętą serię.";
"Log this one on your iPhone." = "To zapisz na iPhonie.";
"Saved on the watch, syncs later" = "Zapisano na zegarku, zsynchronizuje się później";
+"All done?" = "Koniec treningu?";
"Skip this set?" = "Pominąć tę serię?";
"Turn the Digital Crown to change it." = "Obróć Digital Crown, by zmienić.";
"%lld done" = "%lld zrobione";
diff --git a/frontend/ios/App/WatchWidgets/pt-BR.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/pt-BR.lproj/Localizable.strings
index 91ad95787..f65e55c24 100644
--- a/frontend/ios/App/WatchWidgets/pt-BR.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/pt-BR.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminar treino";
"Finish workout?" = "Terminar o treino?";
"Finish and save" = "Terminar e salvar";
+"Continue workout" = "Continuar treino";
"Cancel" = "Cancelar";
"Rest’s over. Next set!" = "Acabou o descanso. Próxima série!";
"Left" = "Esquerda";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Toque num ponto para fazer uma série pulada.";
"Log this one on your iPhone." = "Este você registra no iPhone.";
"Saved on the watch, syncs later" = "Salvo no relógio, sincroniza depois";
+"All done?" = "Terminou?";
"Skip this set?" = "Pular esta série?";
"Turn the Digital Crown to change it." = "Gire a Digital Crown para mudar.";
"%lld done" = "%lld feitas";
diff --git a/frontend/ios/App/WatchWidgets/pt-PT.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/pt-PT.lproj/Localizable.strings
index 347caf093..78a9d7db9 100644
--- a/frontend/ios/App/WatchWidgets/pt-PT.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/pt-PT.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Terminar treino";
"Finish workout?" = "Terminar o treino?";
"Finish and save" = "Terminar e guardar";
+"Continue workout" = "Continuar treino";
"Cancel" = "Cancelar";
"Rest’s over. Next set!" = "Acabou o descanso. Próxima série!";
"Left" = "Esquerda";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Toca num ponto para fazer uma série saltada.";
"Log this one on your iPhone." = "Este regista-se no iPhone.";
"Saved on the watch, syncs later" = "Guardado no relógio, sincroniza depois";
+"All done?" = "Terminaste?";
"Skip this set?" = "Saltar esta série?";
"Turn the Digital Crown to change it." = "Roda a Digital Crown para mudar.";
"%lld done" = "%lld feitas";
diff --git a/frontend/ios/App/WatchWidgets/ru.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/ru.lproj/Localizable.strings
index fe159f362..42df48dce 100644
--- a/frontend/ios/App/WatchWidgets/ru.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/ru.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Завершить тренировку";
"Finish workout?" = "Завершить тренировку?";
"Finish and save" = "Завершить и сохранить";
+"Continue workout" = "Продолжить тренировку";
"Cancel" = "Отмена";
"Rest’s over. Next set!" = "Отдых окончен. Следующий подход!";
"Left" = "Левая";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Нажмите на точку, чтобы сделать пропущенный подход.";
"Log this one on your iPhone." = "Это записывается на iPhone.";
"Saved on the watch, syncs later" = "Сохранено на часах, синхронизируется позже";
+"All done?" = "Тренировка окончена?";
"Skip this set?" = "Пропустить этот подход?";
"Turn the Digital Crown to change it." = "Поверните Digital Crown, чтобы изменить.";
"%lld done" = "%lld сделано";
diff --git a/frontend/ios/App/WatchWidgets/th.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/th.lproj/Localizable.strings
index b6d7d2079..5bc0f111d 100644
--- a/frontend/ios/App/WatchWidgets/th.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/th.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "จบการออกกำลังกาย";
"Finish workout?" = "จบการออกกำลังกายไหม?";
"Finish and save" = "จบและบันทึก";
+"Continue workout" = "ออกกำลังกายต่อ";
"Cancel" = "ยกเลิก";
"Rest’s over. Next set!" = "หมดเวลาพักแล้ว เซ็ตถัดไป!";
"Left" = "ซ้าย";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "แตะจุดเพื่อทำเซ็ตที่ข้ามไป";
"Log this one on your iPhone." = "อันนี้บันทึกบน iPhone";
"Saved on the watch, syncs later" = "บันทึกบนนาฬิกาแล้ว จะซิงค์ทีหลัง";
+"All done?" = "เสร็จแล้วหรือยัง";
"Skip this set?" = "ข้ามเซ็ตนี้ไหม";
"Turn the Digital Crown to change it." = "หมุน Digital Crown เพื่อเปลี่ยน";
"%lld done" = "เสร็จ %lld";
diff --git a/frontend/ios/App/WatchWidgets/tr.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/tr.lproj/Localizable.strings
index 8a762cf1e..33cc8fe2c 100644
--- a/frontend/ios/App/WatchWidgets/tr.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/tr.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Antrenmanı bitir";
"Finish workout?" = "Antrenman bitirilsin mi?";
"Finish and save" = "Bitir ve kaydet";
+"Continue workout" = "Antrenmana devam et";
"Cancel" = "İptal";
"Rest’s over. Next set!" = "Dinlenme bitti. Sıradaki set!";
"Left" = "Sol";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Atlanan bir set için bir noktaya dokun.";
"Log this one on your iPhone." = "Bunu iPhone’da kaydet.";
"Saved on the watch, syncs later" = "Saatte kaydedildi, sonra eşitlenir";
+"All done?" = "Bitirdin mi?";
"Skip this set?" = "Bu set atlansın mı?";
"Turn the Digital Crown to change it." = "Değiştirmek için Digital Crown’u çevir.";
"%lld done" = "%lld tamam";
diff --git a/frontend/ios/App/WatchWidgets/uk.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/uk.lproj/Localizable.strings
index e349386a9..3faf0a963 100644
--- a/frontend/ios/App/WatchWidgets/uk.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/uk.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "Завершити тренування";
"Finish workout?" = "Завершити тренування?";
"Finish and save" = "Завершити й зберегти";
+"Continue workout" = "Продовжити тренування";
"Cancel" = "Скасувати";
"Rest’s over. Next set!" = "Відпочинок скінчився. Наступний підхід!";
"Left" = "Ліва";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "Торкнись точки, щоб зробити пропущений підхід.";
"Log this one on your iPhone." = "Це записуй на iPhone.";
"Saved on the watch, syncs later" = "Збережено на годиннику, синхронізується пізніше";
+"All done?" = "Тренування завершено?";
"Skip this set?" = "Пропустити цей підхід?";
"Turn the Digital Crown to change it." = "Поверни Digital Crown, щоб змінити.";
"%lld done" = "%lld зроблено";
diff --git a/frontend/ios/App/WatchWidgets/zh-Hans.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/zh-Hans.lproj/Localizable.strings
index f6ef685e9..30f633906 100644
--- a/frontend/ios/App/WatchWidgets/zh-Hans.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/zh-Hans.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "结束训练";
"Finish workout?" = "结束训练?";
"Finish and save" = "结束并保存";
+"Continue workout" = "继续训练";
"Cancel" = "取消";
"Rest’s over. Next set!" = "休息结束,下一组!";
"Left" = "左侧";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "轻点圆点来做跳过的组。";
"Log this one on your iPhone." = "这个请在 iPhone 上记录。";
"Saved on the watch, syncs later" = "已存在手表上,稍后同步";
+"All done?" = "练完了吗?";
"Skip this set?" = "跳过这一组?";
"Turn the Digital Crown to change it." = "转动数码表冠来更改。";
"%lld done" = "已完成 %lld";
diff --git a/frontend/ios/App/WatchWidgets/zh-Hant.lproj/Localizable.strings b/frontend/ios/App/WatchWidgets/zh-Hant.lproj/Localizable.strings
index 4f13b454c..5d56bf434 100644
--- a/frontend/ios/App/WatchWidgets/zh-Hant.lproj/Localizable.strings
+++ b/frontend/ios/App/WatchWidgets/zh-Hant.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Finish workout" = "結束訓練";
"Finish workout?" = "結束訓練?";
"Finish and save" = "結束並儲存";
+"Continue workout" = "繼續訓練";
"Cancel" = "取消";
"Rest’s over. Next set!" = "休息結束,下一組!";
"Left" = "左側";
@@ -47,6 +48,7 @@
"Tap a dot to do a skipped set." = "輕點圓點來做跳過的組。";
"Log this one on your iPhone." = "這個請在 iPhone 上記錄。";
"Saved on the watch, syncs later" = "已存在手錶上,稍後同步";
+"All done?" = "練完了嗎?";
"Skip this set?" = "跳過這一組?";
"Turn the Digital Crown to change it." = "轉動數位錶冠來更改。";
"%lld done" = "已完成 %lld";
diff --git a/frontend/ios/ci/watch-strings.mjs b/frontend/ios/ci/watch-strings.mjs
index 615387d46..dec1d6cb8 100644
--- a/frontend/ios/ci/watch-strings.mjs
+++ b/frontend/ios/ci/watch-strings.mjs
@@ -31,6 +31,7 @@ const FROM_APP = {
'Finish workout': 'Finish workout',
'Finish workout?': 'Finish workout?',
'Finish and save': 'Finish and save',
+ 'Continue workout': 'Continue workout',
'Cancel': 'Cancel',
'Rest’s over. Next set!': 'Rest’s over. Next set!',
'Left': 'Left',
@@ -154,6 +155,9 @@ const OWN = {
'Saved on the watch, syncs later': {
de: 'Auf der Watch gespeichert, synct später', fr: 'Gardé sur la montre, synchro plus tard', es: 'Guardado en el reloj, se sincroniza luego', it: 'Salvato sull’orologio, si sincronizza dopo', 'pt-PT': 'Guardado no relógio, sincroniza depois', 'pt-BR': 'Salvo no relógio, sincroniza depois', pl: 'Zapisano na zegarku, zsynchronizuje się później', hu: 'Az órán mentve, később szinkronizál', tr: 'Saatte kaydedildi, sonra eşitlenir', ru: 'Сохранено на часах, синхронизируется позже', uk: 'Збережено на годиннику, синхронізується пізніше', ar: 'حُفظ على الساعة، تتم المزامنة لاحقًا', hi: 'वॉच पर सहेजा, बाद में सिंक होगा', bn: 'ঘড়িতে সেভ হয়েছে, পরে সিঙ্ক হবে', th: 'บันทึกบนนาฬิกาแล้ว จะซิงค์ทีหลัง', ko: '워치에 저장됨, 나중에 동기화돼요', 'zh-Hans': '已存在手表上,稍后同步', 'zh-Hant': '已存在手錶上,稍後同步',
},
+ 'All done?': {
+ de: 'Alles erledigt?', fr: 'Terminé ?', es: '¿Has terminado?', it: 'Hai finito?', 'pt-PT': 'Terminaste?', 'pt-BR': 'Terminou?', pl: 'Koniec treningu?', hu: 'Végeztél?', tr: 'Bitirdin mi?', ru: 'Тренировка окончена?', uk: 'Тренування завершено?', ar: 'هل انتهيت؟', hi: 'हो गया?', bn: 'শেষ হয়েছে?', th: 'เสร็จแล้วหรือยัง', ko: '다 끝났나요?', 'zh-Hans': '练完了吗?', 'zh-Hant': '練完了嗎?',
+ },
'Skip this set?': {
de: 'Diesen Satz überspringen?', fr: 'Sauter cette série ?', es: '¿Saltar esta serie?', it: 'Saltare questa serie?', 'pt-PT': 'Saltar esta série?', 'pt-BR': 'Pular esta série?', pl: 'Pominąć tę serię?', hu: 'Kihagyod ezt a sorozatot?', tr: 'Bu set atlansın mı?', ru: 'Пропустить этот подход?', uk: 'Пропустити цей підхід?', ar: 'تخطي هذه المجموعة؟', hi: 'यह सेट छोड़ें?', bn: 'এই সেটটি বাদ দেবেন?', th: 'ข้ามเซ็ตนี้ไหม', ko: '이 세트를 건너뛸까요?', 'zh-Hans': '跳过这一组?', 'zh-Hant': '跳過這一組?',
},