asd

LightBulb.Core/SolarTimes.cs

@@ -3,6 +3,7 @@
 
 namespace LightBulb.Core;
 
+// Times are presented in the current timezone, which is a flimsy convention
 public readonly record struct SolarTimes(TimeOnly Sunrise, TimeOnly Sunset)
 {
     private static double DegreesToRadians(double degree) => degree * (Math.PI / 180);
@@ -11,7 +12,7 @@ public readonly record struct SolarTimes(TimeOnly Sunrise, TimeOnly Sunset)
 
     private static TimeOnly CalculateSolarTime(
         GeoLocation location,
-        DateTimeOffset date,
+        DateTimeOffset instant,
         double zenith,
         bool isSunrise
     )
@@ -21,7 +22,7 @@ bool isSunrise
         // Convert longitude to hour value and calculate an approximate time
         var lngHours = location.Longitude / 15;
         var timeApproxHours = isSunrise ? 6 : 18;
-        var timeApproxDays = date.DayOfYear + (timeApproxHours - lngHours) / 24;
+        var timeApproxDays = instant.DayOfYear + (timeApproxHours - lngHours) / 24;
 
         // Calculate Sun's mean anomaly
         var sunMeanAnomaly = 0.9856 * timeApproxDays - 3.289;
@@ -75,14 +76,14 @@ bool isSunrise
 
         // Adjust UTC time to local time
         // (we use the provided offset because it's impossible to calculate timezone from coordinates)
-        var localHours = (utcHours + date.Offset.TotalHours).Wrap(0, 24);
+        var localHours = (utcHours + instant.Offset.TotalHours).Wrap(0, 24);
 
         return TimeOnly.FromTimeSpan(TimeSpan.FromHours(localHours));
     }
 
-    public static SolarTimes Calculate(GeoLocation location, DateTimeOffset date) =>
+    public static SolarTimes Calculate(GeoLocation location, DateTimeOffset instant) =>
         new(
-            CalculateSolarTime(location, date, 90.83, true),
-            CalculateSolarTime(location, date, 90.83, false)
+            CalculateSolarTime(location, instant, 90.83, true),
+            CalculateSolarTime(location, instant, 90.83, false)
         );
 }

LightBulb.WindowsApi/DeviceContext.cs

@@ -12,7 +12,7 @@ public partial class DeviceContext(nint handle) : NativeResource(handle)
     private void SetGammaRamp(GammaRamp ramp)
     {
         if (!NativeMethods.SetDeviceGammaRamp(Handle, ref ramp))
-            Debug.WriteLine($"Failed to set gamma ramp on device context #${Handle}).");
+            Debug.WriteLine($"Failed to set gamma ramp on device context #{Handle}).");
     }
 
     public void SetGamma(double redMultiplier, double greenMultiplier, double blueMultiplier)

LightBulb/App.axaml

@@ -8,7 +8,7 @@
     xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles">
     <Application.DataTemplates>
-        <framework:ViewBinder />
+        <framework:ViewManager />
     </Application.DataTemplates>
 
     <Application.Styles>
@@ -98,6 +98,7 @@
         </Style>
     </Application.Styles>
 
+    <!--  Tray icon  -->
     <TrayIcon.Icons>
         <TrayIcons>
             <TrayIcon

LightBulb/App.axaml.cs

@@ -34,7 +34,7 @@ public App()
 
         // View model framework
         services.AddSingleton<DialogManager>();
-        services.AddSingleton<ViewModelProvider>();
+        services.AddSingleton<ViewModelManager>();
 
         // View models
         services.AddTransient<MainViewModel>();
@@ -48,10 +48,10 @@ public App()
         services.AddTransient<SettingsTabViewModelBase, LocationSettingsTabViewModel>();
 
         // View framework
-        services.AddSingleton<ViewBinder>();
+        services.AddSingleton<ViewManager>();
 
         _services = services.BuildServiceProvider(true);
-        _mainViewModel = _services.GetRequiredService<MainViewModel>();
+        _mainViewModel = _services.GetRequiredService<ViewModelManager>().CreateMainViewModel();
     }
 
     public override void Initialize() => AvaloniaXamlLoader.Load(this);
@@ -101,9 +101,6 @@ private void ToggleMenuItem_OnClick(object? sender, EventArgs args) =>
     private void DisableUntilSunriseMenuItem_OnClick(object? sender, EventArgs args) =>
         _mainViewModel.Dashboard.DisableUntilSunriseCommand.Execute(null);
 
