bossanyit/workouttest_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WT1.1.11 Null-Safe migration

Browse Source
This commit is contained in:
bossanyit
2021-04-02 11:42:26 +02:00
parent a656562c49
commit 01148c6e39
219 changed files with 3208 additions and 5334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/bloc/exercise_new/exercise_new_bloc.dart
+17 -15
View File
@@ -1,4 +1,6 @@
import 'dart:async';
import 'package:intl/intl.dart';
import 'package:aitrainer_app/bloc/menu/menu_bloc.dart';
import 'package:aitrainer_app/model/cache.dart';
import 'package:aitrainer_app/model/exercise_type.dart';
@@ -12,7 +14,6 @@ import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/animation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_form_bloc/flutter_form_bloc.dart';
import 'package:meta/meta.dart';
import 'package:stop_watch_timer/stop_watch_timer.dart';
@@ -23,7 +24,7 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> with Logg
final ExerciseRepository exerciseRepository;
final CustomerRepository customerRepository;
final MenuBloc menuBloc;
AnimationController bmiAnimationController;
late AnimationController bmiAnimationController;
double quantity = 12;
double unitQuantity = 30;
double bmi = 0;
@@ -35,11 +36,11 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> with Logg
double bmiAngle = 0;
double bmiTop = 0;
double bmiLeft = 0;
double weight;
double height;
late double weight;
late double height;
double bmrEnergy = 0;
int birthYear;
String fitnessLevel;
late int birthYear;
late String fitnessLevel;
bool changedWeight = false;
bool changedSizes = false;
@@ -53,23 +54,24 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> with Logg
final StopWatchTimer stopWatchTimer = StopWatchTimer(
isLapHours: false,
);
int timerValue;
late int timerValue;
@override
ExerciseNewBloc({this.exerciseRepository, this.menuBloc, this.customerRepository, ExerciseType exerciseType})
ExerciseNewBloc(
{required this.exerciseRepository, required this.menuBloc, required this.customerRepository, required ExerciseType exerciseType})
: super(ExerciseNewInitial()) {
exerciseRepository.exerciseType = exerciseType;
exerciseRepository.setUnit(exerciseType.unit);
exerciseRepository.setUnitQuantity(unitQuantity);
exerciseRepository.setQuantity(quantity);
exerciseRepository.exercise.exercisePlanDetailId = 0;
exerciseRepository.exercise!.exercisePlanDetailId = 0;
exerciseRepository.start = DateTime.now();
if (Cache().userLoggedIn != null) {
customerRepository.customer = Cache().userLoggedIn;
customerRepository.customer = Cache().userLoggedIn!;
weight = customerRepository.customer.getProperty("Weight");
height = customerRepository.customer.getProperty("Height");
birthYear = customerRepository.customer.birthYear;
fitnessLevel = customerRepository.customer.fitnessLevel;
birthYear = customerRepository.customer.birthYear!;
fitnessLevel = customerRepository.customer.fitnessLevel!;
}
if (exerciseType.unit == "second") {
stopWatchTimer.rawTime.listen((value) => {timerValue = value, this.setQuantity((value / 1000).toDouble())});
@@ -151,7 +153,7 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> with Logg
// exerciseRepository.initExercise();
menuBloc.add(MenuTreeDown(parent: 0));
Cache().initBadges();
Track().track(TrackingEvent.exercise_new, eventValue: exerciseRepository.exerciseType.name);
Track().track(TrackingEvent.exercise_new, eventValue: exerciseRepository.exerciseType!.name);
yield ExerciseNewSaved();
} else if (event is ExerciseNewBMIAnimate) {
yield ExerciseNewLoading();
@@ -183,10 +185,10 @@ class ExerciseNewBloc extends Bloc<ExerciseNewEvent, ExerciseNewState> with Logg
if (customerRepository.customer.sex == "m") {
//66.47 + ( 13.75 × tömeg kg-ban ) + ( 5.003 × magasság cm-ben ) − ( 6.755 × életkor évben kifejezve )
bmr = 66.47 + (13.75 * weight) + (5.003 * height) - (6.755 * (year - customerRepository.customer.birthYear));
bmr = 66.47 + (13.75 * weight) + (5.003 * height) - (6.755 * (year - customerRepository.customer.birthYear!));
} else {
//BMR = 655.1 + ( 9.563 × ömeg kg-ban ) + ( 1.85 × magasság cm-ben) − ( 4.676 × életkor évben kifejezve )
bmr = 655.1 + (9.563 * weight) + (1.85 * height) - (4.676 * (year - customerRepository.customer.birthYear));
bmr = 655.1 + (9.563 * weight) + (1.85 * height) - (4.676 * (year - customerRepository.customer.birthYear!));
}
bmrEnergy = bmr;
lib/bloc/exercise_new/exercise_new_event.dart
+7 -7
View File
@@ -14,7 +14,7 @@ class ExerciseNewLoad extends ExerciseNewEvent {
class ExerciseNewQuantityChange extends ExerciseNewEvent {
final double quantity;
const ExerciseNewQuantityChange({this.quantity});
const ExerciseNewQuantityChange({required this.quantity});
@override
List<Object> get props => [quantity];
@@ -22,7 +22,7 @@ class ExerciseNewQuantityChange extends ExerciseNewEvent {
class ExerciseNewQuantityUnitChange extends ExerciseNewEvent {
final double quantity;
const ExerciseNewQuantityUnitChange({this.quantity});
const ExerciseNewQuantityUnitChange({required this.quantity});
@override
List<Object> get props => [quantity];
@@ -30,21 +30,21 @@ class ExerciseNewQuantityUnitChange extends ExerciseNewEvent {
class ExerciseNewBirthyearChange extends ExerciseNewEvent {
final int value;
const ExerciseNewBirthyearChange({this.value});
const ExerciseNewBirthyearChange({required this.value});
@override
List<Object> get props => [value];
}
class ExerciseNewWeightChange extends ExerciseNewEvent {
final double value;
const ExerciseNewWeightChange({this.value});
const ExerciseNewWeightChange({required this.value});
@override
List<Object> get props => [value];
}
class ExerciseNewHeightChange extends ExerciseNewEvent {
final double value;
const ExerciseNewHeightChange({this.value});
const ExerciseNewHeightChange({required this.value});
@override
List<Object> get props => [value];
@@ -52,7 +52,7 @@ class ExerciseNewHeightChange extends ExerciseNewEvent {
class ExerciseNewFitnessLevelChange extends ExerciseNewEvent {
final String value;
const ExerciseNewFitnessLevelChange({this.value});
const ExerciseNewFitnessLevelChange({required this.value});
@override
List<Object> get props => [value];
@@ -61,7 +61,7 @@ class ExerciseNewFitnessLevelChange extends ExerciseNewEvent {
class ExerciseNewSizeChange extends ExerciseNewEvent {
final String propertyName;
final double value;
const ExerciseNewSizeChange({this.propertyName, this.value});
const ExerciseNewSizeChange({required this.propertyName, required this.value});
@override
List<Object> get props => [propertyName, value];
lib/bloc/exercise_new/exercise_new_state.dart
+1 -1
View File
@@ -26,7 +26,7 @@ class ExerciseNewSaved extends ExerciseNewState {
class ExerciseNewError extends ExerciseNewState {
final String message;
const ExerciseNewError({this.message});
const ExerciseNewError({required this.message});
@override
List<Object> get props => [message];