windows: update weather alert bindings

Author: thewizrd

SimpleWeather.Common/Controls/WeatherAlertsViewModel.cs

@@ -9,10 +9,13 @@
 using SimpleWeather.WeatherData;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace SimpleWeather.Common.Controls
 {
+    [Bindable(true)]
 #if WINUI
     [WinRT.GeneratedBindableCustomProperty]
 #endif
@@ -25,11 +28,10 @@ public partial class WeatherAlertsViewModel : BaseViewModel, IDisposable
         private ObservableItem<ICollection<WeatherAlert>> currentAlertsData;
 
         [ObservableProperty]
-        public partial SimpleObservableList<WeatherAlertViewModel> Alerts { get; set; }
+        public partial ICollection<WeatherAlertViewModel> Alerts { get; set; }
 
         public WeatherAlertsViewModel()
         {
-            Alerts = new SimpleObservableList<WeatherAlertViewModel>();
             currentAlertsData = new ObservableItem<ICollection<WeatherAlert>>();
             currentAlertsData.ItemValueChanged += CurrentAlertsData_ItemValueChanged;
         }
@@ -84,31 +86,12 @@ private void CurrentAlertsData_ItemValueChanged(object sender, ObservableItemCha
 
         private void RefreshAlerts(ICollection<WeatherAlert> alertData)
         {
-            Alerts.Clear();
-
-            if (alertData?.Count > 0)
+            var now = DateTimeOffset.Now;
+            // Skip if alert has expired
+            Alerts = alertData?.WhereNot(alert => alert.ExpiresDate <= now || alert.Date > now)?.Select(alert =>
             {
-                var now = DateTimeOffset.Now;
-                Alerts.EnsureCapacity(alertData.Count);
-                foreach (var alert in alertData)
-                {
-                    // Skip if alert has expired
-                    if (alert.ExpiresDate <= now || alert.Date > now)
-                        continue;
-
-                    Alerts.Add(new WeatherAlertViewModel(alert));
-                }
-            }
-
-#if WINUI
-            DispatcherQueue.EnqueueAsync(() =>
-#else
-            Dispatcher.Dispatch(() =>
-#endif
-            {
-                Alerts.NotifyCollectionChanged();
-                OnPropertyChanged(nameof(Alerts));
-            });
+                return new WeatherAlertViewModel(alert);
+            }).ToList();
         }
 
         private bool isDisposed;

SimpleWeather.Windows/Controls/WeatherAlertPanel.xaml.cs

@@ -56,6 +56,8 @@ public WeatherAlertPanel()
                 }
 
                 MessageSpan.Inlines.Add(new LineBreak());
+
+                this.Bindings.Update();
             };
         }
     }

SimpleWeather.Windows/Main/WeatherNow.xaml

@@ -151,17 +151,29 @@
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Stretch"
                         x:Load="{x:Bind AlertsView.Alerts, Mode=OneWay, Converter={StaticResource collectionBooleanConverter}}"
-                        Background="OrangeRed"
+                        Background="{ThemeResource ErrorContainerColor}"
                         Click="AlertButton_Click"
                         Loaded="DeferedControl_Loaded">
                         <Button.Resources>
-                            <SolidColorBrush x:Key="ButtonBackground" Color="OrangeRed" />
-                            <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#FFFF5A00" />
-                            <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#FFFF8A00" />
+                            <SolidColorBrush x:Key="ButtonBackground" Color="{ThemeResource ErrorContainerColor}" />
+                            <SolidColorBrush
+                                x:Key="ButtonBackgroundPointerOver"
+                                Opacity="0.9"
+                                Color="{ThemeResource ErrorContainerColor}" />
+                            <SolidColorBrush
+                                x:Key="ButtonBackgroundPressed"
+                                Opacity="0.8"
+                                Color="{ThemeResource ErrorContainerColor}" />
                             <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="ButtonDisabledBackgroundThemeBrush" />
-                            <SolidColorBrush x:Key="ButtonForeground" Color="White" />
-                            <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
-                            <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+                            <SolidColorBrush x:Key="ButtonForeground" Color="{ThemeResource OnErrorContainerColor}" />
+                            <SolidColorBrush
+                                x:Key="ButtonForegroundPointerOver"
+                                Opacity="0.9"
+                                Color="{ThemeResource OnErrorContainerColor}" />
+                            <SolidColorBrush
+                                x:Key="ButtonForegroundPressed"
+                                Opacity="0.8"
+                                Color="{ThemeResource OnErrorContainerColor}" />
                             <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
                         </Button.Resources>
                         <Button.Content>