Simplifies theme cycle management

Refines the theme preference cycling logic to only allow switching between Light and Dark modes directly. The "System" preference is no longer part of the user-facing cycle, although system preference detection continues to determine the active theme when "System" is the selected preference.

Updates associated UI elements (icons, tooltips) and removes outdated tests to reflect this change.

Also updates the `launchSettings.json` for a more streamlined development experience.

Author: Keboo

PointerStar/Client/Properties/launchSettings.json

@@ -1,40 +1,12 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:13580",
-      "sslPort": 44352
-    }
-  },
   "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:5225",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
+    "PointerStar.Client": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7234;http://localhost:5225",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
       "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "https://localhost:58850;http://localhost:58851"
     }
   }
-}
+}

PointerStar/Client/Services/ThemeService.cs

@@ -19,35 +19,26 @@ public interface IThemeService
     Task CycleThemeAsync();
 }
 
-public class ThemeService : IThemeService
+public class ThemeService(ICookie cookie) : IThemeService
 {
-    private readonly ICookie _cookie;
-    private Func<Task<bool>>? _getSystemPreference;
-    private bool _systemPreference;
+    private readonly ICookie _cookie = cookie ?? throw new ArgumentNullException(nameof(cookie));
+    private bool _systemIsDark;
 
     public ThemePreference CurrentPreference { get; private set; }
 
     public bool IsDarkMode => CurrentPreference switch
     {
         ThemePreference.Dark => true,
         ThemePreference.Light => false,
-        ThemePreference.System => _systemPreference,
-        _ => _systemPreference
+        _ => _systemIsDark
     };
 
     public event EventHandler? ThemeChanged;
 
-    public ThemeService(ICookie cookie)
-    {
-        _cookie = cookie ?? throw new ArgumentNullException(nameof(cookie));
-    }
-
     public async Task InitializeAsync(Func<Task<bool>> getSystemPreference)
     {
-        _getSystemPreference = getSystemPreference ?? throw new ArgumentNullException(nameof(getSystemPreference));
-        
         // Get system preference
-        _systemPreference = await _getSystemPreference();
+        _systemIsDark = await getSystemPreference();
 
         // Load saved preference from cookie
         string preferenceValue = await _cookie.GetThemePreferenceAsync();
@@ -73,21 +64,19 @@ public async Task SetPreferenceAsync(ThemePreference preference)
 
     public async Task CycleThemeAsync()
     {
-        var nextPreference = CurrentPreference switch
+        var nextPreference = IsDarkMode switch
         {
-            ThemePreference.System => ThemePreference.Light,
-            ThemePreference.Light => ThemePreference.Dark,
-            ThemePreference.Dark => ThemePreference.System,
-            _ => ThemePreference.System
+            true => ThemePreference.Light,
+            false => ThemePreference.Dark,
         };
         await SetPreferenceAsync(nextPreference);
     }
 
     public async Task UpdateSystemPreferenceAsync(bool isDark)
     {
-        if (_systemPreference != isDark)
+        if (_systemIsDark != isDark)
         {
-            _systemPreference = isDark;
+            _systemIsDark = isDark;
             if (CurrentPreference == ThemePreference.System)
             {
                 ThemeChanged?.Invoke(this, EventArgs.Empty);

PointerStar/Client/Shared/MainLayout.razor

@@ -63,7 +63,6 @@
     {
         return ThemeService.CurrentPreference switch
         {
-            ThemePreference.System => Icons.Material.Filled.Brightness4,
             ThemePreference.Light => Icons.Material.Filled.LightMode,
             ThemePreference.Dark => Icons.Material.Filled.DarkMode,
             _ => Icons.Material.Filled.Brightness4
@@ -74,9 +73,8 @@
     {
         return ThemeService.CurrentPreference switch
         {
-            ThemePreference.System => "Theme: System (click to switch to Light)",
             ThemePreference.Light => "Theme: Light (click to switch to Dark)",
-            ThemePreference.Dark => "Theme: Dark (click to switch to System)",
+            ThemePreference.Dark => "Theme: Dark (click to switch to Light)",
             _ => "Toggle theme"
         };
     }

Tests/PointerStar.Client.Tests/Services/ThemeServiceTests.cs

@@ -150,22 +150,6 @@ public async Task SetPreferenceAsync_WithSamePreference_DoesNotRaiseEvent()
         mocker.GetMock<ICookie>().Verify(x => x.SetValueAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int?>()), Times.Never);
     }
 
-    [Fact]
-    public async Task CycleThemeAsync_FromSystem_SwitchesToLight()
-    {
-        AutoMocker mocker = new();
-        mocker.GetMock<ICookie>()
-            .Setup(x => x.GetValueAsync("ThemePreference", ""))
-            .ReturnsAsync("System");
-
-        ThemeService service = mocker.CreateInstance<ThemeService>();
-        await service.InitializeAsync(() => Task.FromResult(false));
-
-        await service.CycleThemeAsync();
-
-        Assert.Equal(ThemePreference.Light, service.CurrentPreference);
-    }
-
     [Fact]
     public async Task CycleThemeAsync_FromLight_SwitchesToDark()
     {
@@ -182,22 +166,6 @@ public async Task CycleThemeAsync_FromLight_SwitchesToDark()
         Assert.Equal(ThemePreference.Dark, service.CurrentPreference);
     }
 
-    [Fact]
-    public async Task CycleThemeAsync_FromDark_SwitchesToSystem()
-    {
-        AutoMocker mocker = new();
-        mocker.GetMock<ICookie>()
-            .Setup(x => x.GetValueAsync("ThemePreference", ""))
-            .ReturnsAsync("Dark");
-
-        ThemeService service = mocker.CreateInstance<ThemeService>();
-        await service.InitializeAsync(() => Task.FromResult(false));
-
-        await service.CycleThemeAsync();
-
-        Assert.Equal(ThemePreference.System, service.CurrentPreference);
-    }
-
     [Fact]
     public async Task UpdateSystemPreferenceAsync_WhenSystemModeActive_RaisesThemeChangedEvent()
     {