From 9d27ed2dc57a605ff6fa4fa267ecc8af209f6f2f Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 25 May 2025 11:13:24 +0300 Subject: [PATCH] SP-1506 rework, coloring and padding. --- .../helpers/energy_management_charts_helper.dart | 4 ++-- .../widgets/energy_consumption_by_phases_chart.dart | 2 +- .../widgets/energy_consumption_by_phases_chart_box.dart | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart index 567e03ed..11c088e8 100644 --- a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart +++ b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart @@ -38,7 +38,7 @@ abstract final class EnergyManagementChartsHelper { sideTitles: SideTitles( showTitles: true, maxIncluded: false, - minIncluded: true, + minIncluded: false, interval: leftTitlesInterval, reservedSize: 110, getTitlesWidget: (value, meta) => Padding( @@ -50,7 +50,7 @@ abstract final class EnergyManagementChartsHelper { value.formatNumberToKwh, style: context.textTheme.bodySmall?.copyWith( fontSize: 12, - color: ColorsManager.greyColor, + color: ColorsManager.lightGreyColor, ), ), ), diff --git a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart index 1497d0fd..001f4d2c 100644 --- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart +++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart @@ -170,7 +170,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget { child: Text( month, style: context.textTheme.bodySmall?.copyWith( - color: ColorsManager.greyColor, + color: ColorsManager.lightGreyColor, fontSize: 11, ), ), diff --git a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart index 1766266c..1bd1ed9e 100644 --- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart +++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart @@ -19,10 +19,12 @@ class EnergyConsumptionByPhasesChartBox extends StatelessWidget { decoration: secondarySection, child: Column( mainAxisSize: MainAxisSize.min, - spacing: 20, children: [ AnalyticsErrorWidget(state.errorMessage), - EnergyConsumptionByPhasesTitle(isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,), + EnergyConsumptionByPhasesTitle( + isLoading: state.status == EnergyConsumptionByPhasesStatus.loading, + ), + const SizedBox(height: 20), Expanded( child: EnergyConsumptionByPhasesChart( energyData: state.chartData,