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

WT 1.1.11+3 Evaluation, null-safe fixes

Browse Source
This commit is contained in:
bossanyit
2021-04-12 00:51:09 +02:00
parent 01148c6e39
commit 10c8a0a2d8
73 changed files with 3256 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/bloc/test_set_execute/test_set_execute_bloc.dart
+8 -5
View File
@@ -136,7 +136,9 @@ class TestSetExecuteBloc extends Bloc<TestSetExecuteEvent, TestSetExecuteState>
if (!this.existsInPlanDetails(event.exerciseTypeId)) {
ExercisePlanDetail exercisePlanDetail = ExercisePlanDetail(event.exerciseTypeId);
exercisePlanDetail.exercisePlanId = exercisePlan!.exercisePlanId!;
if (exercisePlan!.exercisePlanId != null) {
exercisePlanDetail.exercisePlanId = exercisePlan!.exercisePlanId!;
}
final ExerciseType exerciseType = Cache().getExerciseTypeById(event.exerciseTypeId)!;
exercisePlanDetail.serie = exerciseType.unitQuantityUnit == null ? 1 : 4;
@@ -316,8 +318,9 @@ class TestSetExecuteBloc extends Bloc<TestSetExecuteEvent, TestSetExecuteState>
ExercisePlanDetail? getNext() {
ExercisePlanDetail? nextExercisePlanDetail;
int minStep = 99;
if (this.exercisePlanDetails == null) {
if (this.exercisePlanDetails != null) {
for (final detail in this.exercisePlanDetails!) {
if (!detail.state.equalsTo(ExercisePlanDetailState.finished)) {
if (detail.exercises == null) {
@@ -369,9 +372,9 @@ class TestSetExecuteBloc extends Bloc<TestSetExecuteEvent, TestSetExecuteState>
if (!hasBegun() || exercisePlanDetail.exercises!.length < 2) {
return text;
}
final double unitQuantity = exercisePlanDetail.exercises!.last.unitQuantity;
final double quantity = exercisePlanDetail.exercises!.last.quantity;
double oneRepMax = this.calculate1RM(quantity, unitQuantity);
final double? unitQuantity = exercisePlanDetail.exercises!.last.unitQuantity!;
final double? quantity = exercisePlanDetail.exercises!.last.quantity!;
double oneRepMax = this.calculate1RM(quantity!, unitQuantity!);
text = (oneRepMax * 0.75).round().toStringAsFixed(0) + " " + exercisePlanDetail.exerciseType!.unitQuantityUnit!;
return text;
}