Merge remote-tracking branch 'origin/feature/exercise-crowdsourcing' into feature/exercise-crowdsourcing

# Conflicts:
#	pubspec.lock

Author: rolandgeider

lib/providers/exercises.dart

@@ -374,8 +374,6 @@ class ExercisesProvider with ChangeNotifier {
   Future<void> fetchAndSetExercises() async {
     clear();
 
-    //fetchAndSetExerciseBase(9);
-
     // Load exercises from cache, if available
     final prefs = await SharedPreferences.getInstance();
     await checkExerciseCacheVersion();

lib/screens/add_exercise_screen.dart

@@ -4,11 +4,11 @@ import 'package:provider/provider.dart';
 import 'package:wger/providers/add_exercise_provider.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/screens/exercise_screen.dart';
-import 'package:wger/widgets/add_exercise/steps/basics.dart';
-import 'package:wger/widgets/add_exercise/steps/description.dart';
-import 'package:wger/widgets/add_exercise/steps/images.dart';
-import 'package:wger/widgets/add_exercise/steps/translations.dart';
-import 'package:wger/widgets/add_exercise/steps/variations.dart';
+import 'package:wger/widgets/add_exercise/steps/step1basics.dart';
+import 'package:wger/widgets/add_exercise/steps/step2variations.dart';
+import 'package:wger/widgets/add_exercise/steps/step3description.dart';
+import 'package:wger/widgets/add_exercise/steps/step4translations.dart';
+import 'package:wger/widgets/add_exercise/steps/step5images.dart';
 import 'package:wger/widgets/core/app_bar.dart';
 
 class AddExerciseScreen extends StatefulWidget {
@@ -39,6 +39,10 @@ class _AddExerciseScreenState extends State<AddExerciseScreen> {
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceAround,
           children: [
+            OutlinedButton(
+              onPressed: details.onStepCancel,
+              child: Text(AppLocalizations.of(context).previous),
+            ),
             if (_currentStep == lastStepIndex)
               ElevatedButton(
                 onPressed: () async {
@@ -50,14 +54,10 @@ class _AddExerciseScreenState extends State<AddExerciseScreen> {
                 child: Text(AppLocalizations.of(context).save),
               )
             else
-              OutlinedButton(
+              ElevatedButton(
                 onPressed: details.onStepContinue,
                 child: Text(AppLocalizations.of(context).next),
               ),
-            OutlinedButton(
-              onPressed: details.onStepCancel,
-              child: Text(AppLocalizations.of(context).previous),
-            ),
           ],
         ),
       ],
@@ -73,23 +73,23 @@ class _AddExerciseScreenState extends State<AddExerciseScreen> {
         steps: [
           Step(
             title: Text(AppLocalizations.of(context).baseData),
-            content: BasicStepContent(formkey: _keys[0]),
+            content: Step1Basics(formkey: _keys[0]),
           ),
           Step(
             title: Text(AppLocalizations.of(context).variations),
-            content: DuplicatesAndVariationsStepContent(formkey: _keys[1]),
+            content: Step2Variations(formkey: _keys[1]),
           ),
           Step(
             title: Text(AppLocalizations.of(context).description),
-            content: DescriptionStepContent(formkey: _keys[2]),
+            content: Step3Description(formkey: _keys[2]),
           ),
           Step(
             title: Text(AppLocalizations.of(context).translation),
-            content: DescriptionTranslationStepContent(formkey: _keys[3]),
+            content: Step4Translation(formkey: _keys[3]),
           ),
           Step(
             title: Text(AppLocalizations.of(context).images),
-            content: ImagesStepContent(formkey: _keys[4]),
+            content: Step5Images(formkey: _keys[4]),
           ),
         ],
         currentStep: _currentStep,

lib/widgets/add_exercise/steps/basics.dart renamed to lib/widgets/add_exercise/steps/step1basics.dart

@@ -13,9 +13,9 @@ import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
 import 'package:wger/widgets/exercises/exercises.dart';
 import 'package:wger/widgets/exercises/forms.dart';
 
-class BasicStepContent extends StatelessWidget {
+class Step1Basics extends StatelessWidget {
   final GlobalKey<FormState> formkey;
-  const BasicStepContent({required this.formkey});
+  const Step1Basics({required this.formkey});
 
   @override
   Widget build(BuildContext context) {

lib/widgets/add_exercise/steps/variations.dart renamed to lib/widgets/add_exercise/steps/step2variations.dart

@@ -4,10 +4,10 @@ import 'package:provider/provider.dart';
 import 'package:wger/providers/add_exercise_provider.dart';
 import 'package:wger/providers/exercises.dart';
 
-class DuplicatesAndVariationsStepContent extends StatelessWidget {
+class Step2Variations extends StatelessWidget {
   final GlobalKey<FormState> formkey;
 
-  const DuplicatesAndVariationsStepContent({required this.formkey});
+  const Step2Variations({required this.formkey});
 
   @override
   Widget build(BuildContext context) {

lib/widgets/add_exercise/steps/description.dart renamed to lib/widgets/add_exercise/steps/step3description.dart

@@ -5,9 +5,9 @@ import 'package:wger/helpers/exercises/forms.dart';
 import 'package:wger/providers/add_exercise_provider.dart';
 import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
 
-class DescriptionStepContent extends StatelessWidget {
+class Step3Description extends StatelessWidget {
   final GlobalKey<FormState> formkey;
-  const DescriptionStepContent({required this.formkey});
+  const Step3Description({required this.formkey});
 
   @override
   Widget build(BuildContext context) {

lib/widgets/add_exercise/steps/translations.dart renamed to lib/widgets/add_exercise/steps/step4translations.dart

@@ -8,16 +8,15 @@ import 'package:wger/providers/exercises.dart';
 import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
 import 'package:wger/widgets/exercises/forms.dart';
 
-class DescriptionTranslationStepContent extends StatefulWidget {
+class Step4Translation extends StatefulWidget {
   final GlobalKey<FormState> formkey;
-  const DescriptionTranslationStepContent({required this.formkey});
+  const Step4Translation({required this.formkey});
 
   @override
-  State<DescriptionTranslationStepContent> createState() =>
-      _DescriptionTranslationStepContentState();
+  State<Step4Translation> createState() => _Step4TranslationState();
 }
 
-class _DescriptionTranslationStepContentState extends State<DescriptionTranslationStepContent> {
+class _Step4TranslationState extends State<Step4Translation> {
   bool translate = false;
 
   @override

lib/widgets/add_exercise/steps/images.dart renamed to lib/widgets/add_exercise/steps/step5images.dart

@@ -5,15 +5,15 @@ import 'package:wger/providers/add_exercise_provider.dart';
 import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
 import 'package:wger/widgets/add_exercise/preview_images.dart';
 
-class ImagesStepContent extends StatefulWidget {
+class Step5Images extends StatefulWidget {
   final GlobalKey<FormState> formkey;
-  const ImagesStepContent({required this.formkey});
+  const Step5Images({required this.formkey});
 
   @override
-  State<ImagesStepContent> createState() => _ImagesStepContentState();
+  State<Step5Images> createState() => _Step5ImagesState();
 }
 
-class _ImagesStepContentState extends State<ImagesStepContent> with ExerciseImagePickerMixin {
+class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
   @override
   Widget build(BuildContext context) {
     return Form(

lib/widgets/exercises/list_tile.dart

@@ -62,67 +62,6 @@ class ExerciseListTile extends StatelessWidget {
       onTap: () {
         Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: exerciseBase);
       },
-      /*
-      trailing: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
-        decoration: BoxDecoration(
-          color: theme.primaryColorLight.withOpacity(0.15),
-          border: Border.all(color: Colors.grey[300]!),
-          borderRadius: BorderRadius.circular(5),
-        ),
-        child: Text(
-          exercise.category.name,
-        ),
-      ),
-
-       */
     );
-
-    /*
-    return Row(
-      children: [
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Container(
-            width: size.width * 0.2,
-            child: Center(
-              child: ExerciseImageWidget(
-                image: exercise.getMainImage,
-              ),
-            ),
-          ),
-        ),
-        Expanded(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Container(
-                padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
-                decoration: BoxDecoration(
-                  color: theme.primaryColorLight.withOpacity(0.15),
-                  border: Border.all(color: Colors.grey[300]!),
-                  borderRadius: BorderRadius.circular(5),
-                ),
-                child: Text(
-                  exercise.category.name,
-                ),
-              ),
-              Text(
-                exercise.name,
-                style: theme.textTheme.headline6,
-                overflow: TextOverflow.ellipsis,
-                maxLines: 2,
-              ),
-              Text(
-                exercise.equipment.map((equipment) => equipment.name).join(", "),
-              )
-            ],
-          ),
-        )
-      ],
-    );
-
-     */
   }
 }