Further refactoring and notes for future refactorings. Still working …

…towards defining the main functions in the program more clearly.

GlucoseTray.Domain/DisplayResults/AlertService.cs

@@ -1,4 +1,5 @@
 using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 
 namespace GlucoseTray.Domain.DisplayResults;
 

GlucoseTray.Domain/FetchResults/Dexcom/DexcomService.cs

@@ -1,4 +1,5 @@
 using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.Domain.GlucoseSettings;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 

GlucoseTray.Domain/FetchResults/GlucoseFetchService.cs

@@ -1,6 +1,7 @@
 using GlucoseTray.Domain.Enums;
 using GlucoseTray.Domain.FetchResults.Dexcom;
 using GlucoseTray.Domain.FetchResults.Nightscout;
+using GlucoseTray.Domain.GlucoseSettings;
 using Microsoft.Extensions.Logging;
 
 namespace GlucoseTray.Domain.FetchResults;

GlucoseTray.Domain/FetchResults/Nightscout/NightscoutService.cs

@@ -1,5 +1,6 @@
 using GlucoseTray.Domain.DisplayResults;
 using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 

GlucoseTray.Domain/FetchResults/UrlAssembler.cs

@@ -1,4 +1,5 @@
 using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 
 namespace GlucoseTray.Domain.FetchResults;
 

GlucoseTray.Domain/GlucoseResult.cs

@@ -1,4 +1,5 @@
 using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 
 namespace GlucoseTray.Domain;
 

GlucoseTray/GlucoseSettings/GlucoseTraySettings.cs → GlucoseTray.Domain/GlucoseSettings/GlucoseTraySettings.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Text.Json.Serialization;
 
