Updated wpfextended dependency

Daybreak/Configuration/ProjectConfiguration.cs

@@ -1,5 +1,4 @@
 using Daybreak.Services.ApplicationLauncher;
-using Daybreak.Services.ApplicationLifetime;
 using Daybreak.Services.Bloogum;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
@@ -8,7 +7,6 @@ using Daybreak.Services.IconRetrieve;
 using Daybreak.Services.Logging;
 using Daybreak.Services.Mutex;
 using Daybreak.Services.Privilege;
-using Daybreak.Services.Runtime;
 using Daybreak.Services.Screens;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Shortcuts;
@@ -47,11 +45,9 @@ namespace Daybreak.Configuration
         {
             serviceProducer.ThrowIfNull(nameof(serviceProducer));
 
-            serviceProducer.RegisterSingleton<ApplicationLifetimeManager>();
             serviceProducer.RegisterSingleton<ViewManager>();
             serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
             serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
-            serviceProducer.RegisterSingleton<IRuntimeStore, RuntimeStore>();
             serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
             serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
             serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
@@ -65,14 +61,7 @@ namespace Daybreak.Configuration
             serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
             serviceProducer.RegisterLogWriter<ILogsManager, JsonLogsManager>();
         }
-        public static void RegisterLifetimeServices(IApplicationLifetimeProducer applicationLifetimeProducer)
-        {
-            applicationLifetimeProducer.ThrowIfNull(nameof(applicationLifetimeProducer));
 
-            applicationLifetimeProducer.RegisterService<IScreenshotProvider>();
-            applicationLifetimeProducer.RegisterService<IApplicationUpdater>();
-            applicationLifetimeProducer.RegisterService<IShortcutManager>();
-        }
         public static void RegisterViews(IViewProducer viewProducer)
         {
             viewProducer.ThrowIfNull(nameof(viewProducer));

Daybreak/Daybreak.csproj

@@ -10,7 +10,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.2.2</Version>
+    <Version>0.9.2.3</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,11 +23,11 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.1" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageReference Include="Slim" Version="1.4.3" />
+    <PackageReference Include="Slim" Version="1.5.0" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.4.2" />
+    <PackageReference Include="WpfExtended" Version="0.5.0" />
     <PackageReference Include="WpfExtended.SourceGeneration" Version="0.1.1" />
     <PackageReference Include="WpfScreenHelper" Version="1.0.0" />
   </ItemGroup>

Daybreak/Launch/Launcher.cs

@@ -1,6 +1,5 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
-using Daybreak.Services.ApplicationLifetime;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
 using Slim;
@@ -33,7 +32,6 @@ namespace Daybreak.Launch
         {
             ProjectConfiguration.RegisterServices(this.ServiceManager);
             ServiceManager.BuildSingletons();
-            ProjectConfiguration.RegisterLifetimeServices(this.ServiceManager.GetService<IApplicationLifetimeManager>());
             ProjectConfiguration.RegisterViews(this.ServiceManager.GetService<IViewManager>());
         }
         protected override bool HandleException(Exception e)
@@ -86,13 +84,11 @@ namespace Daybreak.Launch
         }
         protected override void ApplicationStarting()
         {
-            this.ServiceManager.GetService<IApplicationLifetimeManager>().OnStartup();
             this.logger = this.ServiceManager.GetService<ILogger<Launcher>>();
             this.RegisterViewContainer();
         }
         protected override void ApplicationClosing()
         {
-            this.ServiceManager.GetService<IApplicationLifetimeManager>().OnClosing();
         }
 
         private void RegisterViewContainer()

Daybreak/Launch/MainWindow.xaml.cs

@@ -1,7 +1,6 @@
 using Daybreak.Services.Bloogum;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.Privilege;
-using Daybreak.Services.Runtime;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;

