Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b2878f6e3 | ||
|
|
d200cad8be |
@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.5.2] - 2026-01-07
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- **Proportional sun/moon arc visualization** - Arc angle now proportional to day/night duration
|
||||||
|
- Day arc: spans (daylight hours / 24) × 360° above horizon
|
||||||
|
- Night arc: spans (night hours / 24) × 360° with moon traversal
|
||||||
|
- Horizon points represent sunrise/sunset times
|
||||||
|
- Gradient colors: yellow/orange for day, blue/indigo for night
|
||||||
|
- **Sun position widget now updates every 10 minutes** - Position aligned to clock intervals (0/10/20/30/40/50)
|
||||||
|
- Converted to StatefulWidget with timer-based updates
|
||||||
|
- Shows default 7am/5pm sunrise/sunset when API data unavailable (asymmetric for visual effect)
|
||||||
|
- Always displays times and daylight duration (no more "--:--")
|
||||||
|
- **Environment widgets consistent height** - All cards maintain same height in "no data" state
|
||||||
|
|
||||||
|
## [1.5.1] - 2026-01-07
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- **Environment widgets layout redesign** - All 4 widgets always visible with responsive layout
|
||||||
|
- Desktop (>900px): 4-in-a-row with 30/20/20/30 width distribution (Sun | Weather | Air Quality | Forecast)
|
||||||
|
- Tablet (600-900px): 2x2 grid layout
|
||||||
|
- Mobile (<600px): Stacked vertically
|
||||||
|
- Widgets now show "No data available" state instead of being hidden or using mock data
|
||||||
|
- Sun position widget now calculates position from system clock
|
||||||
|
- Defaults to 6am/6pm (12-hour day/night cycles) when API sun times unavailable
|
||||||
|
- Environment data refresh interval changed from 5 minutes to 1 hour
|
||||||
|
|
||||||
## [1.5.0] - 2026-01-06
|
## [1.5.0] - 2026-01-06
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 5.3 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 MiB |
@@ -34,9 +34,9 @@ class _DashboardContentState extends ConsumerState<DashboardContent> {
|
|||||||
const Duration(seconds: 30),
|
const Duration(seconds: 30),
|
||||||
(_) => ref.invalidate(systemStatsProvider),
|
(_) => ref.invalidate(systemStatsProvider),
|
||||||
);
|
);
|
||||||
// Refresh environment data every 5 minutes
|
// Refresh environment data every hour
|
||||||
_environmentTimer = Timer.periodic(
|
_environmentTimer = Timer.periodic(
|
||||||
const Duration(minutes: 5),
|
const Duration(hours: 1),
|
||||||
(_) => ref.invalidate(environmentProvider),
|
(_) => ref.invalidate(environmentProvider),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -279,7 +279,12 @@ class _SystemStatsCard extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Environment section displaying sun position, weather, forecast, and air quality.
|
/// Environment section displaying sun position, weather, air quality, and forecast.
|
||||||
|
///
|
||||||
|
/// Layout:
|
||||||
|
/// - Desktop (>900px): 4 widgets in a row - Sun(30%) | Weather(20%) | AirQuality(20%) | Forecast(30%)
|
||||||
|
/// - Tablet (600-900px): 2x2 grid
|
||||||
|
/// - Mobile (<600px): Stacked vertically
|
||||||
class _EnvironmentSection extends StatelessWidget {
|
class _EnvironmentSection extends StatelessWidget {
|
||||||
const _EnvironmentSection({
|
const _EnvironmentSection({
|
||||||
required this.envData,
|
required this.envData,
|
||||||
@@ -293,40 +298,73 @@ class _EnvironmentSection extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return LayoutBuilder(
|
return LayoutBuilder(
|
||||||
builder: (context, constraints) {
|
builder: (context, constraints) {
|
||||||
final isWide = constraints.maxWidth > 600;
|
if (constraints.maxWidth > 900) {
|
||||||
|
// Desktop: 4 in a row (30/20/20/30) - wider widgets on outsides
|
||||||
return Column(
|
return Row(
|
||||||
children: [
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
// Sun Position Widget - prominent at top
|
children: [
|
||||||
SunPositionWidget(sunTimes: envData.sunTimes),
|
Expanded(
|
||||||
const SizedBox(height: 12),
|
flex: 30,
|
||||||
|
child: SunPositionWidget(sunTimes: envData.sunTimes),
|
||||||
// Weather and Forecast side-by-side on wide screens
|
),
|
||||||
if (isWide)
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
flex: 20,
|
||||||
|
child: WeatherWidget(apiData: envData.weather),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
flex: 20,
|
||||||
|
child: AirQualityWidget(apiData: envData.airQuality),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
flex: 30,
|
||||||
|
child: ForecastWidget(forecast: envData.forecast),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
} else if (constraints.maxWidth > 600) {
|
||||||
|
// Tablet: 2x2 grid
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
Row(
|
Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: SunPositionWidget(sunTimes: envData.sunTimes),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
Expanded(child: WeatherWidget(apiData: envData.weather)),
|
Expanded(child: WeatherWidget(apiData: envData.weather)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: AirQualityWidget(apiData: envData.airQuality),
|
||||||
|
),
|
||||||
const SizedBox(width: 12),
|
const SizedBox(width: 12),
|
||||||
Expanded(child: ForecastWidget(forecast: envData.forecast)),
|
Expanded(child: ForecastWidget(forecast: envData.forecast)),
|
||||||
],
|
],
|
||||||
)
|
|
||||||
else
|
|
||||||
Column(
|
|
||||||
children: [
|
|
||||||
WeatherWidget(apiData: envData.weather),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
ForecastWidget(forecast: envData.forecast),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
|
],
|
||||||
// Air Quality - only show if data is available
|
);
|
||||||
if (envData.airQuality != null) ...[
|
} else {
|
||||||
|
// Mobile: stacked vertically
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
SunPositionWidget(sunTimes: envData.sunTimes),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
WeatherWidget(apiData: envData.weather),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
AirQualityWidget(apiData: envData.airQuality),
|
AirQualityWidget(apiData: envData.airQuality),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
ForecastWidget(forecast: envData.forecast),
|
||||||
],
|
],
|
||||||
],
|
);
|
||||||
);
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,10 +28,16 @@ class AirQualityWidget extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
final colorScheme = Theme.of(context).colorScheme;
|
||||||
|
|
||||||
|
// Show "no data" state when no API data and no legacy data
|
||||||
|
if (apiData == null && data == null) {
|
||||||
|
if (compact) {
|
||||||
|
return _buildCompactNoData(context, colorScheme);
|
||||||
|
}
|
||||||
|
return _buildNoData(context, colorScheme);
|
||||||
|
}
|
||||||
|
|
||||||
// Convert API data to local model, or use legacy data
|
// Convert API data to local model, or use legacy data
|
||||||
final aqi = apiData != null
|
final aqi = apiData != null ? _fromApiData(apiData!) : data!;
|
||||||
? _fromApiData(apiData!)
|
|
||||||
: (data ?? AirQualityData.mock());
|
|
||||||
|
|
||||||
if (compact) {
|
if (compact) {
|
||||||
return _buildCompact(context, colorScheme, aqi);
|
return _buildCompact(context, colorScheme, aqi);
|
||||||
@@ -178,6 +184,95 @@ class AirQualityWidget extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget _buildNoData(BuildContext context, ColorScheme colorScheme) {
|
||||||
|
return Card(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
// Header
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.air,
|
||||||
|
size: 20,
|
||||||
|
color: colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'Air Quality',
|
||||||
|
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||||
|
color: colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
// Match height of populated card content area
|
||||||
|
const SizedBox(height: 120),
|
||||||
|
Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.air_outlined,
|
||||||
|
size: 32,
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'No data available',
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 40),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildCompactNoData(BuildContext context, ColorScheme colorScheme) {
|
||||||
|
return Card(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
width: 32,
|
||||||
|
height: 32,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: colorScheme.outline.withValues(alpha: 0.15),
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
),
|
||||||
|
child: Center(
|
||||||
|
child: Text(
|
||||||
|
'--',
|
||||||
|
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'AQI',
|
||||||
|
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _PollutantChip extends StatelessWidget {
|
class _PollutantChip extends StatelessWidget {
|
||||||
|
|||||||
@@ -27,13 +27,50 @@ class ForecastWidget extends StatelessWidget {
|
|||||||
return Card(
|
return Card(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(16),
|
padding: const EdgeInsets.all(16),
|
||||||
child: Center(
|
child: Column(
|
||||||
child: Text(
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
'No forecast data available',
|
mainAxisSize: MainAxisSize.min,
|
||||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
children: [
|
||||||
|
// Header
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.calendar_today,
|
||||||
|
size: 20,
|
||||||
color: colorScheme.onSurfaceVariant,
|
color: colorScheme.onSurfaceVariant,
|
||||||
),
|
),
|
||||||
),
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'Forecast',
|
||||||
|
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||||
|
color: colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
// Match height of populated card content area
|
||||||
|
const SizedBox(height: 120),
|
||||||
|
Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.event_busy_outlined,
|
||||||
|
size: 32,
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'No data available',
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 40),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'dart:async';
|
||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:tatlock_ui/features/front_hall/data/models/environment_model.dart';
|
import 'package:tatlock_ui/features/front_hall/data/models/environment_model.dart';
|
||||||
@@ -9,7 +10,11 @@ import 'package:tatlock_ui/features/front_hall/data/models/environment_model.dar
|
|||||||
/// - Blue tones for night
|
/// - Blue tones for night
|
||||||
/// - Orange tones for sunrise/sunset
|
/// - Orange tones for sunrise/sunset
|
||||||
/// - Yellow tones for daytime
|
/// - Yellow tones for daytime
|
||||||
class SunPositionWidget extends StatelessWidget {
|
///
|
||||||
|
/// Position updates every 10 minutes based on system clock.
|
||||||
|
/// When sun times are unavailable, assumes 12-hour day/night cycles
|
||||||
|
/// (6am sunrise, 6pm sunset).
|
||||||
|
class SunPositionWidget extends StatefulWidget {
|
||||||
const SunPositionWidget({
|
const SunPositionWidget({
|
||||||
super.key,
|
super.key,
|
||||||
this.sunTimes,
|
this.sunTimes,
|
||||||
@@ -22,11 +27,71 @@ class SunPositionWidget extends StatelessWidget {
|
|||||||
/// Whether to use compact layout.
|
/// Whether to use compact layout.
|
||||||
final bool compact;
|
final bool compact;
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<SunPositionWidget> createState() => _SunPositionWidgetState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _SunPositionWidgetState extends State<SunPositionWidget> {
|
||||||
|
Timer? _positionTimer;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_scheduleNextUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Schedule update at next 10-minute wall clock mark (0/10/20/30/40/50)
|
||||||
|
void _scheduleNextUpdate() {
|
||||||
|
final now = DateTime.now();
|
||||||
|
final currentMinute = now.minute;
|
||||||
|
// Calculate minutes until next 10-minute mark
|
||||||
|
final minutesUntilNext = 10 - (currentMinute % 10);
|
||||||
|
final secondsUntilNext = (minutesUntilNext * 60) - now.second;
|
||||||
|
|
||||||
|
_positionTimer = Timer(
|
||||||
|
Duration(seconds: secondsUntilNext),
|
||||||
|
() {
|
||||||
|
if (mounted) {
|
||||||
|
setState(() {});
|
||||||
|
_scheduleNextUpdate();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_positionTimer?.cancel();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get sunrise time, defaulting to 7am if not available (asymmetric for visual effect)
|
||||||
|
DateTime get _sunrise {
|
||||||
|
final now = DateTime.now();
|
||||||
|
return widget.sunTimes?.sunrise ?? DateTime(now.year, now.month, now.day, 7, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get sunset time, defaulting to 5pm if not available (asymmetric for visual effect)
|
||||||
|
DateTime get _sunset {
|
||||||
|
final now = DateTime.now();
|
||||||
|
return widget.sunTimes?.sunset ?? DateTime(now.year, now.month, now.day, 17, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Calculate daylight minutes from sunrise/sunset
|
||||||
|
int get _daylightMinutes {
|
||||||
|
return _sunset.difference(_sunrise).inMinutes;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool get _isDaytime {
|
||||||
|
final now = DateTime.now();
|
||||||
|
return now.isAfter(_sunrise) && now.isBefore(_sunset);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
final colorScheme = Theme.of(context).colorScheme;
|
||||||
|
|
||||||
if (compact) {
|
if (widget.compact) {
|
||||||
return _buildCompact(context, colorScheme);
|
return _buildCompact(context, colorScheme);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +127,7 @@ class SunPositionWidget extends StatelessWidget {
|
|||||||
child: CustomPaint(
|
child: CustomPaint(
|
||||||
size: const Size(double.infinity, 120),
|
size: const Size(double.infinity, 120),
|
||||||
painter: _SunArcPainter(
|
painter: _SunArcPainter(
|
||||||
sunTimes: sunTimes,
|
sunTimes: widget.sunTimes,
|
||||||
isDark: colorScheme.brightness == Brightness.dark,
|
isDark: colorScheme.brightness == Brightness.dark,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -77,15 +142,14 @@ class SunPositionWidget extends StatelessWidget {
|
|||||||
_TimeDisplay(
|
_TimeDisplay(
|
||||||
icon: Icons.wb_twilight,
|
icon: Icons.wb_twilight,
|
||||||
label: 'Sunrise',
|
label: 'Sunrise',
|
||||||
time: sunTimes?.sunrise,
|
time: _sunrise,
|
||||||
iconColor: Colors.orange,
|
iconColor: Colors.orange,
|
||||||
),
|
),
|
||||||
if (sunTimes?.daylightMinutes != null)
|
_DaylightDisplay(minutes: _daylightMinutes),
|
||||||
_DaylightDisplay(minutes: sunTimes!.daylightMinutes!),
|
|
||||||
_TimeDisplay(
|
_TimeDisplay(
|
||||||
icon: Icons.nights_stay,
|
icon: Icons.nights_stay,
|
||||||
label: 'Sunset',
|
label: 'Sunset',
|
||||||
time: sunTimes?.sunset,
|
time: _sunset,
|
||||||
iconColor: Colors.deepOrange,
|
iconColor: Colors.deepOrange,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -114,11 +178,11 @@ class SunPositionWidget extends StatelessWidget {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
_formatTime(sunTimes?.sunrise),
|
_formatTime(_sunrise),
|
||||||
style: Theme.of(context).textTheme.labelSmall,
|
style: Theme.of(context).textTheme.labelSmall,
|
||||||
),
|
),
|
||||||
Text(
|
Text(
|
||||||
_formatTime(sunTimes?.sunset),
|
_formatTime(_sunset),
|
||||||
style: Theme.of(context).textTheme.labelSmall,
|
style: Theme.of(context).textTheme.labelSmall,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -129,14 +193,7 @@ class SunPositionWidget extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get _isDaytime {
|
String _formatTime(DateTime time) {
|
||||||
if (sunTimes?.sunrise == null || sunTimes?.sunset == null) return true;
|
|
||||||
final now = DateTime.now();
|
|
||||||
return now.isAfter(sunTimes!.sunrise!) && now.isBefore(sunTimes!.sunset!);
|
|
||||||
}
|
|
||||||
|
|
||||||
String _formatTime(DateTime? time) {
|
|
||||||
if (time == null) return '--:--';
|
|
||||||
return '${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}';
|
return '${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -151,7 +208,7 @@ class _TimeDisplay extends StatelessWidget {
|
|||||||
|
|
||||||
final IconData icon;
|
final IconData icon;
|
||||||
final String label;
|
final String label;
|
||||||
final DateTime? time;
|
final DateTime time;
|
||||||
final Color? iconColor;
|
final Color? iconColor;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -167,7 +224,7 @@ class _TimeDisplay extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
Text(
|
Text(
|
||||||
_formatTime(time),
|
'${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}',
|
||||||
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
),
|
),
|
||||||
@@ -181,11 +238,6 @@ class _TimeDisplay extends StatelessWidget {
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
String _formatTime(DateTime? time) {
|
|
||||||
if (time == null) return '--:--';
|
|
||||||
return '${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class _DaylightDisplay extends StatelessWidget {
|
class _DaylightDisplay extends StatelessWidget {
|
||||||
@@ -224,6 +276,11 @@ class _DaylightDisplay extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Custom painter for the sun arc visualization.
|
/// Custom painter for the sun arc visualization.
|
||||||
|
///
|
||||||
|
/// The arc is proportional to the day/night duration:
|
||||||
|
/// - During day: shows a day arc spanning (daylight hours / 24) × 360°
|
||||||
|
/// - During night: shows a night arc spanning (night hours / 24) × 360°
|
||||||
|
/// - Horizon points (left/right) represent sunrise/sunset times
|
||||||
class _SunArcPainter extends CustomPainter {
|
class _SunArcPainter extends CustomPainter {
|
||||||
_SunArcPainter({
|
_SunArcPainter({
|
||||||
this.sunTimes,
|
this.sunTimes,
|
||||||
@@ -241,9 +298,28 @@ class _SunArcPainter extends CustomPainter {
|
|||||||
static const _dayGold = Color(0xFFffb300);
|
static const _dayGold = Color(0xFFffb300);
|
||||||
static const _duskOrange = Color(0xFFef6c00);
|
static const _duskOrange = Color(0xFFef6c00);
|
||||||
static const _nightIndigo = Color(0xFF283593);
|
static const _nightIndigo = Color(0xFF283593);
|
||||||
|
static const _moonSilver = Color(0xFFB0BEC5);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void paint(Canvas canvas, Size size) {
|
void paint(Canvas canvas, Size size) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
|
||||||
|
// Get sunrise/sunset times (default to 7am/5pm for asymmetric visual)
|
||||||
|
final sunrise = sunTimes?.sunrise ?? DateTime(now.year, now.month, now.day, 7, 0);
|
||||||
|
final sunset = sunTimes?.sunset ?? DateTime(now.year, now.month, now.day, 17, 0);
|
||||||
|
|
||||||
|
// Calculate durations
|
||||||
|
final daylightMinutes = sunset.difference(sunrise).inMinutes;
|
||||||
|
final nightMinutes = 1440 - daylightMinutes; // 24 hours = 1440 minutes
|
||||||
|
|
||||||
|
// Determine if currently day or night
|
||||||
|
final isDaytime = now.isAfter(sunrise) && now.isBefore(sunset);
|
||||||
|
|
||||||
|
// Calculate arc angles (proportional to duration)
|
||||||
|
// Day arc sweeps upward (above horizon), night arc sweeps downward
|
||||||
|
final dayArcAngle = (daylightMinutes / 1440) * 2 * math.pi;
|
||||||
|
final nightArcAngle = (nightMinutes / 1440) * 2 * math.pi;
|
||||||
|
|
||||||
final center = Offset(size.width / 2, size.height - 10);
|
final center = Offset(size.width / 2, size.height - 10);
|
||||||
final radius = math.min(size.width / 2 - 20, size.height - 30);
|
final radius = math.min(size.width / 2 - 20, size.height - 30);
|
||||||
|
|
||||||
@@ -257,182 +333,225 @@ class _SunArcPainter extends CustomPainter {
|
|||||||
horizonPaint,
|
horizonPaint,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Create gradient for arc background
|
|
||||||
final arcRect = Rect.fromCenter(
|
final arcRect = Rect.fromCenter(
|
||||||
center: center,
|
center: center,
|
||||||
width: radius * 2,
|
width: radius * 2,
|
||||||
height: radius * 2,
|
height: radius * 2,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Draw arc background (night portion below horizon implied)
|
if (isDaytime) {
|
||||||
final arcBgPaint = Paint()
|
_drawDayArc(canvas, arcRect, center, radius, dayArcAngle, now, sunrise, sunset);
|
||||||
|
} else {
|
||||||
|
_drawNightArc(canvas, arcRect, center, radius, nightArcAngle, now, sunrise, sunset);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw sunrise/sunset time labels at horizon points
|
||||||
|
_drawHorizonLabels(canvas, center, radius, sunrise, sunset);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _drawDayArc(
|
||||||
|
Canvas canvas,
|
||||||
|
Rect arcRect,
|
||||||
|
Offset center,
|
||||||
|
double radius,
|
||||||
|
double arcAngle,
|
||||||
|
DateTime now,
|
||||||
|
DateTime sunrise,
|
||||||
|
DateTime sunset,
|
||||||
|
) {
|
||||||
|
// Day arc: starts at left horizon, sweeps upward
|
||||||
|
// Arc starts at π (left) and sweeps toward 0 (right)
|
||||||
|
// But the sweep angle is proportional to daylight duration
|
||||||
|
final startAngle = math.pi;
|
||||||
|
final sweepAngle = arcAngle.clamp(0.0, math.pi); // Cap at semicircle for visual
|
||||||
|
|
||||||
|
// Draw arc background with day gradient
|
||||||
|
final arcPaint = Paint()
|
||||||
..style = PaintingStyle.stroke
|
..style = PaintingStyle.stroke
|
||||||
..strokeWidth = 8
|
..strokeWidth = 8
|
||||||
..strokeCap = StrokeCap.round;
|
..strokeCap = StrokeCap.round
|
||||||
|
..shader = SweepGradient(
|
||||||
|
center: Alignment.center,
|
||||||
|
startAngle: 0,
|
||||||
|
endAngle: 2 * math.pi,
|
||||||
|
colors: [
|
||||||
|
_dawnOrange.withValues(alpha: 0.6),
|
||||||
|
_sunriseOrange.withValues(alpha: 0.7),
|
||||||
|
_dayYellow.withValues(alpha: 0.8),
|
||||||
|
_dayGold.withValues(alpha: 0.8),
|
||||||
|
_dayYellow.withValues(alpha: 0.7),
|
||||||
|
_duskOrange.withValues(alpha: 0.6),
|
||||||
|
],
|
||||||
|
stops: const [0.0, 0.15, 0.4, 0.6, 0.85, 1.0],
|
||||||
|
transform: const GradientRotation(math.pi),
|
||||||
|
).createShader(arcRect);
|
||||||
|
|
||||||
// Create gradient that transitions through time of day colors
|
canvas.drawArc(arcRect, startAngle, sweepAngle, false, arcPaint);
|
||||||
arcBgPaint.shader = SweepGradient(
|
|
||||||
center: Alignment.bottomCenter,
|
|
||||||
startAngle: math.pi,
|
|
||||||
endAngle: 2 * math.pi,
|
|
||||||
colors: [
|
|
||||||
_nightBlue.withValues(alpha: 0.3),
|
|
||||||
_dawnOrange.withValues(alpha: 0.5),
|
|
||||||
_sunriseOrange.withValues(alpha: 0.6),
|
|
||||||
_dayYellow.withValues(alpha: 0.7),
|
|
||||||
_dayGold.withValues(alpha: 0.7),
|
|
||||||
_dayYellow.withValues(alpha: 0.6),
|
|
||||||
_duskOrange.withValues(alpha: 0.5),
|
|
||||||
_nightIndigo.withValues(alpha: 0.3),
|
|
||||||
],
|
|
||||||
stops: const [0.0, 0.1, 0.2, 0.4, 0.5, 0.6, 0.8, 1.0],
|
|
||||||
transform: const GradientRotation(-math.pi / 2),
|
|
||||||
).createShader(arcRect);
|
|
||||||
|
|
||||||
// Draw the arc (semicircle from left to right)
|
// Calculate sun position along the arc
|
||||||
canvas.drawArc(
|
|
||||||
arcRect,
|
|
||||||
math.pi, // Start at left (180 degrees)
|
|
||||||
math.pi, // Sweep 180 degrees (semicircle)
|
|
||||||
false,
|
|
||||||
arcBgPaint,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Calculate sun position
|
|
||||||
final sunPosition = _calculateSunPosition();
|
|
||||||
|
|
||||||
// Draw sun/moon indicator
|
|
||||||
final angle = math.pi + (sunPosition * math.pi); // Map 0-1 to pi-2pi
|
|
||||||
final sunX = center.dx + radius * math.cos(angle);
|
|
||||||
final sunY = center.dy + radius * math.sin(angle);
|
|
||||||
|
|
||||||
// Determine if day or night for icon/color
|
|
||||||
final isDaytime = sunPosition > 0 && sunPosition < 1;
|
|
||||||
final isNearHorizon = sunPosition < 0.15 || sunPosition > 0.85;
|
|
||||||
|
|
||||||
// Sun/moon glow
|
|
||||||
if (isDaytime) {
|
|
||||||
final glowColor = isNearHorizon ? _dawnOrange : _dayYellow;
|
|
||||||
final glowPaint = Paint()
|
|
||||||
..shader = RadialGradient(
|
|
||||||
colors: [
|
|
||||||
glowColor.withValues(alpha: 0.6),
|
|
||||||
glowColor.withValues(alpha: 0.0),
|
|
||||||
],
|
|
||||||
).createShader(
|
|
||||||
Rect.fromCircle(center: Offset(sunX, sunY), radius: 24),
|
|
||||||
);
|
|
||||||
canvas.drawCircle(Offset(sunX, sunY), 24, glowPaint);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sun/moon circle
|
|
||||||
final sunPaint = Paint()
|
|
||||||
..style = PaintingStyle.fill
|
|
||||||
..color = isDaytime
|
|
||||||
? (isNearHorizon ? _sunriseOrange : _dayYellow)
|
|
||||||
: _nightIndigo;
|
|
||||||
|
|
||||||
canvas.drawCircle(Offset(sunX, sunY), 12, sunPaint);
|
|
||||||
|
|
||||||
// Sun rays or moon craters
|
|
||||||
if (isDaytime) {
|
|
||||||
final rayPaint = Paint()
|
|
||||||
..style = PaintingStyle.stroke
|
|
||||||
..strokeWidth = 2
|
|
||||||
..color = (isNearHorizon ? _dawnOrange : _dayGold).withValues(alpha: 0.8);
|
|
||||||
|
|
||||||
for (var i = 0; i < 8; i++) {
|
|
||||||
final rayAngle = (i * math.pi / 4);
|
|
||||||
final innerRadius = 14.0;
|
|
||||||
final outerRadius = 18.0;
|
|
||||||
canvas.drawLine(
|
|
||||||
Offset(
|
|
||||||
sunX + innerRadius * math.cos(rayAngle),
|
|
||||||
sunY + innerRadius * math.sin(rayAngle),
|
|
||||||
),
|
|
||||||
Offset(
|
|
||||||
sunX + outerRadius * math.cos(rayAngle),
|
|
||||||
sunY + outerRadius * math.sin(rayAngle),
|
|
||||||
),
|
|
||||||
rayPaint,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Moon highlight
|
|
||||||
final moonHighlight = Paint()
|
|
||||||
..style = PaintingStyle.fill
|
|
||||||
..color = Colors.white24;
|
|
||||||
canvas.drawCircle(Offset(sunX - 3, sunY - 3), 4, moonHighlight);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw time markers on arc
|
|
||||||
_drawTimeMarkers(canvas, center, radius);
|
|
||||||
}
|
|
||||||
|
|
||||||
double _calculateSunPosition() {
|
|
||||||
if (sunTimes?.sunrise == null || sunTimes?.sunset == null) {
|
|
||||||
// Default to noon position
|
|
||||||
return 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
final now = DateTime.now();
|
|
||||||
final sunrise = sunTimes!.sunrise!;
|
|
||||||
final sunset = sunTimes!.sunset!;
|
|
||||||
|
|
||||||
// Before sunrise
|
|
||||||
if (now.isBefore(sunrise)) {
|
|
||||||
// Calculate position in pre-dawn (negative values = below horizon)
|
|
||||||
final midnight = DateTime(now.year, now.month, now.day);
|
|
||||||
final minutesSinceMidnight = now.difference(midnight).inMinutes;
|
|
||||||
final minutesToSunrise = sunrise.difference(midnight).inMinutes;
|
|
||||||
// Map to 0 at sunrise, negative before
|
|
||||||
return (minutesSinceMidnight / minutesToSunrise) * 0.15 - 0.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// After sunset
|
|
||||||
if (now.isAfter(sunset)) {
|
|
||||||
// Calculate position in post-dusk
|
|
||||||
final minutesSinceSunset = now.difference(sunset).inMinutes;
|
|
||||||
final nextMidnight = DateTime(now.year, now.month, now.day + 1);
|
|
||||||
final minutesToMidnight = nextMidnight.difference(sunset).inMinutes;
|
|
||||||
// Map to 1 at sunset, going towards negative
|
|
||||||
return 1.0 + (minutesSinceSunset / minutesToMidnight) * 0.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// During daylight hours
|
|
||||||
final totalDaylight = sunset.difference(sunrise).inMinutes;
|
final totalDaylight = sunset.difference(sunrise).inMinutes;
|
||||||
final minutesSinceSunrise = now.difference(sunrise).inMinutes;
|
final minutesSinceSunrise = now.difference(sunrise).inMinutes;
|
||||||
return minutesSinceSunrise / totalDaylight;
|
final progress = (minutesSinceSunrise / totalDaylight).clamp(0.0, 1.0);
|
||||||
|
|
||||||
|
// Map progress to angle along the arc
|
||||||
|
final sunAngle = startAngle + (progress * sweepAngle);
|
||||||
|
final sunX = center.dx + radius * math.cos(sunAngle);
|
||||||
|
final sunY = center.dy + radius * math.sin(sunAngle);
|
||||||
|
|
||||||
|
// Determine sun color based on position (orange near horizon, yellow at peak)
|
||||||
|
final isNearHorizon = progress < 0.15 || progress > 0.85;
|
||||||
|
final sunColor = isNearHorizon ? _sunriseOrange : _dayYellow;
|
||||||
|
final glowColor = isNearHorizon ? _dawnOrange : _dayYellow;
|
||||||
|
|
||||||
|
// Draw sun glow
|
||||||
|
final glowPaint = Paint()
|
||||||
|
..shader = RadialGradient(
|
||||||
|
colors: [
|
||||||
|
glowColor.withValues(alpha: 0.6),
|
||||||
|
glowColor.withValues(alpha: 0.0),
|
||||||
|
],
|
||||||
|
).createShader(Rect.fromCircle(center: Offset(sunX, sunY), radius: 24));
|
||||||
|
canvas.drawCircle(Offset(sunX, sunY), 24, glowPaint);
|
||||||
|
|
||||||
|
// Draw sun
|
||||||
|
final sunPaint = Paint()
|
||||||
|
..style = PaintingStyle.fill
|
||||||
|
..color = sunColor;
|
||||||
|
canvas.drawCircle(Offset(sunX, sunY), 12, sunPaint);
|
||||||
|
|
||||||
|
// Draw sun rays
|
||||||
|
final rayPaint = Paint()
|
||||||
|
..style = PaintingStyle.stroke
|
||||||
|
..strokeWidth = 2
|
||||||
|
..color = (isNearHorizon ? _dawnOrange : _dayGold).withValues(alpha: 0.8);
|
||||||
|
|
||||||
|
for (var i = 0; i < 8; i++) {
|
||||||
|
final rayAngle = (i * math.pi / 4);
|
||||||
|
canvas.drawLine(
|
||||||
|
Offset(sunX + 14 * math.cos(rayAngle), sunY + 14 * math.sin(rayAngle)),
|
||||||
|
Offset(sunX + 18 * math.cos(rayAngle), sunY + 18 * math.sin(rayAngle)),
|
||||||
|
rayPaint,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _drawTimeMarkers(Canvas canvas, Offset center, double radius) {
|
void _drawNightArc(
|
||||||
|
Canvas canvas,
|
||||||
|
Rect arcRect,
|
||||||
|
Offset center,
|
||||||
|
double radius,
|
||||||
|
double arcAngle,
|
||||||
|
DateTime now,
|
||||||
|
DateTime sunrise,
|
||||||
|
DateTime sunset,
|
||||||
|
) {
|
||||||
|
// Night arc: sweeps below the horizon (or shown inverted above)
|
||||||
|
// For visual clarity, we show it as an arc above horizon but with night colors
|
||||||
|
final startAngle = math.pi;
|
||||||
|
final sweepAngle = arcAngle.clamp(0.0, math.pi); // Cap at semicircle
|
||||||
|
|
||||||
|
// Draw arc background with night gradient
|
||||||
|
final arcPaint = Paint()
|
||||||
|
..style = PaintingStyle.stroke
|
||||||
|
..strokeWidth = 8
|
||||||
|
..strokeCap = StrokeCap.round
|
||||||
|
..shader = SweepGradient(
|
||||||
|
center: Alignment.center,
|
||||||
|
startAngle: 0,
|
||||||
|
endAngle: 2 * math.pi,
|
||||||
|
colors: [
|
||||||
|
_duskOrange.withValues(alpha: 0.4),
|
||||||
|
_nightIndigo.withValues(alpha: 0.5),
|
||||||
|
_nightBlue.withValues(alpha: 0.6),
|
||||||
|
_nightBlue.withValues(alpha: 0.6),
|
||||||
|
_nightIndigo.withValues(alpha: 0.5),
|
||||||
|
_dawnOrange.withValues(alpha: 0.4),
|
||||||
|
],
|
||||||
|
stops: const [0.0, 0.15, 0.4, 0.6, 0.85, 1.0],
|
||||||
|
transform: const GradientRotation(math.pi),
|
||||||
|
).createShader(arcRect);
|
||||||
|
|
||||||
|
canvas.drawArc(arcRect, startAngle, sweepAngle, false, arcPaint);
|
||||||
|
|
||||||
|
// Calculate moon position
|
||||||
|
// Night spans from sunset to next sunrise
|
||||||
|
final double progress;
|
||||||
|
if (now.isAfter(sunset)) {
|
||||||
|
// After sunset: progress from sunset toward midnight and beyond
|
||||||
|
final nextSunrise = DateTime(now.year, now.month, now.day + 1, sunrise.hour, sunrise.minute);
|
||||||
|
final nightDuration = nextSunrise.difference(sunset).inMinutes;
|
||||||
|
final minutesSinceSunset = now.difference(sunset).inMinutes;
|
||||||
|
progress = (minutesSinceSunset / nightDuration).clamp(0.0, 1.0);
|
||||||
|
} else {
|
||||||
|
// Before sunrise: progress toward sunrise
|
||||||
|
final prevSunset = DateTime(now.year, now.month, now.day - 1, sunset.hour, sunset.minute);
|
||||||
|
final nightDuration = sunrise.difference(prevSunset).inMinutes;
|
||||||
|
final minutesSincePrevSunset = now.difference(prevSunset).inMinutes;
|
||||||
|
progress = (minutesSincePrevSunset / nightDuration).clamp(0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Map progress to angle along the arc
|
||||||
|
final moonAngle = startAngle + (progress * sweepAngle);
|
||||||
|
final moonX = center.dx + radius * math.cos(moonAngle);
|
||||||
|
final moonY = center.dy + radius * math.sin(moonAngle);
|
||||||
|
|
||||||
|
// Draw moon glow
|
||||||
|
final glowPaint = Paint()
|
||||||
|
..shader = RadialGradient(
|
||||||
|
colors: [
|
||||||
|
_moonSilver.withValues(alpha: 0.3),
|
||||||
|
_moonSilver.withValues(alpha: 0.0),
|
||||||
|
],
|
||||||
|
).createShader(Rect.fromCircle(center: Offset(moonX, moonY), radius: 20));
|
||||||
|
canvas.drawCircle(Offset(moonX, moonY), 20, glowPaint);
|
||||||
|
|
||||||
|
// Draw moon
|
||||||
|
final moonPaint = Paint()
|
||||||
|
..style = PaintingStyle.fill
|
||||||
|
..color = _moonSilver;
|
||||||
|
canvas.drawCircle(Offset(moonX, moonY), 10, moonPaint);
|
||||||
|
|
||||||
|
// Draw crescent shadow for moon effect
|
||||||
|
final shadowPaint = Paint()
|
||||||
|
..style = PaintingStyle.fill
|
||||||
|
..color = _nightBlue.withValues(alpha: 0.7);
|
||||||
|
canvas.drawCircle(Offset(moonX + 4, moonY - 2), 8, shadowPaint);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _drawHorizonLabels(
|
||||||
|
Canvas canvas,
|
||||||
|
Offset center,
|
||||||
|
double radius,
|
||||||
|
DateTime sunrise,
|
||||||
|
DateTime sunset,
|
||||||
|
) {
|
||||||
final textPainter = TextPainter(
|
final textPainter = TextPainter(
|
||||||
textDirection: TextDirection.ltr,
|
textDirection: TextDirection.ltr,
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
);
|
);
|
||||||
|
|
||||||
final markerStyle = TextStyle(
|
final labelStyle = TextStyle(
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
color: isDark ? Colors.white38 : Colors.black38,
|
color: isDark ? Colors.white38 : Colors.black38,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Draw quarter markers (6am, 12pm, 6pm positions conceptually)
|
// Sunrise label (left horizon point)
|
||||||
final markers = ['6:00', '12:00', '18:00'];
|
final sunriseText = '${sunrise.hour.toString().padLeft(2, '0')}:${sunrise.minute.toString().padLeft(2, '0')}';
|
||||||
final positions = [0.25, 0.5, 0.75];
|
textPainter.text = TextSpan(text: sunriseText, style: labelStyle);
|
||||||
|
textPainter.layout();
|
||||||
|
textPainter.paint(
|
||||||
|
canvas,
|
||||||
|
Offset(center.dx - radius - textPainter.width / 2, center.dy + 5),
|
||||||
|
);
|
||||||
|
|
||||||
for (var i = 0; i < markers.length; i++) {
|
// Sunset label (right horizon point)
|
||||||
final angle = math.pi + (positions[i] * math.pi);
|
final sunsetText = '${sunset.hour.toString().padLeft(2, '0')}:${sunset.minute.toString().padLeft(2, '0')}';
|
||||||
final markerRadius = radius + 15;
|
textPainter.text = TextSpan(text: sunsetText, style: labelStyle);
|
||||||
final x = center.dx + markerRadius * math.cos(angle);
|
textPainter.layout();
|
||||||
final y = center.dy + markerRadius * math.sin(angle);
|
textPainter.paint(
|
||||||
|
canvas,
|
||||||
textPainter.text = TextSpan(text: markers[i], style: markerStyle);
|
Offset(center.dx + radius - textPainter.width / 2, center.dy + 5),
|
||||||
textPainter.layout();
|
);
|
||||||
textPainter.paint(
|
|
||||||
canvas,
|
|
||||||
Offset(x - textPainter.width / 2, y - textPainter.height / 2),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -26,10 +26,16 @@ class WeatherWidget extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
final colorScheme = Theme.of(context).colorScheme;
|
||||||
|
|
||||||
|
// Show "no data" state when no API data and no legacy data
|
||||||
|
if (apiData == null && data == null) {
|
||||||
|
if (compact) {
|
||||||
|
return _buildCompactNoData(context, colorScheme);
|
||||||
|
}
|
||||||
|
return _buildNoData(context, colorScheme);
|
||||||
|
}
|
||||||
|
|
||||||
// Convert API data to local model, or use legacy data
|
// Convert API data to local model, or use legacy data
|
||||||
final weather = apiData != null
|
final weather = apiData != null ? _fromApiData(apiData!) : data!;
|
||||||
? _fromApiData(apiData!)
|
|
||||||
: (data ?? WeatherData.mock());
|
|
||||||
|
|
||||||
if (compact) {
|
if (compact) {
|
||||||
return _buildCompact(context, colorScheme, weather);
|
return _buildCompact(context, colorScheme, weather);
|
||||||
@@ -180,6 +186,84 @@ class WeatherWidget extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget _buildNoData(BuildContext context, ColorScheme colorScheme) {
|
||||||
|
return Card(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
// Header
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.wb_sunny_outlined,
|
||||||
|
size: 20,
|
||||||
|
color: colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'Weather',
|
||||||
|
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||||
|
color: colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
// Match height of populated card content area
|
||||||
|
const SizedBox(height: 120),
|
||||||
|
Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.cloud_off_outlined,
|
||||||
|
size: 32,
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'No data available',
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 40),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildCompactNoData(BuildContext context, ColorScheme colorScheme) {
|
||||||
|
return Card(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.cloud_off_outlined,
|
||||||
|
size: 24,
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'--',
|
||||||
|
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||||
|
color: colorScheme.outline,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _DetailChip extends StatelessWidget {
|
class _DetailChip extends StatelessWidget {
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 1.5.0+1
|
version: 1.5.2+1
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.10.4
|
sdk: ^3.10.4
|
||||||
|
|||||||
@@ -89,7 +89,8 @@ void main() {
|
|||||||
expect(find.text('Air Quality'), findsOneWidget);
|
expect(find.text('Air Quality'), findsOneWidget);
|
||||||
});
|
});
|
||||||
|
|
||||||
testWidgets('hides Air Quality widget when no data', (tester) async {
|
testWidgets('shows Air Quality widget with no data state when data unavailable',
|
||||||
|
(tester) async {
|
||||||
await setLargeWindowSize(tester);
|
await setLargeWindowSize(tester);
|
||||||
harness.givenAuthenticatedUser();
|
harness.givenAuthenticatedUser();
|
||||||
harness.givenQuickLinks();
|
harness.givenQuickLinks();
|
||||||
@@ -99,8 +100,9 @@ void main() {
|
|||||||
await tester.pumpWidget(harness.wrap(const FrontHallPage()));
|
await tester.pumpWidget(harness.wrap(const FrontHallPage()));
|
||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
// Air Quality widget should not be present
|
// Air Quality widget should still be present, showing "no data" state
|
||||||
expect(find.byType(AirQualityWidget), findsNothing);
|
expect(find.byType(AirQualityWidget), findsOneWidget);
|
||||||
|
expect(find.text('Air Quality'), findsOneWidget);
|
||||||
});
|
});
|
||||||
|
|
||||||
testWidgets('calls environment API on mount', (tester) async {
|
testWidgets('calls environment API on mount', (tester) async {
|
||||||
|
|||||||
Reference in New Issue
Block a user