Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0569385
fix: replace Vitruvian exercise catalogue with free-exercise-db
codex Aug 20, 2026
5d570b1
fix: address CI failure in Unit Tests
codex Aug 20, 2026
b3f0e79
fix: bump SQLDelight schema version to 44
codex Aug 20, 2026
b7533c7
fix: localize wger refresh copy and canonicalize bodyweight equipment
codex Aug 20, 2026
48fc8d1
fix: address remaining review comments on catalogue import
codex Aug 21, 2026
0bceb5f
Update shared/src/commonMain/kotlin/com/devil/phoenixproject/presenta…
9thLevelSoftware Aug 21, 2026
5687f5f
fix: address CI failure in Lint Check
codex Aug 21, 2026
378d582
fix: address CI failure in Unit Tests
codex Aug 21, 2026
c43b083
fix: honor exercise demo toggle in picker
codex Aug 21, 2026
7efe878
fix: map legacy 5/3/1 catalogue IDs to canonical lifts
codex Aug 21, 2026
dff6d6b
fix: use cable glute kickback in Upper/Lower template
codex Aug 21, 2026
e3fcd21
fix: leave non-cable imports as derived bodyweight
codex Aug 21, 2026
cd1b8f2
fix: address CI failure in iOS Test Target Compile
codex Aug 21, 2026
e562d9b
fix: add Cable chip for imported cable-equipment rows
codex Aug 21, 2026
0d01f5c
fix: preserve user-owned fields on catalogue reimport
codex Aug 21, 2026
8bdb06f
fix: skip catalog source marker unless import inserts rows
codex Aug 21, 2026
217c7e2
test: cover catalogue reimport, zero-row failure, and active name fal…
codex Aug 21, 2026
ba0b84c
fix: remap legacy catalogue IDs onto replacement exercises
codex Aug 21, 2026
4cc665b
fix: make catalogue ID remap idempotent and keep the better PR
codex Aug 21, 2026
1ffb116
fix: map renamed catalogue rows and merge colliding MVT
codex Aug 21, 2026
15070d6
fix: map duplicate catalogue IDs and keep live PRs
codex Aug 21, 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
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ CHANGELOG.md
opencode.json
review-prompt.txt

# Reference/decompiled code (not for distribution)
/reference/
/vitruvian-decompiled/
/scripts/
/apktool.jar
/vitruvian-official.apk
/parent repo/

# Git worktrees
Expand Down
27 changes: 27 additions & 0 deletions LICENSE-free-exercise-db
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Vendored exercise catalogue (`shared/src/commonMain/composeResources/files/exercises.json`)
is copied from https://github.com/yuhonas/free-exercise-db (Unlicense / public domain).

This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org/>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Proprietary License - All Rights Reserved. See [LICENSE](LICENSE) file for detai
## Acknowledgments

- Original [VitruvianProjectPhoenix](https://github.com/DasBluEyedDevil/VitruvianProjectPhoenix) Android app
- Web app developers for reverse-engineering the BLE protocol
- Community protocol documentation for the machine BLE interface
- Vitruvian machine owners community for testing and feedback
- JetBrains for Kotlin Multiplatform
- All contributors and supporters
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ allprojects {
resolutionStrategy.dependencySubstitution {
substitute(module("com.juul.kable:kable-core-android"))
.using(project(":third_party:kable-core-android-patched"))
.because("Phoenix #333: keep Kable's Android queue/callback path but use the official app's legacy GATT write shape")
.because("Phoenix #333: keep Kable's Android queue/callback path but use the machine's legacy GATT write shape")
substitute(module("com.juul.kable:kable-core-android-debug"))
.using(project(":third_party:kable-core-android-patched"))
.because("Phoenix #333: debug Android variant must use the same patched Kable write path")
Expand Down
Loading
Loading