ExerciseDevice pre1 merge commit

This commit is contained in:
bossanyit 2020-11-23 18:39:03 +01:00
parent ed8760f8e8
commit 0394c42e01
2 changed files with 5 additions and 2 deletions

View File

@ -1,4 +1,5 @@
import 'dart:async'; 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/push_notifications.dart';
import 'package:aitrainer_app/repository/customer_repository.dart'; import 'package:aitrainer_app/repository/customer_repository.dart';
import 'package:aitrainer_app/repository/workout_tree_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/account.dart';
import 'package:aitrainer_app/view/custom_exercise_page.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_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_fitness_page.dart';
import 'package:aitrainer_app/view/customer_goal_page.dart'; import 'package:aitrainer_app/view/customer_goal_page.dart';
import 'package:aitrainer_app/view/customer_modify_page.dart'; import 'package:aitrainer_app/view/customer_modify_page.dart';
@ -188,6 +190,7 @@ class AitrainerApp extends StatelessWidget {
'customerFitnessPage': (context) => CustomerFitnessPage(), 'customerFitnessPage': (context) => CustomerFitnessPage(),
'customerBodyTypePage': (context) => CustomerBodyTypePage(), 'customerBodyTypePage': (context) => CustomerBodyTypePage(),
'customerWelcomePage': (context) => CustomerWelcomePage(), 'customerWelcomePage': (context) => CustomerWelcomePage(),
'customerExerciseDevicePage': (context) => CustomerExerciseDevicePage(),
'exerciseNewPage': (context) => ExerciseNewPage(), 'exerciseNewPage': (context) => ExerciseNewPage(),
'exerciseCustomPage': (context) => CustomExercisePage(), 'exerciseCustomPage': (context) => CustomExercisePage(),
'exerciseControlPage': (context) => ExerciseControlPage(), 'exerciseControlPage': (context) => ExerciseControlPage(),

View File

@ -28,7 +28,7 @@ dependencies:
google_fonts: ^1.1.1 google_fonts: ^1.1.1
devicelocale: ^0.3.3 devicelocale: ^0.3.3
sentry: ^3.0.1 sentry: ^3.0.1
flutter_bloc: ^6.0.6 flutter_bloc: ^6.1.0
equatable: ^1.2.5 equatable: ^1.2.5
freezed: ^0.12.1 freezed: ^0.12.1
flutter_form_bloc: ^0.19.0 flutter_form_bloc: ^0.19.0
@ -58,7 +58,7 @@ dev_dependencies:
flutter_driver: flutter_driver:
sdk: flutter sdk: flutter
test: any test: any
bloc_test: ^7.0.4 bloc_test: ^7.1.0
build_runner: build_runner: