WT 1.1.5+2 remote images for menu

lib/bloc/login/login_bloc.dart

@@ -4,6 +4,8 @@ import 'package:aitrainer_app/bloc/account/account_bloc.dart';
 import 'package:aitrainer_app/model/cache.dart';
 import 'package:aitrainer_app/repository/customer_repository.dart';
 import 'package:aitrainer_app/repository/user_repository.dart';
+import 'package:aitrainer_app/service/exercise_tree_service.dart';
+import 'package:aitrainer_app/service/exercisetype_service.dart';
 import 'package:aitrainer_app/util/common.dart';
 import 'package:aitrainer_app/util/trans.dart';
 import 'package:bloc/bloc.dart';
@@ -22,7 +24,12 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> with Trans {
   final bool isRegistration;
   bool dataPolicyAllowed = false;
   bool obscure = true;
-  LoginBloc({this.accountBloc, this.userRepository, this.context, this.isRegistration}) : super(LoginInitial());
+  LoginBloc({this.accountBloc, this.userRepository, this.context, this.isRegistration}) : super(LoginInitial()) {
+    if (isRegistration) {
+      ExerciseTreeApi().getExerciseTree();
+      ExerciseTypeApi().getExerciseTypes();
+    }
+  }
 
   @override
   Stream<LoginState> mapEventToState(
@@ -119,7 +126,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> with Trans {
         this.dataPolicyAllowed = !dataPolicyAllowed;
         yield LoginReady();
       } else if (event is LoginPasswordChangeObscure) {
+        yield LoginLoading();
         this.obscure = !this.obscure;
+        yield LoginReady();
       }
     } on Exception catch (e) {
       yield LoginError(message: e.toString());

lib/bloc/menu/menu_bloc.dart

@@ -13,6 +13,7 @@ import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:meta/meta.dart';
+import 'package:aitrainer_app/library/image_cache.dart' as wt;
 
 part 'menu_event.dart';
 part 'menu_state.dart';
@@ -21,9 +22,9 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
   final WorkoutTreeRepository menuTreeRepository;
   final ExerciseRepository exerciseRepository = ExerciseRepository();
   ExerciseDeviceRepository exerciseDeviceRepository = ExerciseDeviceRepository();
-  int parent;
+  int parent = 0;
   WorkoutMenuTree workoutItem;
-  List<int> listFilterDevice = List();
+  final List<int> listFilterDevice = List();
 
   String infoTitle = "";
   String infoText = "";
@@ -95,25 +96,27 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
       if (event is MenuCreate) {
         yield MenuLoading();
         //await menuTreeRepository.createTree();
+        //menuTreeRepository.getBranch(this.parent);
         setMenuInfo();
         exerciseDeviceRepository.setDevices(Cache().getDevices());
-        /* exerciseDeviceRepository.getGymDevices().forEach((element) {
-          listFilterDevice.add(element.exerciseDeviceId);
-        }); */
         yield MenuReady();
       } else if (event is MenuRecreateTree) {
+        yield MenuLoading();
         // ie. at language changes
         await menuTreeRepository.createTree();
         yield MenuReady();
       } else if (event is MenuTreeDown) {
-        // get child menus or exercises
         yield MenuLoading();
         parent = event.parent;
         workoutItem = event.item;
+
         if (workoutItem != null) {
           setAbility(workoutItem.nameEnglish);
         }
-        menuTreeRepository.getBranch(event.parent);
+        final LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(event.parent);
+
+        await getImages(branch);
+        //await Future.delayed(Duration(seconds: 2));
         yield MenuReady();
       } else if (event is MenuTreeUp) {
         yield MenuLoading();
@@ -121,10 +124,13 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
         parent = event.parent;
         workoutItem = menuTreeRepository.getParentItem(parent);
 
+        LinkedHashMap<String, WorkoutMenuTree> branch;
         if (workoutItem != null) {
-          menuTreeRepository.getBranch(workoutItem.parent);
           setAbility(workoutItem.nameEnglish);
+          branch = menuTreeRepository.getBranch(workoutItem.parent);
+          await getImages(branch);
         }
+
         yield MenuReady();
       } else if (event is MenuTreeJump) {
         yield MenuLoading();
@@ -132,9 +138,12 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
         workoutItem = menuTreeRepository.getParentItem(parent);
 
         if (workoutItem != null) {
-          menuTreeRepository.getBranch(workoutItem.parent);
           setAbility(workoutItem.nameEnglish);
         }
+        final LinkedHashMap<String, WorkoutMenuTree> branch = menuTreeRepository.getBranch(workoutItem.parent);
+        if (branch != null) {
+          await getImages(branch);
+        }
         yield MenuReady();
       } else if (event is MenuClickExercise) {
         yield MenuLoading();
@@ -171,6 +180,29 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> with Trans, Logging {
     log("Ability: " + ability.toString() + " name:" + name);
   }
 
+  Future<void> getImages(LinkedHashMap<String, WorkoutMenuTree> branch) async {
+    wt.ImageCache().clearImageList();
+    await putBranchImageToHash(branch);
+    log("downloaded image size in KB: " + wt.ImageCache().downloadSize.toString());
+  }
+
+  Future<void> putBranchImageToHash(LinkedHashMap<String, WorkoutMenuTree> branch) async {
+    await Future.forEach(branch.keys, (key) async {
+      final WorkoutMenuTree value = branch[key];
+      if (!value.imageName.contains("asset")) {
+        await wt.ImageCache().putImageToList(value.id, value.imageName);
+      }
+    });
+  }
+
+  String getImage(int id, String name) {
+    String imageString;
+    if (name.contains("http")) {
+      imageString = wt.ImageCache().getImageString(id, name);
+    }
+    return imageString;
+  }
+
   bool selectedDevice(int deviceId) {
     return !listFilterDevice.contains(deviceId);
   }

lib/bloc/session/session_bloc.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 
 import 'package:aitrainer_app/bloc/settings/settings_bloc.dart';
 import 'package:aitrainer_app/localization/app_language.dart';
+import 'package:aitrainer_app/service/exercise_tree_service.dart';
+import 'package:aitrainer_app/service/exercisetype_service.dart';
 import 'package:aitrainer_app/service/logging.dart';
 import 'package:aitrainer_app/util/session.dart';
 import 'package:bloc/bloc.dart';
@@ -41,7 +43,6 @@ class SessionBloc extends Bloc<SessionEvent, SessionState> with Logging {
   @override
   Future<void> close() async {
     await this.close();
-    //PlatformPurchaseApi().close();
     super.close();
   }
 }