Revert "."

This reverts commit 9930736151.

lib/pages/analytics/models/range_of_aqi.dart

@@ -38,9 +38,9 @@ class RangeOfAqiValue extends Equatable {
   factory RangeOfAqiValue.fromJson(Map<String, dynamic> json) {
     return RangeOfAqiValue(
       type: json['type'] as String,
-      min: (json['min'] as num? ?? 0).toDouble(),
-      average: (json['average'] as num? ?? 0).toDouble(),
-      max: (json['max'] as num? ?? 0).toDouble(),
+      min: (json['min'] as num).toDouble(),
+      average: (json['average'] as num).toDouble(),
+      max: (json['max'] as num).toDouble(),
     );
   }
 

lib/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart

@@ -24,13 +24,11 @@ abstract final class FetchAirQualityDataHelper {
   }) {
     final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
     final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
-    if (shouldFetchAnalyticsDevices) {
-      loadAnalyticsDevices(
-        context,
-        communityUuid: communityUuid,
-        spaceUuid: spaceUuid,
-      );
-    }
+    loadAnalyticsDevices(
+      context,
+      communityUuid: communityUuid,
+      spaceUuid: spaceUuid,
+    );
     loadRangeOfAqi(
       context,
       spaceUuid: spaceUuid,

lib/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart

@@ -23,7 +23,6 @@ abstract final class RangeOfAqiChartsHelper {
     return titlesData.copyWith(
       bottomTitles: titlesData.bottomTitles.copyWith(
         sideTitles: titlesData.bottomTitles.sideTitles.copyWith(
-          reservedSize: 36,
           getTitlesWidget: (value, meta) => Padding(
             padding: const EdgeInsetsDirectional.only(top: 20.0),
             child: Text(
@@ -41,7 +40,6 @@ abstract final class RangeOfAqiChartsHelper {
           reservedSize: 70,
           interval: 50,
           maxIncluded: false,
-          minIncluded: true,
           getTitlesWidget: (value, meta) {
             final text = value >= 300 ? '301+' : value.toInt().toString();
             return Padding(

lib/pages/analytics/modules/air_quality/views/air_quality_view.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_box.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_legend.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart';
 
 class AirQualityView extends StatelessWidget {
@@ -21,10 +20,6 @@ class AirQualityView extends StatelessWidget {
             child: Column(
               spacing: 32,
               children: [
-                SizedBox(
-                  height: height * 0.1,
-                  child: const AqiLegend(),
-                ),
                 SizedBox(
                   height: height * 1.2,
                   child: const AirQualityEndSideWidget(),
@@ -45,7 +40,7 @@ class AirQualityView extends StatelessWidget {
         return SingleChildScrollView(
           child: Container(
             padding: _padding,
-            height: height * 1.2,
+            height: height * 1.1,
             child: const Column(
               children: [
                 Expanded(
@@ -57,9 +52,8 @@ class AirQualityView extends StatelessWidget {
                         child: Column(
                           spacing: 20,
                           children: [
-                            Expanded(flex: 2, child: AqiLegend()),
-                            Expanded(flex: 12, child: RangeOfAqiChartBox()),
-                            Expanded(flex: 12, child: AqiDistributionChartBox()),
+                            Expanded(child: RangeOfAqiChartBox()),
+                            Expanded(child: AqiDistributionChartBox()),
                           ],
                         ),
                       ),

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart.dart

@@ -32,13 +32,8 @@ class AqiDistributionChart extends StatelessWidget {
   }
 
   List<BarChartGroupData> _buildBarGroups() {
-    final groups = <BarChartGroupData>[];
-    for (var i = 0; i < chartData.length; i++) {
-      final data = chartData[i];
-      final isAllZero = data.data.every((d) => d.percentage == 0);
-      if (isAllZero) {
-        continue;
-      }
+    return List.generate(chartData.length, (index) {
+      final data = chartData[index];
       final stackItems = <BarChartRodData>[];
       double currentY = 0;
       var isFirstElement = true;
@@ -61,15 +56,13 @@ class AqiDistributionChart extends StatelessWidget {
         currentY += percentageData.percentage + _rodStackItemsSpacing;
         isFirstElement = false;
       }
-      groups.add(
-        BarChartGroupData(
-          x: i,
-          barRods: stackItems,
-          groupVertically: true,
-        ),
+
+      return BarChartGroupData(
+        x: index,
+        barRods: stackItems,
+        groupVertically: true,
       );
-    }
-    return groups;
+    });
   }
 
   BarTouchData _barTouchData(BuildContext context) {
@@ -80,7 +73,6 @@ class AqiDistributionChart extends StatelessWidget {
           color: ColorsManager.semiTransparentBlack,
         ),
         tooltipRoundedRadius: 16,
-        maxContentWidth: 500,
         tooltipPadding: const EdgeInsets.all(8),
         getTooltipItem: (group, groupIndex, rod, rodIndex) {
           final data = chartData[group.x];
@@ -89,13 +81,10 @@ class AqiDistributionChart extends StatelessWidget {
 
           final textStyle = context.textTheme.bodySmall?.copyWith(
             color: ColorsManager.blackColor,
-            fontSize: 11,
+            fontSize: 8,
           );
 
           for (final percentageData in data.data) {
-            if (percentageData.percentage == 0) {
-              continue;
-            }
             final percentage = percentageData.percentage.toStringAsFixed(1);
             final type = percentageData.type[0].toUpperCase() +
                 percentageData.type.substring(1).replaceAll('_', ' ');
@@ -109,7 +98,7 @@ class AqiDistributionChart extends StatelessWidget {
             DateFormat('dd/MM/yyyy').format(data.date),
             context.textTheme.bodyMedium!.copyWith(
               color: ColorsManager.blackColor,
-              fontSize: 12,
+              fontSize: 9,
               fontWeight: FontWeight.w600,
             ),
             textAlign: TextAlign.start,
@@ -129,6 +118,7 @@ class AqiDistributionChart extends StatelessWidget {
     final leftTitles = titlesData.leftTitles.copyWith(
       sideTitles: titlesData.leftTitles.sideTitles.copyWith(
         reservedSize: 70,
+        interval: 20,
         maxIncluded: false,
         minIncluded: true,
         getTitlesWidget: (value, meta) => Padding(
@@ -150,7 +140,7 @@ class AqiDistributionChart extends StatelessWidget {
 
     final bottomTitles = AxisTitles(
       sideTitles: SideTitles(
-        showTitles: chartData.isNotEmpty,
+        showTitles: true,
         getTitlesWidget: (value, _) => FittedBox(
           alignment: AlignmentDirectional.bottomCenter,
           fit: BoxFit.scaleDown,
@@ -158,7 +148,7 @@ class AqiDistributionChart extends StatelessWidget {
             chartData[value.toInt()].date.day.toString(),
             style: context.textTheme.bodySmall?.copyWith(
               color: ColorsManager.lightGreyColor,
-              fontSize: 12,
+              fontSize: 8,
             ),
           ),
         ),

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart

@@ -19,7 +19,7 @@ class AqiDistributionChartTitle extends StatelessWidget {
       children: [
         ChartsLoadingWidget(isLoading: isLoading),
         const Expanded(
-          flex: 4,
+          flex: 3,
           child: FittedBox(
             fit: BoxFit.scaleDown,
             alignment: AlignmentDirectional.centerStart,
@@ -28,26 +28,23 @@ class AqiDistributionChartTitle extends StatelessWidget {
             ),
           ),
         ),
-        Expanded(
-          flex: 2,
-          child: FittedBox(
-            alignment: AlignmentDirectional.centerEnd,
-            fit: BoxFit.scaleDown,
-            child: AqiTypeDropdown(
-              onChanged: (value) {
-                if (value != null) {
-                  final bloc = context.read<AirQualityDistributionBloc>();
-                  try {
-                    final param = _makeLoadAqiDistributionParam(context, value);
-                    bloc.add(LoadAirQualityDistribution(param));
-                  } catch (_) {
-                    return;
-                  } finally {
-                    bloc.add(UpdateAqiTypeEvent(value));
-                  }
+        FittedBox(
+          alignment: AlignmentDirectional.centerEnd,
+          fit: BoxFit.scaleDown,
+          child: AqiTypeDropdown(
+            onChanged: (value) {
+              if (value != null) {
+                final bloc = context.read<AirQualityDistributionBloc>();
+                try {
+                  final param = _makeLoadAqiDistributionParam(context, value);
+                  bloc.add(LoadAirQualityDistribution(param));
+                } catch (_) {
+                  return;
+                } finally {
+                  bloc.add(UpdateAqiTypeEvent(value));
                 }
-              },
-            ),
+              }
+            },
           ),
         ),
       ],

lib/pages/analytics/modules/air_quality/widgets/aqi_legend.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class AqiLegend extends StatelessWidget {
-  const AqiLegend({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsetsDirectional.all(20),
-      decoration: subSectionContainerDecoration.copyWith(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        spacing: 16,
-        children: RangeOfAqiChartsHelper.gradientData.map((e) {
-          return Flexible(
-            flex: 4,
-            child: FittedBox(
-              fit: BoxFit.fill,
-              child: ChartInformativeCell(
-                color: e.$1,
-                title: FittedBox(
-                  fit: BoxFit.fill,
-                  child: Text(e.$2),
-                ),
-                height: null,
-              ),
-            ),
-          );
-        }).toList(),
-      ),
-    );
-  }
-}

lib/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart

@@ -47,37 +47,36 @@ class AqiLocationInfoCell extends StatelessWidget {
               ),
             ),
             Align(
-              alignment: AlignmentDirectional.bottomCenter,
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Expanded(
-                    child: SvgPicture.asset(
-                      svgPath,
-                      fit: BoxFit.scaleDown,
-                      alignment: AlignmentDirectional.bottomStart,
-                    ),
-                  ),
-                  Expanded(
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      alignment: AlignmentDirectional.bottomEnd,
-                      child: Padding(
-                        padding: const EdgeInsetsDirectional.all(10),
-                        child: Text(
-                          value,
-                          style: context.textTheme.bodySmall?.copyWith(
-                            color: ColorsManager.vividBlue.withValues(
-                              alpha: 0.7,
-                            ),
-                            fontWeight: FontWeight.w700,
-                            fontSize: 24,
-                          ),
-                        ),
+              alignment: AlignmentDirectional.bottomEnd,
+              child: Padding(
+                padding: const EdgeInsetsDirectional.all(10),
+                child: SizedBox(
+                  height: 40,
+                  width: 120,
+                  child: FittedBox(
+                    fit: BoxFit.scaleDown,
+                    alignment: AlignmentDirectional.bottomEnd,
+                    child: Text(
+                      value,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.vividBlue.withValues(alpha: 0.7),
+                        fontWeight: FontWeight.w700,
+                        fontSize: 24,
                       ),
                     ),
                   ),
-                ],
+                ),
+              ),
+            ),
+            Align(
+              alignment: AlignmentDirectional.bottomStart,
+              child: SizedBox.square(
+                dimension: MediaQuery.sizeOf(context).width * 0.45,
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  alignment: AlignmentDirectional.bottomStart,
+                  child: SvgPicture.asset(svgPath),
+                ),
               ),
             ),
           ],

lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart

@@ -7,18 +7,16 @@ class ChartInformativeCell extends StatelessWidget {
     required this.title,
     required this.color,
     this.hasBorder = false,
-    this.height,
   });
 
   final Widget title;
   final Color color;
   final bool hasBorder;
-  final double? height;
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: height ?? MediaQuery.sizeOf(context).height * 0.0385,
+      height: MediaQuery.sizeOf(context).height * 0.0385,
       padding: const EdgeInsetsDirectional.symmetric(
         vertical: 8,
         horizontal: 12,

lib/pages/home/view/home_card.dart

@@ -34,9 +34,17 @@ class HomeCard extends StatelessWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.start,
                 children: [
-                  Expanded(
-                    child: SpliteNameHelperWidget(
-                      name: name,
+                  Flexible(
+                    child: FittedBox(
+                      fit: BoxFit.scaleDown,
+                      child: Text(
+                        name,
+                        style: const TextStyle(
+                          fontSize: 30,
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
                     ),
                   ),
                 ],
@@ -55,72 +63,3 @@ class HomeCard extends StatelessWidget {
     );
   }
 }
-
-class SpliteNameHelperWidget extends StatelessWidget {
-  final String name;
-  const SpliteNameHelperWidget({
-    super.key,
-    required this.name,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    List<String> parts = name.split(' ');
-
-    if (parts.length == 2) {
-      // Two-word string
-      return Padding(
-        padding: const EdgeInsetsGeometry.only(top: 10, left: 10),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Expanded(
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                child: Text(
-                  parts[0],
-                  style: const TextStyle(
-                    fontSize: 30,
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ),
-            Expanded(
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                child: Text(
-                  parts[1],
-                  style: const TextStyle(
-                    fontSize: 30,
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      );
-    } else {
-      // One-word string
-      return Text(
-        name,
-        style: const TextStyle(
-          fontSize: 30,
-          color: Colors.white,
-          fontWeight: FontWeight.bold,
-        ),
-      );
-    }
-  }
-}
-// Text(
-//                       name,
-//                       style: const TextStyle(
-//                         fontSize: 32,
-//                         color: Colors.white,
-//                         fontWeight: FontWeight.bold,
-//                       ),
-//                     )

lib/pages/home/view/home_page_web.dart

@@ -92,7 +92,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                         flex: 4,
                         child: SizedBox(
                           height: size.height * 0.6,
-                          width: size.width * 0.8,
+                          width: size.width * 0.68,
                           child: GridView.builder(
                             itemCount: homeBloc.homeItems.length,
                             gridDelegate: