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/result/result_bloc.dart
+19 -21
View File
@@ -8,7 +8,7 @@ import 'package:aitrainer_app/util/trans.dart';
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter_form_bloc/flutter_form_bloc.dart';
//import 'package:health/health.dart';
part 'result_event.dart';
@@ -18,9 +18,9 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
final ExerciseResultRepository resultRepository;
final ExerciseRepository exerciseRepository;
final BuildContext context;
//List<HealthDataPoint> _healthDataList = List();
DateTime startTime;
DateTime endTime;
//List<HealthDataPoint> _healthDataList = [];
DateTime? startTime;
DateTime? endTime;
/* final HealthFactory health = HealthFactory();
final List<HealthDataType> types = [
HealthDataType.ACTIVE_ENERGY_BURNED,
@@ -34,12 +34,12 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
HealthDataType.RESTING_HEART_RATE
]; */
ResultBloc({this.resultRepository, this.exerciseRepository, this.context}) : super(ResultInitial()) {
ResultBloc({required this.resultRepository, required this.exerciseRepository, required this.context}) : super(ResultInitial()) {
this.startTime = exerciseRepository.start;
this.endTime = exerciseRepository.end;
if (this.startTime == null) {
this.startTime = exerciseRepository.exercise.dateAdd;
exerciseRepository.start = exerciseRepository.exercise.dateAdd;
this.startTime = exerciseRepository.exercise!.dateAdd!;
exerciseRepository.start = exerciseRepository.exercise!.dateAdd!;
}
}
@@ -65,7 +65,7 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
resultRepository.getResults().forEach((element) {
element.dateFrom = startTime;
element.dateTo = endTime;
element.exerciseId = exerciseRepository.actualExerciseList[0].exerciseId;
element.exerciseId = exerciseRepository.actualExerciseList![0].exerciseId;
switch (element.item) {
case ResultItem.bpm_avg:
//element.data = _gethHealthDataPointValueAvg(HealthDataType.HEART_RATE);
@@ -80,11 +80,10 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
//element.data = _gethHealthDataPointValueSum(HealthDataType.ACTIVE_ENERGY_BURNED);
break;
case ResultItem.development_percent_bodypart:
// TODO: Handle this case.
break;
case ResultItem.distance:
if (exerciseRepository.exerciseType.unit == "meter") {
element.data = exerciseRepository.exercise.quantity;
if (exerciseRepository.exerciseType!.unit == "meter") {
element.data = exerciseRepository.exercise!.quantity!;
}
break;
case ResultItem.fatburn_percent:
@@ -109,13 +108,12 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
} */
break;
case ResultItem.speed_max:
// TODO: Handle this case.
break;
case ResultItem.reps_volume:
if (exerciseRepository.exerciseType.unit == "repeat") {
if (exerciseRepository.exerciseType!.unit == "repeat") {
double value = 0;
exerciseRepository.actualExerciseList.forEach((actual) {
value += actual.quantity;
exerciseRepository.actualExerciseList!.forEach((actual) {
value += actual.quantity!;
});
element.data = value;
}
@@ -128,10 +126,10 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
element.data = _printDuration(duration);
break; */
case ResultItem.weight_volume:
if (exerciseRepository.exerciseType.unitQuantityUnit == "kilogram") {
if (exerciseRepository.exerciseType!.unitQuantityUnit == "kilogram") {
double value = 0;
exerciseRepository.actualExerciseList.forEach((actual) {
value += actual.quantity * actual.unitQuantity;
exerciseRepository.actualExerciseList!.forEach((actual) {
value += actual.quantity! * actual.unitQuantity!;
});
element.data = value;
}
@@ -233,12 +231,12 @@ class ResultBloc extends Bloc<ResultEvent, ResultState> with Logging, Trans {
}
} */
double calculate1RM({double percent}) {
double calculate1RM({double percent = 0.75}) {
if (exerciseRepository.exercise == null) {
exerciseRepository.getLastExercise();
}
double weight = exerciseRepository.exercise.unitQuantity;
double repeat = exerciseRepository.exercise.quantity;
double weight = exerciseRepository.exercise!.unitQuantity!;
double repeat = exerciseRepository.exercise!.quantity!;
if (weight == 0 || repeat == 0) {
return 0;
}
lib/bloc/result/result_state.dart
+1 -1
View File
@@ -21,7 +21,7 @@ class ResultReady extends ResultState {
class ResultError extends ResultState {
final String error;
const ResultError({this.error});
const ResultError({required this.error});
@override
List<Object> get props => [this.error];