Compare commits

..
8 Commits
Author SHA1 Message Date
Jeroen SchweitzerandClaude Opus 4.5 a376482cd1 feat: align horizon line at 50px across all environment widgets
Build and Push / release (push) Successful in 3s
Build and Push / build (push) Successful in 3m24s
- Weather/Air Quality dividers align with Sun Position horizon
- Forecast card bottoms align with same horizon line
- Unified visual rhythm across all cards

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-08 19:50:13 +01:00
Jeroen SchweitzerandClaude Opus 4.5 f31967aa3e feat: bottom-aligned widgets and wind direction
Build and Push / release (push) Successful in 2s
Build and Push / build (push) Successful in 3m27s
- All environment widgets align content from bottom for visual harmony
- Wind chip now shows direction (e.g., "SE 14 km/h")

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-08 19:10:24 +01:00
Jeroen SchweitzerandClaude Opus 4.5 780edd2d3b fix: environment widget alignment and sun position night labels
Build and Push / release (push) Successful in 3s
Build and Push / build (push) Successful in 3m27s
- Consistent 170px minHeight across Weather, Air Quality, Forecast widgets
- Swap sunrise/sunset labels at night to match arc direction
- Weather header shows "Weather" instead of location

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-08 18:52:27 +01:00
Jeroen SchweitzerandClaude Opus 4.5 eefb491e87 fix: log environment API user only once per session
Build and Push / release (push) Successful in 3s
Build and Push / build (push) Successful in 3m11s
- Store user in static variable for reuse
- Only debugPrint on first successful load

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-07 15:40:06 +01:00
Jeroen SchweitzerandClaude Opus 4.5 9b2000efc2 fix: sun position arc overflow and revert user display
Build and Push / release (push) Successful in 3s
Build and Push / build (push) Successful in 3m14s
- Constrain arc height to fit within card boundaries
- Scale radius down when arc would overflow on wider displays
- Revert user display in section header, use debugPrint instead

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-07 15:26:51 +01:00
Jeroen SchweitzerandClaude Opus 4.5 cc6068b759 chore: release v1.5.4
Build and Push / release (push) Successful in 2s
Build and Push / build (push) Successful in 3m9s
Add user display in environment section header for debugging OIDC
user resolution issues.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-07 14:05:16 +01:00
Jeroen SchweitzerandClaude Opus 4.5 9a75fb25db feat(sun-position): redesign arc to touch horizon at endpoints
Build and Push / release (push) Successful in 23s
Build and Push / build (push) Successful in 3m13s
- Arc geometry now uses chord-radius calculation for proper horizon intersection
- Sunrise/sunset icons integrated at horizon endpoints (removed duplicate labels)
- Daylight duration centered below arc
- Increased all environment card heights 20% (140px → 170px) for better arc visibility
- Visual balance: sunrise/sunset raised 10px, daylight at bottom

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-07 13:29:56 +01:00
Jeroen SchweitzerandClaude Opus 4.5 9b2878f6e3 feat(sun-position): add proportional arc visualization with 10-min updates
Build and Push / release (push) Successful in 3s
Build and Push / build (push) Successful in 3m12s
- Arc angle now proportional to day/night duration (day = daylight/24 × 360°)
- Horizon points represent sunrise/sunset times
- Day arc with sun icon and yellow/orange gradient
- Night arc with moon icon and blue/indigo gradient
- Position updates every 10 minutes aligned to clock (0/10/20/30/40/50)
- Default to 07:00-17:00 when API data unavailable (asymmetric for visual effect)
- All environment cards maintain consistent height in "no data" state

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-07 12:06:17 +01:00
7 changed files with 800 additions and 422 deletions
+88
View File
@@ -7,6 +7,94 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [1.5.9] - 2026-01-08
### Changed
- **Aligned horizon line across all widgets** - Consistent visual baseline at 50px from bottom
- Weather and Air Quality dividers now align with Sun Position horizon line
- Forecast card bottoms align with the same horizon
- Creates unified visual rhythm across all environment cards
## [1.5.8] - 2026-01-08
### Changed
- **Bottom-aligned widget content** - All environment widgets now align content from the bottom
- Creates consistent visual baseline across Sun Position, Weather, Air Quality, and Forecast cards
- Footers (weather details, pollutants) sit at the same level across cards
### Added
- **Wind direction in Weather** - Wind chip now shows direction (e.g., "SE 14 km/h")
## [1.5.7] - 2026-01-08
### Fixed
- **Environment widget alignment** - Consistent card heights across all environment widgets
- Added `ConstrainedBox(minHeight: 170)` to Weather, Air Quality, and Forecast widgets
- All cards now match Sun Position widget height when displaying data
- **Sun position night labels** - Swap sunrise/sunset labels at night
- During day: Sunrise on left, Sunset on right (day arc)
- At night: Sunset on left, Sunrise on right (night arc)
### Changed
- **Weather widget header** - Changed from location name to "Weather" for consistency
- Location now displayed in content area below temperature
## [1.5.6] - 2026-01-07
### Changed
- **Environment user logging** - Now logs API user only once per session instead of on every refresh
## [1.5.5] - 2026-01-07
### Fixed
- **Sun position arc overflow** - Arc now constrained to fit within card boundaries
- Prevents arc and sun/moon from overflowing on wider displays
- Scales radius down when arc height exceeds available space
### Added
- **Debug logging for environment user** - Logs authenticated user on environment data load
## [1.5.4] - 2026-01-07
### Added
- User display in environment section header (reverted in 1.5.5)
## [1.5.3] - 2026-01-07
### Changed
- **Sun position arc redesign** - Arc now touches horizon at sunrise/sunset points
- Arc geometry uses chord-radius calculation for proper horizon intersection
- Sunrise/sunset icons integrated at horizon endpoints (no duplicate labels)
- Daylight duration centered below arc
- Increased card height 20% for better arc visibility (140px → 170px)
- **Visual balance improvements** - Sunrise/sunset labels raised 10px, daylight label at bottom
## [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
@@ -26,6 +26,13 @@ class _DashboardContentState extends ConsumerState<DashboardContent> {
Timer? _systemStatsTimer;
Timer? _environmentTimer;
/// Tracks if we've logged the environment API user (log once per session)
static bool _hasLoggedEnvUser = false;
static String? _envApiUser;
/// Get the environment API user (available after first load)
static String? get envApiUser => _envApiUser;
@override
void initState() {
super.initState();
@@ -129,13 +136,21 @@ class _DashboardContentState extends ConsumerState<DashboardContent> {
const SizedBox(height: 24),
// Environment - Sun, Weather, Forecast, Air Quality
_SectionHeader(title: 'Environment', icon: Icons.eco),
const _SectionHeader(title: 'Environment', icon: Icons.eco),
const SizedBox(height: 8),
environmentAsync.when(
data: (envData) => _EnvironmentSection(
envData: envData,
onRefresh: () => ref.invalidate(environmentProvider),
),
data: (envData) {
// Store and log user once per session
if (!_hasLoggedEnvUser && envData.user != null) {
_envApiUser = envData.user;
_hasLoggedEnvUser = true;
debugPrint('Environment API user: ${envData.user}');
}
return _EnvironmentSection(
envData: envData,
onRefresh: () => ref.invalidate(environmentProvider),
);
},
loading: () => const Card(
child: Padding(
padding: EdgeInsets.all(32),
+114 -85
View File
@@ -67,77 +67,102 @@ class AirQualityWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 16),
const SizedBox(height: 8),
// AQI Display
Row(
children: [
// AQI number with colored background
Container(
width: 64,
height: 64,
decoration: BoxDecoration(
color: aqi.level.color.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: aqi.level.color.withValues(alpha: 0.3),
width: 2,
),
),
child: Center(
child: Text(
'${aqi.index}',
style:
Theme.of(context).textTheme.headlineMedium?.copyWith(
fontWeight: FontWeight.bold,
color: aqi.level.color,
),
),
),
),
const SizedBox(width: 16),
// Level info
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
aqi.level.label,
style:
Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w600,
color: aqi.level.color,
),
),
const SizedBox(height: 4),
Text(
aqi.level.description,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colorScheme.onSurfaceVariant,
// Content area with fixed height, horizon line at 50px from bottom
SizedBox(
height: 170,
child: Stack(
children: [
// Main content positioned above horizon
Positioned(
left: 0,
right: 0,
bottom: 50,
child: Row(
children: [
// AQI number with colored background
Container(
width: 64,
height: 64,
decoration: BoxDecoration(
color: aqi.level.color.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: aqi.level.color.withValues(alpha: 0.3),
width: 2,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
],
),
child: Center(
child: Text(
'${aqi.index}',
style: Theme.of(context)
.textTheme
.headlineMedium
?.copyWith(
fontWeight: FontWeight.bold,
color: aqi.level.color,
),
),
),
),
const SizedBox(width: 16),
// Level info
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
aqi.level.label,
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(
fontWeight: FontWeight.w600,
color: aqi.level.color,
),
),
const SizedBox(height: 4),
Text(
aqi.level.description,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colorScheme.onSurfaceVariant,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
],
),
),
],
),
),
),
],
),
// Pollutants
if (aqi.pollutants.isNotEmpty) ...[
const SizedBox(height: 16),
const Divider(height: 1),
const SizedBox(height: 12),
Wrap(
spacing: 16,
runSpacing: 8,
children: aqi.pollutants
.map((p) => _PollutantChip(pollutant: p))
.toList(),
// Horizon divider at fixed position
if (aqi.pollutants.isNotEmpty)
Positioned(
left: 0,
right: 0,
bottom: 38,
child: const Divider(height: 1),
),
// Footer below horizon
if (aqi.pollutants.isNotEmpty)
Positioned(
left: 0,
right: 0,
bottom: 0,
child: Wrap(
spacing: 16,
runSpacing: 8,
children: aqi.pollutants
.map((p) => _PollutantChip(pollutant: p))
.toList(),
),
),
],
),
],
),
],
),
),
@@ -210,26 +235,30 @@ class AirQualityWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 24),
Center(
child: Column(
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: 8),
// Match sun position card height (170px content area)
SizedBox(
height: 170,
child: 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: 16),
],
),
),
+63 -15
View File
@@ -27,13 +27,52 @@ class ForecastWidget extends StatelessWidget {
return Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Center(
child: Text(
'No forecast data available',
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
// Header
Row(
children: [
Icon(
Icons.calendar_today,
size: 20,
color: colorScheme.onSurfaceVariant,
),
),
const SizedBox(width: 8),
Text(
'Forecast',
style: Theme.of(context).textTheme.titleSmall?.copyWith(
color: colorScheme.onSurfaceVariant,
),
),
],
),
const SizedBox(height: 8),
// Match sun position card height (170px content area)
SizedBox(
height: 170,
child: 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,
),
),
],
),
),
),
],
),
),
);
@@ -67,18 +106,27 @@ class ForecastWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 16),
const SizedBox(height: 8),
// Forecast days - horizontal scroll
// Content area with fixed height, card bottoms at horizon (50px from bottom)
SizedBox(
height: 100,
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: forecast!.length,
separatorBuilder: (_, i) => const SizedBox(width: 12),
itemBuilder: (context, index) {
return _ForecastDayCard(day: forecast![index]);
},
height: 170,
child: Padding(
padding: const EdgeInsets.only(bottom: 50),
child: Align(
alignment: Alignment.bottomCenter,
child: SizedBox(
height: 110,
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: forecast!.length,
separatorBuilder: (_, i) => const SizedBox(width: 12),
itemBuilder: (context, index) {
return _ForecastDayCard(day: forecast![index]);
},
),
),
),
),
),
],
+378 -221
View File
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:math' as math;
import 'package:flutter/material.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
/// - Orange tones for sunrise/sunset
/// - 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({
super.key,
this.sunTimes,
@@ -22,11 +27,71 @@ class SunPositionWidget extends StatelessWidget {
/// Whether to use compact layout.
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
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
if (compact) {
if (widget.compact) {
return _buildCompact(context, colorScheme);
}
@@ -54,42 +119,65 @@ class SunPositionWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 16),
const SizedBox(height: 8),
// Arc visualization
// Arc with integrated horizon labels
// At night: sunset on left (night start), sunrise on right (night end)
// During day: sunrise on left (day start), sunset on right (day end)
SizedBox(
height: 120,
child: CustomPaint(
size: const Size(double.infinity, 120),
painter: _SunArcPainter(
sunTimes: sunTimes,
isDark: colorScheme.brightness == Brightness.dark,
),
height: 170,
child: LayoutBuilder(
builder: (context, constraints) {
return Stack(
clipBehavior: Clip.none,
children: [
// Arc painter
Positioned.fill(
child: CustomPaint(
painter: _SunArcPainter(
sunTimes: widget.sunTimes,
isDark: colorScheme.brightness == Brightness.dark,
),
),
),
// Left horizon: Sunrise during day, Sunset at night
Positioned(
left: 0,
bottom: 10,
child: _HorizonTimeDisplay(
icon: _isDaytime ? Icons.wb_twilight : Icons.nights_stay,
label: _isDaytime ? 'Sunrise' : 'Sunset',
time: _isDaytime ? _sunrise : _sunset,
iconColor: _isDaytime ? Colors.orange : Colors.deepOrange,
alignment: CrossAxisAlignment.start,
),
),
// Daylight display centered (at bottom for balance)
Positioned(
left: 0,
right: 0,
bottom: 0,
child: Center(
child: _DaylightDisplay(minutes: _daylightMinutes),
),
),
// Right horizon: Sunset during day, Sunrise at night
Positioned(
right: 0,
bottom: 10,
child: _HorizonTimeDisplay(
icon: _isDaytime ? Icons.nights_stay : Icons.wb_twilight,
label: _isDaytime ? 'Sunset' : 'Sunrise',
time: _isDaytime ? _sunset : _sunrise,
iconColor: _isDaytime ? Colors.deepOrange : Colors.orange,
alignment: CrossAxisAlignment.end,
),
),
],
);
},
),
),
const SizedBox(height: 12),
// Sunrise/Sunset times
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_TimeDisplay(
icon: Icons.wb_twilight,
label: 'Sunrise',
time: sunTimes?.sunrise,
iconColor: Colors.orange,
),
if (sunTimes?.daylightMinutes != null)
_DaylightDisplay(minutes: sunTimes!.daylightMinutes!),
_TimeDisplay(
icon: Icons.nights_stay,
label: 'Sunset',
time: sunTimes?.sunset,
iconColor: Colors.deepOrange,
),
],
),
],
),
),
@@ -114,11 +202,11 @@ class SunPositionWidget extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
Text(
_formatTime(sunTimes?.sunrise),
_formatTime(_sunrise),
style: Theme.of(context).textTheme.labelSmall,
),
Text(
_formatTime(sunTimes?.sunset),
_formatTime(_sunset),
style: Theme.of(context).textTheme.labelSmall,
),
],
@@ -129,50 +217,44 @@ class SunPositionWidget extends StatelessWidget {
);
}
bool get _isDaytime {
final now = DateTime.now();
// Use actual sun times if available, otherwise default to 6am/6pm
final sunrise = sunTimes?.sunrise ??
DateTime(now.year, now.month, now.day, 6, 0);
final sunset = sunTimes?.sunset ??
DateTime(now.year, now.month, now.day, 18, 0);
return now.isAfter(sunrise) && now.isBefore(sunset);
}
String _formatTime(DateTime? time) {
if (time == null) return '--:--';
String _formatTime(DateTime time) {
return '${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}';
}
}
class _TimeDisplay extends StatelessWidget {
const _TimeDisplay({
/// Horizon-aligned time display with icon above time and label.
class _HorizonTimeDisplay extends StatelessWidget {
const _HorizonTimeDisplay({
required this.icon,
required this.label,
required this.time,
this.iconColor,
this.alignment = CrossAxisAlignment.center,
});
final IconData icon;
final String label;
final DateTime? time;
final DateTime time;
final Color? iconColor;
final CrossAxisAlignment alignment;
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: alignment,
children: [
Icon(
icon,
size: 20,
size: 18,
color: iconColor ?? colorScheme.primary,
),
const SizedBox(height: 4),
const SizedBox(height: 2),
Text(
_formatTime(time),
style: Theme.of(context).textTheme.titleSmall?.copyWith(
'${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}',
style: Theme.of(context).textTheme.labelMedium?.copyWith(
fontWeight: FontWeight.w600,
),
),
@@ -180,16 +262,12 @@ class _TimeDisplay extends StatelessWidget {
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: colorScheme.onSurfaceVariant,
fontSize: 10,
),
),
],
);
}
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 {
@@ -228,6 +306,11 @@ class _DaylightDisplay extends StatelessWidget {
}
/// 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°
/// - Arc endpoints touch the horizon line at sunrise/sunset positions
class _SunArcPainter extends CustomPainter {
_SunArcPainter({
this.sunTimes,
@@ -245,199 +328,273 @@ class _SunArcPainter extends CustomPainter {
static const _dayGold = Color(0xFFffb300);
static const _duskOrange = Color(0xFFef6c00);
static const _nightIndigo = Color(0xFF283593);
static const _moonSilver = Color(0xFFB0BEC5);
@override
void paint(Canvas canvas, Size size) {
final center = Offset(size.width / 2, size.height - 10);
final radius = math.min(size.width / 2 - 20, size.height - 30);
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)
final dayArcAngle = (daylightMinutes / 1440) * 2 * math.pi;
final nightArcAngle = (nightMinutes / 1440) * 2 * math.pi;
// Layout constants - horizon is 50px from bottom to leave room for labels
const horizonY = 50.0;
const horizontalPadding = 40.0;
final horizonWidth = size.width - (horizontalPadding * 2);
final centerX = size.width / 2;
// Draw horizon line
final horizonPaint = Paint()
..color = isDark ? Colors.white24 : Colors.black12
..strokeWidth = 1;
canvas.drawLine(
Offset(center.dx - radius - 10, center.dy),
Offset(center.dx + radius + 10, center.dy),
Offset(horizontalPadding - 5, size.height - horizonY),
Offset(size.width - horizontalPadding + 5, size.height - horizonY),
horizonPaint,
);
// Create gradient for arc background
if (isDaytime) {
_drawDayArc(canvas, size, centerX, horizonWidth, horizonY, dayArcAngle, now, sunrise, sunset);
} else {
_drawNightArc(canvas, size, centerX, horizonWidth, horizonY, nightArcAngle, now, sunrise, sunset);
}
}
void _drawDayArc(
Canvas canvas,
Size size,
double centerX,
double horizonWidth,
double horizonY,
double arcAngle,
DateTime now,
DateTime sunrise,
DateTime sunset,
) {
// Clamp arc angle between 30° and 180° for visual sanity
final clampedAngle = arcAngle.clamp(math.pi / 6, math.pi);
// Calculate radius so arc endpoints touch horizon
// For a chord of width W and arc angle θ: R = W / (2 * sin(θ/2))
var radius = horizonWidth / (2 * math.sin(clampedAngle / 2));
// Constrain arc height to fit within available space (leave 25px margin for sun)
final maxArcHeight = size.height - horizonY - 25;
final arcHeight = radius * (1 - math.cos(clampedAngle / 2));
if (arcHeight > maxArcHeight) {
// Scale radius down to fit
radius = maxArcHeight / (1 - math.cos(clampedAngle / 2));
}
// Arc center is below the horizon for an upward-bulging arc
// Distance from chord to center = R * cos(θ/2)
final horizonYPos = size.height - horizonY;
final centerY = horizonYPos + radius * math.cos(clampedAngle / 2);
final center = Offset(centerX, centerY);
// The arc starts at the LEFT horizon point
// In canvas coords (Y down), angle to left point = 3π/2 - θ/2
// The arc sweeps clockwise (positive) through angle θ to reach right point
final startAngle = (3 * math.pi / 2) - (clampedAngle / 2);
final arcRect = Rect.fromCenter(
center: center,
width: radius * 2,
height: radius * 2,
);
// Draw arc background (night portion below horizon implied)
final arcBgPaint = Paint()
// Draw arc background with day gradient
final arcPaint = Paint()
..style = PaintingStyle.stroke
..strokeWidth = 8
..strokeCap = StrokeCap.round;
..strokeWidth = 6
..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: GradientRotation(startAngle),
).createShader(arcRect);
// Create gradient that transitions through time of day colors
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 (positive sweep = clockwise in canvas coords = visually upward arc)
canvas.drawArc(arcRect, startAngle, clampedAngle, false, arcPaint);
// Draw the arc (semicircle from left to right)
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() {
final now = DateTime.now();
// Use actual sun times if available, otherwise default to 6am/6pm (12-hour cycles)
final sunrise = sunTimes?.sunrise ??
DateTime(now.year, now.month, now.day, 6, 0);
final sunset = sunTimes?.sunset ??
DateTime(now.year, now.month, now.day, 18, 0);
// 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
// Calculate sun position along the arc
final totalDaylight = sunset.difference(sunrise).inMinutes;
final minutesSinceSunrise = now.difference(sunrise).inMinutes;
return minutesSinceSunrise / totalDaylight;
}
final progress = (minutesSinceSunrise / totalDaylight).clamp(0.0, 1.0);
void _drawTimeMarkers(Canvas canvas, Offset center, double radius) {
final textPainter = TextPainter(
textDirection: TextDirection.ltr,
textAlign: TextAlign.center,
);
// Map progress to angle along the arc (0 = sunrise/left, 1 = sunset/right)
final sunAngle = startAngle + (progress * clampedAngle);
final sunX = center.dx + radius * math.cos(sunAngle);
final sunY = center.dy + radius * math.sin(sunAngle);
final markerStyle = TextStyle(
fontSize: 10,
color: isDark ? Colors.white38 : Colors.black38,
);
// 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 quarter markers (6am, 12pm, 6pm positions conceptually)
final markers = ['6:00', '12:00', '18:00'];
final positions = [0.25, 0.5, 0.75];
// 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: 20));
canvas.drawCircle(Offset(sunX, sunY), 20, glowPaint);
for (var i = 0; i < markers.length; i++) {
final angle = math.pi + (positions[i] * math.pi);
final markerRadius = radius + 15;
final x = center.dx + markerRadius * math.cos(angle);
final y = center.dy + markerRadius * math.sin(angle);
// Draw sun
final sunPaint = Paint()
..style = PaintingStyle.fill
..color = sunColor;
canvas.drawCircle(Offset(sunX, sunY), 10, sunPaint);
textPainter.text = TextSpan(text: markers[i], style: markerStyle);
textPainter.layout();
textPainter.paint(
canvas,
Offset(x - textPainter.width / 2, y - textPainter.height / 2),
// 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 + 12 * math.cos(rayAngle), sunY + 12 * math.sin(rayAngle)),
Offset(sunX + 16 * math.cos(rayAngle), sunY + 16 * math.sin(rayAngle)),
rayPaint,
);
}
}
void _drawNightArc(
Canvas canvas,
Size size,
double centerX,
double horizonWidth,
double horizonY,
double arcAngle,
DateTime now,
DateTime sunrise,
DateTime sunset,
) {
// Clamp arc angle between 30° and 180° for visual sanity
final clampedAngle = arcAngle.clamp(math.pi / 6, math.pi);
// Calculate radius so arc endpoints touch horizon
var radius = horizonWidth / (2 * math.sin(clampedAngle / 2));
// Constrain arc height to fit within available space (leave 20px margin for moon)
final maxArcHeight = size.height - horizonY - 20;
final arcHeight = radius * (1 - math.cos(clampedAngle / 2));
if (arcHeight > maxArcHeight) {
// Scale radius down to fit
radius = maxArcHeight / (1 - math.cos(clampedAngle / 2));
}
// Arc center is below the horizon for an upward-bulging arc
final horizonYPos = size.height - horizonY;
final centerY = horizonYPos + radius * math.cos(clampedAngle / 2);
final center = Offset(centerX, centerY);
// The arc starts at the LEFT horizon point
// In canvas coords (Y down), angle to left point = 3π/2 - θ/2
final startAngle = (3 * math.pi / 2) - (clampedAngle / 2);
final arcRect = Rect.fromCenter(
center: center,
width: radius * 2,
height: radius * 2,
);
// Draw arc background with night gradient
final arcPaint = Paint()
..style = PaintingStyle.stroke
..strokeWidth = 6
..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: GradientRotation(startAngle),
).createShader(arcRect);
// Draw the arc (positive sweep = clockwise in canvas coords)
canvas.drawArc(arcRect, startAngle, clampedAngle, 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 (0 = sunset/left, 1 = sunrise/right)
final moonAngle = startAngle + (progress * clampedAngle);
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: 16));
canvas.drawCircle(Offset(moonX, moonY), 16, glowPaint);
// Draw moon
final moonPaint = Paint()
..style = PaintingStyle.fill
..color = _moonSilver;
canvas.drawCircle(Offset(moonX, moonY), 8, moonPaint);
// Draw crescent shadow for moon effect
final shadowPaint = Paint()
..style = PaintingStyle.fill
..color = _nightBlue.withValues(alpha: 0.7);
canvas.drawCircle(Offset(moonX + 3, moonY - 1), 6, shadowPaint);
}
@override
bool shouldRepaint(covariant _SunArcPainter oldDelegate) {
return oldDelegate.sunTimes != sunTimes || oldDelegate.isDark != isDark;
+136 -95
View File
@@ -59,7 +59,7 @@ class WeatherWidget extends StatelessWidget {
const SizedBox(width: 8),
Expanded(
child: Text(
weather.location,
'Weather',
style: Theme.of(context).textTheme.titleSmall?.copyWith(
color: colorScheme.onSurfaceVariant,
),
@@ -69,89 +69,123 @@ class WeatherWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 16),
const SizedBox(height: 8),
// Main weather display (matching AQI layout)
Row(
children: [
// Weather icon in box (like AQI number box)
Container(
width: 64,
height: 64,
decoration: BoxDecoration(
color: (weather.iconColor ?? colorScheme.primary)
.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: (weather.iconColor ?? colorScheme.primary)
.withValues(alpha: 0.3),
width: 2,
),
),
child: Center(
child: Icon(
weather.icon,
size: 32,
color: weather.iconColor ?? colorScheme.primary,
),
),
),
const SizedBox(width: 16),
// Temperature and condition
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${weather.temperature.round()}°${weather.unit.symbol}',
style:
Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 4),
Text(
weather.condition,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colorScheme.onSurfaceVariant,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
],
),
),
],
),
// Details
if (weather.humidity != null || weather.windSpeed != null) ...[
const SizedBox(height: 16),
const Divider(height: 1),
const SizedBox(height: 12),
Wrap(
spacing: 16,
runSpacing: 8,
// Content area with fixed height, horizon line at 50px from bottom
SizedBox(
height: 170,
child: Stack(
children: [
if (weather.humidity != null)
_DetailChip(
label: 'Humidity',
value: '${weather.humidity}%',
// Main content positioned above horizon
Positioned(
left: 0,
right: 0,
bottom: 50,
child: Row(
children: [
// Weather icon in box
Container(
width: 64,
height: 64,
decoration: BoxDecoration(
color: (weather.iconColor ?? colorScheme.primary)
.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: (weather.iconColor ?? colorScheme.primary)
.withValues(alpha: 0.3),
width: 2,
),
),
child: Center(
child: Icon(
weather.icon,
size: 32,
color: weather.iconColor ?? colorScheme.primary,
),
),
),
const SizedBox(width: 16),
// Temperature and condition
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${weather.temperature.round()}°${weather.unit.symbol}',
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(fontWeight: FontWeight.w600),
),
const SizedBox(height: 4),
Text(
weather.condition,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: colorScheme.onSurfaceVariant,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
if (weather.location.isNotEmpty) ...[
const SizedBox(height: 2),
Text(
weather.location,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: colorScheme.outline,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
],
),
),
],
),
if (weather.windSpeed != null)
_DetailChip(
label: 'Wind',
value: '${weather.windSpeed!.round()} ${weather.windUnit}',
),
// Horizon divider at fixed position
if (weather.humidity != null || weather.windSpeed != null)
Positioned(
left: 0,
right: 0,
bottom: 38,
child: const Divider(height: 1),
),
if (weather.feelsLike != null)
_DetailChip(
label: 'Feels',
value: '${weather.feelsLike!.round()}°${weather.unit.symbol}',
// Footer below horizon
if (weather.humidity != null || weather.windSpeed != null)
Positioned(
left: 0,
right: 0,
bottom: 0,
child: Wrap(
spacing: 16,
runSpacing: 8,
children: [
if (weather.humidity != null)
_DetailChip(
label: 'Humidity',
value: '${weather.humidity}%',
),
if (weather.windSpeed != null)
_DetailChip(
label: 'Wind',
value: weather.windDirection != null
? '${weather.windDirection} ${weather.windSpeed!.round()} ${weather.windUnit}'
: '${weather.windSpeed!.round()} ${weather.windUnit}',
),
if (weather.feelsLike != null)
_DetailChip(
label: 'Feels',
value: '${weather.feelsLike!.round()}°${weather.unit.symbol}',
),
],
),
),
],
),
],
),
],
),
),
@@ -212,26 +246,30 @@ class WeatherWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 24),
Center(
child: Column(
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: 8),
// Match sun position card height (170px content area)
SizedBox(
height: 170,
child: 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: 16),
],
),
),
@@ -307,6 +345,7 @@ WeatherData _fromApiData(api.WeatherData data) {
icon: _getWeatherIcon(data.conditions, data.icon),
humidity: data.humidity,
windSpeed: data.windSpeed,
windDirection: data.windDirection,
feelsLike: data.feelsLike,
iconColor: _getWeatherColor(data.conditions),
);
@@ -371,6 +410,7 @@ class WeatherData {
this.unit = TemperatureUnit.celsius,
this.humidity,
this.windSpeed,
this.windDirection,
this.windUnit = 'km/h',
this.feelsLike,
this.iconColor,
@@ -383,6 +423,7 @@ class WeatherData {
final TemperatureUnit unit;
final int? humidity;
final double? windSpeed;
final String? windDirection;
final String windUnit;
final double? feelsLike;
final Color? iconColor;
+1 -1
View File
@@ -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
# 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.
version: 1.5.1+1
version: 1.5.9+1
environment:
sdk: ^3.10.4