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.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
Merge remote-tracking branch 'origin/cleanup-1015' into v143-integration
Duarte Santos57f93e091f47
diff --cc CHANGELOG.mdindex ac5f311ca,7f0874272..e8811ad64--- a/CHANGELOG.md+++ b/CHANGELOG.md@@@ -1,112 -1,10 +1,116 @@@# Changelog+ Newest first. Each release is a `## vX.Y.Z (YYYY-MM-DD)` section, and the release notes on+ GitHub and GitLab are that section, word for word. New work goes under `## Unreleased` until the+ tag. Write it for the people using the app: what changed for them, short, no em dashes.+-## Unreleased+## v1.4.2 (2026-10-18)++openGym comes to the App Store, with an Apple Watch app in tow. Plus everything you asked for+since v1.4.1, five reported security holes closed and a fresh look at the animations.++**openGym on the iPhone.** The App Store app is the same openGym: use it on the phone alone, or+connect it to your own server. Your data stays where it is (no account with us, nothing collected).+Want it before the App Store has it? Join the public TestFlight beta:+https://testflight.apple.com/join/RKATb61k++- **Apple Watch.** Start a workout on the wrist, or on the phone and the watch app opens with it,+ then tick off sets with a big Done button and the Digital Crown for reps and weight. Rest is a+ full-screen countdown with +15 s and Skip, holds count down, sides say Left or Right, supersets+ go in turns. Heart rate per set, a summary at the end, a Smart Stack widget and complications+ for your watch face. It speaks the app's language, asks for a weigh-in at the start if you like,+ makes weights quick to change, and you pick what the set screen shows. No phone in reach? Your+ ticks wait on the watch and catch up later.+- **Widgets and a Live Activity.** Today's workout on the Home Screen and the Lock Screen, your+ streak too. A running workout sits on the Lock Screen and in the Dynamic Island, with a Done+ button that logs the set and starts the rest without opening the app.+- **Apple Health.** Finished workouts and weigh-ins go to Apple Health, the same switch Android+ has for Health Connect, offered once at the start. Delete a workout in openGym (on any of your+ devices) and it leaves Apple Health too.+- **Sharper animations, your choice.** Settings → Workout → Animation quality: Still only, built in+ (180 px), or 240, 360, 480, 720 and 1080 px, downloaded from the App Store when you pick them.+ Auto takes 360 on a phone and 720 on an iPad, over Wi-Fi. Female and male figures download+ separately, so you only get the one you use.+- **No more boxes.** The animations in the app showed faint rectangles around the moving parts.+ They are re-made from the original files, frame by frame, and look like the originals now. The+ APKs get the same fix (180, 240 or 360 px built in, see Android below).+- **Swipe from the left edge to go back**, with the page you came from sliding in underneath.+- **Notifications are asked for at the start**, not in the middle of your first rest.+- The Vibrate switch works on the iPhone, and a server or Coach on your home network works over+ plain http, like on Android (#428).+- **A logo instead of a black screen** while the app starts, loading its plates.++**Android.** The app now targets Android 16 and needs Android 7.0 or newer (6.0 is out). The APK+you know stays and updates itself, now in three sizes: **Standard** (`openGym-1.4.2.apk`,+animations built in at 180 px, the small one), **Plus** (`openGym-Plus-1.4.2.apk`, 240 px) and+**HD** (`openGym-HD-1.4.2.apk`, 360 px, sharp and hungry). Each one updates to its own kind, so+nobody gets a surprise download twice the size. Phones on v1.4.1 update to Standard; want Plus or+HD? Install it on top, your data stays (same goes for going back). A Google Play version is ready for the store too: it updates through Play and gets+the sharper animations as Play downloads, like the iPhone, and an APK phone can move to it later+without losing anything.++**Your account, your call.**+- **Delete your account** from Settings → Account. It offers your backup first, asks you to type+ your name, and then a passkey or password (on the phone: Face ID, Touch ID or the passcode).+ The server's last admin hears straight away why they can't, instead of after all that.+- **The Coach asks before anything leaves.** The first time the Coach would send your training to+ an AI service, it says which one and what goes there. You can take it back in the Coach menu.+ A model on your home network doesn't ask; it's yours.+- **Sign in on a computer from the phone app** (#551): Settings → Account → Add another device+ makes the same one-time code a browser does.++**Reminders that know you trained.** Logged a workout on another device? Before the missed-day+nudge goes out, the phone checks with your server and keeps quiet. (On the iPhone, iOS decides+when the app may check in the background; opening the app always catches up.)++**Your data, safer**+- A running workout is saved the moment it changes and again when the app goes to the background,+ so a crash or a dead battery costs you nothing.+- Taps from the watch or the Lock Screen wait until your saved data is loaded, and offline changes+ count as sent only once they're safely on disk. Saving swaps the file in one go, never half.+- Importing a backup without an account now offers "Merge them in" instead of wiping what's there.++**In the workout**+- **Backups for an exercise** (Discord): in the routine editor, up to five exercises to do instead+ when the machine is taken. A swap lists them first.+- **Rest between warm-ups** (Discord): Settings → Workout sets it for every exercise (no timer,+ or a time of its own). One exercise can still do its own thing, and get a rest between sides.+- **Your bars** (Discord): Settings → Equipment sets your bar weight once per bar type, say the+ 15 kg women's Olympic bar, and every exercise on it loads plates from that. The plate editor+ gets quick picks (20/15/10/7.5 kg, 45/35/25/15 lb).+- **Skip finished exercises** in Cards and Focus, a new switch next to Collapse completed (#523).+- **Timed exercises move on by themselves**: when the last rest after a plank runs out, the next+ exercise comes up (#532).+- **Per-side sets can be warm-ups** and back again (#575).+- **Bodyweight exercises** stop asking for a weight step (#583).+- **Change plates** of 2, 1.5 and 1 kg, and 1 and 0.5 lb, for gyms that stock them (#510).++**Small things**+- **Progress photos for any day**, several at once, each on the day it was taken (#557), and a+ photo can be removed from the gallery, with Undo (#558).+- **Muscle balance**: tap an untrained muscle to see its exercises (#553), and the Week view lines+ up. The status bar no longer covers the page on more Android phones (#573).+- The Coach's questionnaire has a clearer days screen and the same time wheels for session length.+- The Coach's message box grows with your text and opens into a tall editor for long ones. A+ reload on the intake no longer sends you home, and dates follow your day, not UTC's.+- The Undo after a delete has an × to send it away, on the far side from Undo.+- Day notes (sick, travelling...) show icon and word on one line.+- The swipe hint no longer swallows a quick tap on the first set (found by the new iPhone tests).+- The pairing code field no longer hides behind the keyboard on iPhone.++**From the community** (thanks!)+- Body weight for an earlier day, like measurements (#570, @smist37).+- Warm-ups on assisted machines ramp down from more help (#581, @lntvan166).+- Effort stats average the whole training, and your logged RIR tunes the anchor (#539, @sg41).+- 15 rowing exercises stop counting as chest and triceps (#503, @sg41).+- German exercise texts (#578, @ThatsMeGIT).+- A shared plan keeps a superset's name and rest (#564, @pawell67).+- Push reminders show the routine's emoji (#548, @mzspicoli).+- The swap icon shows on picker rows (#579, @Totopo27).+- `.env.example`: CF_CONNECTING_IP quoted so Compose keeps it (#565, @APN-Carmine).+- Skip finished exercises, the change plates and the untrained-muscle shortcut were first sent as+ pull requests by @anshuman83-40 (#526, #530) and @tfdmendes (#543). The CLA wasn't signed yet,+ so we built our own take for this release, but the ideas are theirs. Thank you!**Security.** Five private reports, all fixed, plus our own audit. Thanks to Boris Kurktchievfor the reports, each with a patch and a test. Self-hosters: please update.diff --cc README.mdindex 53fb73bdd,c1fec2c15..db2c1ba34--- a/README.md+++ b/README.md@@@ -186,19 -193,18 +193,18 @@@ variable. The [self-hosting guide](docs## Phone app- The same codebase builds a standalone app with Capacitor: no account, no server, everything stays- on the phone, with native reminders and a rest countdown in the notification shade.+ The same codebase builds the phone apps with Capacitor. Use them on their own (everything stays on+ the phone, no account) or connect them to your server and sync.- - **Android:** download the signed APK from the [latest release](https://github.com/DuarteSantos8/openGym/releases/latest)- or the [website](https://opengym.ch): Standard (`openGym-X.Y.Z.apk`, 180 px animations, about- 315 MB), Plus (`openGym-Plus-X.Y.Z.apk`, 240 px, about 424 MB) or HD (`openGym-HD-X.Y.Z.apk`,- 360 px, about 760 MB). Each sits next to its `.sha256`,- checks for updates itself and stays the kind you picked. A Google Play version is on its way.- - **iPhone and Apple Watch:** the App Store app, with a public- [TestFlight beta](https://testflight.apple.com/join/RKATb61k) until it is out. Or self-host and- add the PWA to your home screen from Safari.+ | | Get it |+ |---|---|+ | **iPhone and iPad**, with the **Apple Watch** app | The App Store. Until it is listed there, the [public TestFlight beta](https://testflight.apple.com/join/RKATb61k) |-| **Android** | The signed APK from the [latest release](https://github.com/DuarteSantos8/openGym/releases/latest) or [opengym.ch](https://opengym.ch). From v1.4.2 in two sizes: **Standard** (animations at 180 px) and **HD** (360 px, a bigger download). It updates itself |++| **Android** | The signed APK from the [latest release](https://github.com/DuarteSantos8/openGym/releases/latest) or [opengym.ch](https://opengym.ch), in three sizes: **Standard** (`openGym-X.Y.Z.apk`, animations at 180 px, about 315 MB), **Plus** (`openGym-Plus-X.Y.Z.apk`, 240 px, about 424 MB) and **HD** (`openGym-HD-X.Y.Z.apk`, 360 px, about 760 MB). It updates itself and stays the kind you picked |+ | **Google Play** | Coming: a new developer account has to run a closed test first |- Details and build instructions: [docs/MOBILE.md](docs/MOBILE.md).+ Every APK sits next to its `.sha256`. The APK and the Play app share one signing key, so you can-switch between them (or between Standard and HD) without losing data. Details, building it++switch between them (or between Standard, Plus and HD) without losing data. Details, building it+ yourself and connecting to your server: [docs/MOBILE.md](docs/MOBILE.md).## How it worksdiff --cc docs/MOBILE.mdindex c6aa44eff,72a13dbfa..b2e268b95--- a/docs/MOBILE.md+++ b/docs/MOBILE.md@@@ -1,12 -1,23 +1,23 @@@# The phone app (Android and iOS)- **Just want the app?** Download the APK from the- [latest release](https://github.com/DuarteSantos8/openGym/releases/latest) (`openGym-X.Y.Z.apk`,- or `openGym-Plus-X.Y.Z.apk` / `openGym-HD-X.Y.Z.apk` for sharper animations at a bigger size) and read+ **Just want the app?** See [getting the app](#getting-the-app): the App Store (and the public+ TestFlight beta) on an iPhone, the APK on Android. Then read[how the phone app works](#how-the-phone-app-works) and- [connecting it to your server](#connecting-the-app-to-your-own-server). On an iPhone, see- [what's possible](#iphone--whats-actually-possible). Everything from [Prerequisites](#prerequisites)- on is for building the app yourself.+ [connecting it to your server](#connecting-the-app-to-your-own-server). Everything from+ [Prerequisites](#prerequisites) on is for building the app yourself.++ ## Getting the app++ | | Where | Updates |+ |---|---|---|+ | **iPhone and iPad** | The App Store. Before it is there, or to test the next version early: the [public TestFlight beta](https://testflight.apple.com/join/RKATb61k) | the App Store or TestFlight |+ | **Apple Watch** | Comes with the iPhone app | with the iPhone app |-| **Android, APK** | [GitHub release](https://github.com/DuarteSantos8/openGym/releases/latest) or [opengym.ch](https://opengym.ch). From v1.4.2 in two sizes: Standard (animations at 180 px) and HD (360 px, bigger download) | the app itself, each size to its own kind |++| **Android, APK** | [GitHub release](https://github.com/DuarteSantos8/openGym/releases/latest) or [opengym.ch](https://opengym.ch). From v1.4.2 in three sizes: Standard (animations at 180 px), Plus (240 px) and HD (360 px, the biggest download) | the app itself, each size to its own kind |+ | **Android, Google Play** | Coming: the account has to run a closed test first | Google Play, sharper animations as downloads |++ The APK and the Google Play app are signed with the same key, so a phone can move from one to-the other, or between Standard and HD, without losing its data. How the store builds are made and++the other, or between Standard, Plus and HD, without losing its data. How the store builds are made and+ released is in [APP_STORES.md](APP_STORES.md).## How the phone app works@@@ -282,11 -292,11 +293,11 @@@ cellular with Wi-Fi only on, it waits;## Prerequisites- - Node 20+- - **Android:** Android Studio (bundles the SDK). Java 21 for Gradle.- - **iOS:** a Mac with Xcode 15+ and CocoaPods (`brew install cocoapods`). A free Apple ID+ - Node 22 (the Capacitor 8 CLI needs it)+ - **Android:** Android Studio (bundles the SDK, API 36). Java 21 for Gradle.+ - **iOS:** a Mac with Xcode 26 and CocoaPods (`brew install cocoapods`). A free Apple IDis enough to run the app on your own iPhone (see below); paid membership is only needed- to publish it.+ for App Store and TestFlight distribution ([APP_STORES.md](APP_STORES.md)).## Build & run@@@ -316,33 -327,20 +328,34 @@@ npx @capacitor/assets generate --iconBa```(If the generator won't take the SVG directly, export it to `resources/icon.png` at- 1024×1024 first — any image tool can do it.)+ 1024×1024 first; any image tool can do it.)- ## Distribution+ ## Distributing your own build+The signed APK stays the way to get openGym on Android without a store, and it updates itself.+The App Store app (public TestFlight beta: https://testflight.apple.com/join/RKATb61k) and the+Google Play build come from the same code; how they are built and uploaded is in+[APP_STORES.md](APP_STORES.md).+### Android: sideload the APK-Android asks you to allow installs from the browser the first time; that's standard for any app-from outside Google Play. Each APK on the release has its `.sha256` beside it, check it if you got-the file from anywhere else.+Every release has three signed APKs on [the GitHub release](https://github.com/DuarteSantos8/openGym/releases),+each with its `.sha256` beside it, and [opengym.ch](https://opengym.ch) links to all three:++- **`openGym-X.Y.Z.apk` (Standard):** the exercise animations built in at 180 px, about 315 MB.+- **`openGym-Plus-X.Y.Z.apk` (Plus):** the same app with 240 px animations, about 424 MB.+- **`openGym-HD-X.Y.Z.apk` (HD):** the same app with 360 px animations, about 760 MB.++Same app id, same key: install one over another and the data stays. The in-app updater keeps- each on its own kind. Android asks you to allow installs from the browser the first time; that is- standard for any app outside the Play Store. Check the `.sha256` if you got the file from anywhere- else.++each on its own kind. Android asks you to allow installs from the browser the first time; that's++standard for any app from outside Google Play. Check the `.sha256` if you got the file from++anywhere else.- Both are built and signed on the release machine with `scripts/android/build-release.sh`- ([APP_STORES.md](APP_STORES.md)), not in CI: anything above 180 px may only exist inside an app- package (Gym visual licence), never in a CI artifact. The GitLab mirror's `build:apk` job only runs- by hand and builds a plain 180 px APK; its releases link to GitHub's.-The release APKs are built and signed on the release machine (`scripts/android/build-release.sh`),-because the animations inside them are larger than the 180 px the licence allows in a repository-or a CI run. GitLab CI on the mirror can still build a test APK with the repo's 180 px media-(`build:apk`, a manual job on `main` and merge requests, never on a tag).++The release APKs are built and signed on the release machine (`scripts/android/build-release.sh`,++[APP_STORES.md](APP_STORES.md)), not in CI, because the animations inside them are larger than++the 180 px the licence allows in a repository or a CI run. GitLab CI on the mirror can still build++a test APK with the repo's 180 px media (`build:apk`, a manual job on `main` and merge requests,++never on a tag); its releases link to GitHub's.The release APK carries native code for ARM only (`arm64-v8a`, `armeabi-v7a`), which is everyphone; the x86 builds of the barcode scanner's library would add about 12 MB for emulatorsdiff --cc docs/SELF_HOSTING_KUBERNETES.mdindex 9ae548782,292899d24..05487f501--- a/docs/SELF_HOSTING_KUBERNETES.md+++ b/docs/SELF_HOSTING_KUBERNETES.md@@@ -37,9 -37,9 +37,9 @@@ Notes[Envoy Gateway](https://gateway.envoyproxy.io) and [cert-manager](https://cert-manager.io).- The images are the published `ghcr.io/duartesantos8/opengym-api` and `opengym-web`. The AICoach with an API key works on that same API image; the Claude and Codex sign-in providers- need the `coach` build target, which is not published — build it yourself (see+ need the `coach` build target, which is not published, so build it yourself (see[AI_COACH.md](AI_COACH.md)).-- The images are pinned to a release (`1.4.1`), the API and the web image always to the same+- The images are pinned to a release (`1.4.2`), the API and the web image always to the sameone. To update, read the release notes, set the new version on both and apply again; pinningto `latest` instead means a restarted pod can come back on a version you never chose.- Coming from a version before 1.4.0: the `media-download` initContainer and the `opengym-media`