From 0394c42e01a0c72b118c98aa3b564e9b162644bf Mon Sep 17 00:00:00 2001
From: bossanyit <tibor.bossanyi@aitrainer.app>
Date: Mon, 23 Nov 2020 18:39:03 +0100
Subject: [PATCH] ExerciseDevice pre1 merge commit

---
 lib/main.dart | 3 +++
 pubspec.yaml  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 079c703..5d1171e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:aitrainer_app/bloc/customer_exercise_device/customer_exercise_device_bloc.dart';
 import 'package:aitrainer_app/push_notifications.dart';
 import 'package:aitrainer_app/repository/customer_repository.dart';
 import 'package:aitrainer_app/repository/workout_tree_repository.dart';
@@ -6,6 +7,7 @@ import 'package:aitrainer_app/util/session.dart';
 import 'package:aitrainer_app/view/account.dart';
 import 'package:aitrainer_app/view/custom_exercise_page.dart';
 import 'package:aitrainer_app/view/customer_bodytype_page.dart';
+import 'package:aitrainer_app/view/customer_exercise_device.dart';
 import 'package:aitrainer_app/view/customer_fitness_page.dart';
 import 'package:aitrainer_app/view/customer_goal_page.dart';
 import 'package:aitrainer_app/view/customer_modify_page.dart';
@@ -188,6 +190,7 @@ class AitrainerApp extends StatelessWidget {
         'customerFitnessPage': (context) => CustomerFitnessPage(),
         'customerBodyTypePage': (context) => CustomerBodyTypePage(),
         'customerWelcomePage': (context) => CustomerWelcomePage(),
+        'customerExerciseDevicePage': (context) => CustomerExerciseDevicePage(),
         'exerciseNewPage': (context) => ExerciseNewPage(),
         'exerciseCustomPage': (context) => CustomExercisePage(),
         'exerciseControlPage': (context) => ExerciseControlPage(),
diff --git a/pubspec.yaml b/pubspec.yaml
index ae2cf60..993a38c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -28,7 +28,7 @@ dependencies:
   google_fonts: ^1.1.1
   devicelocale: ^0.3.3
   sentry: ^3.0.1
-  flutter_bloc: ^6.0.6
+  flutter_bloc: ^6.1.0
   equatable: ^1.2.5
   freezed: ^0.12.1
   flutter_form_bloc: ^0.19.0
@@ -58,7 +58,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   test: any
-  bloc_test: ^7.0.4
+  bloc_test: ^7.1.0
 
   build_runner: