More renaming of exercise base to just exercise

Author: rolandgeider

lib/providers/exercises.dart

@@ -81,7 +81,7 @@ class ExercisesProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  Map<int, List<Exercise>> get exerciseBasesByVariation {
+  Map<int, List<Exercise>> get exerciseByVariation {
     final Map<int, List<Exercise>> variations = {};
 
     for (final exercise in exercises.where((e) => e.variationId != null)) {

lib/screens/exercises_screen.dart

@@ -50,7 +50,7 @@ class _ExercisesScreenState extends State<ExercisesScreen> {
                       child: CircularProgressIndicator(),
                     ),
                   )
-                : _ExercisesList(exerciseBaseList: exercisesList),
+                : _ExercisesList(exerciseList: exercisesList),
           ),
         ],
       ),

lib/widgets/add_exercise/steps/step2variations.dart

@@ -28,7 +28,7 @@ class Step2Variations extends StatelessWidget {
               child: Column(
                 children: [
                   // Exercise bases with variations
-                  ...exerciseProvider.exerciseBasesByVariation.keys.map(
+                  ...exerciseProvider.exerciseByVariation.keys.map(
                     (key) => Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
@@ -37,7 +37,7 @@ class Step2Variations extends StatelessWidget {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             //mainAxisSize: MainAxisSize.max,
                             children: [
-                              ...exerciseProvider.exerciseBasesByVariation[key]!.map(
+                              ...exerciseProvider.exerciseByVariation[key]!.map(
                                 (base) => Text(
                                   base
                                       .getTranslation(

lib/widgets/exercises/exercises.dart

@@ -97,7 +97,7 @@ class ExerciseDetail extends StatelessWidget {
       style: Theme.of(context).textTheme.headlineSmall,
     ));
     for (final element in variations) {
-      out.add(ExerciseListTile(exerciseBase: element));
+      out.add(ExerciseListTile(exercise: element));
     }
     if (variations.isEmpty) {
       out.add(const Text('-/-'));

lib/widgets/exercises/list_tile.dart

@@ -23,9 +23,9 @@ import 'package:wger/screens/exercise_screen.dart';
 import 'package:wger/widgets/exercises/images.dart';
 
 class ExerciseListTile extends StatelessWidget {
-  const ExerciseListTile({super.key, required this.exerciseBase});
+  const ExerciseListTile({super.key, required this.exercise});
 
-  final Exercise exerciseBase;
+  final Exercise exercise;
 
   @override
   Widget build(BuildContext context) {
@@ -43,22 +43,21 @@ class ExerciseListTile extends StatelessWidget {
             child: SizedBox(
               height: IMG_SIZE,
               width: IMG_SIZE,
-              child: ExerciseImageWidget(image: exerciseBase.getMainImage),
+              child: ExerciseImageWidget(image: exercise.getMainImage),
             ),
           ),
         ),
       ),
       title: Text(
-        exerciseBase.getTranslation(Localizations.localeOf(context).languageCode).name,
-        //style: theme.textTheme.titleLarge,
+        exercise.getTranslation(Localizations.localeOf(context).languageCode).name,
         overflow: TextOverflow.ellipsis,
         maxLines: 2,
       ),
       subtitle: Text(
-        '${getTranslation(exerciseBase.category!.name, context)} / ${exerciseBase.equipment.map((e) => getTranslation(e.name, context)).toList().join(', ')}',
+        '${exercise.id} -- ${getTranslation(exercise.category!.name, context)} / ${exercise.equipment.map((e) => getTranslation(e.name, context)).toList().join(', ')}',
       ),
       onTap: () {
-        Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: exerciseBase);
+        Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: exercise);
       },
     );
   }

test/core/settings_test.mocks.dart

@@ -175,7 +175,7 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
       );
 
   @override
-  Map<int, List<_i4.Exercise>> get exerciseBasesByVariation => (super.noSuchMethod(
+  Map<int, List<_i4.Exercise>> get exerciseByVariation => (super.noSuchMethod(
         Invocation.getter(#exerciseBasesByVariation),
         returnValue: <int, List<_i4.Exercise>>{},
       ) as Map<int, List<_i4.Exercise>>);

test/exercises/contribute_exercise_test.dart

@@ -75,7 +75,7 @@ void main() {
     when(mockExerciseProvider.categories).thenReturn(testCategories);
     when(mockExerciseProvider.muscles).thenReturn(testMuscles);
     when(mockExerciseProvider.equipment).thenReturn(testEquipment);
-    when(mockExerciseProvider.exerciseBasesByVariation).thenReturn({});
+    when(mockExerciseProvider.exerciseByVariation).thenReturn({});
     when(mockExerciseProvider.exercises).thenReturn(getTestExercises());
     when(mockExerciseProvider.languages).thenReturn(testLanguages);
 

test/exercises/exercises_detail_widget_test.mocks.dart

@@ -118,7 +118,7 @@ class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
       );
 
   @override
-  Map<int, List<_i4.Exercise>> get exerciseBasesByVariation => (super.noSuchMethod(
+  Map<int, List<_i4.Exercise>> get exerciseByVariation => (super.noSuchMethod(
         Invocation.getter(#exerciseBasesByVariation),
         returnValue: <int, List<_i4.Exercise>>{},
       ) as Map<int, List<_i4.Exercise>>);

test/workout/gym_mode_screen_test.mocks.dart

@@ -247,7 +247,7 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
       );
 
   @override
-  Map<int, List<_i6.Exercise>> get exerciseBasesByVariation => (super.noSuchMethod(
+  Map<int, List<_i6.Exercise>> get exerciseByVariation => (super.noSuchMethod(
         Invocation.getter(#exerciseBasesByVariation),
         returnValue: <int, List<_i6.Exercise>>{},
       ) as Map<int, List<_i6.Exercise>>);

test/workout/routines_provider_test.mocks.dart

@@ -247,7 +247,7 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
       );
 
   @override
-  Map<int, List<_i6.Exercise>> get exerciseBasesByVariation => (super.noSuchMethod(
+  Map<int, List<_i6.Exercise>> get exerciseByVariation => (super.noSuchMethod(
         Invocation.getter(#exerciseBasesByVariation),
         returnValue: <int, List<_i6.Exercise>>{},
       ) as Map<int, List<_i6.Exercise>>);