From 545f96b1c4ea92f3a77b7c0ce4f034f588652d53 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Sun, 20 Feb 2022 19:19:40 +0100
Subject: [PATCH] Some cleanup

---
 lib/providers/add_exercise_provider.dart              |  9 +++++++--
 lib/screens/add_exercise_screen.dart                  |  2 +-
 .../add_exercise/add_exercise_dropdown_button.dart    |  7 +++----
 lib/widgets/add_exercise/add_exercise_text_area.dart  |  4 ++--
 lib/widgets/add_exercise/preview_images.dart          | 11 ++++++-----
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/lib/providers/add_exercise_provider.dart b/lib/providers/add_exercise_provider.dart
index 91783b34..2d912333 100644
--- a/lib/providers/add_exercise_provider.dart
+++ b/lib/providers/add_exercise_provider.dart
@@ -14,6 +14,7 @@ import 'base_provider.dart';
 
 class AddExerciseProvider with ChangeNotifier {
   final WgerBaseProvider baseProvider;
+  AddExerciseProvider(this.baseProvider);
 
   List<File> get exerciseImages => [..._exerciseImages];
   List<File> _exerciseImages = [];
@@ -30,17 +31,21 @@ class AddExerciseProvider with ChangeNotifier {
   List<Muscle> _primaryMuscles = [];
   List<Muscle> _secondaryMuscles = [];
 
-  AddExerciseProvider(this.baseProvider);
-
   static const _exerciseBaseUrlPath = 'exercise-base';
   static const _imagesUrlPath = 'exerciseimage';
   static const _exerciseTranslationUrlPath = 'exercise-translation';
 
   void clear() {
     _exerciseImages = [];
+    _nameEn = null;
+    _nameTranslation = null;
+    _descriptionEn = null;
+    _descriptionTranslation = null;
+    _language = null;
     _alternativeNamesEn = [];
     _alternativeNamesTranslation = [];
     _category = null;
+    _variations = [];
     _equipment = [];
     _primaryMuscles = [];
     _secondaryMuscles = [];
diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart
index 819ee7fc..dbaa339f 100644
--- a/lib/screens/add_exercise_screen.dart
+++ b/lib/screens/add_exercise_screen.dart
@@ -232,7 +232,7 @@ class _ImagesStepContentState extends State<_ImagesStepContent> with ExerciseIma
           Consumer<AddExerciseProvider>(
             builder: (ctx, provider, __) => provider.exerciseImages.isNotEmpty
                 ? PreviewExerciseImages(
-                    selectedimages: provider.exerciseImages,
+                    selectedImages: provider.exerciseImages,
                   )
                 : ElevatedButton(
                     onPressed: () => pickImages(context),
diff --git a/lib/widgets/add_exercise/add_exercise_dropdown_button.dart b/lib/widgets/add_exercise/add_exercise_dropdown_button.dart
index 2a7586a7..dda65e15 100644
--- a/lib/widgets/add_exercise/add_exercise_dropdown_button.dart
+++ b/lib/widgets/add_exercise/add_exercise_dropdown_button.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
 
 class AddExerciseDropdownButton extends StatefulWidget {
-  AddExerciseDropdownButton({
+  const AddExerciseDropdownButton({
     Key? key,
     required this.items,
     required this.title,
@@ -41,8 +40,8 @@ class _AddExerciseDropdownButtonState extends State<AddExerciseDropdownButton> {
         value: _selectedItem,
         decoration: InputDecoration(
           contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
-          border: OutlineInputBorder(
-            borderRadius: const BorderRadius.all(Radius.circular(10)),
+          border: const OutlineInputBorder(
+            borderRadius: BorderRadius.all(Radius.circular(10)),
           ),
           labelText: widget.title,
           alignLabelWithHint: true,
diff --git a/lib/widgets/add_exercise/add_exercise_text_area.dart b/lib/widgets/add_exercise/add_exercise_text_area.dart
index f351bc32..cec1d50c 100644
--- a/lib/widgets/add_exercise/add_exercise_text_area.dart
+++ b/lib/widgets/add_exercise/add_exercise_text_area.dart
@@ -35,8 +35,8 @@ class AddExerciseTextArea extends StatelessWidget {
         onSaved: onSaved,
         decoration: InputDecoration(
           contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
-          border: OutlineInputBorder(
-            borderRadius: const BorderRadius.all(Radius.circular(10)),
+          border: const OutlineInputBorder(
+            borderRadius: BorderRadius.all(Radius.circular(10)),
           ),
           labelText: title,
           alignLabelWithHint: true,
diff --git a/lib/widgets/add_exercise/preview_images.dart b/lib/widgets/add_exercise/preview_images.dart
index afff771d..5d87e403 100644
--- a/lib/widgets/add_exercise/preview_images.dart
+++ b/lib/widgets/add_exercise/preview_images.dart
@@ -9,16 +9,16 @@ import 'mixins/image_picker_mixin.dart';
 class PreviewExerciseImages extends StatelessWidget with ExerciseImagePickerMixin {
   PreviewExerciseImages({
     Key? key,
-    required this.selectedimages,
+    required this.selectedImages,
   }) : super(key: key);
 
-  final List<File> selectedimages;
+  final List<File> selectedImages;
   @override
   Widget build(BuildContext context) {
     return SizedBox(
       height: 300,
       child: ListView(scrollDirection: Axis.horizontal, children: [
-        ...selectedimages
+        ...selectedImages
             .map(
               (file) => SizedBox(
                 height: 200,
@@ -34,8 +34,9 @@ class PreviewExerciseImages extends StatelessWidget with ExerciseImagePickerMixi
                           padding: const EdgeInsets.all(3.0),
                           child: Container(
                             decoration: BoxDecoration(
-                                color: Colors.grey.withOpacity(0.5),
-                                borderRadius: const BorderRadius.all(Radius.circular(20))),
+                              color: Colors.grey.withOpacity(0.5),
+                              borderRadius: const BorderRadius.all(Radius.circular(20)),
+                            ),
                             child: IconButton(
                               iconSize: 20,
                               onPressed: () =>