WIP

Author: ibetitsmike

App/App.csproj

@@ -57,6 +57,7 @@
     <ItemGroup>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
         <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
+        <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
         <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
         <PackageReference Include="DependencyPropertyGenerator" Version="1.5.0">
             <PrivateAssets>all</PrivateAssets>

App/App.xaml.cs

@@ -44,6 +44,8 @@ public partial class App : Application
     private readonly ILogger<App> _logger;
     private readonly IUriHandler _uriHandler;
 
+    private readonly ISettingsManager _settingsManager;
+
     public App()
     {
         var builder = Host.CreateApplicationBuilder();
@@ -115,6 +117,7 @@ public App()
         _services = services.BuildServiceProvider();
         _logger = (ILogger<App>)_services.GetService(typeof(ILogger<App>))!;
         _uriHandler = (IUriHandler)_services.GetService(typeof(IUriHandler))!;
+        _settingsManager = (ISettingsManager)_services.GetService(typeof(ISettingsManager))!;
 
         InitializeComponent();
     }
@@ -150,6 +153,22 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
                 Debug.WriteLine(t.Exception);
                 Debugger.Break();
 #endif
+            } else
+            {
+                if (rpcController.GetState().RpcLifecycle == RpcLifecycle.Disconnected)
+                {
+                    if (_settingsManager.Read(SettingsManager.ConnectOnLaunchKey, false))
+                    {
+                        _logger.LogInformation("RPC lifecycle is disconnected, but ConnectOnLaunch is enabled; attempting to connect");
+                        _ = rpcController.StartVpn(CancellationToken.None).ContinueWith(connectTask =>
+                        {
+                            if (connectTask.Exception != null)
+                            {
+                                _logger.LogError(connectTask.Exception, "failed to connect on launch");
+                            }
+                        });
+                    }
+                }
             }
         });
 
@@ -178,9 +197,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             if (t.IsCanceled || t.Exception != null)
             {
                 _logger.LogError(t.Exception, "failed to refresh sync state (canceled = {canceled})", t.IsCanceled);
-#if DEBUG
-                Debugger.Break();
-#endif
             }
 
             syncSessionCts.Dispose();

App/Services/SettingsManager.cs

@@ -32,8 +32,11 @@ public sealed class SettingsManager : ISettingsManager
     private readonly object _lock = new();
     private Dictionary<string, JsonElement> _cache;
 
+    public static readonly string ConnectOnLaunchKey = "ConnectOnLaunch";
+    public static readonly string StartOnLoginKey = "StartOnLogin";
+
     /// <param name="appName">
-    /// Sub‑folder under %LOCALAPPDATA% (e.g. "coder-desktop").
+    /// Sub‑folder under %LOCALAPPDATA% (e.g. "CoderDesktop").
     /// If <c>null</c> the folder name defaults to the executable name.
     /// For unit‑tests you can pass an absolute path that already exists.
     /// </param>

App/ViewModels/SettingsViewModel.cs

@@ -1,10 +1,11 @@
-using System;
 using Coder.Desktop.App.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using System;
 
 namespace Coder.Desktop.App.ViewModels;
 
@@ -13,11 +14,48 @@ public partial class SettingsViewModel : ObservableObject
     private Window? _window;
     private DispatcherQueue? _dispatcherQueue;
 
+    private readonly ILogger<SettingsViewModel> _logger;
+
+    [ObservableProperty]
+    public partial bool ConnectOnLaunch { get; set; } = false;
+
+    [ObservableProperty]
+    public partial bool StartOnLogin { get; set; } = false;
+
     private ISettingsManager _settingsManager;
 
-    public SettingsViewModel(ISettingsManager settingsManager)
+    public SettingsViewModel(ILogger<SettingsViewModel> logger, ISettingsManager settingsManager)
     {
         _settingsManager = settingsManager;
+        _logger = logger;
+        ConnectOnLaunch = _settingsManager.Read(SettingsManager.ConnectOnLaunchKey, false);
+        StartOnLogin = _settingsManager.Read(SettingsManager.StartOnLoginKey, false);
+
+        this.PropertyChanged += (_, args) =>
+        {
+            if (args.PropertyName == nameof(ConnectOnLaunch))
+            {
+                try
+                {
+                    _settingsManager.Save(SettingsManager.ConnectOnLaunchKey, ConnectOnLaunch);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Error saving {SettingsManager.ConnectOnLaunchKey} setting: {ex.Message}");
+                }
+            }
+            else if (args.PropertyName == nameof(StartOnLogin))
+            {
+                try
+                {
+                    _settingsManager.Save(SettingsManager.StartOnLoginKey, StartOnLogin);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Error saving {SettingsManager.StartOnLoginKey} setting: {ex.Message}");
+                }
+            }
+        };
     }
 
     public void Initialize(Window window, DispatcherQueue dispatcherQueue)
@@ -27,28 +65,4 @@ public void Initialize(Window window, DispatcherQueue dispatcherQueue)
         if (!_dispatcherQueue.HasThreadAccess)
             throw new InvalidOperationException("Initialize must be called from the UI thread");
     }
-
-    [RelayCommand]
-    private void SaveSetting()
-    {
-        //_settingsManager.Save();
-    }
-
-    [RelayCommand]
-    private void ShowSettingsDialog()
-    {
-        if (_window is null || _dispatcherQueue is null)
-            throw new InvalidOperationException("Initialize must be called before showing the settings dialog.");
-        // Here you would typically open a settings dialog or page.
-        // For example, you could navigate to a SettingsPage in your app.
-        // This is just a placeholder for demonstration purposes.
-        // Display MessageBox and show a message
-        var message = $"Settings dialog opened. Current setting: {_settingsManager.Read("SomeSetting", false)}\n" +
-                      "You can implement your settings dialog here.";
-        var dialog = new ContentDialog();
-        dialog.Title = "Settings";
-        dialog.Content = message;
-        dialog.XamlRoot = _window.Content.XamlRoot;
-        _ = dialog.ShowAsync();
-    }
 }

