feat: Allow more progressive overload strategies

This change introduces more progressive overload strategies. 
Many times, people have asked about disabling progressive overload and the answer has always been "just set it to zero". With this change, there is now an explicit "None" option.

Additionally more complex behaviours can now be encoded. The existing behaviour was this:
If all sets have hit their min reps then:
 - Increase all set's weight by the amount specified

The action that gets completed is now more configurable:
Type: None
If all sets have hit their min reps then:
 - Leave weight alone

Type: Evenly
If all sets have hit their min reps then:
 - Increase all set's weight by the amount specified (this is the original behaviour)


Type: Lowest set/s
Increase strategy: Every lowest
If all sets have hit their min reps then:
 - Find the lowest weight in all the sets, and increase all sets with this weight by the amount

Type: Lowest set/s
Increase strategy: First lowest
If all sets have hit their min reps then:
 - Find the lowest weight in all the sets, and increase the first set which has this weight by the amount


Type: Lowest set/s
Increase strategy: Last lowest
If all sets have hit their min reps then:
 - Find the lowest weight in all the sets, and increase the last set which has this weight by the amount


Type: Lowest set/s
Increase strategy: Middle lowest
If all sets have hit their min reps then:
 - Find the lowest weight in all the sets, and increase the set closest to the middle which has this weight by the amount

These new types and strategies are useful for when you generally don't increase all your sets when you overload, for instance with dumbbell shoulder press where the increase is a bit much. I would use the Middle Lowest strategy where if I succeed it will increase a single set by the amount, starting with the middle set.

Author: LiamMorrow

.github/workflows/android-build.yml

@@ -30,6 +30,9 @@ jobs:
       - name: Install
         run: npm ci
         working-directory: ./app
+      - name: Prebuild
+        run: npm run prebuild
+        working-directory: ./app
 
       - name: Build Android
         run: ./gradlew build

.gitignore

@@ -20,7 +20,6 @@ service-account.json
 # Mono auto generated files
 mono_crash.*
 
-scratch
 
 
 # Build results
@@ -389,3 +388,5 @@ backend/LiftLog.Api/appsettings.Development.json
 LiftLog.Web/wwwroot/crypto-utils.js
 LiftLog.Ui/wwwroot/app-utils.js
 tests/LiftLog.Tests.Api/appsettings.Development.json
+
+temp/

app/eslint.config.js

@@ -119,6 +119,7 @@ module.exports = defineConfig([
     '**/expo-env.d.ts',
     '**/dist',
     '**/node_modules',
+    'src/drizzle/migrations.js',
     'src/types/dom.slim.d.ts',
     'scripts',
   ]),

app/models/storage/versions/v1/exercise-descriptor.ts

@@ -5,6 +5,10 @@ import com.limajuice.liftlog.CardioTarget
 import com.limajuice.liftlog.DistanceCardioTarget
 import com.limajuice.liftlog.ExerciseBlueprint
 import com.limajuice.liftlog.FinishWorkoutCommand
+import com.limajuice.liftlog.IncreaseAllEvenlyProgressiveOverload
+import com.limajuice.liftlog.IncreaseLowestSetProgressiveOverload
+import com.limajuice.liftlog.NoProgressiveOverload
+import com.limajuice.liftlog.ProgressiveOverload
 import com.limajuice.liftlog.RecordedCardioExercise
 import com.limajuice.liftlog.RecordedExercise
 import com.limajuice.liftlog.RecordedWeightedExercise
@@ -80,6 +84,12 @@ object Json {
                 .withSubtype(DistanceCardioTarget::class.java, "distance")
                 .withSubtype(TimeCardioTarget::class.java, "time")
         )
+        .add(
+            PolymorphicJsonAdapterFactory.of(ProgressiveOverload::class.java, "type")
+                .withSubtype(NoProgressiveOverload::class.java, "NoProgressiveOverload")
+                .withSubtype(IncreaseAllEvenlyProgressiveOverload::class.java, "IncreaseAllEvenlyProgressiveOverload")
+                .withSubtype(IncreaseLowestSetProgressiveOverload::class.java, "IncreaseLowestSetProgressiveOverload")
+        )
         .add(Duration::class.java, DurationAdapter())
         .add(Instant::class.java, InstantAdapter())
         .add(BigDecimal::class.java, BigDecimalAdapter())

app/modules/workout-worker/android/src/main/java/expo/modules/workoutworker/utils/Json.kt

@@ -60,7 +60,7 @@
     "expo-status-bar": "~56.0.4",
     "linq": "^4.0.3",
     "material-symbols-react-native": "^1.0.3",
-    "protobufjs": "^7.5.5",
+    "protobufjs": "^7.6.2",
     "react": "19.2.3",
     "react-compiler-runtime": "^1.0.0",
     "react-native": "0.85.3",
@@ -99,6 +99,7 @@
     "@types/node": "^24.3.3",
     "@types/react": "~19.2.10",
     "@typescript/native-preview": "^7.0.0-dev.20251121.1",
+    "ajv": "^8.20.0",
     "babel-plugin-inline-import": "^3.0.0",
     "drizzle-kit": "^0.31.10",
     "eslint": "^9.39.2",

app/package-lock.json

@@ -5,34 +5,15 @@ const fs = require('fs');
 const { join } = require('node:path');
 
 const modelsDir = join(__dirname, '../src/models');
-const storageVersionsDir = join(modelsDir, 'storage/versions');
 const docsSchemasPath = join(__dirname, '../../docs/schemas/');
 // Create schemas for storage
-for (const currentVersionVal of fs
-  .readdirSync(storageVersionsDir)
-  .filter((f) => /^v\d+/.test(f))) {
-  const outputPath = join(docsSchemasPath, currentVersionVal, 'schema.json');
-
-  createSchema(
-    join(storageVersionsDir, currentVersionVal, 'index.ts'),
-    outputPath,
-  );
-}
 
 // Create schema for workout-worker — one file per definition
 createSplitSchemas(
   join(modelsDir, 'workout-worker-messages.ts'),
   join(docsSchemasPath, 'workout-worker'),
 );
 
-function createSchema(inputFile, outputPath) {
-  const schema = buildSchema(inputFile);
-
-  fs.mkdirSync(require('path').dirname(outputPath), { recursive: true });
-  fs.writeFileSync(outputPath, JSON.stringify(schema, null, 2));
-  console.log(`Wrote schema to ${outputPath}`);
-}
-
 /**
  * Write one JSON Schema file per top-level definition.
  * Each file is named `<DefinitionName>.json` and lives in `outputDir`.
@@ -106,6 +87,7 @@ function buildSchema(inputFile) {
     type: '*',
     additionalProperties: true,
     discriminatorType: 'open-api',
+    skipTypeCheck: true,
   };
 
   const schema = tsj.createGenerator(config).createSchema(config.type);