wt1.1.1 translation fixes

lib/bloc/exercise_by_plan/exercise_by_plan_bloc.dart

@@ -3,7 +3,7 @@ import 'package:aitrainer_app/model/exercise_type.dart';
 import 'package:aitrainer_app/model/workout_tree.dart';
 import 'package:aitrainer_app/repository/exercise_plan_repository.dart';
 import 'package:aitrainer_app/repository/exercise_repository.dart';
-import 'package:aitrainer_app/repository/menu_tree_repository.dart';
+import 'package:aitrainer_app/repository/workout_tree_repository.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:meta/meta.dart';
@@ -14,7 +14,7 @@ part 'exercise_by_plan_state.dart';
 
 class ExerciseByPlanBloc extends Bloc<ExerciseByPlanEvent, ExerciseByPlanState> {
   final ExerciseRepository exerciseRepository;
-  final MenuTreeRepository menuTreeRepository;
+  final WorkoutTreeRepository menuTreeRepository;
   final ExercisePlanRepository exercisePlanRepository = ExercisePlanRepository();
   int customerId;
   @override

lib/bloc/exercise_control_form_bloc.dart

@@ -7,6 +7,7 @@ class ExerciseControlFormBloc extends FormBloc<String, String> {
   int step = 1;
   final double percentToCalculate;
   final bool readonly;
+  String times;
 
   final initialRMField = TextFieldBloc(
   );
@@ -63,6 +64,8 @@ class ExerciseControlFormBloc extends FormBloc<String, String> {
       exerciseRepository.setUnitQuantity(unitQuantity3Field.valueToDouble);
     });
 
+    times = percentToCalculate == 0.5 ? "30-35" : "12";
+
   }
 
   @override

lib/bloc/exercise_plan/exercise_plan_bloc.dart

@@ -4,7 +4,7 @@ import 'package:aitrainer_app/model/exercise_type.dart';
 import 'package:aitrainer_app/model/workout_tree.dart';
 import 'package:aitrainer_app/repository/exercise_plan_repository.dart';
 import 'package:aitrainer_app/repository/exercise_repository.dart';
-import 'package:aitrainer_app/repository/menu_tree_repository.dart';
+import 'package:aitrainer_app/repository/workout_tree_repository.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:meta/meta.dart';
@@ -14,7 +14,7 @@ part 'exercise_plan_event.dart';
 part 'exercise_plan_state.dart';
 
 class ExercisePlanBloc extends Bloc<ExercisePlanEvent, ExercisePlanState> {
-  final MenuTreeRepository menuTreeRepository;
+  final WorkoutTreeRepository menuTreeRepository;
   final ExerciseRepository exerciseRepository;
   final ExercisePlanRepository exercisePlanRepository = ExercisePlanRepository();
   int customerId;

lib/bloc/menu/menu_bloc.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:aitrainer_app/model/workout_tree.dart';
-import 'package:aitrainer_app/repository/menu_tree_repository.dart';
+import 'package:aitrainer_app/repository/workout_tree_repository.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:meta/meta.dart';
@@ -10,7 +10,7 @@ part 'menu_event.dart';
 part 'menu_state.dart';
 
 class MenuBloc extends Bloc<MenuEvent, MenuState> {
-  final MenuTreeRepository menuTreeRepository;
+  final WorkoutTreeRepository menuTreeRepository;
   int parent;
 
   MenuBloc({this.menuTreeRepository}) : super(MenuInitial()) {

lib/bloc/session/session_bloc.dart

@@ -1,5 +1,7 @@
 import 'dart:async';
 
+import 'package:aitrainer_app/bloc/settings/settings_bloc.dart';
+import 'package:aitrainer_app/localization/app_language.dart';
 import 'package:aitrainer_app/util/session.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
@@ -19,7 +21,12 @@ class SessionBloc extends Bloc<SessionEvent, SessionState> {
     try {
       if (event is SessionStart) {
         yield SessionLoading();
+        // ignore: close_sinks
+        SettingsBloc settingsBloc = event.settingsBloc;
         await session.fetchSessionAndNavigate();
+        String lang = AppLanguage().appLocal.languageCode;
+        print("Change lang to $lang");
+        settingsBloc.add(SettingsChangeLanguage(language: lang));
         yield SessionReady();
       }
     } on Exception catch(ex) {

lib/bloc/session/session_event.dart

@@ -9,8 +9,10 @@ abstract class SessionEvent extends Equatable {
 }
 
 class SessionStart extends SessionEvent {
-  const SessionStart();
+  final SettingsBloc settingsBloc;
+  const SessionStart({this.settingsBloc});
 
   @override
-  List<Object> get props => [];
+  List<Object> get props => [settingsBloc];
 }
+

lib/bloc/settings/settings_bloc.dart

@@ -42,28 +42,35 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
   }
 
   Future<void> _changeLang( String lang ) async{
-
+    print("_change to $lang");
     switch ( lang ) {
       case "English":
+      case "en":
       case "Angol":
         _locale = Locale('en');
         break;
       case "Hungarian":
       case "Magyar":
+      case "hu":
         _locale = Locale('hu');
         break;
     }
     this.language = lang;
-    final AppLanguage appLanguage = AppLanguage();
-    appLanguage.changeLanguage(_locale);
+    AppLanguage().changeLanguage(_locale);
     await loadLang();
   }
 
   Future<void> loadLang() async{
-    print (" -- Loading lang $_locale");
-    if ( context != null ) {
-      AppLocalizations.of(context).setLocale(_locale);
-      await AppLocalizations.of(context).load();
+    if ( _locale != null ) {
+      print(" -- Loading lang $_locale");
+      if (context != null) {
+        AppLocalizations.of(context).setLocale(_locale);
+        await AppLocalizations.of(context).load();
+      } else {
+        print("no context, does not load");
+      }
+    } else {
+      print("no locale, does not load");
     }
   }
 }