Suspend and restore the settings app state using JSON

GH-87

build/KeyboardSwitch.Build/macos/postinstall-uninstaller-pkg

@@ -3,8 +3,8 @@
 dscl . -list /Users UniqueID | grep -v -e ^_ -e root -e daemon -e nobody | while read -r CURRENT_USER CURRENT_UID ; do
     launchctl asuser $CURRENT_UID launchctl remove io.tolik.keyboardswitch
 
-    if [ -f "$(eval echo ~$CURRENT_USER)/.keyboard-switch/.setup-configured" ] ; then
-        rm "$(eval echo ~$CURRENT_USER)/.keyboard-switch/.setup-configured"
+    if [ -f "$(eval echo ~$CURRENT_USER)/Library/Application Support/Keyboard Switch/.setup-configured" ] ; then
+        rm "$(eval echo ~$CURRENT_USER)/Library/Application Support/Keyboard Switch/.setup-configured"
     fi
 done
 

src/KeyboardSwitch.Core/Settings/GlobalSettings.cs

@@ -3,6 +3,7 @@ namespace KeyboardSwitch.Core.Settings;
 public sealed class GlobalSettings
 {
     public string SettingsFilePath { get; set; } = String.Empty;
+    public string StateFilePath { get; set; } = String.Empty;
     public string ServicePath { get; set; } = String.Empty;
     public string InitialSetupFilePath { get; set; } = String.Empty;
 }

src/KeyboardSwitch.Settings.Core/KeyboardSwitch.Settings.Core.csproj

@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="akavache" Version="9.1.20" />
     <PackageReference Include="DynamicData" Version="8.3.27" />
     <PackageReference Include="Fody" Version="6.8.0">
       <PrivateAssets>all</PrivateAssets>

src/KeyboardSwitch.Settings/App.axaml.cs

@@ -191,10 +191,8 @@ private async Task<MainWindow> CreateMainWindow(MainViewModel viewModel)
 
         if (state.IsInitialized)
         {
-            window.WindowStartupLocation = WindowStartupLocation.Manual;
             window.Width = state.WindowWidth;
             window.Height = state.WindowHeight;
-            window.Position = new PixelPoint(state.WindowX, state.WindowY);
             window.WindowState = state.IsWindowMaximized ? WindowState.Maximized : WindowState.Normal;
         }
 
@@ -235,8 +233,6 @@ private void SaveAppState()
         {
             state.WindowWidth = this.desktop.MainWindow.Width;
             state.WindowHeight = this.desktop.MainWindow.Height;
-            state.WindowX = this.desktop.MainWindow.Position.X;
-            state.WindowY = this.desktop.MainWindow.Position.Y;
         }
 
         state.IsInitialized = true;

src/KeyboardSwitch.Settings/KeyboardSwitch.Settings.csproj

@@ -47,6 +47,7 @@
     <PackageReference Include="System.Interactive" Version="6.0.1" />
     <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/KeyboardSwitch.Settings/State/AppState.cs

@@ -1,25 +1,11 @@
 namespace KeyboardSwitch.Settings.State;
 
-using System.Runtime.Serialization;
-
-[DataContract]
 public class AppState
 {
-    [DataMember]
     public double WindowWidth { get; set; }
-
-    [DataMember]
     public double WindowHeight { get; set; }
 
-    [DataMember]
-    public int WindowX { get; set; }
-
-    [DataMember]
-    public int WindowY { get; set; }
-
-    [DataMember]
     public bool IsWindowMaximized { get; set; }
 
-    [DataMember]
     public bool IsInitialized { get; set; }
 }

src/KeyboardSwitch.Settings/State/Extensions.cs

@@ -5,5 +5,5 @@ namespace KeyboardSwitch.Settings.State;
 public static class Extensions
 {
     public static IServiceCollection AddSuspensionDriver(this IServiceCollection services) =>
-        services.AddSingleton<ISuspensionDriver, AkavacheSuspensionDriver<AppState>>();
+        services.AddSingleton<ISuspensionDriver, JsonSuspensionDriver>();
 }

