Implement settings and add icon

Stone-Red-Code · Stone-Red-Code · commit cb90f665f69a · 2024-12-18T15:12:36.000+01:00
diff --git a/InvLock/Assets/logo.ico b/InvLock/Assets/logo.ico
diff --git a/InvLock/DataContexts/MainWindowDataContext.cs b/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 string Title => $"{App.AppName} - {AppVersion}";
+
+    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();
 }
diff --git a/InvLock/InvLock.csproj b/InvLock/InvLock.csproj
@@ -7,13 +7,22 @@
     <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" />
     <PackageReference Include="WPF-UI" Version="3.0.5" />
     <PackageReference Include="WPF-UI.Tray" Version="3.0.5" />
   </ItemGroup>
+    
+  <ItemGroup>
+    <Resource Include="Assets\logo.ico" />
+  </ItemGroup>
 
 </Project>
diff --git a/InvLock/LockWindow.xaml.cs b/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 LockWindow()
 
         Owner = w;
 
+        this.settings = settings;
+
         hook.MouseMoved += Hook_Mouse;
         hook.MouseDragged += Hook_Mouse;
         hook.MousePressed += Hook_Mouse;
@@ -59,7 +61,7 @@ public LockWindow()
 
     private void ActivateLockScreen()
     {
-        if (HideWindows)
+        if (settings.HideWindows)
         {
             MinimizeWindows();
         }
@@ -71,7 +73,7 @@ private void ActivateLockScreen()
         {
             _ = Activate();
 
-            textBlock.Text = "Lock Screen Active";
+            textBlock.Text = settings.LockText;
             textBlock.Stroke = (Brush)FindResource("PaletteRedBrush");
 
             Animation();
@@ -120,7 +122,7 @@ private async void SystemEvents_SessionSwitch(object sender, Microsoft.Win32.Ses
     {
         if (e.Reason == Microsoft.Win32.SessionSwitchReason.SessionUnlock)
         {
-            if (HideWindows)
+            if (settings.HideWindows)
             {
                 RestoreWindows();
             }
@@ -131,7 +133,7 @@ private async void SystemEvents_SessionSwitch(object sender, Microsoft.Win32.Ses
 
             await Task.Delay(500);
 
-            textBlock.Text = "Lock Screen Inactive";
+            textBlock.Text = settings.UnlockText;
             textBlock.Stroke = (Brush)FindResource("PaletteGreenBrush");
 
             Animation();
diff --git a/InvLock/MainWindow.xaml b/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" />
diff --git a/InvLock/MainWindow.xaml.cs b/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 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
     {
         Close();
 
-        lockWindow = new LockWindow();
+        lockWindow = new LockWindow(mainWindowDataContext.Settings);
         lockWindow.Show();
     }
 
@@ -62,6 +63,8 @@ private void NotifyIcon_LeftClick(Wpf.Ui.Tray.Controls.NotifyIcon sender, Routed
 
     private void FluentWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
     {
+        mainWindowDataContext.Settings.Save();
+
         if (blockWindowClosing)
         {
             e.Cancel = true;
diff --git a/InvLock/Settings.cs b/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 string LockText { get; set; } = "Lock Screen Active";
-    public string UnlockText { get; set; } = "Lock Screen Inactive";
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    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));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ namespace InvLock;`
`15`	`15`	`/// </summary>`
`16`	`16`	`public partial class LockWindow : Window`
`17`	`17`	`{`
`18`		`- private const bool HideWindows = false;`
`19`	`18`	`private readonly SimpleGlobalHook hook = new SimpleGlobalHook();`
`20`	`19`	`private readonly Dictionary<KeyCode, DateTime> pressedKeys = [];`
	`20`	`+ private readonly Settings settings;`
`21`	`21`	`private List<IntPtr> windows = [];`
`22`	`22`	`private bool isOpen = true;`
`23`	`23`	`private bool suppressInput = false;`
`24`	`24`
`25`		`- public LockWindow()`
	`25`	`+ public LockWindow(Settings settings)`
`26`	`26`	`{`
`27`	`27`	`InitializeComponent();`
`28`	`28`
`@@ -42,6 +42,8 @@ public LockWindow()`
`42`	`42`
`43`	`43`	`Owner = w;`
`44`	`44`
	`45`	`+ this.settings = settings;`
	`46`	`+`
`45`	`47`	`hook.MouseMoved += Hook_Mouse;`
`46`	`48`	`hook.MouseDragged += Hook_Mouse;`
`47`	`49`	`hook.MousePressed += Hook_Mouse;`
`@@ -59,7 +61,7 @@ public LockWindow()`
`59`	`61`
`60`	`62`	`private void ActivateLockScreen()`
`61`	`63`	`{`
`62`		`- if (HideWindows)`
	`64`	`+ if (settings.HideWindows)`
`63`	`65`	`{`
`64`	`66`	`MinimizeWindows();`
`65`	`67`	`}`
`@@ -71,7 +73,7 @@ private void ActivateLockScreen()`
`71`	`73`	`{`
`72`	`74`	`_ = Activate();`
`73`	`75`
`74`		`- textBlock.Text = "Lock Screen Active";`
	`76`	`+ textBlock.Text = settings.LockText;`
`75`	`77`	`textBlock.Stroke = (Brush)FindResource("PaletteRedBrush");`
`76`	`78`
`77`	`79`	`Animation();`
`@@ -120,7 +122,7 @@ private async void SystemEvents_SessionSwitch(object sender, Microsoft.Win32.Ses`
`120`	`122`	`{`
`121`	`123`	`if (e.Reason == Microsoft.Win32.SessionSwitchReason.SessionUnlock)`
`122`	`124`	`{`
`123`		`- if (HideWindows)`
	`125`	`+ if (settings.HideWindows)`
`124`	`126`	`{`
`125`	`127`	`RestoreWindows();`
`126`	`128`	`}`
`@@ -131,7 +133,7 @@ private async void SystemEvents_SessionSwitch(object sender, Microsoft.Win32.Ses`
`131`	`133`
`132`	`134`	`await Task.Delay(500);`
`133`	`135`
`134`		`- textBlock.Text = "Lock Screen Inactive";`
	`136`	`+ textBlock.Text = settings.UnlockText;`
`135`	`137`	`textBlock.Stroke = (Brush)FindResource("PaletteGreenBrush");`
`136`	`138`
`137`	`139`	`Animation();`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,13 @@ namespace InvLock;`
`12`	`12`	`/// </summary>`
`13`	`13`	`public partial class MainWindow : FluentWindow`
`14`	`14`	`{`
	`15`	`+ private readonly MainWindowDataContext mainWindowDataContext = new MainWindowDataContext();`
`15`	`16`	`private LockWindow? lockWindow;`
`16`	`17`	`private bool blockWindowClosing = true;`
`17`	`18`
`18`	`19`	`public MainWindow()`
`19`	`20`	`{`
`20`		`- DataContext = new MainWindowDataContext();`
	`21`	`+ DataContext = mainWindowDataContext;`
`21`	`22`
`22`	`23`	`InitializeComponent();`
`23`	`24`
`@@ -51,7 +52,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e)`
`51`	`52`	`{`
`52`	`53`	`Close();`
`53`	`54`
`54`		`- lockWindow = new LockWindow();`
	`55`	`+ lockWindow = new LockWindow(mainWindowDataContext.Settings);`
`55`	`56`	`lockWindow.Show();`
`56`	`57`	`}`
`57`	`58`
`@@ -62,6 +63,8 @@ private void NotifyIcon_LeftClick(Wpf.Ui.Tray.Controls.NotifyIcon sender, Routed`
`62`	`63`
`63`	`64`	`private void FluentWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)`
`64`	`65`	`{`
	`66`	`+ mainWindowDataContext.Settings.Save();`
	`67`	`+`
`65`	`68`	`if (blockWindowClosing)`
`66`	`69`	`{`
`67`	`70`	`e.Cancel = true;`