Daybreak/Services/ApplicationLifetime/ApplicationLifetimeManager.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Extensions;
-using IServiceProvider = Slim.IServiceProvider;
-
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public sealed class ApplicationLifetimeManager : IApplicationLifetimeManager
-    {
-        private readonly IServiceProvider serviceProvider;
-        private List<Type> RegisteredTypes { get; } = new List<Type>();
-
-        public ApplicationLifetimeManager(IServiceProvider serviceProvider)
-        {
-            serviceProvider.ThrowIfNull(nameof(serviceProvider));
-
-            this.serviceProvider = serviceProvider;
-        }
-
-        public void RegisterService<T>() where T : IApplicationLifetimeService
-        {
-            this.RegisteredTypes.Add(typeof(T));
-        }
-
-        public void OnStartup()
-        {
-            foreach (var serviceType in this.RegisteredTypes)
-            {
-                var service = this.serviceProvider.GetService(serviceType);
-                service.As<IApplicationLifetimeService>().OnStartup();
-            }
-        }
-
-        public void OnClosing()
-        {
-            foreach (var serviceType in this.RegisteredTypes)
-            {
-                var service = this.serviceProvider.GetService(serviceType);
-                service.As<IApplicationLifetimeService>().OnClosing();
-            }
-        }
-    }
-}

Daybreak/Services/ApplicationLifetime/IApplicationLifetimeManager.cs

@@ -1,8 +0,0 @@
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public interface IApplicationLifetimeManager : IApplicationLifetimeProducer
-    {
-        void OnStartup();
-        void OnClosing();
-    }
-}

Daybreak/Services/ApplicationLifetime/IApplicationLifetimeProducer.cs

@@ -1,7 +0,0 @@
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public interface IApplicationLifetimeProducer
-    {
-        void RegisterService<T>() where T : IApplicationLifetimeService;
-    }
-}

Daybreak/Services/ApplicationLifetime/IApplicationLifetimeService.cs

@@ -1,8 +0,0 @@
-namespace Daybreak.Services.ApplicationLifetime
-{
-    public interface IApplicationLifetimeService
-    {
-        void OnStartup();
-        void OnClosing();
-    }
-}

Daybreak/Services/KeyboardHook/IKeyboardHookService.cs

@@ -1,6 +1,6 @@
 using Daybreak.Models;
