diff --git a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart index 07390480..8e2333fe 100644 --- a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart +++ b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart @@ -2,8 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart'; import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart.dart'; -import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart'; -import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart'; +import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart'; import 'package:syncrow_web/pages/analytics/widgets/analytics_error_widget.dart'; import 'package:syncrow_web/utils/style.dart'; @@ -37,39 +36,3 @@ class RangeOfAqiChartBox extends StatelessWidget { ); } } - -class RangeOfAqiChartTitle extends StatelessWidget { - const RangeOfAqiChartTitle({super.key}); - - static const List<(Color color, String title, bool hasBorder)> _colors = [ - (Color(0xFF962DFF), 'Max', false), - (Color(0xFF93AAFD), 'Min', false), - (Colors.transparent, 'Avg', true), - ]; - - @override - Widget build(BuildContext context) { - return Row( - mainAxisSize: MainAxisSize.min, - children: [ - const ChartTitle(title: Text('Range of AQI')), - const Spacer(), - ..._colors.map( - (e) { - final (color, title, hasBorder) = e; - return Padding( - padding: const EdgeInsetsDirectional.only(end: 16), - child: ChartInformativeCell( - title: Text(title), - color: color, - hasBorder: hasBorder, - ), - ); - }, - ), - const SizedBox(width: 34), - const Text('AQI'), - ], - ); - } -} diff --git a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart new file mode 100644 index 00000000..cea28c2f --- /dev/null +++ b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart @@ -0,0 +1,39 @@ +import 'package:flutter/material.dart'; +import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart'; +import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart'; + +class RangeOfAqiChartTitle extends StatelessWidget { + const RangeOfAqiChartTitle({super.key}); + + static const List<(Color color, String title, bool hasBorder)> _colors = [ + (Color(0xFF962DFF), 'Max', false), + (Color(0xFF93AAFD), 'Min', false), + (Colors.transparent, 'Avg', true), + ]; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisSize: MainAxisSize.min, + children: [ + const ChartTitle(title: Text('Range of AQI')), + const Spacer(), + ..._colors.map( + (e) { + final (color, title, hasBorder) = e; + return Padding( + padding: const EdgeInsetsDirectional.only(end: 16), + child: ChartInformativeCell( + title: Text(title), + color: color, + hasBorder: hasBorder, + ), + ); + }, + ), + const SizedBox(width: 34), + const Text('AQI'), + ], + ); + } +} diff --git a/lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart b/lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart index 05d2b2b5..eec31998 100644 --- a/lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart +++ b/lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart @@ -16,7 +16,7 @@ class ChartInformativeCell extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - height: MediaQuery.sizeOf(context).height * 0.0365, + height: MediaQuery.sizeOf(context).height * 0.0385, padding: const EdgeInsetsDirectional.symmetric( vertical: 8, horizontal: 12, @@ -43,10 +43,6 @@ class ChartInformativeCell extends StatelessWidget { shape: BoxShape.circle, ), ), - // CircleAvatar( - // radius: 4, - // backgroundColor: color, - // ), DefaultTextStyle( style: const TextStyle( color: ColorsManager.blackColor,