feat(diary): Diary ID is passed on calendar click, new layouts for calendar, fixed nutrition chart

This commit is contained in:
2024-08-02 18:08:28 +03:00
parent f3d099fe0c
commit 5d13358fbc
5 changed files with 230 additions and 108 deletions

View File

@@ -23,7 +23,13 @@ import 'package:syncfusion_flutter_charts/charts.dart';
// ignore: must_be_immutable
class DiaryScreen extends StatelessWidget {
DiaryScreen({Key? key}) : super(key: key);
final String? diaryID;
const DiaryScreen({
this.diaryID,
super.key,
});
Widget build(BuildContext context) {
return BlocBuilder<DiaryBloc, DiaryState>(
builder: (context, state) {
@@ -141,7 +147,6 @@ class DiaryScreen extends StatelessWidget {
alignment: Alignment.centerRight,
widthFactor: 0.5,
child: SfCircularChart(
legend: Legend(isVisible: false),
series: <CircularSeries>[
RadialBarSeries<NutritionData, String>(
dataSource: state.chartData,
@@ -153,30 +158,29 @@ class DiaryScreen extends StatelessWidget {
),
),
)),
SizedBox(height: 16.0),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Калории'),
Text('Белки'),
Text('Жиры'),
Text('Углеводы'),
Text('Жиры'),
Text('Белки'),
Text('Калории'),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'${state.chartData![0].nutrition.toStringAsFixed(1)}'), // Калории
'${state.chartData![3].nutrition.toStringAsFixed(0)}%'), // Калории
Text(
'${state.chartData![1].nutrition.toStringAsFixed(1)}'), // Белки
'${state.chartData![2].nutrition.toStringAsFixed(0)}%'), // Белки
Text(
'${state.chartData![2].nutrition.toStringAsFixed(1)}'), // Жиры
'${state.chartData![1].nutrition.toStringAsFixed(0)}%'), // Жиры
Text(
'${state.chartData![3].nutrition.toStringAsFixed(1)}'), // Углеводы
'${state.chartData![0].nutrition.toStringAsFixed(0)}% '), // Углеводы
],
),
],