feat(Лента): фильтрация рецептов по тегам, поиск по строке

This commit is contained in:
mso7nueh
2024-09-02 16:12:54 +03:00
parent 5a651cad9e
commit 334a6b0970
43 changed files with 2320 additions and 2160 deletions

View File

@@ -1,3 +1,4 @@
import 'package:eatvio_app/core/app_export.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
@@ -15,91 +16,101 @@ class CircumferenceChartWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 16),
scrollDirection: Axis.horizontal,
physics: const BouncingScrollPhysics(),
child: Row(
children: [
Text(
'Грудь ${chartData.last.chestCircumference} см',
'${chartData.last.chestCircumference} см',
style: TextStyle(
color: Colors.black,
fontSize: 18,
fontSize: 48,
fontWeight: FontWeight.w500,
),
),
chartData.last.chestCircumference > chartData[chartData.length - 2].chestCircumference
? Icon(
Icons.arrow_drop_up,
size: 18,
size: 48,
color: Colors.grey,
)
: Icon(
Icons.arrow_drop_down,
size: 18,
size: 48,
color: Colors.grey,
),
Text(
'Талия ${chartData.last.waistCircumference} см',
'${chartData.last.waistCircumference} см',
style: TextStyle(
color: Colors.black,
fontSize: 18,
fontSize: 48,
fontWeight: FontWeight.w500,
),
),
chartData.last.waistCircumference > chartData[chartData.length - 2].waistCircumference
? Icon(
Icons.arrow_drop_up,
size: 18,
size: 48,
color: Colors.grey,
)
: Icon(
Icons.arrow_drop_down,
size: 18,
size: 48,
color: Colors.grey,
),
Text(
'Бёдра ${chartData.last.hipCircumference} см',
'${chartData.last.hipCircumference} см',
style: TextStyle(
color: Colors.black,
fontSize: 18,
fontSize: 48,
fontWeight: FontWeight.w500,
),
),
chartData.last.hipCircumference > chartData[chartData.length - 2].hipCircumference
? Icon(
Icons.arrow_drop_up,
size: 18,
size: 48,
color: Colors.grey,
)
: Icon(
Icons.arrow_drop_down,
size: 18,
size: 48,
color: Colors.grey,
),
],
),
),
SfCartesianChart(
margin: EdgeInsets.zero,
margin: EdgeInsets.symmetric(horizontal: 8),
enableAxisAnimation: true,
enableSideBySideSeriesPlacement: true,
legend: const Legend(
isVisible: true,
opacity: 0.7,
position: LegendPosition.bottom,
),
plotAreaBorderWidth: 0,
trackballBehavior: TrackballBehavior(
enable: true,
activationMode: ActivationMode.singleTap,
tooltipDisplayMode: TrackballDisplayMode.groupAllPoints,
tooltipSettings: InteractiveTooltip(),
lineType: TrackballLineType.vertical,
),
primaryXAxis: DateTimeCategoryAxis(
tickPosition: TickPosition.inside,
majorTickLines: MajorTickLines(
size: 0,
),
edgeLabelPlacement: EdgeLabelPlacement.shift,
dateFormat: DateFormat.MMMd('ru'),
labelStyle: TextStyle(
color: Colors.grey,
),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)),
axisLine: AxisLine(
width: 1,
color: Colors.grey.withOpacity(0.3),
width: 0.4,
),
),
primaryYAxis: NumericAxis(
isVisible: false,
labelFormat: '{value} см',
axisLine: AxisLine(
width: 1,
@@ -115,57 +126,81 @@ class CircumferenceChartWidget extends StatelessWidget {
List<CartesianSeries<Circumference, DateTime>> _getSplineSeries() {
final Color seriesColor1 = Colors.red;
final Color seriesColor2 = Colors.blue;
final Color seriesColor2 = appTheme.blueA400;
final Color seriesColor3 = Colors.green;
return <CartesianSeries<Circumference, DateTime>>[
SplineSeries<Circumference, DateTime>(
SplineAreaSeries<Circumference, DateTime>(
markerSettings: MarkerSettings(
isVisible: true,
color: seriesColor1,
height: 12,
width: 12,
height: 8,
width: 8,
),
dataLabelSettings: DataLabelSettings(
labelAlignment: ChartDataLabelAlignment.top,
isVisible: true,
),
dataSource: chartData,
color: seriesColor1,
borderColor: seriesColor1,
gradient: LinearGradient(
colors: [
seriesColor1.withOpacity(0.14),
Colors.transparent,
],
begin: Alignment.topCenter,
end: Alignment(0, 0.6),
),
name: 'Грудь',
xValueMapper: (Circumference value, int index) => value.createdAt,
yValueMapper: (Circumference value, int index) => value.chestCircumference,
),
SplineSeries<Circumference, DateTime>(
SplineAreaSeries<Circumference, DateTime>(
markerSettings: MarkerSettings(
isVisible: true,
color: seriesColor2,
height: 12,
width: 12,
height: 8,
width: 8,
),
dataLabelSettings: DataLabelSettings(
labelAlignment: ChartDataLabelAlignment.top,
isVisible: true,
),
dataSource: chartData,
color: seriesColor2,
borderColor: seriesColor2,
gradient: LinearGradient(
colors: [
seriesColor2.withOpacity(0.14),
Colors.transparent,
],
begin: Alignment.topCenter,
end: Alignment(0, 0.6),
),
name: 'Талия',
xValueMapper: (Circumference value, int index) => value.createdAt,
yValueMapper: (Circumference value, int index) => value.waistCircumference,
),
SplineSeries<Circumference, DateTime>(
SplineAreaSeries<Circumference, DateTime>(
markerSettings: MarkerSettings(
isVisible: true,
color: seriesColor3,
height: 12,
width: 12,
height: 8,
width: 8,
),
dataLabelSettings: DataLabelSettings(
labelAlignment: ChartDataLabelAlignment.top,
isVisible: true,
),
dataSource: chartData,
color: seriesColor3,
borderColor: seriesColor3,
gradient: LinearGradient(
colors: [
seriesColor3.withOpacity(0.14),
Colors.transparent,
],
begin: Alignment.topCenter,
end: Alignment(0, 0.6),
),
name: 'Бёдра',
xValueMapper: (Circumference value, int index) => value.createdAt,
yValueMapper: (Circumference value, int index) => value.hipCircumference,

View File

@@ -1,10 +1,11 @@
import 'package:eatvio_app/features/profile/models/profile_model.dart' as ProfileModel;
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/theme/theme_helper.dart';
import 'package:flutter/material.dart';
import 'package:syncfusion_flutter_charts/charts.dart';
import 'package:intl/intl.dart';
class ImtChartWidget extends StatelessWidget {
final List<ProfileModel.ChartPoint> chartPoints;
final List<ChartPointModel> chartPoints;
const ImtChartWidget({
super.key,
@@ -30,39 +31,49 @@ class ImtChartWidget extends StatelessWidget {
),
chartPoints.last.bmi > chartPoints[chartPoints.length - 2].bmi
? Icon(
Icons.arrow_drop_up,
size: 48,
color: Colors.grey,
)
Icons.arrow_drop_up,
size: 48,
color: Colors.grey,
)
: Icon(
Icons.arrow_drop_down,
size: 48,
color: Colors.grey,
),
Icons.arrow_drop_down,
size: 48,
color: Colors.grey,
),
],
),
),
SfCartesianChart(
margin: EdgeInsets.zero,
margin: EdgeInsets.symmetric(horizontal: 8),
enableAxisAnimation: true,
enableSideBySideSeriesPlacement: true,
plotAreaBorderWidth: 0,
trackballBehavior: TrackballBehavior(
enable: true,
activationMode: ActivationMode.singleTap,
tooltipDisplayMode: TrackballDisplayMode.groupAllPoints,
tooltipSettings: InteractiveTooltip(),
lineType: TrackballLineType.vertical,
),
primaryXAxis: DateTimeCategoryAxis(
initialVisibleMinimum: chartPoints.first.createdAt,
initialVisibleMaximum: chartPoints.last.createdAt,
tickPosition: TickPosition.inside,
majorTickLines: MajorTickLines(
size: 0,
),
edgeLabelPlacement: EdgeLabelPlacement.shift,
dateFormat: DateFormat.MMMd('ru'),
labelStyle: TextStyle(
color: Colors.grey,
),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)),
axisLine: AxisLine(
width: 1,
color: Colors.grey.withOpacity(0.3),
width: 0.4,
),
),
primaryYAxis: NumericAxis(
labelFormat: '{value} кг/м²',
axisLine: AxisLine(
width: 1,
),
majorTickLines: MajorTickLines(size: 0),
isVisible: false,
),
series: _getSplineSeries(),
tooltipBehavior: TooltipBehavior(enable: true),
@@ -71,24 +82,32 @@ class ImtChartWidget extends StatelessWidget {
);
}
List<CartesianSeries<ProfileModel.ChartPoint, DateTime>> _getSplineSeries() {
return <CartesianSeries<ProfileModel.ChartPoint, DateTime>>[
SplineSeries<ProfileModel.ChartPoint, DateTime>(
List<CartesianSeries<ChartPointModel, DateTime>> _getSplineSeries() {
return <CartesianSeries<ChartPointModel, DateTime>>[
SplineAreaSeries<ChartPointModel, DateTime>(
markerSettings: MarkerSettings(
isVisible: true,
color: Colors.blue,
height: 12,
width: 12,
color: appTheme.blueA400,
height: 8,
width: 8,
),
dataLabelSettings: DataLabelSettings(
labelAlignment: ChartDataLabelAlignment.top,
isVisible: true,
),
dataSource: chartPoints,
color: Colors.blue,
borderColor: appTheme.blueA400,
gradient: LinearGradient(
colors: [
appTheme.blueA400.withOpacity(0.14),
Colors.transparent,
],
begin: Alignment.topCenter,
end: Alignment(0, 0.6),
),
name: 'ИМТ',
xValueMapper: (ProfileModel.ChartPoint value, int index) => value.createdAt,
yValueMapper: (ProfileModel.ChartPoint value, int index) => value.bmi,
xValueMapper: (ChartPointModel value, int index) => value.createdAt,
yValueMapper: (ChartPointModel value, int index) => double.parse(value.bmi.toStringAsFixed(2)),
),
];
}

View File

@@ -1,11 +1,11 @@
import 'package:eatvio_app/core/app_export.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart' as ProfileModel;
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:syncfusion_flutter_charts/charts.dart';
class WeightChartWidget extends StatelessWidget {
final List<ProfileModel.ChartPoint> chartPoints;
final List<ChartPointModel> chartPoints;
const WeightChartWidget({
super.key,
@@ -22,7 +22,7 @@ class WeightChartWidget extends StatelessWidget {
child: Row(
children: [
Text(
'${chartPoints.last.weight} кг',
'${chartPoints.last.weight.toStringAsFixed(2)} кг',
style: TextStyle(
color: Colors.black,
fontSize: 48,
@@ -88,9 +88,9 @@ class WeightChartWidget extends StatelessWidget {
);
}
List<CartesianSeries<ProfileModel.ChartPoint, DateTime>> _getSplineSeries() {
return <CartesianSeries<ProfileModel.ChartPoint, DateTime>>[
SplineAreaSeries<ProfileModel.ChartPoint, DateTime>(
List<CartesianSeries<ChartPointModel, DateTime>> _getSplineSeries() {
return <CartesianSeries<ChartPointModel, DateTime>>[
SplineAreaSeries<ChartPointModel, DateTime>(
markerSettings: MarkerSettings(
isVisible: true,
color: appTheme.blueA400,
@@ -112,8 +112,8 @@ class WeightChartWidget extends StatelessWidget {
end: Alignment(0, 0.6),
),
name: 'Вес',
xValueMapper: (ProfileModel.ChartPoint value, int index) => value.createdAt,
yValueMapper: (ProfileModel.ChartPoint value, int index) => value.weight,
xValueMapper: (ChartPointModel value, int index) => value.createdAt,
yValueMapper: (ChartPointModel value, int index) => value.weight,
),
];
}