wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup/simplify existing code

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-04-15 12:21:31 +02:00
parent 0951561456
commit cc39b692b2
2 changed files with 51 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/models/nutrition/nutritional_values.dart
View File

@@ -82,6 +82,20 @@ class NutritionalValues {
sodium == other.sodium;
}
double prop(String name) {
return switch (name) {
'energy' => energy,
'protein' => protein,
'carbohydrates' => carbohydrates,
'carbohydratesSugar' => carbohydratesSugar,
'fat' => fat,
'fatSaturated' => fatSaturated,
'fibres' => fibres,
'sodium' => sodium,
_ => 0,
};
}
@override
String toString() {
return 'e: $energy, p: $protein, c: $carbohydrates, cS: $carbohydratesSugar, f: $fat, fS: $fatSaturated, fi: $fibres, s: $sodium';

166
lib/widgets/nutrition/charts.dart
View File

@@ -168,28 +168,14 @@ class NutritionalDiaryChartWidgetFl extends StatefulWidget {
class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidgetFl> {
Widget bottomTitles(double value, TitleMeta meta) {
const style = TextStyle(fontSize: 10);
String text;
switch (value.toInt()) {
case 0:
text = AppLocalizations.of(context).protein;
break;
case 1:
text = AppLocalizations.of(context).carbohydrates;
break;
case 2:
text = AppLocalizations.of(context).sugars;
break;
case 3:
text = AppLocalizations.of(context).fat;
break;
case 4:
text = AppLocalizations.of(context).saturatedFat;
break;
default:
text = '';
break;
}
final String text = switch (value.toInt()) {
0 => AppLocalizations.of(context).protein,
1 => AppLocalizations.of(context).carbohydrates,
2 => AppLocalizations.of(context).sugars,
3 => AppLocalizations.of(context).fat,
4 => AppLocalizations.of(context).saturatedFat,
_ => '',
};
return SideTitleWidget(
axisSide: meta.axisSide,
child: Text(text, style: style),
@@ -219,6 +205,30 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
final colorLoggedToday = LIST_OF_COLORS3[1];
final colorLogged7Day = LIST_OF_COLORS3[2];
BarChartGroupData barchartGroup(int x, double barsSpace, double barsWidth, String prop) {
return BarChartGroupData(
x: x,
barsSpace: barsSpace,
barRods: [
BarChartRodData(
toY: planned.prop(prop),
color: colorPlanned,
width: barsWidth,
),
BarChartRodData(
toY: loggedToday.prop(prop),
color: colorLoggedToday,
width: barsWidth,
),
BarChartRodData(
toY: logged7DayAvg.prop(prop),
color: colorLogged7Day,
width: barsWidth,
),
],
);
}
return AspectRatio(
aspectRatio: 1.66,
child: Padding(
@@ -269,115 +279,13 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
show: false,
),
groupsSpace: 30,
// groupsSpace: barsSpace,
barGroups: [
BarChartGroupData(
x: 0,
barsSpace: barsSpace,
barRods: [
BarChartRodData(
toY: planned.protein,
color: colorPlanned,
width: barsWidth,
),
BarChartRodData(
toY: loggedToday.protein,
color: colorLoggedToday,
width: barsWidth,
),
BarChartRodData(
toY: logged7DayAvg.protein,
color: colorLogged7Day,
width: barsWidth,
),
],
),
BarChartGroupData(
x: 1,
barsSpace: barsSpace,
barRods: [
BarChartRodData(
toY: planned.carbohydrates,
color: colorPlanned,
width: barsWidth,
),
BarChartRodData(
toY: loggedToday.carbohydrates,
color: colorLoggedToday,
width: barsWidth,
),
BarChartRodData(
toY: logged7DayAvg.carbohydrates,
color: colorLogged7Day,
width: barsWidth,
),
],
),
BarChartGroupData(
x: 2,
barsSpace: barsSpace,
barRods: [
BarChartRodData(
toY: planned.carbohydratesSugar,
color: colorPlanned,
width: barsWidth,
),
BarChartRodData(
toY: loggedToday.carbohydratesSugar,
color: colorLoggedToday,
width: barsWidth,
),
BarChartRodData(
toY: logged7DayAvg.carbohydratesSugar,
color: colorLogged7Day,
width: barsWidth,
),
],
),
BarChartGroupData(
x: 3,
barsSpace: barsSpace,
barRods: [
BarChartRodData(
toY: planned.fat,
color: colorPlanned,
width: barsWidth,
),
BarChartRodData(
toY: loggedToday.fat,
color: colorLoggedToday,
width: barsWidth,
),
BarChartRodData(
toY: logged7DayAvg.fat,
color: colorLogged7Day,
width: barsWidth,
),
],
),
BarChartGroupData(
x: 4,
barsSpace: barsSpace,
barRods: [
BarChartRodData(
toY: planned.fatSaturated,
color: colorPlanned,
width: barsWidth,
),
BarChartRodData(
toY: loggedToday.fatSaturated,
color: colorLoggedToday,
width: barsWidth,
),
BarChartRodData(
toY: logged7DayAvg.fatSaturated,
color: colorLogged7Day,
width: barsWidth,
),
],
),
barchartGroup(0, barsSpace, barsWidth, 'protein'),
barchartGroup(1, barsSpace, barsWidth, 'carbohydrates'),
barchartGroup(2, barsSpace, barsWidth, 'carbohydratesSugar'),
barchartGroup(3, barsSpace, barsWidth, 'fat'),
barchartGroup(4, barsSpace, barsWidth, 'fatSaturated'),
],
// barGroups: getData(barsWidth, barsSpace),
),
);
},