wt1.1b exercise description, bug fixing + custom exercise fix

lib/bloc/custom_exercise_form_bloc.dart

@@ -19,14 +19,15 @@ class CustomExerciseFormBloc extends FormBloc<String, String> {
 
   //1RM calculated Fields
   final rmWendlerField = TextFieldBloc( initialValue:  "0",);
-  final rmMcGothlinField = TextFieldBloc( initialValue:  "0");
-  final rmLombardiField = TextFieldBloc( initialValue:  "0");
   final rmMayhewField = TextFieldBloc( initialValue:  "0");
   final rmOconnerField = TextFieldBloc( initialValue:  "0");
   final rmWathenField = TextFieldBloc( initialValue:  "0");
   final rmAverageField = TextFieldBloc( initialValue:  "0");
   final rm90Field = TextFieldBloc( initialValue:  "0");
   final rm80Field = TextFieldBloc( initialValue:  "0");
+  final rm75Field = TextFieldBloc( initialValue:  "0");
+  final rm75WendlerField = TextFieldBloc( initialValue:  "0");
+  final rm75OconnorField = TextFieldBloc( initialValue:  "0");
   final rm70Field = TextFieldBloc( initialValue:  "0");
   final rm60Field = TextFieldBloc( initialValue:  "0");
   final rm50Field = TextFieldBloc( initialValue:  "0");
@@ -36,8 +37,6 @@ class CustomExerciseFormBloc extends FormBloc<String, String> {
       quantityField,
       unitQuantityField,
       rmWendlerField,
-      rmMcGothlinField,
-      rmLombardiField,
       rmMayhewField,
       rmOconnerField,
       rmWathenField,
@@ -45,6 +44,9 @@ class CustomExerciseFormBloc extends FormBloc<String, String> {
       rm90Field,
       rm80Field,
       rm70Field,
+      rm75Field,
+      rm75WendlerField,
+      rm75OconnorField,
       rm60Field,
       rm50Field
     ]);
@@ -81,28 +83,27 @@ class CustomExerciseFormBloc extends FormBloc<String, String> {
     }
     print("Calculating 1RM");
     exerciseRepository.rmWendler = weight * repeat * 0.0333 + weight;
-    rmWendlerField.updateValue(exerciseRepository.rmWendler.toString());
-    exerciseRepository.rmMcglothlin = 100 * weight / (101.3 - 2.67123 * repeat);
-    rmMcGothlinField.updateValue(exerciseRepository.rmMcglothlin.toString());
-    exerciseRepository.rmLombardi = pow(weight * repeat, 0.1);
-    rmLombardiField.updateValue(exerciseRepository.rmLombardi.toString());
+    rmWendlerField.updateValue(exerciseRepository.rmWendler.toStringAsFixed(1));
     exerciseRepository.rmOconner = weight * (1 + repeat / 40);
-    rmOconnerField.updateValue(exerciseRepository.rmOconner.toString());
+    rmOconnerField.updateValue(exerciseRepository.rmOconner.toStringAsFixed(1));
     exerciseRepository.rmMayhew =
         100 * weight / (52.2 + 41.9 * pow(e, -0.055 * repeat));
-    rmMayhewField.updateValue(exerciseRepository.rmMayhew.toString());
+    rmMayhewField.updateValue(exerciseRepository.rmMayhew.toStringAsFixed(1));
     exerciseRepository.rmWathen =
         100 * weight / (48.8 + 53.8 * pow(e, -0.075 * repeat));
-    rmWathenField.updateValue(exerciseRepository.rmWathen.toString());
+    rmWathenField.updateValue(exerciseRepository.rmWathen.toStringAsFixed(1));
     double average = (exerciseRepository.rmWendler + exerciseRepository.rmWathen +
       exerciseRepository.rmMayhew + exerciseRepository.rmOconner +
-      exerciseRepository.rmMcglothlin)/5;
-    rmAverageField.updateValue(average.toString());
-    rm90Field.updateValue((average*0.9).toString());
-    rm80Field.updateValue((average*0.8).toString());
-    rm70Field.updateValue((average*0.7).toString());
-    rm60Field.updateValue((average*0.6).toString());
-    rm50Field.updateValue((average*0.5).toString());
+      exerciseRepository.rmMcglothlin)/4;
+    rmAverageField.updateValue(average.toStringAsFixed(1));
+    rm90Field.updateValue((average*0.9).toStringAsFixed(1));
+    rm80Field.updateValue((average*0.8).toStringAsFixed(1));
+    rm75Field.updateValue((average*0.75).toStringAsFixed(1));
+    rm75OconnorField.updateValue((exerciseRepository.rmOconner*0.75).toStringAsFixed(1));
+    rm75WendlerField.updateValue((exerciseRepository.rmWendler*0.75).toStringAsFixed(1));
+    rm70Field.updateValue((average*0.7).toStringAsFixed(1));
+    rm60Field.updateValue((average*0.6).toStringAsFixed(1));
+    rm50Field.updateValue((average*0.5).toStringAsFixed(1));
   }
 
   //@override
@@ -111,14 +112,15 @@ class CustomExerciseFormBloc extends FormBloc<String, String> {
     unitQuantityField.close();
 
     rmWendlerField.close();
-    rmMcGothlinField.close();
-    rmLombardiField.close();
     rmMayhewField.close();
     rmOconnerField.close();
     rmWathenField.close();
     rmAverageField.close();
     rm90Field.close();
     rm80Field.close();
+    rm75WendlerField.close();
+    rm75OconnorField.close();
+    rm75Field.close();
     rm70Field.close();
     rm60Field.close();
     rm50Field.close();

lib/bloc/menu/menu_bloc.dart

@@ -26,6 +26,10 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {
         yield MenuLoading();
         await menuTreeRepository.createTree();
         yield MenuReady();
+      } else if (event is MenuRecreateTree) {
+        // ie. at language changes
+        await menuTreeRepository.createTree();
+        yield MenuReady();
       } else if (event is MenuTreeDown) {
         // get child menus or exercises
         yield MenuLoading();

lib/bloc/menu/menu_event.dart

@@ -39,3 +39,7 @@ class MenuClickExercise extends MenuEvent {
   List<Object> get props => [exerciseTypeId];
 }
 
+class MenuRecreateTree extends MenuEvent {
+  const MenuRecreateTree();
+}
+

lib/bloc/settings/settings_bloc.dart

@@ -17,6 +17,14 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
 
   SettingsBloc({this.context}) : super(SettingsInitial());
 
+  void setLocale(Locale locale) {
+    _locale = locale;
+  }
+
+  Locale getLocale() {
+    return _locale;
+  }
+
   @override
   Stream<SettingsState> mapEventToState(
     SettingsEvent event,