-namespace GlucoseTray.GlucoseSettings;
+namespace GlucoseTray.Domain.GlucoseSettings;
 
 public class GlucoseTraySettings : INotifyPropertyChanged
 {

GlucoseTray.Domain/ISettingsProxy.cs → GlucoseTray.Domain/GlucoseSettings/ISettingsProxy.cs

@@ -1,6 +1,6 @@
 using GlucoseTray.Domain.Enums;
 
-namespace GlucoseTray.Domain
+namespace GlucoseTray.Domain.GlucoseSettings
 {
     public interface ISettingsProxy
     {

GlucoseTray.Domain/GlucoseSettings/ISettingsWindowService.cs

@@ -0,0 +1,15 @@
+using GlucoseTray.Domain.Enums;
+
+namespace GlucoseTray.Domain.GlucoseSettings;
+
+public interface ISettingsWindowService
+{
+    GlucoseTraySettings GetDefaultSettings();
+    IEnumerable<string> GetDexComServerLocationDescriptions();
+    GlucoseTraySettings? GetSettingsFromFile();
+    void UpdateValuesFromMMoLToMG(GlucoseTraySettings settings);
+    void UpdateValuesFromMGToMMoL(GlucoseTraySettings _settings);
+    void UpdateServerDetails(GlucoseTraySettings settings, FetchMethod fetchMethod, GlucoseUnitType unitType, DexcomServerLocation dexcomServerLocation, string dexcomUsername, string dexcomPassword, string nightscoutAccessToken);
+    (bool IsValid, IEnumerable<string> Errors) IsValid(GlucoseTraySettings settings);
+    void Save(GlucoseTraySettings settings);
+}

GlucoseTray/GlucoseSettings/StringEncryptionService.cs → GlucoseTray.Domain/GlucoseSettings/StringEncryptionService.cs

@@ -2,7 +2,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace GlucoseTray.GlucoseSettings;
+namespace GlucoseTray.Domain.GlucoseSettings;
 
 /// <summary>
 /// Used example from here: https://tekeye.uk/visual_studio/encrypt-decrypt-c-sharp-string

GlucoseTray.Domain/GlucoseTray.Domain.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
   </ItemGroup>
 
 </Project>

GlucoseTray.Infrastructure/ExternalCommunicationAdapter.cs

@@ -1,5 +1,5 @@
-using GlucoseTray.Domain;
-using GlucoseTray.Domain.FetchResults;
+using GlucoseTray.Domain.FetchResults;
+using GlucoseTray.Domain.GlucoseSettings;
 using Microsoft.Extensions.Logging;
 using System.Net.Http.Headers;
 using System.Text;

GlucoseTray.Infrastructure/FileService.cs

@@ -6,6 +6,7 @@ public interface IFileService<T> where T : class
 {
     void WriteModelToJsonFile(T model, string file);
     T? ReadModelFromFile(string file);
+    bool DoesFileExist(string filePath);
 }
 
 public class FileService<T> : IFileService<T> where T : class
@@ -32,4 +33,9 @@ public void WriteModelToJsonFile(T model, string file)
 
         return model;
     }
+
+    public bool DoesFileExist(string filePath)
+    {
+        return File.Exists(filePath);
+    }
 }

GlucoseTray.Infrastructure/GlucoseTray.Infrastructure.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
 	<PackageReference Include="TaskScheduler" Version="2.11.0" />
   </ItemGroup>
 

GlucoseTray.Tests/AlertServiceTests.cs

@@ -3,6 +3,7 @@
 using GlucoseTray.Domain.Enums;
 using GlucoseTray.Domain;
 using GlucoseTray.Domain.DisplayResults;
+using GlucoseTray.Domain.GlucoseSettings;
 
 namespace GlucoseTray.Tests;
 

GlucoseTray.Tests/GlucoseFetchResultExtensionTests.cs

@@ -2,6 +2,7 @@
 using GlucoseTray.Domain.Enums;
 using GlucoseTray.Domain.DisplayResults;
 using NSubstitute;
+using GlucoseTray.Domain.GlucoseSettings;
 
 namespace GlucoseTray.Tests;
 

GlucoseTray.Tests/SettingsProxyTests.cs

@@ -1,4 +1,5 @@
 using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 using GlucoseTray.GlucoseSettings;
 using Microsoft.Extensions.Options;
 using NSubstitute;

GlucoseTray/AppContext.cs

@@ -1,4 +1,5 @@
 using GlucoseTray.Domain;
+using GlucoseTray.Domain.GlucoseSettings;
 using Microsoft.Extensions.Logging;
 using System.Windows.Forms;
 
@@ -16,10 +17,10 @@ public AppContext(ILogger<AppContext> logger, IRunner runner, ISettingsProxy opt
         _runner = runner;
         _options = options;
 
-        BeginCycle();
+        RunUntilFailureAsync();
     }
 
-    private async void BeginCycle()
+    private async void RunUntilFailureAsync()
     {
         _runner.Initialize(new EventHandler(Exit));
 

GlucoseTray/DisplayResults/IconService.cs

@@ -1,7 +1,7 @@
 using GlucoseTray.Domain;
 using GlucoseTray.Domain.DisplayResults;
 using GlucoseTray.Domain.Enums;
-using GlucoseTray.Views;
+using GlucoseTray.Domain.GlucoseSettings;
 using GlucoseTray.Views.Settings;
 using Microsoft.Extensions.Logging;
 using System.ComponentModel;
@@ -12,7 +12,7 @@
 
 namespace GlucoseTray.DisplayResults;
 
-public class IconService(ILogger<IconService> logger, ISettingsProxy options, ITaskSchedulerService taskScheduler, ISettingsWindowService settingsWindowService) : IIconService
+public class IconService(ILogger<IconService> logger, ISettingsProxy options, ITaskSchedulerService taskScheduler, ISettingsWindowService settingsWindowService, IDialogService dialogService) : IIconService
 {
     private readonly ILogger<IconService> _logger = logger;
     private readonly ISettingsProxy _options = options;
@@ -97,7 +97,7 @@ private void ChangeSettings(object? sender, EventArgs e)
     {
         if (!SettingsFormIsOpen)
         {
-            var settingsWindow = new SettingsWindow(_settingsWindowService);
+            var settingsWindow = new SettingsWindow(_settingsWindowService, dialogService);
             SettingsFormIsOpen = true;
             settingsWindow.ShowDialog();
             SettingsFormIsOpen = false;

GlucoseTray/GlucoseSettings/SettingsProxy.cs

@@ -1,5 +1,5 @@
-using GlucoseTray.Domain;
-using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 using Microsoft.Extensions.Options;
 
 namespace GlucoseTray.GlucoseSettings;

GlucoseTray/GlucoseSettings/SettingsService.cs

@@ -2,6 +2,7 @@
 using System.Net.Http.Headers;
 using System.Text.Json;
 using GlucoseTray.Domain.Enums;
+using GlucoseTray.Domain.GlucoseSettings;
 using GlucoseTray.Infrastructure;
 
 namespace GlucoseTray.GlucoseSettings;

GlucoseTray/Views/SettingsWindowService.cs → GlucoseTray/GlucoseSettings/SettingsWindowService.cs

@@ -1,26 +1,13 @@
 using System.ComponentModel;
-using System.IO;
 using System.Linq;
-using System.Windows;
+using GlucoseTray.Domain.DisplayResults;
 using GlucoseTray.Domain.Enums;
-using GlucoseTray.GlucoseSettings;
+using GlucoseTray.Domain.GlucoseSettings;
 using GlucoseTray.Infrastructure;
 
-namespace GlucoseTray.Views;
+namespace GlucoseTray.GlucoseSettings;
 
-public interface ISettingsWindowService
-{
-    GlucoseTraySettings GetDefaultSettings();
-    IEnumerable<string> GetDexComServerLocationDescriptions();
-    GlucoseTraySettings? GetSettingsFromFile();
-    void UpdateValuesFromMMoLToMG(GlucoseTraySettings settings);
-    void UpdateValuesFromMGToMMoL(GlucoseTraySettings _settings);
-    void UpdateServerDetails(GlucoseTraySettings settings, FetchMethod fetchMethod, GlucoseUnitType unitType, DexcomServerLocation dexcomServerLocation, string dexcomUsername, string dexcomPassword, string nightscoutAccessToken);
-    (bool IsValid, IEnumerable<string> Errors) IsValid(GlucoseTraySettings settings);
-    void Save(GlucoseTraySettings settings);
-}
-
-public class SettingsWindowService(IFileService<GlucoseTraySettings> fileService, ISettingsService settingsService) : ISettingsWindowService
+public class SettingsWindowService(IFileService<GlucoseTraySettings> fileService, ISettingsService settingsService, IDialogService dialogService) : ISettingsWindowService
 {
     public void Save(GlucoseTraySettings settings)
     {
@@ -91,19 +78,12 @@ public IEnumerable<string> GetDexComServerLocationDescriptions()
     public GlucoseTraySettings? GetSettingsFromFile()
     {
         GlucoseTraySettings? model = null;
-        if (File.Exists(Program.SettingsFile))
+        if (fileService.DoesFileExist(Program.SettingsFile))
         {
-            try
-            {
-                model = fileService.ReadModelFromFile(Program.SettingsFile);
+            model = fileService.ReadModelFromFile(Program.SettingsFile);
 
-                if (model is null)
-                    MessageBox.Show("Unable to load existing settings due to a bad file.");
-            }
-            catch (Exception e) // Catch serialization errors due to a bad file
-            {
-                MessageBox.Show("Unable to load existing settings due to a bad file.  " + e.Message + e.InnerException?.Message);
-            }
+            if (model is null)
+                dialogService.ShowErrorAlert("Unable to load existing settings due to a bad file.", "Error");
         }
 
         return model;

GlucoseTray/GlucoseTray.csproj

@@ -27,15 +27,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

GlucoseTray/Program.cs

@@ -2,15 +2,14 @@
 using GlucoseTray.Domain;
 using GlucoseTray.Domain.DisplayResults;
 using GlucoseTray.Domain.FetchResults;
+using GlucoseTray.Domain.GlucoseSettings;
 using GlucoseTray.GlucoseSettings;
 using GlucoseTray.Infrastructure;
 using GlucoseTray.Settings;
-using GlucoseTray.Views;
 using GlucoseTray.Views.Settings;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using System.IO;
 using System.Reflection;
 using System.Text.Json;
 using System.Threading;
@@ -20,9 +19,8 @@ namespace GlucoseTray;
 
 public class Program
 {
-    private static IConfiguration? Configuration { get; set; }
-    public static string SettingsFile { get; set; } = string.Empty;
-    public static AppSettings AppSettings { get; set; } = new();
+    public static string SettingsFile { get; set; } = string.Empty; // TODO: This is primarily used in the GlucoseSettings namespace and should be moved there and see if we can remove the static.
+    public static AppSettings AppSettings { get; set; } = new(); // TODO: This is only accessed from IconService and should be moved closer to there.
 
     [STAThread]
     private static void Main(string[] args)
@@ -40,16 +38,15 @@ private static void Main(string[] args)
 
         var services = host.Services;
 
-        AppSettings = GetAppSettings();
+        AppSettings = GetAppSettings(); // TODO: This doesn't need to be assigned here. It should be moved closer to the IconService.
 
         var app = services.GetRequiredService<AppContext>();
         Application.Run(app);
     }
 
     private static void ConfigureServices(IConfiguration configuration, IServiceCollection services)
     {
-        Configuration = configuration;
-        services.Configure<GlucoseTraySettings>(Configuration)
+        services.Configure<GlucoseTraySettings>(configuration)
                 .AddHttpClient()
                 .AddScoped<AppContext, AppContext>()
                 .AddScoped<IIconService, IconService>()
@@ -70,16 +67,17 @@ private static AppSettings GetAppSettings()
         return container.AppSettings;
     }
 
-    private static bool LoadApplicationSettings()
+    private static bool LoadApplicationSettings() // TODO: This should mostly be moved to a service in the GlucoseSettings area.
     {
         Environment.SetEnvironmentVariable("windir", Environment.GetEnvironmentVariable("SystemRoot"), EnvironmentVariableTarget.User);
         SettingsFile = Application.UserAppDataPath + @"\glucose_tray_settings.json";
         var fileService = new FileService<GlucoseTraySettings>();
         var settingsService = new SettingsService(fileService);
-        if (!File.Exists(SettingsFile) || settingsService.ValidateSettings().Count != 0)
+        var dialogService = new DialogService();
+        if (!fileService.DoesFileExist(SettingsFile) || settingsService.ValidateSettings().Count != 0)
         {
-            var settingsWindowService = new SettingsWindowService(fileService, settingsService);
-            var settingsWindow = new SettingsWindow(settingsWindowService);
+            var settingsWindowService = new SettingsWindowService(fileService, settingsService, dialogService);
+            var settingsWindow = new SettingsWindow(settingsWindowService, dialogService);
             if (settingsWindow.ShowDialog() != true) // Did not want to setup application.
             {
                 Application.Exit();
@@ -89,5 +87,9 @@ private static bool LoadApplicationSettings()
         return true;
     }
 
-    private static void ApplicationThreadException(object sender, ThreadExceptionEventArgs e) => MessageBox.Show(e?.Exception?.Message + " --- " + e?.Exception?.InnerException?.Message, "Fatal Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+    private static void ApplicationThreadException(object sender, ThreadExceptionEventArgs e)
+    {
+        var dialogService = new DialogService();
+        dialogService.ShowCriticalAlert("An unexpected error occurred. Please restart the application. " + e?.Exception?.Message + " --- " + e?.Exception?.InnerException?.Message, "Fatal Error");
+    }
 }