Implement settings and add icon

InvLock/DataContexts/MainWindowDataContext.cs

@@ -1,16 +1,22 @@
-using System.Reflection;
+using System.ComponentModel;
+using System.Reflection;
 
 namespace InvLock.DataContexts;
 
-internal class MainWindowDataContext
+internal class MainWindowDataContext : INotifyPropertyChanged
 {
 #if DEBUG
     public string Title => $"{App.AppName} - Dev {AppVersion}";
 #else
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
     public string Title => $"{App.AppName} - {AppVersion}";
 #endif
 
     public string AppName => App.AppName;
 
     public string AppVersion => Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "Unknown";
+
+    public Settings Settings { get; } = Settings.Load();
 }

InvLock/InvLock.csproj

@@ -7,8 +7,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="icon.ico" />
+  </ItemGroup>
+    
   <ItemGroup>
     <PackageReference Include="CuteUtils" Version="1.0.0" />
     <PackageReference Include="SharpHook" Version="5.3.8" />
@@ -16,4 +21,8 @@
     <PackageReference Include="WPF-UI.Tray" Version="3.0.5" />
   </ItemGroup>
     
+  <ItemGroup>
+    <Resource Include="Assets\logo.ico" />
+  </ItemGroup>
+
 </Project>

InvLock/LockWindow.xaml.cs

