From 3d183528c56c55daa12bf506caea1fd4ffa5e00b Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Sun, 1 Jun 2025 10:57:49 +0300 Subject: [PATCH] Fixed thrown exceptions because of `Expanded` widgets. --- .../air_quality/widgets/aqi_device_info.dart | 97 +++++++++---------- .../widgets/aqi_location_info.dart | 36 +++---- 2 files changed, 66 insertions(+), 67 deletions(-) diff --git a/lib/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart b/lib/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart index f3773c29..ebe88614 100644 --- a/lib/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart +++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart @@ -72,55 +72,54 @@ class AqiDeviceInfo extends StatelessWidget { return Container( decoration: secondarySection.copyWith(boxShadow: const []), padding: const EdgeInsetsDirectional.all(20), - child: Expanded( - child: Column( - spacing: 6, - children: [ - const AirQualityEndSideLiveIndicator(), - AirQualityEndSideGaugeAndInfo( - aqiLevel: status - .firstWhere( - (e) => e.code == 'air_quality_index', - orElse: () => Status(code: 'air_quality_index', value: ''), - ) - .value - .toString(), - temperature: int.parse(tempValue), - humidity: int.parse(humidityValue), - ), - const SizedBox(height: 20), - AqiSubValueWidget( - range: (0, 999), - label: AqiType.pm25.value, - value: pm25Value, - unit: AqiType.pm25.unit, - ), - AqiSubValueWidget( - range: (0, 999), - label: AqiType.pm10.value, - value: pm10Value, - unit: AqiType.pm10.unit, - ), - AqiSubValueWidget( - range: (0, 5), - label: AqiType.hcho.value, - value: ch2oValue, - unit: AqiType.hcho.unit, - ), - AqiSubValueWidget( - range: (0, 999), - label: AqiType.tvoc.value, - value: tvocValue, - unit: AqiType.tvoc.unit, - ), - AqiSubValueWidget( - range: (0, 5000), - label: AqiType.co2.value, - value: co2Value, - unit: AqiType.co2.unit, - ), - ], - ), + child: Column( + spacing: 6, + mainAxisSize: MainAxisSize.max, + children: [ + const AirQualityEndSideLiveIndicator(), + AirQualityEndSideGaugeAndInfo( + aqiLevel: status + .firstWhere( + (e) => e.code == 'air_quality_index', + orElse: () => Status(code: 'air_quality_index', value: ''), + ) + .value + .toString(), + temperature: int.parse(tempValue), + humidity: int.parse(humidityValue), + ), + const SizedBox(height: 20), + AqiSubValueWidget( + range: (0, 999), + label: AqiType.pm25.value, + value: pm25Value, + unit: AqiType.pm25.unit, + ), + AqiSubValueWidget( + range: (0, 999), + label: AqiType.pm10.value, + value: pm10Value, + unit: AqiType.pm10.unit, + ), + AqiSubValueWidget( + range: (0, 5), + label: AqiType.hcho.value, + value: ch2oValue, + unit: AqiType.hcho.unit, + ), + AqiSubValueWidget( + range: (0, 999), + label: AqiType.tvoc.value, + value: tvocValue, + unit: AqiType.tvoc.unit, + ), + AqiSubValueWidget( + range: (0, 5000), + label: AqiType.co2.value, + value: co2Value, + unit: AqiType.co2.unit, + ), + ], ), ); }, diff --git a/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart b/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart index f8e087b8..8426328e 100644 --- a/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart +++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart @@ -18,24 +18,24 @@ class AqiLocationInfo extends StatelessWidget { AqiLocation(), Expanded( child: Row( - spacing: 8, - children: [ - AqiLocationInfoCell( - label: 'Temperature', - value: ' 25°', - svgPath: Assets.aqiTemperature, - ), - AqiLocationInfoCell( - label: 'Humidity', - value: '25%', - svgPath: Assets.aqiHumidity, - ), - AqiLocationInfoCell( - label: 'Air Quality', - value: ' 120', - svgPath: Assets.aqiAirQuality, - ), - ], + spacing: 8, + children: [ + AqiLocationInfoCell( + label: 'Temperature', + value: ' 25°', + svgPath: Assets.aqiTemperature, + ), + AqiLocationInfoCell( + label: 'Humidity', + value: '25%', + svgPath: Assets.aqiHumidity, + ), + AqiLocationInfoCell( + label: 'Air Quality', + value: ' 120', + svgPath: Assets.aqiAirQuality, + ), + ], ), ), ],