App/Views/Pages/SettingsMainPage.xaml

@@ -8,16 +8,49 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewmodels="using:Coder.Desktop.App.ViewModels"
     xmlns:converters="using:Coder.Desktop.App.Converters"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Grid>
-        <HyperlinkButton
-    Command="{x:Bind ViewModel.ShowSettingsDialogCommand, Mode=OneWay}"
-    HorizontalAlignment="Stretch"
-    HorizontalContentAlignment="Left">
+    <Page.Resources>
+        <!--  These styles can be referenced to create a consistent SettingsPage layout  -->
+
+        <!--  Spacing between cards  -->
+        <x:Double x:Key="SettingsCardSpacing">4</x:Double>
+
+        <!--  Style (inc. the correct spacing) of a section header  -->
+        <Style x:Key="SettingsSectionHeaderTextBlockStyle"
+               BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+               TargetType="TextBlock">
+            <Style.Setters>
+                <Setter Property="Margin" Value="1,30,0,6" />
+            </Style.Setters>
+        </Style>
+    </Page.Resources>
+    <ScrollViewer>
+        <Grid Padding="20, 0, 20, 0">
+            <StackPanel MaxWidth="1000"
+                        HorizontalAlignment="Stretch"
+                        Spacing="{StaticResource SettingsCardSpacing}">
+
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Coder Desktop" />
+
+                <controls:SettingsCard Description="This setting controls whether the Coder Desktop app starts on Windows startup."
+                                       Header="Start on login"
+                                       HeaderIcon="{ui:FontIcon Glyph=&#xE819;}">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.StartOnLogin, Mode=TwoWay}" />
+                </controls:SettingsCard>
+
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Coder Connect" />
+                <controls:SettingsCard Description="This setting controls whether Coder Connect automatically starts with Coder Desktop  "
+                                       Header="Connect on launch"
+                                       HeaderIcon="{ui:FontIcon Glyph=&#xE8AF;}">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.ConnectOnLaunch, Mode=TwoWay}" />
+                </controls:SettingsCard>
+            </StackPanel>
+        </Grid>
+    </ScrollViewer>
 
-            <TextBlock Text="Show settings" Foreground="{ThemeResource DefaultTextForegroundThemeBrush}" />
-        </HyperlinkButton>
-    </Grid>
 </Page>

App/Views/SettingsWindow.xaml

@@ -9,8 +9,8 @@
     xmlns:winuiex="using:WinUIEx"
     mc:Ignorable="d"
     Title="Coder Settings"
-    Width="1000" Height="300"
-    MinWidth="1000" MinHeight="300">
+    Width="600" Height="350"
+    MinWidth="600" MinHeight="350">
 
     <Window.SystemBackdrop>
         <DesktopAcrylicBackdrop />

App/packages.lock.json

@@ -18,6 +18,16 @@
           "Microsoft.WindowsAppSDK": "1.6.250108002"
         }
       },
+      "CommunityToolkit.WinUI.Controls.SettingsControls": {
+        "type": "Direct",
+        "requested": "[8.2.250402, )",
+        "resolved": "8.2.250402",
+        "contentHash": "whJNIyxVwwLmmCS63m91r0aL13EYgdKDE0ERh2e0G2U5TUeYQQe2XRODGGr/ceBRvqu6SIvq1sXxVwglSMiJMg==",
+        "dependencies": {
+          "CommunityToolkit.WinUI.Triggers": "8.2.250402",
+          "Microsoft.WindowsAppSDK": "1.6.250108002"
+        }
+      },
       "CommunityToolkit.WinUI.Extensions": {
         "type": "Direct",
         "requested": "[8.2.250402, )",
@@ -152,6 +162,24 @@
         "resolved": "8.2.1",
         "contentHash": "LWuhy8cQKJ/MYcy3XafJ916U3gPH/YDvYoNGWyQWN11aiEKCZszzPOTJAOvBjP9yG8vHmIcCyPUt4L82OK47Iw=="
       },
+      "CommunityToolkit.WinUI.Helpers": {
+        "type": "Transitive",
+        "resolved": "8.2.250402",
+        "contentHash": "DThBXB4hT3/aJ7xFKQJw/C0ZEs1QhZL7QG6AFOYcpnGWNlv3tkF761PFtTyhpNQrR1AFfzml5zG+zWfFbKs6Mw==",
+        "dependencies": {
+          "CommunityToolkit.WinUI.Extensions": "8.2.250402",
+          "Microsoft.WindowsAppSDK": "1.6.250108002"
+        }
+      },
+      "CommunityToolkit.WinUI.Triggers": {
+        "type": "Transitive",
+        "resolved": "8.2.250402",
+        "contentHash": "laHIrBQkwQCurTNSQdGdEXUyoCpqY8QFXSybDM/Q1Ti/23xL+sRX/gHe3pP8uMM59bcwYbYlMRCbIaLnxnrdjw==",
+        "dependencies": {
+          "CommunityToolkit.WinUI.Helpers": "8.2.250402",
+          "Microsoft.WindowsAppSDK": "1.6.250108002"
+        }
+      },
       "Google.Protobuf": {
         "type": "Transitive",
         "resolved": "3.29.3",