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

move chart legend into actual chart

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-05-15 10:11:03 +02:00
parent 896abf2e76
commit a3d060cd8e
2 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,56 +366,94 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
builder: (context, constraints) {
final barsSpace = 6.0 * constraints.maxWidth / 400;
final barsWidth = 12.0 * constraints.maxWidth / 400;
return BarChart(
BarChartData(
alignment: BarChartAlignment.center,
barTouchData: BarTouchData(
enabled: false,
),
titlesData: FlTitlesData(
show: true,
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 48,
getTitlesWidget: bottomTitles,
return Column(
children: [
Expanded(
child: BarChart(
BarChartData(
alignment: BarChartAlignment.center,
barTouchData: BarTouchData(
enabled: false,
),
titlesData: FlTitlesData(
show: true,
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 48,
getTitlesWidget: bottomTitles,
),
),
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 40,
getTitlesWidget: leftTitles,
),
),
topTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
rightTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
),
gridData: FlGridData(
show: true,
checkToShowHorizontalLine: (value) => value % 10 == 0,
getDrawingHorizontalLine: (value) => const FlLine(
color: Colors.black,
strokeWidth: 1,
),
drawVerticalLine: false,
),
borderData: FlBorderData(
show: false,
),
groupsSpace: 30,
barGroups: [
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'),
],
),
),
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 40,
getTitlesWidget: leftTitles,
),
),
topTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
rightTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
Padding(
padding: const EdgeInsets.only(bottom: 40, left: 25, right: 25),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Indicator(
color: colorPlanned,
text: AppLocalizations.of(context).deficit,
isSquare: true,
marginRight: 0,
),
Indicator(
color: COLOR_SURPLUS,
text: AppLocalizations.of(context).surplus,
isSquare: true,
marginRight: 0,
),
Indicator(
color: colorLoggedToday,
text: AppLocalizations.of(context).today,
isSquare: true,
marginRight: 0,
),
Indicator(
color: colorLogged7Day,
text: AppLocalizations.of(context).weekAverage,
isSquare: true,
marginRight: 0,
),
],
),
),
gridData: FlGridData(
show: true,
checkToShowHorizontalLine: (value) => value % 10 == 0,
getDrawingHorizontalLine: (value) => const FlLine(
color: Colors.black,
strokeWidth: 1,
),
drawVerticalLine: false,
),
borderData: FlBorderData(
show: false,
),
groupsSpace: 30,
barGroups: [
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'),
],
),
],
);
},
);

34
lib/widgets/nutrition/nutritional_plan_detail.dart
View File

@@ -19,11 +19,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:wger/helpers/colors.dart';
import 'package:wger/models/nutrition/nutritional_plan.dart';
import 'package:wger/providers/body_weight.dart';
import 'package:wger/screens/form_screen.dart';
import 'package:wger/widgets/measurements/charts.dart';
import 'package:wger/widgets/nutrition/charts.dart';
import 'package:wger/widgets/nutrition/forms.dart';
import 'package:wger/widgets/nutrition/macro_nutrients_table.dart';
@@ -106,38 +104,6 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
height: 300,
child: NutritionalDiaryChartWidgetFl(nutritionalPlan: _nutritionalPlan),
),
Padding(
padding: const EdgeInsets.only(bottom: 40, left: 25, right: 25),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Indicator(
color: LIST_OF_COLORS3[0],
text: AppLocalizations.of(context).deficit,
isSquare: true,
marginRight: 0,
),
Indicator(
color: COLOR_SURPLUS,
text: AppLocalizations.of(context).surplus,
isSquare: true,
marginRight: 0,
),
Indicator(
color: LIST_OF_COLORS3[1],
text: AppLocalizations.of(context).today,
isSquare: true,
marginRight: 0,
),
Indicator(
color: LIST_OF_COLORS3[2],
text: AppLocalizations.of(context).weekAverage,
isSquare: true,
marginRight: 0,
),
],
),
),
if (_nutritionalPlan.logEntriesValues.isNotEmpty)
Padding(
padding: const EdgeInsets.only(bottom: 15, left: 15, right: 15),