src/KeyboardSwitch.Settings/State/JsonSuspensionDriver.cs

@@ -0,0 +1,43 @@
+namespace KeyboardSwitch.Settings.State;
+
+using System.Text.Json;
+
+using Microsoft.Extensions.Options;
+
+internal sealed class JsonSuspensionDriver(IOptions<GlobalSettings> settings) : ISuspensionDriver
+{
+    private readonly string file = Environment.ExpandEnvironmentVariables(settings.Value.StateFilePath);
+
+    public IObservable<Unit> InvalidateState()
+    {
+        if (File.Exists(this.file))
+        {
+            File.Delete(this.file);
+        }
+
+        return Observable.Return(Unit.Default);
+    }
+
+    public IObservable<object> LoadState()
+    {
+        if (!File.Exists(this.file))
+        {
+            return Observable.Return(new AppState());
+        }
+
+        return Observable.FromAsync(() => File.ReadAllTextAsync(this.file))
+            .Select(content => JsonSerializer.Deserialize(content, SourceGenerationContext.Default.AppState))
+            .Select(state => state ?? new AppState());
+    }
+
+    public IObservable<Unit> SaveState(object state)
+    {
+        if (state is AppState appState)
+        {
+            var content = JsonSerializer.Serialize(appState, SourceGenerationContext.Default.AppState);
+            return Observable.FromAsync(() => File.WriteAllTextAsync(this.file, content));
+        }
+
+        return Observable.Throw<Unit>(new InvalidCastException("AppState must be provided to SaveState"));
+    }
+}

src/KeyboardSwitch.Settings/State/SourceGenerationContext.cs

@@ -0,0 +1,9 @@
+namespace KeyboardSwitch.Settings.State;
+
+using System.Text.Json.Serialization;
+
+[JsonSerializable(typeof(AppState))]
+[JsonSourceGenerationOptions(WriteIndented = true)]
+internal partial class SourceGenerationContext : JsonSerializerContext
+{
+}

src/KeyboardSwitch/appsettings.linux.json

@@ -1,8 +1,9 @@
 {
   "Settings": {
     "SettingsFilePath": "%HOME%/.keyboard-switch/settings.db",
+    "StateFilePath": "%HOME%/.config/keyboard-switch/state.json",
     "ServicePath": "./KeyboardSwitch",
-    "InitialSetupFilePath": "%HOME%/.keyboard-switch/.setup-configured"
+    "InitialSetupFilePath": "%HOME%/.config/keyboard-switch/.setup-configured"
   },
   "Startup": {
     "StartupFilePath": "%HOME%/.config/autostart/keyboard-switch.desktop"

src/KeyboardSwitch/appsettings.macos.json

@@ -1,8 +1,9 @@
 {
   "Settings": {
     "SettingsFilePath": "%HOME%/.keyboard-switch/settings.db",
+    "StateFilePath": "%HOME%/Library/Application Support/Keyboard Switch/state.json",
     "ServicePath": "io.tolik.keyboardswitch",
-    "InitialSetupFilePath": "%HOME%/.keyboard-switch/.setup-configured"
+    "InitialSetupFilePath": "%HOME%/Library/Application Support/Keyboard Switch/.setup-configured"
   },
   "Launchd": {
     "ServiceName": "io.tolik.keyboardswitch",

src/KeyboardSwitch/appsettings.windows.json

@@ -1,6 +1,7 @@
 {
   "Settings": {
     "SettingsFilePath": "%LocalAppData%\\KeyboardSwitch\\settings.db",
+    "StateFilePath": "%LocalAppData%\\KeyboardSwitch\\state.json",
     "ServicePath": ".\\KeyboardSwitch.exe",
     "InitialSetupFilePath": "%LocalAppData%\\KeyboardSwitch\\.setup-configured"
   },