Flexible routines

android/app/build.gradle

@@ -36,12 +36,12 @@ android {
     ndkVersion "25.1.8937393"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {

integration_test/1_dashboard.dart

@@ -5,8 +5,8 @@ import 'package:provider/provider.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/providers/user.dart';
-import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/dashboard.dart';
 import 'package:wger/theme/theme.dart';
 
@@ -20,10 +20,10 @@ import '../test_data/exercises.dart';
 import '../test_data/measurements.dart';
 import '../test_data/nutritional_plans.dart';
 import '../test_data/profile.dart';
-import '../test_data/workouts.dart';
+import '../test_data/routines.dart';
 
 Widget createDashboardScreen({locale = 'en'}) {
-  final mockWorkoutProvider = MockWorkoutPlansProvider();
+  final mockWorkoutProvider = MockRoutinesProvider();
   when(mockWorkoutProvider.activePlan).thenReturn(getWorkout(exercises: getScreenshotExercises()));
 
   final Map<String, dynamic> logs = {
@@ -60,7 +60,7 @@ Widget createDashboardScreen({locale = 'en'}) {
       ChangeNotifierProvider<UserProvider>(
         create: (context) => mockUserProvider,
       ),
-      ChangeNotifierProvider<WorkoutPlansProvider>(
+      ChangeNotifierProvider<RoutinesProvider>(
         create: (context) => mockWorkoutProvider,
       ),
       ChangeNotifierProvider<NutritionPlansProvider>(

integration_test/2_workout.dart

@@ -2,25 +2,25 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../test/workout/workout_form_test.mocks.dart';
 import '../test_data/exercises.dart';
-import '../test_data/workouts.dart';
+import '../test_data/routines.dart';
 
 Widget createWorkoutDetailScreen({locale = 'en'}) {
   final key = GlobalKey<NavigatorState>();
 
-  final mockWorkoutProvider = MockWorkoutPlansProvider();
+  final mockWorkoutProvider = MockRoutinesProvider();
   final workout = getWorkout(exercises: getScreenshotExercises());
   when(mockWorkoutProvider.activePlan).thenReturn(workout);
-  when(mockWorkoutProvider.fetchAndSetWorkoutPlanFull(1)).thenAnswer((_) => Future.value(workout));
+  when(mockWorkoutProvider.fetchAndSetRoutineFull(1)).thenAnswer((_) => Future.value(workout));
 
   return MultiProvider(
     providers: [
-      ChangeNotifierProvider<WorkoutPlansProvider>(
+      ChangeNotifierProvider<RoutinesProvider>(
         create: (context) => mockWorkoutProvider,
       ),
     ],
@@ -35,7 +35,7 @@ Widget createWorkoutDetailScreen({locale = 'en'}) {
         onPressed: () => key.currentState!.push(
           MaterialPageRoute<void>(
             settings: RouteSettings(arguments: workout),
-            builder: (_) => const WorkoutPlanScreen(),
+            builder: (_) => const RoutineScreen(),
           ),
         ),
         child: const SizedBox(),

integration_test/3_gym_mode.dart

@@ -3,15 +3,15 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/screens/gym_mode.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
+import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../test/utils.dart';
 import '../test/workout/gym_mode_screen_test.mocks.dart';
 import '../test_data/exercises.dart';
-import '../test_data/workouts.dart';
+import '../test_data/routines.dart';
 
 Widget createGymModeScreen({locale = 'en'}) {
   final key = GlobalKey<NavigatorState>();
@@ -25,8 +25,8 @@ Widget createGymModeScreen({locale = 'en'}) {
   //when(mockExerciseProvider.findExerciseBaseById(2)).thenReturn(bases[1]); // crunches
   //when(mockExerciseProvider.findExerciseBaseById(3)).thenReturn(bases[2]); // dead lift
 
-  return ChangeNotifierProvider<WorkoutPlansProvider>(
-    create: (context) => WorkoutPlansProvider(
+  return ChangeNotifierProvider<RoutinesProvider>(
+    create: (context) => RoutinesProvider(
       mockBaseProvider,
       mockExerciseProvider,
       [workout],
@@ -50,7 +50,7 @@ Widget createGymModeScreen({locale = 'en'}) {
           child: const SizedBox(),
         ),
         routes: {
-          WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(),
+          RoutineScreen.routeName: (ctx) => const RoutineScreen(),
         },
       ),
     ),