-using Daybreak.Services.ApplicationLifetime;
 using System;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.KeyboardHook
 {

Daybreak/Services/KeyboardMacros/IMacroService.cs

@@ -1,4 +1,4 @@
-using Daybreak.Services.ApplicationLifetime;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.KeyboardMacros
 {

Daybreak/Services/Runtime/IRuntimeStore.cs

@@ -1,9 +0,0 @@
-namespace Daybreak.Services.Runtime
-{
-    public interface IRuntimeStore
-    {
-        void StoreValue<T>(string name, T value);
-        bool TryGetValue<T>(string name, out T value);
-        T GetValue<T>(string name);
-    }
-}

Daybreak/Services/Runtime/RuntimeStore.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Extensions;
-
-namespace Daybreak.Services.Runtime
-{
-    public sealed class RuntimeStore : IRuntimeStore
-    {
-        private Dictionary<string, object> InnerStore { get; } = new Dictionary<string, object>();
-
-        public T GetValue<T>(string name)
-        {
-            if(this.InnerStore.TryGetValue(name, out var value))
-            {
-                return value.Cast<T>();
-            }
-
-            throw new InvalidOperationException($"Could not find any value stored with name {name}");
-        }
-        public void StoreValue<T>(string name, T value)
-        {
-            this.InnerStore[name] = value;
-        }
-        public bool TryGetValue<T>(string name, out T value)
-        {
-            if (this.InnerStore.TryGetValue(name, out var valueObj))
-            {
-                value = valueObj.Cast<T>();
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-    }
-}

Daybreak/Services/Screenshots/IScreenshotProvider.cs

@@ -1,5 +1,5 @@
-using Daybreak.Services.ApplicationLifetime;
-using System.Extensions;
+using System.Extensions;
+using System.Windows.Extensions.Services;
 using System.Windows.Media;
 
 namespace Daybreak.Services.Screenshots

Daybreak/Services/Shortcuts/IShortcutManager.cs

@@ -1,4 +1,4 @@
-using Daybreak.Services.ApplicationLifetime;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.Shortcuts
 {

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -1,7 +1,7 @@
 using Daybreak.Exceptions;
 using Daybreak.Models;
 using Daybreak.Models.Github;
-using Daybreak.Services.Runtime;
+using Daybreak.Services.Configuration;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
 using Daybreak.Views;
@@ -26,7 +26,6 @@ namespace Daybreak.Services.Updater
     public sealed class ApplicationUpdater : IApplicationUpdater
     {
         private const string LaunchActionName = "Launch_Daybreak";
-        private const string UpdateDesiredKey = "UpdateDesired";
         private const string ExecutionPolicyKey = "ExecutionPolicy";
         private const string UpdatedKey = "Updating";
         private const string RegistryKey = "Daybreak";
@@ -59,19 +58,19 @@ namespace Daybreak.Services.Updater
         private readonly CancellationTokenSource updateCancellationTokenSource = new();
         private readonly ILogger<ApplicationUpdater> logger;
         private readonly IViewManager viewManager;
-        private readonly IRuntimeStore runtimeStore;
+        private readonly IConfigurationManager configurationManager;
         private readonly IHttpClient<ApplicationUpdater> httpClient;
 
         public Version CurrentVersion { get; }
 
         public ApplicationUpdater(
             ILogger<ApplicationUpdater> logger,
-            IRuntimeStore runtimeStore,
+            IConfigurationManager configurationManager,
             IViewManager viewManager,
             IHttpClient<ApplicationUpdater> httpClient)
         {
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
+            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
             this.httpClient.DefaultRequestHeaders.Add("user-agent", "Daybreak Client");
@@ -176,7 +175,7 @@ namespace Daybreak.Services.Updater
         {
             System.Extensions.TaskExtensions.RunPeriodicAsync(async () =>
             {
-                if (this.runtimeStore.TryGetValue<bool>(UpdateDesiredKey, out var desiringUpdate) && desiringUpdate is false)
+                if (this.configurationManager.GetConfiguration().AutoCheckUpdate is false)
                 {
                     this.updateCancellationTokenSource.Cancel();
                     return;

Daybreak/Services/Updater/IApplicationUpdater.cs

@@ -1,8 +1,8 @@
 using Daybreak.Models;
 using Daybreak.Models.Versioning;
-using Daybreak.Services.ApplicationLifetime;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Windows.Extensions.Services;
 
 namespace Daybreak.Services.Updater
 {

Daybreak/Views/AskUpdateView.xaml.cs

@@ -1,5 +1,5 @@
-using Daybreak.Services.Privilege;
-using Daybreak.Services.Runtime;
+using Daybreak.Services.Configuration;
+using Daybreak.Services.Privilege;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
 using Microsoft.Extensions.Logging;
@@ -14,24 +14,22 @@ namespace Daybreak.Views
     /// </summary>
     public partial class AskUpdateView : UserControl
     {
-        private const string UpdateDesiredKey = "UpdateDesired";
-
         private readonly ILogger<AskUpdateView> logger;
         private readonly IViewManager viewManager;
-        private readonly IRuntimeStore runtimeStore;
+        private readonly IConfigurationManager configurationManager;
         private readonly IPrivilegeManager privilegeManager;
         private readonly IApplicationUpdater applicationUpdater;
 
         public AskUpdateView(
             ILogger<AskUpdateView> logger,
             IViewManager viewManager,
-            IRuntimeStore runtimeStore,
+            IConfigurationManager configurationManager,
             IPrivilegeManager privilegeManager,
             IApplicationUpdater applicationUpdater)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
+            this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
             this.privilegeManager = privilegeManager.ThrowIfNull(nameof(privilegeManager));
             this.applicationUpdater = applicationUpdater.ThrowIfNull(nameof(applicationUpdater));
             this.InitializeComponent();
@@ -51,14 +49,18 @@ namespace Daybreak.Views
         private void NoButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User declined update");
-            this.runtimeStore.StoreValue(UpdateDesiredKey, false);
+            var config = this.configurationManager.GetConfiguration();
+            config.AutoCheckUpdate = false;
+            this.configurationManager.SaveConfiguration(config);
             this.viewManager.ShowView<MainView>();
         }
 
         private async void YesButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User accepted update");
-            this.runtimeStore.StoreValue(UpdateDesiredKey, true);
+            var config = this.configurationManager.GetConfiguration();
+            config.AutoCheckUpdate = false;
+            this.configurationManager.SaveConfiguration(config);
             if (this.CheckIfAdmin() is false)
             {
                 return;