-    private void ExitMenuItem_OnClick(object? sender, EventArgs args) =>
-        ApplicationLifetime?.TryShutdown();
-
     private void DisableTemporarily1DayMenuItem_OnClick(object? sender, EventArgs args) =>
         _mainViewModel.Dashboard.DisableTemporarilyCommand.Execute(TimeSpan.FromDays(1));
 
@@ -128,5 +125,8 @@ private void DisableTemporarily5MinutesMenuItem_OnClick(object? sender, EventArg
     private void DisableTemporarily1MinuteMenuItem_OnClick(object? sender, EventArgs args) =>
         _mainViewModel.Dashboard.DisableTemporarilyCommand.Execute(TimeSpan.FromMinutes(1));
 
+    private void ExitMenuItem_OnClick(object? sender, EventArgs args) =>
+        ApplicationLifetime?.TryShutdown();
+
     public void Dispose() => _services.Dispose();
 }

LightBulb/Converters/SettingsTabViewModelToMaterialIconKindConverter.cs → LightBulb/Converters/SettingsTabToMaterialIconKindConverter.cs

@@ -6,9 +6,9 @@
 
 namespace LightBulb.Converters;
 
-public class SettingsTabViewModelToMaterialIconKindConverter : IValueConverter
+public class SettingsTabToMaterialIconKindConverter : IValueConverter
 {
-    public static SettingsTabViewModelToMaterialIconKindConverter Instance { get; } = new();
+    public static SettingsTabToMaterialIconKindConverter Instance { get; } = new();
 
     public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value switch

LightBulb/Framework/DialogManager.cs

@@ -5,42 +5,31 @@
 
 namespace LightBulb.Framework;
 
-public class DialogManager(ViewBinder viewBinder) : IDisposable
+public class DialogManager : IDisposable
 {
     private readonly SemaphoreSlim _dialogLock = new(1, 1);
 
     public async Task<T?> ShowDialogAsync<T>(DialogViewModelBase<T> dialog)
     {
-        var view = viewBinder.TryBindView(dialog);
-        if (view is null)
-        {
-            throw new InvalidOperationException(
-                $"View not found for dialog view model '{dialog.GetType()}'."
-            );
-        }
-
         await _dialogLock.WaitAsync();
         try
         {
             await DialogHost.Show(
-                view,
-                (object openSender, DialogOpenedEventArgs openArgs) =>
+                dialog,
+                // It's fine to await in a void method here because it's an event handler
+                // ReSharper disable once AsyncVoidLambda
+                async (object _, DialogOpenedEventArgs args) =>
                 {
-                    void OnClosed(object? closedSender, EventArgs closedArgs)
-                    {
-                        try
-                        {
-                            openArgs.Session.Close();
-                        }
-                        catch (InvalidOperationException)
-                        {
-                            // Race condition: dialog is already being closed
-                        }
+                    await dialog.WaitForCloseAsync();
 
-                        dialog.Closed -= OnClosed;
+                    try
+                    {
+                        args.Session.Close();
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        // Dialog host is already processing a close operation
                     }
-
-                    dialog.Closed += OnClosed;
                 }
             );
 

LightBulb/Framework/DialogViewModelBase.cs

@@ -1,22 +1,25 @@
-using System;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
 namespace LightBulb.Framework;
 
 public abstract partial class DialogViewModelBase<T> : ViewModelBase
 {
+    private readonly TaskCompletionSource<T> _closeTcs =
+        new(TaskCreationOptions.RunContinuationsAsynchronously);
+
     [ObservableProperty]
     private T? _dialogResult;
 
-    public event EventHandler? Closed;
-
     [RelayCommand]
     protected void Close(T dialogResult)
     {
         DialogResult = dialogResult;
-        Closed?.Invoke(this, EventArgs.Empty);
+        _closeTcs.TrySetResult(dialogResult);
     }
+
+    public async Task<T> WaitForCloseAsync() => await _closeTcs.Task;
 }
 
 public abstract class DialogViewModelBase : DialogViewModelBase<bool?>;

LightBulb/Framework/UserControl.cs

@@ -8,9 +8,11 @@ public class UserControl<TDataContext> : UserControl
     public new TDataContext DataContext
     {
         get =>
-            (TDataContext)(
-                base.DataContext ?? throw new InvalidOperationException("DataContext is null.")
-            );
+            base.DataContext is TDataContext dataContext
+                ? dataContext
+                : throw new InvalidCastException(
+                    $"DataContext is null or not of the expected type '{typeof(TDataContext).FullName}'."
+                );
         set => base.DataContext = value;
     }
 }

LightBulb/Framework/ViewBinder.cs → LightBulb/Framework/ViewManager.cs

@@ -4,7 +4,7 @@
 
 namespace LightBulb.Framework;
 
-public partial class ViewBinder
+public partial class ViewManager
 {
     public Control? TryBindView(ViewModelBase viewModel)
     {
@@ -20,8 +20,7 @@ public partial class ViewBinder
         if (type is null)
             return null;
 
-        var view = Activator.CreateInstance(type) as Control;
-        if (view is null)
+        if (Activator.CreateInstance(type) is not Control view)
             return null;
 
         view.DataContext ??= viewModel;
@@ -30,7 +29,7 @@ public partial class ViewBinder
     }
 }
 
-public partial class ViewBinder : IDataTemplate
+public partial class ViewManager : IDataTemplate
 {
     bool IDataTemplate.Match(object? data) => data is ViewModelBase;
 

LightBulb/Framework/ViewModelProvider.cs → LightBulb/Framework/ViewModelManager.cs

@@ -6,14 +6,14 @@
 
 namespace LightBulb.Framework;
 
-public class ViewModelProvider(IServiceProvider services)
+public class ViewModelManager(IServiceProvider services)
 {
-    public MainViewModel GetMainViewModel() => services.GetRequiredService<MainViewModel>();
+    public MainViewModel CreateMainViewModel() => services.GetRequiredService<MainViewModel>();
 
-    public DashboardViewModel GetDashboardViewModel() =>
+    public DashboardViewModel CreateDashboardViewModel() =>
         services.GetRequiredService<DashboardViewModel>();
 
-    public MessageBoxViewModel GetMessageBoxViewModel(
+    public MessageBoxViewModel CreateMessageBoxViewModel(
         string title,
         string message,
         string? okButtonText,
@@ -30,6 +30,6 @@ public MessageBoxViewModel GetMessageBoxViewModel(
         return viewModel;
     }
 
-    public SettingsViewModel GetSettingsViewModel() =>
+    public SettingsViewModel CreateSettingsViewModel() =>
         services.GetRequiredService<SettingsViewModel>();
 }

LightBulb/Framework/Window.cs

@@ -8,9 +8,11 @@ public class Window<TDataContext> : Window
     public new TDataContext DataContext
     {
         get =>
-            (TDataContext)(
-                base.DataContext ?? throw new InvalidOperationException("DataContext is null.")
-            );
+            base.DataContext is TDataContext dataContext
+                ? dataContext
+                : throw new InvalidCastException(
+                    $"DataContext is null or not of the expected type '{typeof(TDataContext).FullName}'."
+                );
         set => base.DataContext = value;
     }
 }

LightBulb/LightBulb.csproj

@@ -29,7 +29,7 @@
     <PackageReference Include="Material.Avalonia" Version="3.4.2" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Onova" Version="2.6.10" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
+    <PackageReference Include="Onova" Version="2.6.10" />
   </ItemGroup>
 
 </Project>

LightBulb/Models/ExternalApplication.cs

@@ -5,7 +5,7 @@ namespace LightBulb.Models;
 
 public partial class ExternalApplication(string executableFilePath)
 {
-    public string ExecutableFilePath { get; } = executableFilePath;
+    public string ExecutableFilePath { get; } = NormalizeFilePath(executableFilePath);
 
     public string Name => Path.GetFileNameWithoutExtension(ExecutableFilePath);
 
@@ -14,7 +14,7 @@ public partial class ExternalApplication(string executableFilePath)
 
 public partial class ExternalApplication
 {
-    private static string? NormalizeFilePath(string? filePath) =>
+    private static string NormalizeFilePath(string filePath) =>
         !string.IsNullOrWhiteSpace(filePath) ? Path.GetFullPath(filePath) : filePath;
 }
 
@@ -28,8 +28,8 @@ public bool Equals(ExternalApplication? other)
             return true;
 
         return string.Equals(
-            NormalizeFilePath(ExecutableFilePath),
-            NormalizeFilePath(other.ExecutableFilePath),
+            ExecutableFilePath,
+            other.ExecutableFilePath,
             StringComparison.OrdinalIgnoreCase
         );
     }
@@ -44,7 +44,8 @@ public override bool Equals(object? obj)
         return obj.GetType() == GetType() && Equals((ExternalApplication)obj);
     }
 
-    public override int GetHashCode() => HashCode.Combine(NormalizeFilePath(ExecutableFilePath));
+    public override int GetHashCode() =>
+        StringComparer.OrdinalIgnoreCase.GetHashCode(ExecutableFilePath);
 
     public static bool operator ==(ExternalApplication? a, ExternalApplication? b) =>
         a?.Equals(b) ?? false;