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/development_by_muscle/development_by_muscle_bloc.dart
+64 -63
View File
@@ -13,11 +13,10 @@ import 'package:aitrainer_app/util/common.dart';
import 'package:aitrainer_app/util/enums.dart';
import 'package:aitrainer_app/util/group_data.dart';
import 'package:aitrainer_app/util/track.dart';
import 'package:intl/intl.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:meta/meta.dart';
import 'package:fl_chart/fl_chart.dart';
@@ -36,35 +35,35 @@ class DiagramType {
*/
class GroupDate extends GroupData with Calculate, Common {
final List<dynamic> inputList;
final List<dynamic> outputList;
final List<Exercise> inputList;
final List<Exercise> outputList;
String _origDatePart;
int _origExerciseTypeId;
Exercise _origExercise;
String? _origDatePart;
late int _origExerciseTypeId;
late Exercise _origExercise;
double _sumQuantity;
double _maxQuantity;
int _countExercises;
late double _sumQuantity;
late double _maxQuantity;
late int _countExercises;
String diagramType;
String dateRate;
late String diagramType;
late String dateRate;
GroupDate({this.inputList, this.outputList});
GroupDate({required this.inputList, required this.outputList});
double getQuantityByDate(Exercise exercise) {
double sum = 0;
if (this.diagramType == DiagramType.sumMass) {
if (exercise.unitQuantity != null) {
sum = exercise.quantity * exercise.unitQuantity;
sum = exercise.quantity! * exercise.unitQuantity!;
} else {
sum = exercise.quantity;
sum = exercise.quantity!;
}
} else if (this.diagramType == DiagramType.oneRepMax || this.diagramType == DiagramType.percent) {
if (exercise.unitQuantity != null) {
sum = calculate1RM(exercise.quantity, exercise.unitQuantity);
sum = calculate1RM(exercise.quantity!, exercise.unitQuantity!);
} else {
sum = exercise.quantity;
sum = exercise.quantity!;
}
}
return sum;
@@ -73,26 +72,26 @@ class GroupDate extends GroupData with Calculate, Common {
@override
void addTempData(Exercise exercise) {
double newQuantity = getQuantityByDate(exercise);
_sumQuantity += newQuantity;
_sumQuantity = _sumQuantity + newQuantity;
if (_maxQuantity < newQuantity) {
_maxQuantity = newQuantity;
}
_countExercises++;
_origDatePart = getDatePart(exercise.dateAdd, dateRate);
_origExerciseTypeId = exercise.exerciseTypeId;
_countExercises = _countExercises + 1;
_origDatePart = getDatePart(exercise.dateAdd!, dateRate);
_origExerciseTypeId = exercise.exerciseTypeId!;
_origExercise = exercise;
}
@override
bool checkNewType(Exercise exercise) {
String exerciseDatePart = getDatePart(exercise.dateAdd, dateRate);
return _origDatePart != exerciseDatePart || _origExerciseTypeId != exercise.exerciseTypeId;
String exerciseDatePart = getDatePart(exercise.dateAdd!, dateRate);
return _origDatePart == null || _origDatePart != exerciseDatePart || _origExerciseTypeId != exercise.exerciseTypeId;
}
@override
void iteration() {
this.resetTemp();
Exercise tempExercise;
Exercise? tempExercise;
inputList.forEach((element) {
tempExercise = element;
if (this.checkNewType(element)) {
@@ -108,7 +107,7 @@ class GroupDate extends GroupData with Calculate, Common {
}
});
if (tempExercise != null) {
this.temp2Output(tempExercise);
this.temp2Output(tempExercise!);
}
}
@@ -142,21 +141,21 @@ class GroupChart extends GroupData with Calculate {
final List<dynamic> inputList;
LinkedHashMap<int, ChartDataExtended> outputList = LinkedHashMap();
int _origExerciseTypeId;
double _minData = 999999999999;
double _maxData = 0;
List<BarChartGroupData> _chartData;
double _basePercent;
int? _origExerciseTypeId;
late double _minData = 999999999999;
late double _maxData = 0;
late List<BarChartGroupData> _chartData;
late double _basePercent;
String diagramType = DiagramType.sumMass;
GroupChart({this.inputList, this.outputList});
GroupChart({required this.inputList, required this.outputList});
double getBasePercent(Exercise exercise) {
if (exercise.unitQuantity != null) {
this._basePercent = calculate1RM(exercise.quantity, exercise.unitQuantity);
this._basePercent = calculate1RM(exercise.quantity!, exercise.unitQuantity!);
} else {
this._basePercent = exercise.quantity;
this._basePercent = exercise.quantity!;
}
return this._basePercent;
}
@@ -166,13 +165,13 @@ class GroupChart extends GroupData with Calculate {
if (diagramType == DiagramType.percent) {
if (exercise.unitQuantity != null) {
double oneRepMax = calculate1RM(exercise.quantity, exercise.unitQuantity);
double oneRepMax = calculate1RM(exercise.quantity!, exercise.unitQuantity!);
value = (oneRepMax / this._basePercent) * 100;
} else {
value = (exercise.quantity / this._basePercent) * 100;
value = (exercise.quantity! / this._basePercent) * 100;
}
} else if (diagramType == DiagramType.oneRepMax || diagramType == DiagramType.sumMass) {
value = exercise.calculated;
value = exercise.calculated!;
}
return value;
}
@@ -188,22 +187,22 @@ class GroupChart extends GroupData with Calculate {
_minData = diagramValue;
}
BarChartGroupData data = BarChartGroupData(x: exercise.dateAdd.millisecondsSinceEpoch, barRods: [
BarChartGroupData data = BarChartGroupData(x: exercise.dateAdd!.millisecondsSinceEpoch, barRods: [
BarChartRodData(y: diagramValue, width: 12, colors: [Colors.lightBlue, Colors.lightBlueAccent])
]);
_chartData.add(data);
_origExerciseTypeId = exercise.exerciseTypeId;
_origExerciseTypeId = exercise.exerciseTypeId!;
}
@override
bool checkNewType(Exercise exercise) {
return _origExerciseTypeId != exercise.exerciseTypeId;
return _origExerciseTypeId == null || _origExerciseTypeId != exercise.exerciseTypeId;
}
@override
void iteration() {
this.resetTemp();
Exercise tempExercise;
Exercise? tempExercise;
inputList.forEach((element) {
tempExercise = element;
@@ -222,7 +221,7 @@ class GroupChart extends GroupData with Calculate {
}
});
if (tempExercise != null) {
this.temp2Output(tempExercise);
this.temp2Output(tempExercise!);
}
}
@@ -234,9 +233,9 @@ class GroupChart extends GroupData with Calculate {
ChartDataExtended extended;
if (outputList[_origExerciseTypeId] == null) {
extended = ChartDataExtended(data: _chartData, interval: dInterval, gridInterval: gridInterval);
outputList[_origExerciseTypeId] = extended;
outputList[_origExerciseTypeId!] = extended;
} else {
extended = outputList[_origExerciseTypeId];
extended = outputList[_origExerciseTypeId]!;
_chartData.forEach((element) {
extended.data.add(element);
});
@@ -247,7 +246,7 @@ class GroupChart extends GroupData with Calculate {
void resetTemp() {
_minData = 999999999999;
_maxData = 0;
_chartData = List();
_chartData = [];
}
}
@@ -256,10 +255,10 @@ class ChartDataExtended {
final double interval;
final int gridInterval;
const ChartDataExtended({this.data, this.interval, this.gridInterval});
const ChartDataExtended({required this.data, required this.interval, required this.gridInterval});
Map<String, dynamic> toJson() {
List listBarChartData = List();
List listBarChartData = [];
data.forEach((element) {
element.barRods.forEach((rods) {
var barChartData = {
@@ -280,18 +279,19 @@ class ChartDataExtended {
class DevelopmentByMuscleBloc extends Bloc<DevelopmentByMuscleEvent, DevelopmentByMuscleState> with Calculate, Logging {
final WorkoutTreeRepository workoutTreeRepository;
final ExerciseRepository exerciseRepository = ExerciseRepository();
LinkedHashMap<int, ChartDataExtended> listChartData = LinkedHashMap();
List<BarChartGroupData> chartData;
late List<BarChartGroupData> chartData;
String diagramType = DiagramType.sumMass;
String dateRate = DateRate.daily;
double basePercent = 0;
@override
DevelopmentByMuscleBloc({this.workoutTreeRepository}) : super(DevelopmentByMuscleStateInitial());
DevelopmentByMuscleBloc({required this.workoutTreeRepository}) : super(DevelopmentByMuscleStateInitial());
Future<void> getData() async {
workoutTreeRepository.sortedTree = null;
workoutTreeRepository.sortedTree.clear();
workoutTreeRepository.sortByMuscleType();
workoutTreeRepository.sortedTree.forEach((key, value) {
@@ -305,7 +305,7 @@ class DevelopmentByMuscleBloc extends Bloc<DevelopmentByMuscleEvent, Development
}
void getChartData() {
List<Exercise> exercises = exerciseRepository.getExerciseList();
List<Exercise>? exercises = exerciseRepository.getExerciseList();
//print("-- Start calculate --- ");
exercises = this.groupByDate(exercises);
@@ -322,24 +322,25 @@ class DevelopmentByMuscleBloc extends Bloc<DevelopmentByMuscleEvent, Development
listChartData = groupChart.outputList;
listChartData.forEach((key, value) {
trace("typeid " + key.toString() + " chardata " + value.toJson().toString());
//trace("typeid " + key.toString() + " chardata " + value.toJson().toString());
});
return;
}
List<Exercise> groupByDate(List<Exercise> exercises) {
List<Exercise> groupedExercises = List();
List<Exercise> groupByDate(List<Exercise>? exercises) {
List<Exercise> groupedExercises = [];
if (exercises != null) {
exercises = sort(exercises, false);
exercises.forEach((exercise) {
//trace("Date exercise " + exercise.toJsonDatePart().toString());
});
exercises = sort(exercises, false);
exercises.forEach((exercise) {
trace("Date exercise " + exercise.toJsonDatePart().toString());
});
GroupDate groupDate = GroupDate(inputList: exercises, outputList: groupedExercises);
groupDate.dateRate = this.dateRate;
groupDate.diagramType = this.diagramType;
groupDate.iteration();
groupedExercises = groupDate.outputList;
GroupDate groupDate = GroupDate(inputList: exercises, outputList: groupedExercises);
groupDate.dateRate = this.dateRate;
groupDate.diagramType = this.diagramType;
groupDate.iteration();
groupedExercises = groupDate.outputList;
}
/* groupedExercises.forEach((element) {
print("Grouped " + element.toJsonDatePart().toString());
lib/bloc/development_by_muscle/development_by_muscle_event.dart
+2 -2
View File
@@ -14,7 +14,7 @@ class DevelopmentByMuscleLoad extends DevelopmentByMuscleEvent {
class DevelopmentByMuscleDateRateChange extends DevelopmentByMuscleEvent {
final String dateRate;
const DevelopmentByMuscleDateRateChange({this.dateRate});
const DevelopmentByMuscleDateRateChange({required this.dateRate});
@override
List<Object> get props => [dateRate];
@@ -22,7 +22,7 @@ class DevelopmentByMuscleDateRateChange extends DevelopmentByMuscleEvent {
class DevelopmentByMuscleDiagramTypeChange extends DevelopmentByMuscleEvent {
final String diagramType;
const DevelopmentByMuscleDiagramTypeChange({this.diagramType});
const DevelopmentByMuscleDiagramTypeChange({required this.diagramType});
@override
List<Object> get props => [diagramType];
lib/bloc/development_by_muscle/development_by_muscle_state.dart
+2 -3
View File
@@ -1,7 +1,7 @@
part of 'development_by_muscle_bloc.dart';
@immutable
abstract class DevelopmentByMuscleState extends Equatable{
abstract class DevelopmentByMuscleState extends Equatable {
const DevelopmentByMuscleState();
@override
@@ -20,10 +20,9 @@ class DevelopmentByMuscleReadyState extends DevelopmentByMuscleState {
const DevelopmentByMuscleReadyState();
}
class DevelopmentByMuscleErrorState extends DevelopmentByMuscleState {
final String message;
const DevelopmentByMuscleErrorState({this.message});
const DevelopmentByMuscleErrorState({required this.message});
@override
List<Object> get props => [message];