@@ -15,14 +15,14 @@ namespace InvLock;
 /// </summary>
 public partial class LockWindow : Window
 {
-    private const bool HideWindows = false;
     private readonly SimpleGlobalHook hook = new SimpleGlobalHook();
     private readonly Dictionary<KeyCode, DateTime> pressedKeys = [];
+    private readonly Settings settings;
     private List<IntPtr> windows = [];
     private bool isOpen = true;
     private bool suppressInput = false;
 
-    public LockWindow()
+    public LockWindow(Settings settings)
     {
         InitializeComponent();
 
@@ -42,6 +42,8 @@ public partial class LockWindow : Window
 
         Owner = w;
 
+        this.settings = settings;
+
         hook.MouseMoved += Hook_Mouse;
         hook.MouseDragged += Hook_Mouse;
         hook.MousePressed += Hook_Mouse;
@@ -59,7 +61,7 @@ public partial class LockWindow : Window
 
     private void ActivateLockScreen()
     {
-        if (HideWindows)
+        if (settings.HideWindows)
         {
             MinimizeWindows();
         }
@@ -71,7 +73,7 @@ public partial class LockWindow : Window
         {
             _ = Activate();
 
-            textBlock.Text = "Lock Screen Active";
+            textBlock.Text = settings.LockText;
             textBlock.Stroke = (Brush)FindResource("PaletteRedBrush");
 
             Animation();
@@ -120,7 +122,7 @@ public partial class LockWindow : Window
     {
         if (e.Reason == Microsoft.Win32.SessionSwitchReason.SessionUnlock)
         {
-            if (HideWindows)
+            if (settings.HideWindows)
             {
                 RestoreWindows();
             }
@@ -131,7 +133,7 @@ public partial class LockWindow : Window
 
             await Task.Delay(500);
 
-            textBlock.Text = "Lock Screen Inactive";
+            textBlock.Text = settings.UnlockText;
             textBlock.Stroke = (Brush)FindResource("PaletteGreenBrush");
 
             Animation();

InvLock/MainWindow.xaml

@@ -31,15 +31,22 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <ui:TitleBar Title="{Binding Title}" Grid.Row="0" />
+        <ui:TitleBar Title="{Binding Title}">
+            <ui:TitleBar.Icon>
+                <ui:ImageIcon Source="pack://application:,,,/Assets/logo.ico" />
+            </ui:TitleBar.Icon>
+        </ui:TitleBar>
 
-        <tray:NotifyIcon Grid.Row="0" FocusOnLeftClick="True" MenuOnRightClick="True" LeftClick="NotifyIcon_LeftClick" TooltipText="Wpf.Ui.Demo.Simple">
+        <tray:NotifyIcon Grid.Row="0" FocusOnLeftClick="True" MenuOnRightClick="True" LeftClick="NotifyIcon_LeftClick" TooltipText="{Binding AppName}">
             <tray:NotifyIcon.Menu>
                 <ContextMenu>
                     <MenuItem Header="Settings" Click="SettingsMenuItem_Click" />
                     <MenuItem Header="Quit" Click="QuitMenuItem_Click" />
                 </ContextMenu>
             </tray:NotifyIcon.Menu>
+            <tray:NotifyIcon.Icon>
+                <BitmapImage UriSource="pack://application:,,,/Assets/logo.ico" />
+            </tray:NotifyIcon.Icon>
         </tray:NotifyIcon>
 
         <ui:DynamicScrollViewer Grid.Row="1" VirtualizingPanel.ScrollUnit="Pixel">
@@ -80,21 +87,21 @@
                     <ui:CardControl.Header>
                         <ui:TextBlock Grid.Row="0" FontTypography="Body" Text="Show desktop while locked" />
                     </ui:CardControl.Header>
-                    <ui:ToggleSwitch Grid.Column="1" IsChecked="False" OffContent="Off" OnContent="On" />
+                    <ui:ToggleSwitch Grid.Column="1" IsChecked="{Binding Settings.HideWindows}" OffContent="Off" OnContent="On" />
                 </ui:CardControl>
 
                 <ui:CardControl Margin="0,0,0,12" Icon="{ui:SymbolIcon Symbol=LockClosed24}" Height="75">
                     <ui:CardControl.Header>
                         <ui:TextBlock Grid.Row="0" FontTypography="Body" Text="Lock text" />
                     </ui:CardControl.Header>
-                    <ui:TextBox Grid.Column="1" MinWidth="200" PlaceholderText="Lock screen active" />
+                    <ui:TextBox Grid.Column="1" MinWidth="200" Text="{Binding Settings.LockText, UpdateSourceTrigger=PropertyChanged}" PlaceholderText="Type your lock text here" />
                 </ui:CardControl>
 
                 <ui:CardControl Margin="0,0,0,12" Icon="{ui:SymbolIcon Symbol=LockOpen24}" Height="75">
                     <ui:CardControl.Header>
                         <ui:TextBlock Grid.Row="0" FontTypography="Body" Text="Unlock text" />
                     </ui:CardControl.Header>
-                    <ui:TextBox Grid.Column="1" MinWidth="200" PlaceholderText="Lock screen inactive" />
+                    <ui:TextBox Grid.Column="1" MinWidth="200" Text="{Binding Settings.UnlockText, UpdateSourceTrigger=PropertyChanged}" PlaceholderText="Type your unlock text here" />
                 </ui:CardControl>
 
                 <ui:TextBlock Margin="0,24,0,8" FontTypography="BodyStrong" Text="About" />

InvLock/MainWindow.xaml.cs

@@ -12,12 +12,13 @@ namespace InvLock;
 /// </summary>
 public partial class MainWindow : FluentWindow
 {
+    private readonly MainWindowDataContext mainWindowDataContext = new MainWindowDataContext();
     private LockWindow? lockWindow;
     private bool blockWindowClosing = true;
 
     public MainWindow()
     {
-        DataContext = new MainWindowDataContext();
+        DataContext = mainWindowDataContext;
 
         InitializeComponent();
 
@@ -51,7 +52,7 @@ public partial class MainWindow : FluentWindow
     {
         Close();
 
-        lockWindow = new LockWindow();
+        lockWindow = new LockWindow(mainWindowDataContext.Settings);
         lockWindow.Show();
     }
 
@@ -62,6 +63,8 @@ public partial class MainWindow : FluentWindow
 
     private void FluentWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
     {
+        mainWindowDataContext.Settings.Save();
+
         if (blockWindowClosing)
         {
             e.Cancel = true;

InvLock/Settings.cs

@@ -1,8 +1,69 @@
-namespace InvLock;
+using System.ComponentModel;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
 
-internal class Settings
+namespace InvLock;
+
+public class Settings : INotifyPropertyChanged
 {
-    public bool HideWindows { get; set; } = false;
+    public event PropertyChangedEventHandler? PropertyChanged;
-    public string LockText { get; set; } = "Lock Screen Active";
+
-    public string UnlockText { get; set; } = "Lock Screen Inactive";
+    private static readonly string settingsPath = Path.Combine(App.ApplicationDataPath, "settings.json");
+    private bool hideWindows = false;
+    private string lockText = "Lock Screen Active";
+
+    private string unlockText = "Lock Screen Inactive";
+
+    public bool HideWindows
+    {
+        get => hideWindows;
+        set
+        {
+            hideWindows = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string LockText
+    {
+        get => lockText;
+        set
+        {
+            lockText = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string UnlockText
+    {
+        get => unlockText;
+        set
+        {
+            unlockText = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public static Settings Load()
+    {
+        if (File.Exists(settingsPath))
+        {
+            string json = File.ReadAllText(settingsPath);
+            return JsonSerializer.Deserialize<Settings>(json) ?? new Settings();
+        }
+
+        return new Settings();
+    }
+
+    public void Save()
+    {
+        string json = JsonSerializer.Serialize(this);
+        File.WriteAllText(settingsPath, json);
+    }
+
+    protected void OnPropertyChanged([CallerMemberName] string? name = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+    }
 }