Implement expandable menu view (#95)

* Make main view maintain its state

* Stop checking game state when mainview is not loaded

.editorconfig

@@ -0,0 +1,134 @@
+[*.cs]
+
+# CA2254: Template should be a static expression
+dotnet_diagnostic.CA2254.severity = none
+csharp_indent_labels = one_less_than_current
+csharp_using_directive_placement = outside_namespace:error
+csharp_prefer_simple_using_statement = true:error
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_braces = false
+insert_final_newline = true
+csharp_space_around_binary_operators = before_and_after
+csharp_style_throw_expression = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:error
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:error
+csharp_style_unused_value_assignment_preference = discard_variable:error
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_prefer_static_local_function = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_prefer_parameter_null_checking = true:suggestion
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = false:silent
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = error
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = error
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = error
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error
+dotnet_style_prefer_auto_properties = true:error
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = false:suggestion
+dotnet_code_quality_unused_parameters = all:error
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
+dotnet_style_qualification_for_field = true:error
+dotnet_style_qualification_for_property = true:error
+dotnet_style_qualification_for_method = true:error
+dotnet_style_qualification_for_event = true:error
+dotnet_diagnostic.CA1000.severity = error
+
+[*.vb]
+dotnet_diagnostic.CA1047.severity = error

.github/CODEOWNERS

@@ -0,0 +1 @@
+*	amacocian@yahoo.com

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/cd.yaml

@@ -9,6 +9,9 @@ on:
   push:
     branches:
       - master
+    paths:
+      - "Daybreak/**"
+      - "Daybreak.Installer/**"
       
 jobs:
 
@@ -24,12 +27,12 @@ jobs:
       Configuration: Release
       Solution_Path: Daybreak.sln
       Test_Project_Path: Daybreak.Tests\Daybreak.Tests.csproj
-      Wpf_Project_Path: Daybreak\Daybreal.csproj
+      Wpf_Project_Path: Daybreak\Daybreak.csproj
       Actions_Allow_Unsecure_Commands: true
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -50,13 +53,18 @@ jobs:
         echo "${{ env.Changelog }}"
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: '6.x'
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.1
 
+    - name: Setup project secrets
+      run: |
+        dotnet user-secrets --project Daybreak\Daybreak.csproj set AadApplicationId "${{ secrets.AadApplicationId }}"
+        dotnet user-secrets --project Daybreak\Daybreak.csproj set AadTenantId "${{ secrets.AadTenantId }}"
+
     - name:  Restore project
       run: msbuild $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=$env:RuntimeIdentifier
       env:
@@ -87,7 +95,7 @@ jobs:
       shell: pwsh
 
     - name: Publish release
-      uses: Xotl/cool-github-releases@v1.1.2
+      uses: Xotl/cool-github-releases@v1.1.7
       with:
         mode: update
         tag_name: v${{ env.Version }}

.github/workflows/ci.yaml

@@ -31,12 +31,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: '6.x'
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '41 12 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '6.x'
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/version_check.yaml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - master
+    paths:
+      - "Daybreak/**"
+      - "Daybreak.Installer/**"
 
 jobs:
 
@@ -22,7 +25,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     

Daybreak.Installer/Program.cs

@@ -24,11 +24,32 @@ catch
 
 }
 Console.WriteLine("Deleting package");
-File.Delete(tempFile);
+try
+{
+    File.Delete(tempFile);
+}
+catch(Exception e)
+{
+    Console.WriteLine($"Failed to delete {tempFile}.\n{e}");
+}
 
 Console.WriteLine("Deleting browser caches");
-Directory.Delete("BrowserData", true);
-Directory.Delete("Daybreak.exe.WebView2", true);
+try
+{
+    Directory.Delete("BrowserData", true);
+}
+catch(Exception e)
+{
+    Console.WriteLine($"Failed to delete BrowserData.\n{e}");
+}
+try
+{
+    Directory.Delete("Daybreak.exe.WebView2", true);
+}
+catch(Exception e)
+{
+    Console.WriteLine($"Failed to delete Daybreak.exe.WebView2.\n{e}");
+}
 
 Console.WriteLine("Launching application");
 var process = new Process
@@ -43,4 +64,4 @@ if (process.Start() is false)
 {
     Console.WriteLine("Failed to launch application");
     Console.ReadKey();
-}
+}

Daybreak.Tests/Daybreak.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220707-01" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220726-02" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />

Daybreak.Tests/Services/BuildTemplateManagerTests.cs

@@ -17,7 +17,7 @@ namespace Daybreak.Tests.Services
         [TestInitialize]
         public void Initialize()
         {
-            buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
+            this.buildTemplateManager = new BuildTemplateManager(new Mock<ILogger<BuildTemplateManager>>().Object);
         }
 
         [TestMethod]

Daybreak.sln

@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pipelines", "Pipelines", "{
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\cd.yaml = .github\workflows\cd.yaml
 		.github\workflows\ci.yaml = .github\workflows\ci.yaml
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\dependabot.yml = .github\dependabot.yml
 		.github\workflows\version_check.yaml = .github\workflows\version_check.yaml
 	EndProjectSection
 EndProject
@@ -19,8 +21,14 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{41AE8C5D-25E1-4B08-8D65-868552421A63}"
 	ProjectSection(SolutionItems) = preProject
 		Scripts\BuildRelease.ps1 = Scripts\BuildRelease.ps1
-		Scripts\GetBuildVersion.ps1 = Scripts\GetBuildVersion.ps1
 		Scripts\CompareVersions.ps1 = Scripts\CompareVersions.ps1
+		Scripts\GetBuildVersion.ps1 = Scripts\GetBuildVersion.ps1
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0E30DDA0-2111-4E6C-851E-01DC34124FC2}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.github\CODEOWNERS = .github\CODEOWNERS
 	EndProjectSection
 EndProject
 Global

Daybreak/Behaviors/ScrollIntoView.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Behaviors
         protected override void OnAttached()
         {
             base.OnAttached();
-            this.AssociatedObject.SelectionChanged += AssociatedObject_SelectionChanged;
+            this.AssociatedObject.SelectionChanged += this.AssociatedObject_SelectionChanged;
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ namespace Daybreak.Behaviors
         {
             base.OnDetaching();
             this.AssociatedObject.SelectionChanged -=
-                AssociatedObject_SelectionChanged;
+                this.AssociatedObject_SelectionChanged;
 
         }
     }

Daybreak/Configuration/ApplicationConfiguration.cs

@@ -37,5 +37,7 @@ namespace Daybreak.Configuration
         public bool PlaceShortcut { get; set; }
         [JsonProperty("AutoCheckUpdate")]
         public bool AutoCheckUpdate { get; set; } = true;
+        [JsonProperty("ProtectedGraphAccessToken")]
+        public string ProtectedGraphAccessToken { get; set; }
     }
 }

Daybreak/Configuration/ProjectConfiguration.cs

@@ -23,79 +23,114 @@ using Daybreak.Services.Options;
 using Daybreak.Models;
 using Microsoft.CorrelationVector;
 using System.Logging;
+using Daybreak.Services.Updater.PostUpdate;
+using System.Core.Extensions;
+using Daybreak.Services.Updater.PostUpdate.Actions;
+using Daybreak.Services.Graph;
+using Microsoft.Extensions.DependencyInjection;
 
-namespace Daybreak.Configuration
+namespace Daybreak.Configuration;
+
+public static class ProjectConfiguration
 {
-    public static class ProjectConfiguration
+    public static void RegisterResolvers(IServiceManager serviceManager)
     {
-        public static void RegisterResolvers(IServiceManager serviceManager)
+        serviceManager.ThrowIfNull();
+
+        serviceManager.RegisterOptionsManager<ApplicationConfigurationOptionsManager>();
+        serviceManager.RegisterResolver(new LoggerResolver());
+        serviceManager
+            .RegisterHttpClient<ApplicationUpdater>()
+                .WithMessageHandler(sp =>
+                {
+                    var logger = sp.GetService<ILogger<ApplicationUpdater>>();
+                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                })
+                .Build()
+            .RegisterHttpClient<BloogumClient>()
+                .WithMessageHandler(sp =>
+                {
+                    var logger = sp.GetService<ILogger<BloogumClient>>();
+                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                })
+                .Build()
+            .RegisterHttpClient<GraphClient>()
+                .WithMessageHandler(sp =>
+                {
+                    var logger = sp.GetService<ILogger<GraphClient>>();
+                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                })
+                .Build();
+    }
+
+    public static void RegisterServices(IServiceCollection services)
+    {
+        services.ThrowIfNull();
+
+        services.AddSingleton<ILogsManager, JsonLogsManager>();
+        services.AddSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
+        services.AddSingleton<ILoggerFactory, LoggerFactory>(sp =>
         {
-            serviceManager.ThrowIfNull(nameof(serviceManager));
+            var factory = new LoggerFactory();
+            factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
+            return factory;
+        });
+        services.AddSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
+            sp.GetService<ILogsManager>(),
+            sp.GetService<IDebugLogsWriter>()));
 
-            serviceManager.RegisterHttpFactory((serviceProvider, categoryType) =>
-            {
-                var loggerType = typeof(ILogger<>).MakeGenericType(categoryType);
-                var logger = serviceProvider.GetService(loggerType).As<ILogger>();
-                var handler = new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
-                return handler;
-            });
-            serviceManager.RegisterOptionsManager<ApplicationConfigurationOptionsManager>();
-        }
+        services.AddScoped((sp) => new ScopeMetadata(new CorrelationVector()));
+        services.AddSingleton<ViewManager>();
+        services.AddSingleton<IViewManager, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
+        services.AddSingleton<IViewProducer, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
+        services.AddSingleton<PostUpdateActionManager>();
+        services.AddSingleton<IPostUpdateActionManager>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IPostUpdateActionProducer>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IPostUpdateActionProvider>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IConfigurationManager, ConfigurationManager>();
+        services.AddSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
+        services.AddSingleton<IMutexHandler, MutexHandler>();
+        services.AddSingleton<IShortcutManager, ShortcutManager>();
+        services.AddSingleton<IIconBrowser, IconBrowser>();
+        services.AddSingleton<IIconDownloader, IconDownloader>();
+        services.AddScoped<ICredentialManager, CredentialManager>();
+        services.AddScoped<IApplicationLauncher, ApplicationLauncher>();
+        services.AddScoped<IScreenshotProvider, ScreenshotProvider>();
+        services.AddScoped<IBloogumClient, BloogumClient>();
+        services.AddScoped<IApplicationUpdater, ApplicationUpdater>();
+        services.AddScoped<IBuildTemplateManager, BuildTemplateManager>();
+        services.AddScoped<IIconCache, IconCache>();
+        services.AddScoped<IPrivilegeManager, PrivilegeManager>();
+        services.AddScoped<IScreenManager, ScreenManager>();
+        services.AddScoped<IGraphClient, GraphClient>();
+    }
 
-        public static void RegisterServices(IServiceProducer serviceProducer)
-        {
-            serviceProducer.ThrowIfNull(nameof(serviceProducer));
+    public static void RegisterViews(IViewProducer viewProducer)
+    {
+        viewProducer.ThrowIfNull();
 
-            serviceProducer.RegisterSingleton<ILogsManager, JsonLogsManager>();
-            serviceProducer.RegisterSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
-            serviceProducer.RegisterSingleton<ILoggerFactory, LoggerFactory>(sp =>
-            {
-                var factory = new LoggerFactory();
-                factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
-                return factory;
-            });
-            serviceProducer.RegisterSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
-                sp.GetService<ILogsManager>(),
-                sp.GetService<IDebugLogsWriter>()));
+        viewProducer.RegisterPermanentView<CompanionView>();
+        viewProducer.RegisterView<SettingsView>();
+        viewProducer.RegisterView<AskUpdateView>();
+        viewProducer.RegisterView<UpdateView>();
+        viewProducer.RegisterView<AccountsView>();
+        viewProducer.RegisterView<ExperimentalSettingsView>();
+        viewProducer.RegisterView<ExecutablesView>();
+        viewProducer.RegisterView<BuildTemplateView>();
+        viewProducer.RegisterView<BuildsListView>();
+        viewProducer.RegisterView<RequestElevationView>();
+        viewProducer.RegisterView<ScreenChoiceView>();
+        viewProducer.RegisterView<VersionManagementView>();
+        viewProducer.RegisterView<LogsView>();
+        viewProducer.RegisterView<IconDownloadView>();
+        viewProducer.RegisterView<GraphAuthorizationView>();
+        viewProducer.RegisterView<BuildsSynchronizationView>();
+    }
 
-            serviceProducer.RegisterScoped((sp) => new ScopeMetadata(new CorrelationVector()));
-            serviceProducer.RegisterSingleton<ViewManager>(registerAllInterfaces: true);
-            serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
-            serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
-            serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
-            serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
-            serviceProducer.RegisterSingleton<IIconBrowser, IconBrowser>();
-            serviceProducer.RegisterSingleton<IIconDownloader, IconDownloader>();
-            serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
-            serviceProducer.RegisterScoped<IApplicationLauncher, ApplicationLauncher>();
-            serviceProducer.RegisterScoped<IScreenshotProvider, ScreenshotProvider>();
-            serviceProducer.RegisterScoped<IBloogumClient, BloogumClient>();
-            serviceProducer.RegisterScoped<IApplicationUpdater, ApplicationUpdater>();
-            serviceProducer.RegisterScoped<IBuildTemplateManager, BuildTemplateManager>();
-            serviceProducer.RegisterScoped<IIconCache, IconCache>();
-            serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
-            serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
-        }
+    public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)
+    {
+        postUpdateActionProducer.ThrowIfNull();
 
-        public static void RegisterViews(IViewProducer viewProducer)
-        {
-            viewProducer.ThrowIfNull(nameof(viewProducer));
-
-            viewProducer.RegisterView<MainView>();
-            viewProducer.RegisterView<SettingsView>();
-            viewProducer.RegisterView<AskUpdateView>();
-            viewProducer.RegisterView<UpdateView>();
-            viewProducer.RegisterView<SettingsCategoryView>();
-            viewProducer.RegisterView<AccountsView>();
-            viewProducer.RegisterView<ExperimentalSettingsView>();
-            viewProducer.RegisterView<ExecutablesView>();
-            viewProducer.RegisterView<BuildTemplateView>();
-            viewProducer.RegisterView<BuildsListView>();
-            viewProducer.RegisterView<RequestElevationView>();
-            viewProducer.RegisterView<ScreenChoiceView>();
-            viewProducer.RegisterView<VersionManagementView>();
-            viewProducer.RegisterView<LogsView>();
-            viewProducer.RegisterView<IconDownloadView>();
-        }
+        postUpdateActionProducer.AddPostUpdateAction<RenameInstallerAction>();
     }
 }

Daybreak/Configuration/SecretKeys.cs

@@ -0,0 +1,12 @@
+namespace Daybreak.Configuration;
+
+public class SecretKeys
+{
+    public static readonly SecretKeys AadApplicationId = new() { Key = "AadApplicationId" };
+    public static readonly SecretKeys AadTenantId = new() { Key = "AadTenantId" };
+
+    public string Key { get; private set; }
+    private SecretKeys()
+    {
+    }
+}

Daybreak/Configuration/SecretManager.cs

@@ -0,0 +1,49 @@
+using Newtonsoft.Json.Linq;
+using System.Extensions;
+using System.Linq;
+using System.Reflection;
+
+namespace Daybreak.Configuration;
+
+public static class SecretManager
+{
+    private static JObject SecretsHolder;
+
+    public static string GetSecret(SecretKeys secretKey)
+    {
+        if (SecretsHolder is null)
+        {
+            LoadSecrets();
+        }
+
+        return SecretsHolder.Value<string>(secretKey.Key);
+    }
+
+    public static T GetSecret<T>(SecretKeys secretKey)
+    {
+        if (SecretsHolder is null)
+        {
+            LoadSecrets();
+        }
+
+        return SecretsHolder.Value<T>(secretKey.Key);
+    }
+
+    private static void LoadSecrets()
+    {
+        var serializedSecrets = Assembly.GetExecutingAssembly().GetManifestResourceStream("Daybreak.secrets.json").ReadAllBytes().GetString();
+        serializedSecrets = TrimUnwantedCharacters(serializedSecrets);
+        SecretsHolder = JObject.Parse(serializedSecrets);
+    }
+
+    private static string TrimUnwantedCharacters(string s)
+    {
+        return new string(s.Where(c =>
+            char.IsWhiteSpace(c) ||
+            char.IsLetterOrDigit(c) ||
+            char.IsSymbol(c) ||
+            char.IsSeparator(c) ||
+            char.IsPunctuation(c))
+            .ToArray());
+    }
+}

Daybreak/Controls/Buttons/AddButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public AddButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/BackButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public BackButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/BinButton.xaml.cs

@@ -12,7 +12,7 @@ namespace Daybreak.Controls
         public event EventHandler Clicked;
         public BinButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

Daybreak/Controls/Buttons/CancelButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public CancelButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/FilePickerGlyph.xaml

@@ -12,11 +12,7 @@
         <Viewbox Stretch="Fill">
             <Grid>
                 <Ellipse Height="4" Width="4" StrokeThickness="0.2" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Ellipse>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                </StackPanel>
+                <local:ThreeDotsGlyph Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Padding="0.5"></local:ThreeDotsGlyph>
             </Grid>
         </Viewbox>
         <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>

Daybreak/Controls/Buttons/HelpButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public HelpButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/MaximizeButton.xaml.cs

@@ -13,17 +13,17 @@ namespace Daybreak.Controls
 
         public MaximizeButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
         }
 
         private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
         }
 
         private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

Daybreak/Controls/Buttons/MenuButton.xaml

@@ -0,0 +1,41 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.MenuButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
+             xmlns:converters="clr-namespace:Daybreak.Converters"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <converters:MenuButtonHighlightConverter x:Key="HighlightConverter"></converters:MenuButtonHighlightConverter>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"></ColumnDefinition>
+            <ColumnDefinition Width="*"></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+        <Rectangle
+            Fill="{Binding ElementName=_this, Path=HighlightColor, Mode=OneWay}"
+            Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}"
+            Grid.ColumnSpan="2">
+        </Rectangle>
+        <ContentPresenter Margin="5" 
+                          Content="{Binding ElementName=_this, Path=InnerContent, Mode=OneWay}" />
+        <TextBlock Grid.Column="1" 
+                   Text="{Binding ElementName=_this, Path=Title, Mode=OneWay}" 
+                   FontSize="{Binding ElementName=_this, Path=FontSize, Mode=OneWay}"
+                   FontFamily="{Binding ElementName=_this, Path=FontFamily, Mode=OneWay}"
+                   Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                   VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap"
+                   TextAlignment="Left" />
+        <Rectangle Fill="Transparent"
+                   MouseEnter="Grid_MouseEnter" 
+                   MouseLeave="Grid_MouseLeave"
+                   MouseLeftButtonDown="Rectangle_MouseLeftButtonDown"
+                   Grid.ColumnSpan="2" />
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/MenuButton.xaml.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Windows.Extensions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for MenuButton.xaml
+/// </summary>
+public partial class MenuButton : UserControl
+{
+    public event EventHandler Clicked;
+
+    [GenerateDependencyProperty]
+    private bool highlighted;
+    [GenerateDependencyProperty]
+    private Brush highlightColor;
+    [GenerateDependencyProperty]
+    private FrameworkElement innerContent;
+    [GenerateDependencyProperty]
+    private string title;
+
+    public MenuButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = true;
+    }
+
+    private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = false;
+    }
+
+    private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/MinusButton.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public MinusButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/OpaqueButton.xaml.cs

@@ -70,7 +70,7 @@ namespace Daybreak.Controls
 
         public OpaqueButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Rectangle_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Buttons/SaveButton.xaml.cs

@@ -13,17 +13,17 @@ namespace Daybreak.Controls
 
         public SaveButton()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
         }
 
         private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
         {
-            BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
+            this.BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
         }
 
         private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

Daybreak/Controls/Buttons/SynchronizeButton.xaml

@@ -0,0 +1,36 @@
+<UserControl x:Class="Daybreak.Controls.SynchronizeButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             mc:Ignorable="d"
+             x:Name="_this"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <Grid>
+            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" Width="35" Height="35" />
+            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" 
+                     StrokeThickness="3"/>
+            <Grid VerticalAlignment="Center"
+                  HorizontalAlignment="Center">
+                <Path Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      StrokeThickness="1.5"
+                      Data="m19,15.6073c1.4937,-0.5852 3,-1.9184 3,-4.6073c0,-4 -3.3333,-5 -5,-5c0,-2 0,-6 -6,-6c-6,0 -6,4 -6,6c-1.66667,0 -5,1 -5,5c0,2.6889 1.50628,4.0221 3,4.6073" />
+                <Path StrokeThickness="1.5"
+                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m6,17l1.76777,1.7678c1.56214,1.5621 4.09474,1.5621 5.65684,0l0.3536,-0.3536" />
+                <Path StrokeThickness="1.5"
+                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m6.35355,19.4749l-0.35355,-2.4749l2.47482,0.3536l-2.12127,2.1213z" />
+                <Path StrokeThickness="1.5"
+                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m14.77821,14.93927l-1.7678,-1.7677c-1.5621,-1.5621 -4.0948,-1.5621 -5.65685,0l-0.35356,0.3535" />
+                <Path StrokeThickness="1.5"
+                      Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m14.1213,12l0.3536,2.4749l-2.4749,-0.3536l2.1213,-2.1213z" />
+            </Grid>
+            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Buttons/SynchronizeButton.xaml.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for SynchronizeButton.xaml
+/// </summary>
+public partial class SynchronizeButton : UserControl
+{
+    public event EventHandler Clicked;
+
+    public SynchronizeButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+    {
+        this.BackgroundEllipse.Opacity = 0.6;
+    }
+
+    private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
+    {
+        this.BackgroundEllipse.Opacity = 0;
+    }
+
+    private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Left)
+        {
+            this.Clicked?.Invoke(this, e);
+        }
+    }
+}

Daybreak/Controls/Buttons/TileButton.xaml

@@ -18,8 +18,8 @@
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <ContentPresenter x:Name="Content" Margin="5" 
-                              Content="{Binding ElementName=_this, Path=InnerContent}"></ContentPresenter>
+        <ContentPresenter Margin="5" 
+                          Content="{Binding ElementName=_this, Path=InnerContent}"></ContentPresenter>
         <Border BorderBrush="{Binding ElementName=_this, Path=BorderBrush}" 
                 BorderThickness="{Binding ElementName=_this, Path=BorderThickness}"
                 Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}"

Daybreak/Controls/Buttons/TileButton.xaml.cs

@@ -3,66 +3,65 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for TileButton.xaml
+/// </summary>
+public partial class TileButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for TileButton.xaml
-    /// </summary>
-    public partial class TileButton : UserControl
+    public event EventHandler Clicked;
+
+    public static readonly DependencyProperty HighlightedProperty =
+        DependencyProperty.Register("Highlighted", typeof(bool), typeof(TileButton), null);
+    public static readonly DependencyProperty HighlightColorProperty =
+        DependencyProperty.Register("HighlightColor", typeof(Brush), typeof(TileButton), null);
+    public static readonly DependencyProperty InnerContentProperty =
+        DependencyProperty.Register("InnerContent", typeof(FrameworkElement), typeof(TileButton), null);
+    public static readonly DependencyProperty TitleProperty =
+        DependencyProperty.Register("Title", typeof(string), typeof(TileButton), null);
+
+    public TileButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public static readonly DependencyProperty HighlightedProperty =
-            DependencyProperty.Register("Highlighted", typeof(bool), typeof(TileButton), null);
-        public static readonly DependencyProperty HighlightColorProperty =
-            DependencyProperty.Register("HighlightColor", typeof(Brush), typeof(TileButton), null);
-        public static readonly DependencyProperty InnerContentProperty =
-            DependencyProperty.Register("InnerContent", typeof(FrameworkElement), typeof(TileButton), null);
-        public static readonly DependencyProperty TitleProperty =
-            DependencyProperty.Register("Title", typeof(string), typeof(TileButton), null);
+    public bool Highlighted
+    {
+        get => (bool)this.GetValue(HighlightedProperty);
+        set => this.SetValue(HighlightedProperty, value);
+    }
 
-        public TileButton()
-        {
-            this.InitializeComponent();
-        }
+    public string Title
+    {
+        get => this.GetValue(TitleProperty) as string;
+        set => this.SetValue(TitleProperty, value);
+    }
 
-        public bool Highlighted
-        {
-            get => (bool)this.GetValue(HighlightedProperty);
-            set => this.SetValue(HighlightedProperty, value);
-        }
+    public FrameworkElement InnerContent
+    {
+        get => this.GetValue(InnerContentProperty) as FrameworkElement;
+        set => this.SetValue(InnerContentProperty, value);
+    }
 
-        public string Title
-        {
-            get => this.GetValue(TitleProperty) as string;
-            set => this.SetValue(TitleProperty, value);
-        }
+    public Brush HighlightColor
+    {
+        get => this.GetValue(HighlightColorProperty) as Brush;
+        set => this.SetValue(HighlightColorProperty, value);
+    }
 
-        public FrameworkElement InnerContent
-        {
-            get => this.GetValue(InnerContentProperty) as FrameworkElement;
-            set => this.SetValue(InnerContentProperty, value);
-        }
+    private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = true;
+    }
 
-        public Brush HighlightColor
-        {
-            get => this.GetValue(HighlightColorProperty) as Brush;
-            set => this.SetValue(HighlightColorProperty, value);
-        }
+    private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = false;
+    }
 
-        private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlighted = true;
-        }
-
-        private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlighted = false;
-        }
-
-        private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            Clicked?.Invoke(this, e);
-        }
+    private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -3,6 +3,7 @@ using Daybreak.Models.Browser;
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Utils;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Web.WebView2.Core;
 using System;
@@ -54,6 +55,8 @@ namespace Daybreak.Controls
         private bool navigating;
         [GenerateDependencyProperty]
         private string favoriteAddress;
+        [GenerateDependencyProperty(InitialValue = false)]
+        private bool preventDispose;
         public string Address
         {
             get => this.GetTypedValue<string>(AddressProperty);
@@ -81,7 +84,16 @@ namespace Daybreak.Controls
             }
         }
 
-        public async Task InitializeBrowser(
+        public async Task InitializeDefaultBrowser()
+        {
+            var options = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
+            var buildTemplateManager = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IBuildTemplateManager>();
+            var logger = Launch.Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILogger<ChromiumBrowserWrapper>>();
+
+            await this.InitializeDefaultBrowser(options, buildTemplateManager, logger);
+        }
+
+        public async Task InitializeDefaultBrowser(
             ILiveOptions<ApplicationConfiguration> liveOptions,
             IBuildTemplateManager buildTemplateManager,
             ILogger<ChromiumBrowserWrapper> logger)
@@ -251,6 +263,11 @@ namespace Daybreak.Controls
 
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)
         {
+            if (this.PreventDispose)
+            {
+                return;
+            }
+
             this.WebBrowser?.Dispose();
         }
 

Daybreak/Controls/CircularLoadingWidget.xaml.cs

@@ -10,7 +10,7 @@ namespace Daybreak.Controls
     {
         public CircularLoadingWidget()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Glyphs/AvatarGlyph.xaml.cs

@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace Daybreak.Controls
 {
@@ -22,7 +9,7 @@ namespace Daybreak.Controls
     {
         public AvatarGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/BadGlyph.xaml

@@ -0,0 +1,22 @@
+<UserControl x:Class="Daybreak.Controls.Glyphs.BadGlyph"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Glyphs"
+             mc:Ignorable="d" 
+             x:Name="_this"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <Grid>
+            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                     StrokeThickness="1"
+                     Width="32"
+                     Height="32"/>
+            <Line X1="8" Y1="8" X2="24" Y2="24"
+                  Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"/>
+            <Line X1="24" Y1="8" X2="8" Y2="24"
+                  Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"/>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Glyphs/BadGlyph.xaml.cs

@@ -0,0 +1,14 @@
+using System.Windows.Controls;
+
+namespace Daybreak.Controls.Glyphs;
+
+/// <summary>
+/// Interaction logic for BadGlyph.xaml
+/// </summary>
+public partial class BadGlyph : UserControl
+{
+    public BadGlyph()
+    {
+        this.InitializeComponent();
+    }
+}

Daybreak/Controls/Glyphs/CogGlyph.xaml

@@ -0,0 +1,18 @@
+<UserControl x:Class="Daybreak.Controls.CogGlyph"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <Grid>
+            <Path Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                        Data="m76.89,45.018c0,-1.587 -0.151,-3.138 -0.383,-4.66l11.227,-6.48l-11.639,-20.136l-11.616,6.47c-2.421,-1.931 -5.479,-3.506 -8.479,-4.664l0,-11.548l-22,0l0,11.548c-4,1.112 -5.649,2.617 -8.005,4.448l-11.251,-6.604l-11.914,20.006l11.12,6.604c-0.262,1.643 -0.45,3.308 -0.45,5.016c0,1.587 0.153,3.136 0.376,4.658l-11.228,6.484l11.634,20.135l11.424,-6.472c2.431,1.933 4.294,3.506 8.294,4.665l0,12.512l22,0l0,-12.512c3,-1.115 5.839,-2.618 8.19,-4.449l11.348,6.604l11.96,-20.006l-11.095,-6.603c0.258,-1.64 0.487,-3.304 0.487,-5.016zm-31.704,14.137c-7.799,0 -14.138,-6.332 -14.138,-14.138c0,-7.808 6.339,-14.136 14.138,-14.136c7.81,0 14.14,6.328 14.14,14.136c-0.001,7.806 -6.331,14.138 -14.14,14.138z"></Path>
+            <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                        Data="m56.5,89l-22,0c-1.381,0 -2.5,-1.119 -2.5,-2.5l0,-10.199c-2.612,-0.955 -4.464,-2.126 -6.274,-3.49l-10.229,5.671c-1.192,0.661 -2.694,0.244 -3.377,-0.936l-11.633,-20.135c-0.331,-0.574 -0.422,-1.257 -0.25,-1.897s0.591,-1.188 1.165,-1.519l9.794,-5.654c-0.121,-1.164 -0.181,-2.262 -0.181,-3.323c0,-1.317 0.112,-2.592 0.254,-3.721l-9.656,-5.75c-0.57,-0.34 -0.982,-0.893 -1.145,-1.537c-0.163,-0.644 -0.063,-1.326 0.279,-1.896l11.977,-20.006c0.702,-1.173 2.218,-1.564 3.399,-0.878l9.927,5.762c1.618,-1.213 3.362,-2.346 5.949,-3.273l0,-10.219c0.001,-1.381 1.12,-2.5 2.501,-2.5l22,0c1.381,0 2.5,1.119 2.5,2.5l0,10.377c2.124,0.938 4.104,2.059 5.919,3.35l9.939,-5.657c1.19,-0.677 2.713,-0.269 3.4,0.922l11.639,20.135c0.332,0.574 0.423,1.257 0.251,1.897s-0.591,1.188 -1.165,1.519l-9.781,5.646c0.126,1.165 0.188,2.266 0.188,3.329c0,1.327 -0.108,2.597 -0.246,3.717l9.692,5.752c0.571,0.339 0.983,0.891 1.147,1.533c0.163,0.644 0.065,1.325 -0.274,1.896l-11.897,20.005c-0.703,1.183 -2.234,1.573 -3.416,0.876l-9.798,-5.765c-1.782,1.25 -3.634,2.29 -5.598,3.144l0,10.324c0,1.381 -1.119,2.5 -2.5,2.5zm-19.5,-5l17,0l0,-9.512c0,-1.045 0.649,-1.979 1.629,-2.344c2.624,-0.975 5.004,-2.309 7.275,-4.078c0.809,-0.629 1.921,-0.702 2.804,-0.182l9.078,5.341l9.347,-15.716l-8.974,-5.325c-0.88,-0.522 -1.354,-1.528 -1.194,-2.538c0.198,-1.259 0.425,-2.923 0.425,-4.629c0,-1.314 -0.116,-2.716 -0.354,-4.284c-0.154,-1.018 0.33,-2.026 1.222,-2.541l9.061,-5.23l-9.145,-15.818l-9.208,5.241c-0.888,0.505 -1.995,0.42 -2.795,-0.219c-2.199,-1.754 -4.747,-3.196 -7.57,-4.286c-0.964,-0.372 -1.6,-1.299 -1.6,-2.332l0,-9.548l-17.001,0l0,9.548c0,1.123 -0.748,2.107 -1.83,2.408c-3.47,0.965 -5.073,2.212 -7.293,3.938l-0.098,0.076c-0.804,0.625 -1.909,0.7 -2.789,0.188l-9.243,-5.365l-9.423,15.739l8.937,5.321c0.879,0.524 1.351,1.531 1.189,2.542c-0.202,1.27 -0.435,2.943 -0.435,4.622c0,1.318 0.112,2.724 0.342,4.297c0.148,1.013 -0.337,2.015 -1.224,2.526l-9.065,5.234l9.151,15.842l9.525,-5.28c0.883,-0.49 1.976,-0.4 2.768,0.229c2.384,1.896 4.207,3.214 7.684,4.221c1.069,0.31 1.804,1.29 1.804,2.402l0,9.512zm8.186,-22.345c-9.174,0 -16.638,-7.464 -16.638,-16.638c0,-9.173 7.464,-16.636 16.638,-16.636c9.175,0 16.64,7.463 16.64,16.636c-0.001,9.174 -7.466,16.638 -16.64,16.638zm0,-28.273c-6.417,0 -11.638,5.22 -11.638,11.636c0,6.417 5.221,11.638 11.638,11.638c6.418,0 11.64,-5.221 11.64,-11.638c-0.001,-6.416 -5.222,-11.636 -11.64,-11.636z"></Path>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Glyphs/CogGlyph.xaml.cs

@@ -0,0 +1,14 @@
+using System.Windows.Controls;
+
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for CogGlyph.xaml
+/// </summary>
+public partial class CogGlyph : UserControl
+{
+    public CogGlyph()
+    {
+        this.InitializeComponent();
+    }
+}

Daybreak/Controls/Glyphs/ExperimentGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public ExperimentGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/FileGlyph.xaml.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Controls
     {
         public FileGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/FireballGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public FireballGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/GoldenArrowGlyph.xaml.cs

@@ -22,7 +22,7 @@ namespace Daybreak.Controls
     {
         public GoldenArrowGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/GoodGlyph.xaml

@@ -0,0 +1,20 @@
+<UserControl x:Class="Daybreak.Controls.Glyphs.GoodGlyph"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Glyphs"
+             mc:Ignorable="d" 
+             x:Name="_this"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <Grid>
+            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                     StrokeThickness="1"
+                     Width="32"
+                     Height="32"/>
+            <Polyline Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                Points="26,8 13.625,22.714284896850586 8,16.02597427368164 "></Polyline>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Glyphs/GoodGlyph.xaml.cs

@@ -0,0 +1,14 @@
+using System.Windows.Controls;
+
+namespace Daybreak.Controls.Glyphs;
+
+/// <summary>
+/// Interaction logic for GoodGlyph.xaml
+/// </summary>
+public partial class GoodGlyph : UserControl
+{
+    public GoodGlyph()
+    {
+        this.InitializeComponent();
+    }
+}

Daybreak/Controls/Glyphs/LogsGlyph.xaml.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Controls
     {
         public LogsGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }

Daybreak/Controls/Glyphs/StarGlyph.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public StarGlyph()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void Ellipse_MouseEnter(object sender, MouseEventArgs e)

Daybreak/Controls/Glyphs/ThreeDotsGlyph.xaml

@@ -0,0 +1,17 @@
+<UserControl x:Class="Daybreak.Controls.ThreeDotsGlyph"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             mc:Ignorable="d" 
+             x:Name="_this"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
+            <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
+            <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
+        </StackPanel>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Glyphs/ThreeDotsGlyph.xaml.cs

@@ -0,0 +1,14 @@
+using System.Windows.Controls;
+
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for ThreeDotsGlyph.xaml
+/// </summary>
+public partial class ThreeDotsGlyph : UserControl
+{
+    public ThreeDotsGlyph()
+    {
+        this.InitializeComponent();
+    }
+}

Daybreak/Controls/ImageViewer.xaml.cs

@@ -20,7 +20,7 @@ namespace Daybreak.Controls
 
         public ImageViewer()
         {
-            InitializeComponent();
+            this.InitializeComponent();
             this.Image1.Visibility = Visibility.Visible;
             this.Image1.Opacity = 1;
             this.Image2.Visibility = Visibility.Hidden;

Daybreak/Controls/MenuList.xaml

@@ -0,0 +1,93 @@
+<UserControl x:Class="Daybreak.Controls.MenuList"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:buttons="clr-namespace:Daybreak.Controls.Buttons"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel>
+        <buttons:MenuButton Title="Game companion" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="GameCompanionButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:GoldenArrowGlyph Foreground="White"
+                                   Width="40"></local:GoldenArrowGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Account settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="AccountSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:AvatarGlyph Foreground="White"
+                                   Width="40"></local:AvatarGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Guildwars settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="GuildwarsSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:FileGlyph Foreground="White"
+                                 Width="40"></local:FileGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Launcher settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="LauncherSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:CogGlyph Foreground="White"
+                                Width="40"
+                                Height="20"></local:CogGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Experimental settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="ExperimentalSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:ExperimentGlyph Foreground="White"
+                                       Width="40"></local:ExperimentGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Manage builds" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="ManageBuildsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:FireballGlyph Foreground="White"
+                                       Width="40"></local:FireballGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Manage client version" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="VersionManagementButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:StaticGlyph Foreground="White"
+                                       Width="40"></local:StaticGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Logs" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="LogsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:LogsGlyph Foreground="White"
+                                       Width="40"></local:LogsGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+    </StackPanel>
+</UserControl>

Daybreak/Controls/MenuList.xaml.cs

@@ -0,0 +1,78 @@
+using Daybreak.Configuration;
+using Daybreak.Launch;
+using Daybreak.Services.ViewManagement;
+using Daybreak.Views;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Configuration;
+using System.Windows.Controls;
+
+namespace Daybreak.Controls
+{
+    /// <summary>
+    /// Interaction logic for MenuList.xaml
+    /// </summary>
+    public partial class MenuList : UserControl
+    {
+        public MenuList()
+        {
+            this.InitializeComponent();
+        }
+
+        private void GameCompanionButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<CompanionView>();
+        }
+
+        private void AccountSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<AccountsView>();
+        }
+
+        private void GuildwarsSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<ExecutablesView>();
+        }
+
+        private void LauncherSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<SettingsView>();
+        }
+
+        private void ExperimentalSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<ExperimentalSettingsView>();
+        }
+
+        private void ManageBuildsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            var options = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
+            if (options.Value.ExperimentalFeatures.DownloadIcons)
+            {
+                viewManager.ShowView<IconDownloadView>();
+            }
+            else
+            {
+                viewManager.ShowView<BuildsListView>();
+            }
+        }
+
+        private void VersionManagementButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<VersionManagementView>();
+        }
+
+        private void LogsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<LogsView>();
+        }
+    }
+}

Daybreak/Controls/Templates/AccountTemplate.xaml.cs

@@ -29,7 +29,7 @@ namespace Daybreak.Controls
         public AccountTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += AccountTemplate_DataContextChanged;
+            this.DataContextChanged += this.AccountTemplate_DataContextChanged;
         }
 
         private void AccountTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/AttributeTemplate.xaml.cs

@@ -25,7 +25,7 @@ namespace Daybreak.Controls
         public AttributeTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += AttributeTemplate_DataContextChanged;
+            this.DataContextChanged += this.AttributeTemplate_DataContextChanged;
         }
 
         private void AttributeTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/BuildEntryTemplate.xaml.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Controls
 
         public BuildEntryTemplate()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
         private void BinButton_Clicked(object sender, EventArgs e)

Daybreak/Controls/Templates/BuildTemplate.xaml

@@ -167,19 +167,25 @@
                                         Background="Transparent"
                                         SearchText="{Binding ElementName=_this, Path=SkillSearchText, Mode=TwoWay}"
                                         TextChanged="SearchTextBox_TextChanged"></local:SearchTextBox>
-                <ScrollViewer VerticalScrollBarVisibility="Hidden"
-                              HorizontalScrollBarVisibility="Disabled"
-                              Grid.Row="1"
-                              PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-                    <ListView x:Name="SkillsListView" Background="Transparent"
-                        ItemsSource="{Binding ElementName=_this, Path=AvailableSkills, Mode=OneWay}" MouseDoubleClick="ListView_MouseDoubleClick">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock FontSize="16" Foreground="White" TextWrapping="Wrap" Text="{Binding Name}"></TextBlock>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                </ScrollViewer>
+                <ListView x:Name="SkillsListView"
+                          Grid.Row="1"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                          ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                          Background="Transparent"
+                          ItemsSource="{Binding ElementName=_this, Path=AvailableSkills, Mode=OneWay}"
+                          MouseDoubleClick="ListView_MouseDoubleClick">
+                    <ListView.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel>
+                            </VirtualizingStackPanel>
+                        </ItemsPanelTemplate>
+                    </ListView.ItemsPanel>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock FontSize="16" Foreground="White" TextWrapping="Wrap" Text="{Binding Name}"></TextBlock>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
             </Grid>
         </Grid>
     </Grid>

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -11,6 +11,7 @@ using System.Core.Extensions;
 using System.Extensions;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
@@ -78,7 +79,7 @@ namespace Daybreak.Controls
             ILogger<ChromiumBrowserWrapper> logger)
         {
             this.iconBrowser = iconBrowser.ThrowIfNull();
-            await this.SkillBrowser.InitializeBrowser(liveOptions, buildTemplateManager, logger);
+            await this.SkillBrowser.InitializeDefaultBrowser(liveOptions, buildTemplateManager, logger);
             this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
             this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
@@ -208,17 +209,8 @@ namespace Daybreak.Controls
             this.loadedBuild.Build.Attributes = this.Attributes.ToList();
         }
 
-        private void LoadSkills()
+        private async void LoadSkills()
         {
-            var possibleSkills = Skill.Skills
-                .Where(s => s.Profession == this.PrimaryProfession || s.Profession == this.SecondaryProfession || s.Profession == Profession.None)
-                .Where(s => s != Skill.NoSkill)
-                .Where(s => this.SkillSearchText.IsNullOrWhiteSpace() ?
-                            true :
-                            StringUtils.MatchesSearchString(s.Name.Replace("\"", "").Replace("!", ""), this.SkillSearchText.Replace("\"", "").Replace("!", "")))
-                .OrderBy(s => s.Name);
-            this.AvailableSkills.ClearAnd().AddRange(possibleSkills);
-
             if (this.Skill0.Profession != this.PrimaryProfession &&
                 this.Skill0.Profession != this.SecondaryProfession &&
                 this.Skill0.Profession != Profession.None)
@@ -274,8 +266,12 @@ namespace Daybreak.Controls
             {
                 this.Skill7 = Skill.NoSkill;
             }
+
+            var filteredSkills = await this.FilterSkills(this.SkillSearchText).ToListAsync().ConfigureAwait(true);
+            this.AvailableSkills.ClearAnd().AddRange(filteredSkills);
         }
 
+
         private void LoadBuild()
         {
             this.suppressBuildChanged = true;
@@ -357,13 +353,14 @@ namespace Daybreak.Controls
             }
         }
 
-        private void AttributeTemplate_HelpClicked(object sender, AttributeEntry e)
+        private void AttributeTemplate_HelpClicked(object _, AttributeEntry e)
         {
             this.BrowseToInfo(e.Attribute.Name);
         }
 
-        private void AttributeTemplate_AttributeChanged(object sender, AttributeEntry e)
+        private void AttributeTemplate_AttributeChanged(object _, AttributeEntry e)
         {
+            e.ThrowIfNull();
             this.BuildChanged?.Invoke(this, new EventArgs());
         }
 
@@ -384,8 +381,9 @@ namespace Daybreak.Controls
             e.Handled = true;
         }
 
-        private void SearchTextBox_TextChanged(object sender, string e)
+        private void SearchTextBox_TextChanged(object _, string e)
         {
+            e.ThrowIfNull();
             this.LoadSkills();
         }
 
@@ -441,5 +439,39 @@ namespace Daybreak.Controls
             e.Handled = true;
             scrollViewer.ScrollToVerticalOffset(scrollViewer.VerticalOffset - e.Delta);
         }
+
+        private async IAsyncEnumerable<Skill> FilterSkills(string searchTerm)
+        {
+            // Replace symbols to ease search
+            searchTerm = searchTerm?.Replace("\"", "").Replace("!", "");
+            
+            foreach (var skill in Skill.Skills)
+            {
+                if (skill == Skill.NoSkill)
+                {
+                    continue;
+                }
+
+                if (skill.Profession != this.PrimaryProfession &&
+                    skill.Profession != this.SecondaryProfession &&
+                    skill.Profession != Profession.None)
+                {
+                    continue;
+                }
+
+                if (searchTerm.IsNullOrWhiteSpace())
+                {
+                    yield return skill;
+                    continue;
+                }
+
+                var matchesName = await Task.Run(() => StringUtils.MatchesSearchString(skill.Name.Replace("\"", "").Replace("!", ""), searchTerm));
+                if (matchesName)
+                {
+                    yield return skill;
+                    continue;
+                }
+            }
+        }
     }
 }

Daybreak/Controls/Templates/GuildwarsPathTemplate.xaml.cs

@@ -26,7 +26,7 @@ namespace Daybreak.Controls
         public GuildwarsPathTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += GuildwarsPathTemplate_DataContextChanged;
+            this.DataContextChanged += this.GuildwarsPathTemplate_DataContextChanged;
         }
 
         private void GuildwarsPathTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/ScreenTemplate.xaml.cs

@@ -25,7 +25,7 @@ namespace Daybreak.Controls.Templates
         public ScreenTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += ScreenTemplate_DataContextChanged;
+            this.DataContextChanged += this.ScreenTemplate_DataContextChanged;
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)

Daybreak/Controls/Templates/SkillTemplate.xaml.cs

@@ -29,7 +29,7 @@ namespace Daybreak.Controls
         public SkillTemplate()
         {
             this.InitializeComponent();
-            this.DataContextChanged += SkillTemplate_DataContextChanged;
+            this.DataContextChanged += this.SkillTemplate_DataContextChanged;
         }
 
         public void InitializeSkillTemplate(IIconCache iconRetriever)

Daybreak/Converters/BooleanToVisibilityConverter.cs

@@ -38,12 +38,12 @@ namespace Daybreak.Converters
             }
 
             var objValue = value.Cast<bool>();
-            if ((objValue && TriggerValue && IsHidden) || (!objValue && !TriggerValue && IsHidden))
+            if ((objValue && this.TriggerValue && this.IsHidden) || (!objValue && !this.TriggerValue && this.IsHidden))
             {
                 return Visibility.Hidden;
             }
 
-            if ((objValue && TriggerValue && !IsHidden) || (!objValue && !TriggerValue && !IsHidden))
+            if ((objValue && this.TriggerValue && !this.IsHidden) || (!objValue && !this.TriggerValue && !this.IsHidden))
             {
                 return Visibility.Collapsed;
             }

Daybreak/Converters/HiddenWhenNull.cs

@@ -9,7 +9,7 @@ namespace Daybreak.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return GetVerticalAlignment(value);
+            return this.GetVerticalAlignment(value);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Daybreak/Converters/MenuButtonHighlightConverter.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Daybreak.Converters
+{
+    public class MenuButtonHighlightConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType == typeof(double) &&
+                value is bool boolean)
+            {
+                return boolean ? 0.4 : 0;
+            }
+            else
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType == typeof(bool) &&
+                value is double doubleValue)
+            {
+                return doubleValue == 0.4;
+            }
+            else
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}

Daybreak/Daybreak.csproj

@@ -10,29 +10,54 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.4.2</Version>
+    <Version>0.9.7</Version>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+
+  <Target Name="AddUserSecrets" BeforeTargets="PrepareForBuild" Condition=" '$(UserSecretsId)' != '' ">
+    <PropertyGroup>
+      <UserSecretsFilePath Condition=" '$(OS)' == 'Windows_NT' ">
+		$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))\AppData\Roaming\Microsoft\UserSecrets\$(UserSecretsId)\secrets.json
+	  </UserSecretsFilePath>
+	  <UserSecretsFilePath Condition=" '$(OS)' == 'Unix' ">
+		$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))/.microsoft/usersecrets/$(UserSecretsId)/secrets.json
+	  </UserSecretsFilePath>
+    </PropertyGroup>
+    <ItemGroup>
+      <EmbeddedResource Include="$(UserSecretsFilePath)" Condition="Exists($(UserSecretsFilePath))" />
+    </ItemGroup>
+  </Target>
+	
   <ItemGroup>
     <PackageReference Include="LiteDB" Version="5.0.12" />
     <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.5" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageReference Include="Slim" Version="1.7.3" />
+    <PackageReference Include="Slim" Version="1.9.2" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="SystemExtensions.NetCore" Version="1.0.1" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.5.0" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.6.2" />
+    <PackageReference Include="WpfExtended" Version="0.7.1" />
     <PackageReference Include="WpfExtended.SourceGeneration" Version="0.1.1" />
-    <PackageReference Include="WpfScreenHelper" Version="2.0.0" />
+    <PackageReference Include="WpfScreenHelper" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Controls\Buttons\SynchronizeButton.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Controls\Buttons\HelpButton.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -51,6 +76,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Page Update="Controls\Buttons\SynchronizeButton.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Controls\Buttons\HelpButton.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>

Daybreak/Launch/Launcher.cs

@@ -1,9 +1,17 @@
 using Daybreak.Configuration;
 using Daybreak.Exceptions;
+using Daybreak.Services.IconRetrieve;
+using Daybreak.Services.Privilege;
+using Daybreak.Services.Screenshots;
+using Daybreak.Services.Updater;
+using Daybreak.Services.Updater.PostUpdate;
 using Daybreak.Services.ViewManagement;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Slim;
+using Slim.Integration.ServiceCollection;
 using System;
+using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -15,8 +23,11 @@ namespace Daybreak.Launch
 {
     public sealed class Launcher : ExtendedApplication<MainWindow>
     {
+        public readonly static Launcher Instance = new();
+
         private ILogger logger;
-        private readonly static Launcher launcher = new();
+
+        public System.IServiceProvider ApplicationServiceProvider => this.ServiceProvider;
 
         [STAThread]
         public static int Main()
@@ -24,15 +35,15 @@ namespace Daybreak.Launch
             return LaunchMainWindow();
         }
 
-        protected override void SetupServiceManager(IServiceManager serviceManager)
+        protected override System.IServiceProvider SetupServiceProvider(IServiceCollection services)
         {
+            var serviceManager = new ServiceManager();
             ProjectConfiguration.RegisterResolvers(serviceManager);
+            return services.BuildSlimServiceProvider(serviceManager);
         }
-        protected override void RegisterServices(IServiceProducer serviceProducer)
+        protected override void RegisterServices(IServiceCollection services)
         {
-            ProjectConfiguration.RegisterServices(this.ServiceManager);
-            ServiceManager.BuildSingletons();
-            ProjectConfiguration.RegisterViews(this.ServiceManager.GetService<IViewManager>());
+            ProjectConfiguration.RegisterServices(services);
         }
         protected override bool HandleException(Exception e)
         {
@@ -89,7 +100,10 @@ namespace Daybreak.Launch
         }
         protected override void ApplicationStarting()
         {
-            this.logger = this.ServiceManager.GetService<ILogger<Launcher>>();
+            ProjectConfiguration.RegisterViews(this.ServiceProvider.GetService<IViewManager>());
+            ProjectConfiguration.RegisterPostUpdateActions(this.ServiceProvider.GetService<IPostUpdateActionProducer>());
+
+            this.logger = this.ServiceProvider.GetRequiredService<ILogger<Launcher>>();
             this.RegisterViewContainer();
         }
         protected override void ApplicationClosing()
@@ -98,13 +112,13 @@ namespace Daybreak.Launch
 
         private void RegisterViewContainer()
         {
-            var viewManager = this.ServiceManager.GetService<IViewManager>();
-            var mainWindow = this.ServiceManager.GetService<MainWindow>();
+            var viewManager = this.ServiceProvider.GetRequiredService<IViewManager>();
+            var mainWindow = this.ServiceProvider.GetRequiredService<MainWindow>();
             viewManager.RegisterContainer(mainWindow.Container);
         }
         private static int LaunchMainWindow()
         {
-            return launcher.Run();
+            return Instance.Run();
         }
     }
 }

Daybreak/Launch/MainWindow.xaml

@@ -3,11 +3,11 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
         xmlns:local="clr-namespace:Daybreak.Launch"
         xmlns:wcl="clr-namespace:WCL;assembly=WCL"
         mc:Ignorable="d"
         xmlns:controls="clr-namespace:Daybreak.Controls"
+        xmlns:converters="clr-namespace:Daybreak.Converters"
         xmlns:effects="clr-namespace:System.Windows.Media.Extensions.Effects;assembly=WpfExtended"
         WindowStyle="None"
         ResizeMode="NoResize"
@@ -25,14 +25,7 @@
                         <ControlTemplate TargetType="{x:Type ToggleButton}">
                             <Grid>
                                 <Rectangle x:Name="OverlayRect" Fill="{TemplateBinding Background}" Opacity="0"></Rectangle>
-                                <Viewbox Margin="5" Stretch="Uniform">
-                                    <Grid>
-                                        <Path Stroke="{TemplateBinding Foreground}" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        Data="m76.89,45.018c0,-1.587 -0.151,-3.138 -0.383,-4.66l11.227,-6.48l-11.639,-20.136l-11.616,6.47c-2.421,-1.931 -5.479,-3.506 -8.479,-4.664l0,-11.548l-22,0l0,11.548c-4,1.112 -5.649,2.617 -8.005,4.448l-11.251,-6.604l-11.914,20.006l11.12,6.604c-0.262,1.643 -0.45,3.308 -0.45,5.016c0,1.587 0.153,3.136 0.376,4.658l-11.228,6.484l11.634,20.135l11.424,-6.472c2.431,1.933 4.294,3.506 8.294,4.665l0,12.512l22,0l0,-12.512c3,-1.115 5.839,-2.618 8.19,-4.449l11.348,6.604l11.96,-20.006l-11.095,-6.603c0.258,-1.64 0.487,-3.304 0.487,-5.016zm-31.704,14.137c-7.799,0 -14.138,-6.332 -14.138,-14.138c0,-7.808 6.339,-14.136 14.138,-14.136c7.81,0 14.14,6.328 14.14,14.136c-0.001,7.806 -6.331,14.138 -14.14,14.138z"></Path>
-                                        <Path Fill="{TemplateBinding Foreground}" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        Data="m56.5,89l-22,0c-1.381,0 -2.5,-1.119 -2.5,-2.5l0,-10.199c-2.612,-0.955 -4.464,-2.126 -6.274,-3.49l-10.229,5.671c-1.192,0.661 -2.694,0.244 -3.377,-0.936l-11.633,-20.135c-0.331,-0.574 -0.422,-1.257 -0.25,-1.897s0.591,-1.188 1.165,-1.519l9.794,-5.654c-0.121,-1.164 -0.181,-2.262 -0.181,-3.323c0,-1.317 0.112,-2.592 0.254,-3.721l-9.656,-5.75c-0.57,-0.34 -0.982,-0.893 -1.145,-1.537c-0.163,-0.644 -0.063,-1.326 0.279,-1.896l11.977,-20.006c0.702,-1.173 2.218,-1.564 3.399,-0.878l9.927,5.762c1.618,-1.213 3.362,-2.346 5.949,-3.273l0,-10.219c0.001,-1.381 1.12,-2.5 2.501,-2.5l22,0c1.381,0 2.5,1.119 2.5,2.5l0,10.377c2.124,0.938 4.104,2.059 5.919,3.35l9.939,-5.657c1.19,-0.677 2.713,-0.269 3.4,0.922l11.639,20.135c0.332,0.574 0.423,1.257 0.251,1.897s-0.591,1.188 -1.165,1.519l-9.781,5.646c0.126,1.165 0.188,2.266 0.188,3.329c0,1.327 -0.108,2.597 -0.246,3.717l9.692,5.752c0.571,0.339 0.983,0.891 1.147,1.533c0.163,0.644 0.065,1.325 -0.274,1.896l-11.897,20.005c-0.703,1.183 -2.234,1.573 -3.416,0.876l-9.798,-5.765c-1.782,1.25 -3.634,2.29 -5.598,3.144l0,10.324c0,1.381 -1.119,2.5 -2.5,2.5zm-19.5,-5l17,0l0,-9.512c0,-1.045 0.649,-1.979 1.629,-2.344c2.624,-0.975 5.004,-2.309 7.275,-4.078c0.809,-0.629 1.921,-0.702 2.804,-0.182l9.078,5.341l9.347,-15.716l-8.974,-5.325c-0.88,-0.522 -1.354,-1.528 -1.194,-2.538c0.198,-1.259 0.425,-2.923 0.425,-4.629c0,-1.314 -0.116,-2.716 -0.354,-4.284c-0.154,-1.018 0.33,-2.026 1.222,-2.541l9.061,-5.23l-9.145,-15.818l-9.208,5.241c-0.888,0.505 -1.995,0.42 -2.795,-0.219c-2.199,-1.754 -4.747,-3.196 -7.57,-4.286c-0.964,-0.372 -1.6,-1.299 -1.6,-2.332l0,-9.548l-17.001,0l0,9.548c0,1.123 -0.748,2.107 -1.83,2.408c-3.47,0.965 -5.073,2.212 -7.293,3.938l-0.098,0.076c-0.804,0.625 -1.909,0.7 -2.789,0.188l-9.243,-5.365l-9.423,15.739l8.937,5.321c0.879,0.524 1.351,1.531 1.189,2.542c-0.202,1.27 -0.435,2.943 -0.435,4.622c0,1.318 0.112,2.724 0.342,4.297c0.148,1.013 -0.337,2.015 -1.224,2.526l-9.065,5.234l9.151,15.842l9.525,-5.28c0.883,-0.49 1.976,-0.4 2.768,0.229c2.384,1.896 4.207,3.214 7.684,4.221c1.069,0.31 1.804,1.29 1.804,2.402l0,9.512zm8.186,-22.345c-9.174,0 -16.638,-7.464 -16.638,-16.638c0,-9.173 7.464,-16.636 16.638,-16.636c9.175,0 16.64,7.463 16.64,16.636c-0.001,9.174 -7.466,16.638 -16.64,16.638zm0,-28.273c-6.417,0 -11.638,5.22 -11.638,11.636c0,6.417 5.221,11.638 11.638,11.638c6.418,0 11.64,-5.221 11.64,-11.638c-0.001,-6.416 -5.222,-11.636 -11.64,-11.636z"></Path>
-                                    </Grid>
-                                </Viewbox>
+                                <controls:ThreeDotsGlyph Margin="13"></controls:ThreeDotsGlyph>
                             </Grid>
                             <ControlTemplate.Triggers>
                                 <MultiTrigger>
@@ -63,30 +56,47 @@
             <RowDefinition Height="30"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <Border BorderBrush="Transparent" BorderThickness="0" Grid.RowSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Border BorderBrush="Transparent" BorderThickness="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
             <Border.Effect>
                 <BlurEffect Radius="5" KernelType="Gaussian" RenderingBias="Performance"></BlurEffect>
             </Border.Effect>
-            <controls:ImageViewer x:Name="ImageViewer">
+            <controls:ImageViewer x:Name="ImageViewer"
+                                  MouseDown="TitleBar_MouseLeftButtonDown">
                 <controls:ImageViewer.Effect>
                     <effects:LightStreak Attenuation="0.4" BrightThreshold="0.9"></effects:LightStreak>
                 </controls:ImageViewer.Effect>
             </controls:ImageViewer>
         </Border>
         <wcl:TitleBar x:Name="Titlebar"
+                      Grid.ColumnSpan="2"
                       Background="Transparent" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown"
                       WindowState="Normal" MinimizeButtonClicked="TitleBar_MinimizeButtonClicked"
                       MaximizeButtonClicked="TitleBar_MaximizeButtonClicked"
                       RestoreButtonClicked="TitleBar_RestoreButtonClicked"
                       CloseButtonClicked="TitleBar_CloseButtonClicked"
                       Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></wcl:TitleBar>
-        <ToggleButton Style="{StaticResource Window_SettingsButton}" Width="50" Height="30" HorizontalAlignment="Right"
-                      Margin="0, 0, 150, 0" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Click="SettingsButton_Clicked"></ToggleButton>
-        <controls:OpaqueButton Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
-                 Text="{Binding ElementName=_this, Path=CreditText, Mode=OneWay}" VerticalAlignment="Bottom"
-                 HorizontalAlignment="Right" Margin="0, 0, 20, 30" FontSize="22" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+        <controls:OpaqueButton Grid.Row="1"
+                               Grid.Column="1"
+                               Background="Transparent"
+                               BorderBrush="Transparent"
+                               BorderThickness="0"
+                               Opacity="0.6"
+                               Text="{Binding ElementName=_this, Path=CreditText, Mode=OneWay}"
+                               VerticalAlignment="Bottom"
+                               HorizontalAlignment="Right" 
+                               Margin="0, 0, 20, 30" 
+                               FontSize="22" 
+                               Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
                  Clicked="CreditTextBox_MouseLeftButtonDown" Cursor="Hand"></controls:OpaqueButton>
-        <WrapPanel Grid.Row="1"  Margin="0, 0, 20, 10" VerticalAlignment="Bottom" HorizontalAlignment="Right">
+        <WrapPanel Grid.Row="1"
+                   Grid.Column="1"
+                   Margin="0, 0, 20, 10"
+                   VerticalAlignment="Bottom"
+                   HorizontalAlignment="Right">
             <controls:OpaqueButton Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
                      Text="{Binding ElementName=_this, Path=CurrentVersionText, Mode=OneWay}" FontSize="10"
                      Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
@@ -100,13 +110,42 @@
                      Visibility="{Binding ElementName=_this, Path=IsRunningAsAdmin, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
                      Clicked="VersionText_Clicked"></controls:OpaqueButton>
         </WrapPanel>
-        <Grid x:Name="Container" Grid.Row="1">
+        <Grid x:Name="Container"
+                  Grid.Column="1"
+                  Grid.Row="1"/>
+        <Grid x:Name="MenuContainer"
+                  Width="0"
+                  Grid.RowSpan="2"
+                  VerticalAlignment="Stretch"
+                  HorizontalAlignment="Left"
+                  Background="#A0202020">
+            <controls:MenuList Margin="0, 30, 0, 0"/>
         </Grid>
-        <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Active="True"></wcl:Border>
-        <webview:WebView2 x:Name="BackgroundWebView"
+        <ToggleButton Style="{StaticResource Window_SettingsButton}"
+                      Width="50"
+                      Height="30"
+                      HorizontalAlignment="Left"
+                      Margin="0, 0, 0, 0"
+                      Grid.ColumnSpan="2"
+                      Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Click="SettingsButton_Clicked"></ToggleButton>
+        <ToggleButton Style="{StaticResource Window_SettingsButton}"
+                      Width="50"
+                      Height="30"
+                      HorizontalAlignment="Left"
+                      Margin="0, 0, 0, 0"
+                      Grid.ColumnSpan="2"
+                      Foreground="White"
+                      Visibility="{Binding ElementName=_this, Path=IsShowingDropdown, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
+                      Click="SettingsButton_Clicked"></ToggleButton>
+        <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Grid.ColumnSpan="2" Active="True"></wcl:Border>
+        <controls:ChromiumBrowserWrapper x:Name="BackgroundWebView"
                                          VerticalAlignment="Center"
                                          HorizontalAlignment="Center"
-                                         Visibility="Collapsed"
-                                         Grid.Row="1"></webview:WebView2>
+                                         Visibility="Visible"
+                                         ControlsEnabled="False"
+                                         CanNavigate="False"
+                                         CanDownloadBuild="False"
+                                         Grid.Row="1"></controls:ChromiumBrowserWrapper>
     </Grid>
 </Window>

Daybreak/Launch/MainWindow.xaml.cs

@@ -14,10 +14,13 @@ using System.Diagnostics;
 using System.Extensions;
 using System.Threading;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Extensions;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 
 namespace Daybreak.Launch
@@ -44,6 +47,8 @@ namespace Daybreak.Launch
         private string currentVersionText;
         [GenerateDependencyProperty]
         private bool isRunningAsAdmin;
+        [GenerateDependencyProperty]
+        private bool isShowingDropdown;
 
         public MainWindow(
             IViewManager viewManager,
@@ -76,6 +81,12 @@ namespace Daybreak.Launch
 
         private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
+            if (e.ChangedButton is not MouseButton.Left &&
+                e.LeftButton is not MouseButtonState.Pressed)
+            {
+                return;
+            }
+
             this.DragMove();
         }
 
@@ -144,7 +155,46 @@ namespace Daybreak.Launch
 
         private void SettingsButton_Clicked(object sender, EventArgs e)
         {
-            this.viewManager.ShowView<SettingsCategoryView>();
+            sender.As<ToggleButton>().IsEnabled = false;
+            var widthAnimation = new DoubleAnimation
+            {
+                From = this.IsShowingDropdown ?
+                    this.MenuContainer.ActualWidth :
+                    0,
+                To = this.IsShowingDropdown ?
+                    0 :
+                    300,
+                Duration = new Duration(TimeSpan.FromMilliseconds(200)),
+                DecelerationRatio = 0.7
+            };
+
+            var opacityAnimation = new DoubleAnimation
+            {
+                From = this.IsShowingDropdown ?
+                    this.MenuContainer.Opacity :
+                    0,
+                To = this.IsShowingDropdown ?
+                    0 :
+                    1,
+                Duration = new Duration(TimeSpan.FromMilliseconds(100)),
+                DecelerationRatio = 0.7
+            };
+
+            var storyBoard = new Storyboard();
+            storyBoard.Children.Add(widthAnimation);
+            Storyboard.SetTarget(widthAnimation, this.MenuContainer);
+            Storyboard.SetTargetProperty(widthAnimation, new PropertyPath(Grid.WidthProperty));
+            storyBoard.Children.Add(opacityAnimation);
+            Storyboard.SetTarget(opacityAnimation, this.MenuContainer);
+            Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath(Grid.OpacityProperty));
+
+            storyBoard.Completed += (_, _) =>
+            {
+                sender.As<ToggleButton>().IsEnabled = true;
+                this.IsShowingDropdown = !this.IsShowingDropdown;
+            };
+
+            storyBoard.Begin();
         }
 
         private void CreditTextBox_MouseLeftButtonDown(object sender, EventArgs e)
@@ -187,7 +237,7 @@ namespace Daybreak.Launch
             }
             else
             {
-                this.viewManager.ShowView<MainView>();
+                this.viewManager.ShowView<CompanionView>();
                 this.PeriodicallyCheckForUpdates();
             }
         }

Daybreak/Models/BuildWithTemplateCode.cs

@@ -0,0 +1,9 @@
+using Daybreak.Models.Builds;
+
+namespace Daybreak.Models;
+
+public sealed class BuildWithTemplateCode
+{
+    public BuildEntry Build { get; set; }
+    public string TemplateCode { get; set; }
+}

Daybreak/Models/Builds/AttributeEntry.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.attribute = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Attribute)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Attribute)));
             }
         }
         public int Points
@@ -22,7 +22,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.points = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Points)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Points)));
             }
         }
 

Daybreak/Models/Builds/BuildEntry.cs

@@ -15,7 +15,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.name = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Name)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Name)));
             }
         }
         public Build Build
@@ -24,7 +24,7 @@ namespace Daybreak.Models.Builds
             set
             {
                 this.build = value;
-                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Build)));
+                this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.Build)));
             }
         }
     }

Daybreak/Models/Builds/Skill.cs

@@ -2978,7 +2978,7 @@ namespace Daybreak.Models.Builds
             WeaponsofThreeForges,
             VowofRevolution,
             HeroicRefrain,
-        };
+        }.OrderBy(s => s.Name).ToList();
 
         public static bool TryParse(int id, out Skill skill)
         {

Daybreak/Models/KeyboardInput.cs

@@ -16,7 +16,7 @@ namespace Daybreak.Models
         /// <summary>
         /// The VirtualCode converted to typeof(Keys) for higher usability.
         /// </summary>
-        public Keys Key { get { return (Keys)VirtualCode; } }
+        public Keys Key { get { return (Keys)this.VirtualCode; } }
 
         /// <summary>
         /// A hardware scan code for the key. 

Daybreak/Models/Progress/IconDownloadStatus.cs

@@ -17,11 +17,11 @@ namespace Daybreak.Models.Progress
 
         public IconDownloadStep CurrentStep
         {
-            get => currentStep;
+            get => this.currentStep;
             set
             {
-                currentStep = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentStep)));
+                this.currentStep = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.CurrentStep)));
             }
         }
 

Daybreak/Models/Progress/UpdateStatus.cs

@@ -17,11 +17,11 @@ namespace Daybreak.Models.Progress
 
         public UpdateStep CurrentStep
         {
-            get => currentStep;
+            get => this.currentStep;
             set
             {
-                currentStep = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentStep)));
+                this.currentStep = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.CurrentStep)));
             }
         }
 
@@ -35,7 +35,7 @@ namespace Daybreak.Models.Progress
         {
             internal DownloadUpdateStep(string name, double progress) : base(name)
             {
-                Progress = progress;
+                this.Progress = progress;
             }
         }
     }

Daybreak/Models/SecureString.cs

@@ -16,33 +16,33 @@ namespace Daybreak.Models
 
         private byte[] DecryptedValue
         {
-            get => this.encryptedBytes.DecryptBytes(key);
-            set => this.encryptedBytes = value.EncryptBytes(key);
+            get => this.encryptedBytes.DecryptBytes(this.key);
+            set => this.encryptedBytes = value.EncryptBytes(this.key);
         }
         [JsonProperty("value")]
         public string Value
         {
             get
             {
-                return this.encryptedBytes.DecryptBytes(key).AsString();
+                return this.encryptedBytes.DecryptBytes(this.key).AsString();
             }
             set
             {
-                this.encryptedBytes = value.AsBytes().EncryptBytes(key);
+                this.encryptedBytes = value.AsBytes().EncryptBytes(this.key);
             }
         }
         private SecureString(byte[] value)
         {
             this.key = new byte[32];
             using var crypto = RandomNumberGenerator.Create();
-            crypto.GetBytes(key);
+            crypto.GetBytes(this.key);
             this.DecryptedValue = value;
         }
         public SecureString(string value)
         {
             this.key = new byte[32];
             using var crypto = RandomNumberGenerator.Create();
-            crypto.GetBytes(key);
+            crypto.GetBytes(this.key);
             this.Value = value;
         }
 

Daybreak/Models/Versioning/Version.cs

@@ -30,10 +30,10 @@ namespace Daybreak.Models.Versioning
 
         public override string ToString()
         {
-            var version = string.Join('.', parts.OfType<VersionNumberToken>());
-            if (parts.Last() is VersionStringToken)
+            var version = string.Join('.', this.parts.OfType<VersionNumberToken>());
+            if (this.parts.Last() is VersionStringToken)
             {
-                version += "-" + parts.Last();
+                version += "-" + this.parts.Last();
             }
 
             if (this.HasPrefix)

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -65,7 +65,7 @@ namespace Daybreak.Services.ApplicationLauncher
                     {
                         if (this.privilegeManager.AdminPrivileges is false)
                         {
-                            this.privilegeManager.RequestAdminPrivileges<MainView>("You need administrator rights in order to start using multi-launch");
+                            this.privilegeManager.RequestAdminPrivileges<CompanionView>("You need administrator rights in order to start using multi-launch");
                             return false;
                         }
 

Daybreak/Services/Bloogum/BloogumClient.cs

@@ -38,7 +38,7 @@ namespace Daybreak.Services.Bloogum
             this.logger.LogInformation($"Retrieving image from {BaseAddress}/{url}");
             try
             {
-                var response = await httpClient.GetAsync($"{BaseAddress}/{url}").ConfigureAwait(false);
+                var response = await this.httpClient.GetAsync($"{BaseAddress}/{url}").ConfigureAwait(false);
                 if (response.IsSuccessStatusCode)
                 {
                     this.logger.LogInformation("Received success status code");

Daybreak/Services/BuildTemplates/BuildTemplateManager.cs

@@ -7,6 +7,7 @@ using System.Extensions;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace Daybreak.Services.BuildTemplates
 {
@@ -41,16 +42,7 @@ namespace Daybreak.Services.BuildTemplates
         public BuildEntry CreateBuild()
         {
             var emptyBuild = new Build();
-            var builds = GetBuilds();
-            var baseName = "New build";
-            var name = baseName;
-            int count = 0;
-            while(builds.Where(b => b.Name.Equals(name, StringComparison.OrdinalIgnoreCase)).Any())
-            {
-                name = baseName + count;
-                count++;
-            }
-
+            var name = Guid.NewGuid().ToString();
             var entry = new BuildEntry { Build = emptyBuild, Name = name, PreviousName = string.Empty };
             this.SaveBuild(entry);
             return entry;
@@ -88,19 +80,42 @@ namespace Daybreak.Services.BuildTemplates
             }
         }
 
-        public IEnumerable<BuildEntry> GetBuilds()
+        public async Task<Result<BuildEntry, Exception>> GetBuild(string name)
+        {
+            if (File.Exists($"{BuildsPath}/{name}.txt") is false)
+            {
+                return new InvalidOperationException("Unable to find build file");
+            }
+
+            var content = await File.ReadAllTextAsync($"{BuildsPath}/{name}.txt");
+            if (this.TryDecodeTemplate(content, out var build) is false)
+            {
+                return new InvalidOperationException("Unable to parse build file");
+            }
+
+            return new BuildEntry { Build = build, Name = name, PreviousName = name };
+        }
+
+        public void ClearBuilds()
+        {
+            foreach(var file in Directory.GetFiles(BuildsPath))
+            {
+                File.Delete(file);
+            }
+        }
+
+        public async IAsyncEnumerable<BuildEntry> GetBuilds()
         {
             foreach (var file in Directory.GetFiles(BuildsPath))
             {
-                Build build = default;
-                try
-                {
-                    build = this.DecodeTemplate(File.ReadAllText(file));
-                }
-                catch(Exception e)
-                {
-                    this.logger.LogError($"Failed to decode template from file {file}. Details: {e}");
-                }
+                var maybeBuild = this.DecodeTemplateInner(await File.ReadAllTextAsync(file));
+                var build = maybeBuild.Switch(
+                    onSuccess: build => build,
+                    onFailure: exception =>
+                    {
+                        this.logger.LogError(exception, "Failed to parse build");
+                        return default;
+                    });
                 
                 if (build is not null)
                 {
@@ -111,7 +126,21 @@ namespace Daybreak.Services.BuildTemplates
 
         public Build DecodeTemplate(string template)
         {
-            return this.DecodeTemplateInner(template);
+            var maybeTemplate = this.DecodeTemplateInner(template);
+            return maybeTemplate.Switch(
+                onSuccess: build => build,
+                onFailure: exception => throw exception);
+        }
+
+        public bool TryDecodeTemplate(string template, out Build build)
+        {
+            var maybeBuild = this.DecodeTemplateInner(template);
+            (var result, var parsedBuild) = maybeBuild.Switch(
+                onSuccess: parsedBuild => (true, parsedBuild),
+                onFailure: _ => (false, null));
+
+            build = parsedBuild;
+            return result;
         }
 
         public string EncodeTemplate(Build build)
@@ -119,7 +148,7 @@ namespace Daybreak.Services.BuildTemplates
             return this.EncodeTemplateInner(build);
         }
 
-        private Build DecodeTemplateInner(string template)
+        private Result<Build, Exception> DecodeTemplateInner(string template)
         {
             this.logger.LogInformation("Attempting to decode template");
             var buildMetadata = ParseEncodedTemplate(template);
@@ -127,7 +156,7 @@ namespace Daybreak.Services.BuildTemplates
             if (buildMetadata.VersionNumber != 0)
             {
                 this.logger.LogError($"Expected version number to be 0 but found {buildMetadata.VersionNumber}");
-                throw new InvalidOperationException($"Failed to parse template");
+                return new InvalidOperationException($"Failed to parse template");
             }
 
             var build = new Build()
@@ -139,14 +168,14 @@ namespace Daybreak.Services.BuildTemplates
             if (Profession.TryParse(buildMetadata.PrimaryProfessionId, out var primaryProfession) is false)
             {
                 this.logger.LogError($"Failed to parse profession with id {buildMetadata.PrimaryProfessionId}");
-                throw new InvalidOperationException($"Failed to parse template");
+                return new InvalidOperationException($"Failed to parse template");
             }
 
             build.Primary = primaryProfession;
             if (Profession.TryParse(buildMetadata.SecondaryProfessionId, out var secondaryProfession) is false)
             {
                 this.logger.LogError($"Failed to parse profession with id {buildMetadata.SecondaryProfessionId}");
-                throw new InvalidOperationException($"Failed to parse template");
+                return new InvalidOperationException($"Failed to parse template");
             }
 
             build.Secondary = secondaryProfession;
@@ -155,7 +184,7 @@ namespace Daybreak.Services.BuildTemplates
                 if (Daybreak.Models.Builds.Attribute.TryParse(buildMetadata.AttributesIds[i], out var attribute) is false)
                 {
                     this.logger.LogError($"Failed to parse attribute with id {buildMetadata.AttributesIds[i]}");
-                    throw new InvalidOperationException($"Failed to parse template");
+                    return new InvalidOperationException($"Failed to parse template");
                 }
 
                 build.Attributes.Add(new AttributeEntry { Attribute = attribute, Points = buildMetadata.AttributePoints[i] });
@@ -166,7 +195,7 @@ namespace Daybreak.Services.BuildTemplates
                 if (Skill.TryParse(buildMetadata.SkillIds[i], out var skill) is false)
                 {
                     this.logger.LogError($"Failed to parse skill with id {buildMetadata.SkillIds[i]}");
-                    throw new InvalidOperationException($"Failed to parse template");
+                    return new InvalidOperationException($"Failed to parse template");
                 }
 
                 build.Skills.Add(skill);
@@ -247,7 +276,7 @@ namespace Daybreak.Services.BuildTemplates
                 buildMetadata.NewTemplate = false;
             }
 
-            buildMetadata.ProfessionIdLength = stream.Read(2) * 2 + 4;
+            buildMetadata.ProfessionIdLength = (stream.Read(2) * 2) + 4;
             buildMetadata.PrimaryProfessionId = stream.Read(buildMetadata.ProfessionIdLength);
             buildMetadata.SecondaryProfessionId = stream.Read(buildMetadata.ProfessionIdLength);
             buildMetadata.AttributeCount = stream.Read(4);
@@ -284,7 +313,7 @@ namespace Daybreak.Services.BuildTemplates
             
             var desiredProfessionIdLength = GetBitLength(new List<int> { buildMetadata.PrimaryProfessionId, buildMetadata.SecondaryProfessionId }.Max());
             var professionIdLength = Math.Max((desiredProfessionIdLength - 4) / 2, 0);
-            var finalProfessionIdLength = professionIdLength * 2 + 4;
+            var finalProfessionIdLength = (professionIdLength * 2) + 4;
             stream.Write(professionIdLength, 2);
             stream.Write(buildMetadata.PrimaryProfessionId, finalProfessionIdLength);
             stream.Write(buildMetadata.SecondaryProfessionId, finalProfessionIdLength);

Daybreak/Services/BuildTemplates/IBuildTemplateManager.cs

@@ -1,5 +1,8 @@
 using Daybreak.Models.Builds;
+using System;
 using System.Collections.Generic;
+using System.Extensions;
+using System.Threading.Tasks;
 
 namespace Daybreak.Services.BuildTemplates
 {
@@ -8,10 +11,13 @@ namespace Daybreak.Services.BuildTemplates
         bool IsTemplate(string template);
         BuildEntry CreateBuild();
         BuildEntry CreateBuild(string name);
+        void ClearBuilds();
         void SaveBuild(BuildEntry buildEntry);
         void RemoveBuild(BuildEntry buildEntry);
-        IEnumerable<BuildEntry> GetBuilds();
+        IAsyncEnumerable<BuildEntry> GetBuilds();
+        Task<Result<BuildEntry, Exception>> GetBuild(string name);
         Build DecodeTemplate(string template);
+        bool TryDecodeTemplate(string template, out Build build);
         string EncodeTemplate(Build build);
     }
 }

Daybreak/Services/BuildTemplates/Models/EncodeCharStream.cs

@@ -13,7 +13,7 @@ namespace Daybreak.Services.BuildTemplates.Models
 
         public string GetEncodedString()
         {
-            return innerStringBuilder.ToString();
+            return this.innerStringBuilder.ToString();
         }
 
         private void EncodeToBinary(int value, int count)

Daybreak/Services/Graph/GraphClient.cs

@@ -0,0 +1,429 @@
+using Daybreak.Configuration;
+using Daybreak.Controls;
+using Daybreak.Models.Builds;
+using Daybreak.Services.BuildTemplates;
+using Daybreak.Services.Graph.Models;
+using Daybreak.Services.ViewManagement;
+using Daybreak.Views;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Core.Extensions;
+using System.Extensions;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+using System.Windows.Controls;
+
+namespace Daybreak.Services.Graph;
+
+public sealed class GraphClient : IGraphClient
+{
+    private const string Scopes = "Files.Read Files.Read.All Files.ReadWrite Files.ReadWrite.All User.Read";
+    private const string RedirectUri = "http://localhost";
+
+    private const string QueryStateKey = "state";
+    private const string QueryCodeKey = "code";
+    private const string ClientIdPlaceholder = "[ClientID]";
+    private const string RedirectUriPlaceholder = "[RedirectUri]";
+    private const string ScopesPlaceholder = "[Scopes]";
+    private const string StatePlaceholder = "[State]";
+    private const string ProfileEndpoint = "me";
+    private const string GraphBaseUrl = "https://graph.microsoft.com/v1.0/";
+    private const string TokenUrlPlaceholder = $"https://login.microsoftonline.com/consumers/oauth2/v2.0/token";
+    private const string AuthorizationUrlPlaceholder = $"https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize?client_id={ClientIdPlaceholder}&response_type=code&redirect_uri={RedirectUriPlaceholder}&response_mode=query&scope={ScopesPlaceholder}&state={StatePlaceholder}";
+    private const string SyncFileUri = $"me/drive/root:/Daybreak/Builds/daybreak.json{ContentSuffix}";
+    private const string ContentSuffix = ":/content";
+
+    private static readonly byte[] Entropy = Convert.FromBase64String("R3VpbGR3YXJz");
+    private static readonly string ApplicationId = SecretManager.GetSecret(SecretKeys.AadApplicationId);
+
+    private readonly IBuildTemplateManager buildTemplateManager;
+    private readonly IViewManager viewManager;
+    private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
+    private readonly IHttpClient<GraphClient> httpClient;
+    private readonly ILogger<GraphClient> logger;
+
+    private List<BuildFile> buildsCache;
+
+    public GraphClient(
+        IBuildTemplateManager buildTemplateManager,
+        IViewManager viewManager,
+        ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions,
+        IHttpClient<GraphClient> httpClient,
+        ILogger<GraphClient> logger)
+    {
+        this.buildTemplateManager = buildTemplateManager.ThrowIfNull();
+        this.viewManager = viewManager.ThrowIfNull();
+        this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull();
+        this.httpClient = httpClient.ThrowIfNull();
+        this.logger = logger.ThrowIfNull();
+
+        this.httpClient.BaseAddress = new Uri(GraphBaseUrl);
+        this.httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+    }
+
+    public async Task<Result<bool, Exception>> PerformAuthorizationFlow(
+        ChromiumBrowserWrapper chromiumBrowserWrapper,
+        CancellationToken cancellationToken = default)
+    {
+        var maybeAuthCode = await RetrieveAuthorizationCode(chromiumBrowserWrapper, cancellationToken);
+        if (maybeAuthCode.TryExtractSuccess(out var authCode) is false)
+        {
+            return maybeAuthCode.SwitchAny(onFailure: exception => exception);
+        }
+
+        var maybeAccessToken = await this.RetrieveAccessToken(authCode);
+
+        return maybeAccessToken.Switch(
+            onSuccess: token =>
+            {
+                var accessToken = AccessToken.FromTokenResponse(token);
+                this.SaveAccessToken(accessToken);
+                return true;
+            },
+            onFailure: exception => exception);
+    }
+
+    public async Task<Result<User, Exception>> GetUserProfile<TViewType>()
+        where TViewType : UserControl
+    {
+        var authCode = this.LoadAccessToken();
+        if (authCode.ExtractValue() is not AccessToken accessToken)
+        {
+            this.viewManager.ShowView<GraphAuthorizationView>(new ViewRedirectContext { CallingView = typeof(TViewType) });
+            return new InvalidOperationException("Client is not authorized");
+        }
+
+        if (DateTime.Now > accessToken.ExpirationDate)
+        {
+            this.viewManager.ShowView<GraphAuthorizationView>(new ViewRedirectContext { CallingView = typeof(TViewType) });
+            return new InvalidOperationException("Client authorization expired");
+        }
+
+        this.httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Token);
+        var response = await this.httpClient.GetAsync(ProfileEndpoint);
+        if (response.IsSuccessStatusCode is false)
+        {
+            this.viewManager.ShowView<GraphAuthorizationView>(new ViewRedirectContext { CallingView = typeof(TViewType) });
+            return new InvalidOperationException($"Failed to load profile. Response status code [{response.StatusCode}]");
+        }
+
+        try
+        {
+            var profile = JsonConvert.DeserializeObject<User>(await response.Content.ReadAsStringAsync());
+            return profile;
+        }
+        catch(Exception e)
+        {
+            return e;
+        }
+    }
+
+    public async Task<Result<bool, Exception>> UploadBuilds()
+    {
+        var builds = await this.buildTemplateManager.GetBuilds().ToListAsync();
+        return await this.PutBuilds(builds);
+    }
+
+    public async Task<Result<bool, Exception>> DownloadBuilds()
+    {
+        var retrieveBuildsResponse = await this.RetrieveBuildsList();
+        if (retrieveBuildsResponse.TryExtractFailure(out var failure))
+        {
+            this.logger.LogError(failure, "Unable to download builds");
+            return false;
+        }
+
+        if (retrieveBuildsResponse.TryExtractSuccess(out var builds) is false)
+        {
+            this.logger.LogError("Unexpected error occured");
+            return false;
+        }
+
+        this.buildTemplateManager.ClearBuilds();
+        var compiledBuilds = this.buildsCache.Select(buildFile =>
+        {
+            if (this.buildTemplateManager.TryDecodeTemplate(buildFile.TemplateCode, out var build) is false)
+            {
+                return null;
+            }
+
+            return new BuildEntry
+            {
+                Build = build,
+                Name = buildFile.FileName,
+                PreviousName = buildFile.FileName
+            };
+        }).Where(entry => entry is not null).ToList();
+        _ = compiledBuilds.Do(this.buildTemplateManager.SaveBuild).ToList();
+
+        return true;
+    }
+
+    public async Task<Result<bool, Exception>> DownloadBuild(string buildName)
+    {
+        var retrieveBuildsResponse = await this.RetrieveBuildsList();
+        if (retrieveBuildsResponse.TryExtractFailure(out var failure))
+        {
+            this.logger.LogError(failure, "Unable to download builds");
+            return false;
+        }
+
+        if (retrieveBuildsResponse.TryExtractSuccess(out var builds) is false)
+        {
+            this.logger.LogError("Unexpected error occured");
+            return false;
+        }
+
+        var compiledBuilds = this.buildsCache
+            .Where(b => b.FileName == buildName)
+            .Select(buildFile =>
+        {
+            if (this.buildTemplateManager.TryDecodeTemplate(buildFile.TemplateCode, out var build) is false)
+            {
+                return null;
+            }
+
+            return new BuildEntry
+            {
+                Build = build,
+                Name = buildFile.FileName,
+                PreviousName = buildFile.FileName
+            };
+        }).Where(entry => entry is not null).ToList();
+        _ = compiledBuilds.Do(this.buildTemplateManager.SaveBuild).ToList();
+
+        return true;
+    }
+
+    public async Task<Result<bool, Exception>> UploadBuild(string buildName)
+    {
+        var getBuildResult = await this.buildTemplateManager.GetBuild(buildName);
+        if (getBuildResult.TryExtractSuccess(out var buildEntry) is false)
+        {
+            return getBuildResult.SwitchAny(
+                onFailure: exception => exception);
+        }
+
+        return await this.PutBuild(buildEntry);
+    }
+
+    public async Task<Result<IEnumerable<BuildFile>, Exception>> RetrieveBuildsList()
+    {
+        var maybeBuildsBackup = await this.GetBuildsBackup();
+        var buildsBackup = maybeBuildsBackup.ExtractValue();
+        this.buildsCache = buildsBackup;
+        return buildsBackup;
+    }
+
+    public void ResetAuthorization()
+    {
+        this.ResetAccessToken();
+    }
+
+    private async Task<bool> PutBuild(BuildEntry buildEntry)
+    {
+        if (this.buildsCache is null)
+        {
+            _ = await this.RetrieveBuildsList();
+        }
+
+        var buildFile = new BuildFile
+        {
+            FileName = buildEntry.Name,
+            TemplateCode = this.buildTemplateManager.EncodeTemplate(buildEntry.Build)
+        };
+
+        var buildList = this.buildsCache ?? new List<BuildFile>();
+        // Remove the previous version of the build
+        buildList = buildList.Where(b => b.FileName != buildEntry.Name).ToList();
+        // Add new version of the build
+        buildList.Add(buildFile);
+        // Order by name
+        buildList = buildList.OrderBy(b => b.FileName).ToList();
+
+        using var stringContent = new StringContent(JsonConvert.SerializeObject(buildList));
+        var response = await this.httpClient.PutAsync(SyncFileUri, stringContent);
+        if (response.IsSuccessStatusCode is false)
+        {
+            return false;
+        }
+
+        this.buildsCache = buildList;
+        return true;
+    }
+
+    private async Task<bool> PutBuilds(List<BuildEntry> buildEntries)
+    {
+        var buildFiles = buildEntries.Select(buildEntry => new BuildFile
+        {
+            FileName = buildEntry.Name,
+            TemplateCode = this.buildTemplateManager.EncodeTemplate(buildEntry.Build)
+        });
+
+        var buildList = new List<BuildFile>();
+        buildList.AddRange(buildFiles);
+        buildList = buildList.OrderBy(b => b.FileName).ToList();
+
+        using var stringContent = new StringContent(JsonConvert.SerializeObject(buildList));
+        var response = await this.httpClient.PutAsync(SyncFileUri, stringContent);
+        if (response.IsSuccessStatusCode is false)
+        {
+            return false;
+        }
+
+        this.buildsCache = buildList;
+        return true;
+    }
+
+    private async Task<Optional<List<BuildFile>>> GetBuildsBackup()
+    {
+        var fileItemResponse = await this.httpClient.GetAsync(SyncFileUri);
+        if (fileItemResponse.IsSuccessStatusCode is false)
+        {
+            return Optional.None<List<BuildFile>>();
+        }
+
+        var driveItemContent = await fileItemResponse.Content.ReadAsStringAsync();
+        var backup = JsonConvert.DeserializeObject<List<BuildFile>>(driveItemContent);
+        if (backup is null)
+        {
+            return Optional.None<List<BuildFile>>();
+        }
+
+        return backup;
+    }
+
+    private static async Task<Result<string, Exception>> RetrieveAuthorizationCode(
+        ChromiumBrowserWrapper chromiumBrowserWrapper,
+        CancellationToken cancellationToken = default)
+    {
+        chromiumBrowserWrapper.ThrowIfNull();
+        await chromiumBrowserWrapper.InitializeDefaultBrowser();
+
+        var state = GetNewState();
+
+        chromiumBrowserWrapper.Address = AuthorizationUrlPlaceholder
+            .Replace(ClientIdPlaceholder, ApplicationId)
+            .Replace(RedirectUriPlaceholder, RedirectUri
+                .Replace(":", "%3a")
+                .Replace("/", "%2f"))
+            .Replace(ScopesPlaceholder, Scopes
+                .Replace(' ', '+'))
+            .Replace(StatePlaceholder, state);
+
+        while (chromiumBrowserWrapper.Address.StartsWith(RedirectUri) is false)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return new TaskCanceledException();
+            }
+
+            await Task.Delay(1000, cancellationToken).ConfigureAwait(true);
+        }
+
+        var query = HttpUtility.ParseQueryString(chromiumBrowserWrapper.Address.Split('?').Skip(1).FirstOrDefault());
+        if (query.GetValues(QueryStateKey) is string[] states is false)
+        {
+            throw new InvalidOperationException("Response doesn't have state key in response");
+        }
+
+        if (states.Length < 1 || states.Length > 1)
+        {
+            throw new InvalidOperationException("Response contains invalid state");
+        }
+
+        if (states.First() != state)
+        {
+            throw new InvalidOperationException("Response contains incorrect state");
+        }
+
+        if (query.GetValues(QueryCodeKey) is string[] codes is false)
+        {
+            throw new InvalidOperationException("Response doesn't have code key in response");
+        }
+
+        if (codes.Length < 1 || codes.Length > 1)
+        {
+            throw new InvalidOperationException("Response contains invalid code");
+        }
+
+        var authCode = codes.First();
+        return authCode;
+    }
+
+    private async Task<Result<TokenResponse, Exception>> RetrieveAccessToken(string authorizationCode)
+    {
+        using var formContent = new FormUrlEncodedContent(
+                new Dictionary<string, string>
+                {
+                    { "grant_type", "authorization_code" },
+                    { "code", authorizationCode },
+                    { "redirect_uri", RedirectUri },
+                    { "client_id", ApplicationId },
+                    { "scope", Scopes }
+                });
+
+        using var httpRequest = new HttpRequestMessage
+        {
+            Content = formContent,
+            Method = HttpMethod.Post,
+            RequestUri = new Uri(TokenUrlPlaceholder)
+        };
+
+        using var response = await this.httpClient.SendAsync(httpRequest);
+        if (response.IsSuccessStatusCode is false)
+        {
+            return new InvalidOperationException($"Invalid access token response. Status code [{response.StatusCode}]");
+        }
+
+        return JsonConvert.DeserializeObject<TokenResponse>(await response.Content.ReadAsStringAsync());
+    }
+
+    private void ResetAccessToken()
+    {
+        this.liveUpdateableOptions.Value.ProtectedGraphAccessToken = null;
+        this.liveUpdateableOptions.UpdateOption();
+    }
+
+    private void SaveAccessToken(AccessToken token)
+    {
+        var codeBytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(token));
+        this.liveUpdateableOptions.Value.ProtectedGraphAccessToken = Convert.ToBase64String(ProtectedData.Protect(codeBytes, Entropy, DataProtectionScope.CurrentUser));
+        this.liveUpdateableOptions.UpdateOption();
+    }
+
+    private Optional<AccessToken> LoadAccessToken()
+    {
+        var protectedCode = this.liveUpdateableOptions.Value.ProtectedGraphAccessToken;
+        if (protectedCode.IsNullOrWhiteSpace())
+        {
+            return Optional.None<AccessToken>();
+        }
+
+        var codeBytes = ProtectedData.Unprotect(Convert.FromBase64String(protectedCode), Entropy, DataProtectionScope.CurrentUser);
+        try
+        {
+            return JsonConvert.DeserializeObject<AccessToken>(Encoding.UTF8.GetString(codeBytes));
+        }
+        catch(Exception e)
+        {
+            this.logger.LogError(e, "Failed to load access token. Resetting access token");
+            this.ResetAccessToken();
+            return Optional.None<AccessToken>();
+        }
+    }
+
+    private static string GetNewState()
+    {
+        return Guid.NewGuid().ToString();
+    }
+}

Daybreak/Services/Graph/IGraphClient.cs

@@ -0,0 +1,23 @@
+using Daybreak.Controls;
+using Daybreak.Services.Graph.Models;
+using System;
+using System.Collections.Generic;
+using System.Extensions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace Daybreak.Services.Graph;
+
+public interface IGraphClient
+{
+    Task<Result<User, Exception>> GetUserProfile<TViewType>()
+        where TViewType : UserControl;
+    Task<Result<bool, Exception>> PerformAuthorizationFlow(ChromiumBrowserWrapper chromiumBrowserWrapper, CancellationToken cancellationToken = default);
+    Task<Result<bool, Exception>> UploadBuilds();
+    Task<Result<bool, Exception>> DownloadBuilds();
+    Task<Result<bool, Exception>> UploadBuild(string buildName);
+    Task<Result<bool, Exception>> DownloadBuild(string buildName);
+    Task<Result<IEnumerable<BuildFile>, Exception>> RetrieveBuildsList();
+    void ResetAuthorization();
+}

Daybreak/Services/Graph/Models/AccessToken.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class AccessToken
+{
+    public string Token { get; set; }
+    public DateTime ExpirationDate { get; set; }
+
+    public static AccessToken FromTokenResponse(TokenResponse tokenResponse)
+    {
+        return new AccessToken
+        {
+            Token = tokenResponse.AccessToken,
+            ExpirationDate = DateTime.Now + TimeSpan.FromSeconds(tokenResponse.ExpiresIn)
+        };
+    }
+}

Daybreak/Services/Graph/Models/BuildFile.cs

@@ -0,0 +1,7 @@
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class BuildFile
+{
+    public string TemplateCode { get; set; }
+    public string FileName { get; set; }
+}

Daybreak/Services/Graph/Models/BuildFilesPayload.cs

@@ -0,0 +1,6 @@
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class BuildFilesPayload
+{
+
+}

Daybreak/Services/Graph/Models/FileItem.cs

@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class FileItem
+{
+    [JsonProperty("@microsoft.graph.downloadUrl")]
+    public string DownloadUrl { get; set; }
+    [JsonProperty("name")]
+    public string Name { get; set; }
+    [JsonProperty("lastModifiedDateTime")]
+    public DateTime LastModifiedDateTime { get; set; }
+}

Daybreak/Services/Graph/Models/FolderItem.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class FolderItem
+{
+    [JsonProperty("value")]
+    public List<FileItem> Files { get; set; }
+}

Daybreak/Services/Graph/Models/TokenResponse.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class TokenResponse
+{
+    [JsonProperty("token_type")]
+    public string TokenType { get; set; }
+    [JsonProperty("scope")]
+    public string Scope { get; set; }
+    [JsonProperty("expires_in")]
+    public int ExpiresIn { get; set; }
+    [JsonProperty("access_token")]
+    public string AccessToken { get; set; }
+    [JsonProperty("refresh_token")]
+    public string RefreshToken { get; set; }
+}

Daybreak/Services/Graph/Models/User.cs

@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class User
+{
+    [JsonProperty("displayName")]
+    public string DisplayName { get; set; }
+
+    [JsonProperty("mail")]
+    public string Email { get; set; }
+}

Daybreak/Services/Graph/Models/ViewRedirectContext.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Daybreak.Services.Graph.Models;
+
+public sealed class ViewRedirectContext
+{
+    public Type CallingView { get; set; }
+}

Daybreak/Services/IconRetrieve/IIconBrowser.cs

@@ -1,13 +1,12 @@
 using Daybreak.Controls;
 using Daybreak.Models;
-using Microsoft.Web.WebView2.Wpf;
 using System.Threading;
 
 namespace Daybreak.Services.IconRetrieve
 {
     public interface IIconBrowser
     {
-        void InitializeWebView(WebView2 webView2, CancellationToken cancellationToken);
+        void InitializeWebView(ChromiumBrowserWrapper webView2, CancellationToken cancellationToken);
         /// <summary>
         /// Queue an icon request. The browser will attempt to download the icon. Monitor the <see cref="IconRequest.Finished"/> to be notified when the request has been served.
         /// </summary>

Daybreak/Services/IconRetrieve/IIconDownloader.cs

@@ -1,13 +1,12 @@
 using Daybreak.Controls;
 using Daybreak.Models.Progress;
-using Microsoft.Web.WebView2.Wpf;
 using System.Threading.Tasks;
 
 namespace Daybreak.Services.IconRetrieve
 {
     public interface IIconDownloader
     {
-        void SetBrowser(WebView2 chromiumBrowserWrapper);
+        void SetBrowser(ChromiumBrowserWrapper chromiumBrowserWrapper);
 
         bool DownloadComplete { get; }
         Task<IconDownloadStatus> StartIconDownload();

Daybreak/Services/IconRetrieve/IconBrowser.cs

@@ -1,4 +1,5 @@
-using Daybreak.Controls;
+using Daybreak.Configuration;
+using Daybreak.Controls;
 using Daybreak.Models;
 using Daybreak.Models.Builds;
 using Daybreak.Utils;
@@ -8,6 +9,7 @@ using Microsoft.Web.WebView2.Wpf;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
+using System.Configuration;
 using System.Core.Extensions;
 using System.Extensions;
 using System.IO;
@@ -31,7 +33,8 @@ namespace Daybreak.Services.IconRetrieve
 
         private readonly ConcurrentQueue<IconRequest> iconRequests = new();
         private readonly ILogger<IconBrowser> logger;
-        private WebView2 browserWrapper;
+
+        private ChromiumBrowserWrapper browserWrapper;
         private CancellationToken cancellationToken;
 
         public IconBrowser(
@@ -40,7 +43,7 @@ namespace Daybreak.Services.IconRetrieve
             this.logger = logger.ThrowIfNull();
         }
 
-        public void InitializeWebView(WebView2 webView2, CancellationToken cancellationToken)
+        public void InitializeWebView(ChromiumBrowserWrapper webView2, CancellationToken cancellationToken)
         {
             this.browserWrapper = webView2.ThrowIfNull();
             this.cancellationToken = cancellationToken;
@@ -91,11 +94,11 @@ namespace Daybreak.Services.IconRetrieve
 
             try
             {
-                await this.browserWrapper.EnsureCoreWebView2Async();
+                await this.browserWrapper.InitializeDefaultBrowser();
             }
             catch(Exception e)
             {
-
+                this.logger.LogError(e, "Encountered error when initializing browser");
             }
 
             var curedSkillName = request.Skill.AlternativeName.IsNullOrWhiteSpace() ?
@@ -104,7 +107,7 @@ namespace Daybreak.Services.IconRetrieve
             var skillIconUrl = $"{BaseUrl}/{QueryUrl.Replace(NamePlaceholder, curedSkillName)}";
             logger.LogInformation($"Looking for icon at {skillIconUrl}");
 
-            this.browserWrapper.CoreWebView2.Navigate(skillIconUrl);
+            this.browserWrapper.Address = skillIconUrl;
 
             for (var i = 0; i < 5; i++)
             {
@@ -116,7 +119,7 @@ namespace Daybreak.Services.IconRetrieve
                 logger.LogInformation("Executing extraction script");
                 var responseTask = await Application.Current.Dispatcher.InvokeAsync(async () =>
                 {
-                    return await this.browserWrapper.ExecuteScriptAsync(Scripts.GetHrefFromSkillPage);
+                    return await this.browserWrapper.WebBrowser.ExecuteScriptAsync(Scripts.GetHrefFromSkillPage);
                 });
                 var response = await responseTask;
                 logger.LogInformation("Parsing response");

Daybreak/Services/IconRetrieve/IconDownloader.cs

@@ -28,7 +28,7 @@ namespace Daybreak.Services.IconRetrieve
         private readonly ILogger<IconDownloader> logger;
         private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly ILogger<ChromiumBrowserWrapper> browserLogger;
-        private WebView2 browserWrapper;
+        private ChromiumBrowserWrapper browserWrapper;
         private CancellationTokenSource cancellationTokenSource;
         private IconDownloadStatus iconDownloadStatus;
 
@@ -52,7 +52,7 @@ namespace Daybreak.Services.IconRetrieve
             this.HookIntoConfigurationChanges();
         }
 
-        public void SetBrowser(WebView2 chromiumBrowserWrapper)
+        public void SetBrowser(ChromiumBrowserWrapper chromiumBrowserWrapper)
         {
             if (this.browserWrapper is not null)
             {
@@ -78,7 +78,7 @@ namespace Daybreak.Services.IconRetrieve
 
             this.cancellationTokenSource = new();
             this.iconDownloadStatus = new IconDownloadStatus();
-            Task.Run(this.DownloadIcons);
+            _ = Task.Run(this.DownloadIcons);
             return this.iconDownloadStatus;
         }
 
@@ -144,9 +144,9 @@ namespace Daybreak.Services.IconRetrieve
                 {
                     progressValue += progressIncrement;
                     continue;
-                }                
+                }
 
-                logger.LogInformation("Downloading icon");
+                this.logger.LogInformation("Downloading icon");
                 this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Downloading(skill.Name, progressValue);
                 var request = new IconRequest { Skill = skill };
                 this.iconBrowser.QueueIconRequest(request);
@@ -158,12 +158,12 @@ namespace Daybreak.Services.IconRetrieve
 
                 if (request.IconBase64.IsNullOrWhiteSpace())
                 {
-                    logger.LogWarning("Failed to download icon");
+                    this.logger.LogWarning("Failed to download icon");
                     incomplete = true;
                 }
                 else
                 {
-                    logger.LogInformation("Downloaded icon");
+                    this.logger.LogInformation("Downloaded icon");
                 }
 
                 progressValue += progressIncrement;
@@ -179,7 +179,7 @@ namespace Daybreak.Services.IconRetrieve
                 Application.Current.Dispatcher.Invoke(() =>
                 {
                     this.browserWrapper.IsEnabled = false;
-                    this.browserWrapper.Dispose();
+                    this.browserWrapper.WebBrowser.Dispose();
                 });
                 this.iconDownloadStatus.CurrentStep = IconDownloadStatus.Finished;
                 this.DownloadComplete = true;

Daybreak/Services/KeyboardHook/KeyboardHookService.cs

@@ -86,7 +86,7 @@ namespace Daybreak.Services.KeyboardHook
                     }
 
                     this.windowsHookHandle = IntPtr.Zero;
-                    this.hookProc -= LowLevelKeyboardProc;
+                    this.hookProc -= this.LowLevelKeyboardProc;
                 }
             }
 
@@ -104,12 +104,12 @@ namespace Daybreak.Services.KeyboardHook
 
         ~KeyboardHookService()
         {
-            Dispose(false);
+            this.Dispose(false);
         }
 
         public void Dispose()
         {
-            Dispose(true);
+            this.Dispose(true);
             GC.SuppressFinalize(this);
         }
     }

Daybreak/Services/Navigation/IViewProducer.cs

@@ -6,5 +6,7 @@ namespace Daybreak.Services.ViewManagement
     {
         void RegisterView<T>()
             where T : UserControl;
+        void RegisterPermanentView<T>()
+            where T : UserControl;
     }
 }

Daybreak/Services/Navigation/ViewManager.cs

@@ -1,6 +1,4 @@
-using Daybreak.Models;
-using Microsoft.CorrelationVector;
-using Slim;
+using Slim;
 using System;
 using System.Extensions;
 using System.Windows;
@@ -28,11 +26,18 @@ namespace Daybreak.Services.ViewManagement
             this.container = panel;
         }
 
-        public void RegisterView<T>() where T : UserControl
+        public void RegisterView<T>()
+            where T : UserControl
         {
             this.serviceManager.RegisterTransient<T, T>();
         }
 
+        public void RegisterPermanentView<T>()
+            where T : UserControl
+        {
+            this.serviceManager.RegisterSingleton<T, T>();
+        }
+
         public void ShowView<T>() where T : UserControl
         {
             this.ShowViewInner(typeof(T), null);

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -2,6 +2,7 @@
 using Daybreak.Exceptions;
 using Daybreak.Models.Github;
 using Daybreak.Models.Progress;
+using Daybreak.Services.Updater.PostUpdate;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Views;
 using Microsoft.Extensions.Logging;
@@ -9,6 +10,7 @@ using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Core.Extensions;
 using System.Diagnostics;
 using System.Extensions;
 using System.IO;
@@ -36,24 +38,29 @@ namespace Daybreak.Services.Updater
         private const string DownloadUrl = $"https://github.com/AlexMacocian/Daybreak/releases/download/{VersionTag}/Daybreak{VersionTag}.zip";
 
         private readonly CancellationTokenSource updateCancellationTokenSource = new();
-        private readonly ILogger<ApplicationUpdater> logger;
         private readonly IViewManager viewManager;
+        private readonly IPostUpdateActionProvider postUpdateActionProvider;
         private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
         private readonly IHttpClient<ApplicationUpdater> httpClient;
+        private readonly ILogger<ApplicationUpdater> logger;
 
         public Version CurrentVersion { get; }
 
         public ApplicationUpdater(
-            ILogger<ApplicationUpdater> logger,
-            ILiveOptions<ApplicationConfiguration> liveOptions,
             IViewManager viewManager,
-            IHttpClient<ApplicationUpdater> httpClient)
+            IPostUpdateActionProvider postUpdateActionProvider,
+            ILiveOptions<ApplicationConfiguration> liveOptions,
+            IHttpClient<ApplicationUpdater> httpClient,
+            ILogger<ApplicationUpdater> logger)
         {
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
-            this.liveOptions = liveOptions.ThrowIfNull(nameof(liveOptions));
-            this.logger = logger.ThrowIfNull(nameof(logger));
-            this.httpClient = httpClient.ThrowIfNull(nameof(httpClient));
+            this.viewManager = viewManager.ThrowIfNull();
+            this.postUpdateActionProvider = postUpdateActionProvider.ThrowIfNull();
+            this.liveOptions = liveOptions.ThrowIfNull();
+            this.httpClient = httpClient.ThrowIfNull();
+            this.logger = logger.ThrowIfNull();
+
             this.httpClient.DefaultRequestHeaders.Add("user-agent", "Daybreak Client");
+
             if (Version.TryParse(Assembly.GetExecutingAssembly().GetName().Version.ToString(), out var currentVersion))
             {
                 if (currentVersion.HasPrefix is false)
@@ -178,8 +185,8 @@ namespace Daybreak.Services.Updater
         {
             if (UpdateMarkedInRegistry())
             {
-                PerformPostUpdateActions();
                 UnmarkUpdateInRegistry();
+                this.ExecutePostUpdateActions();
             }
         }
 
@@ -215,6 +222,18 @@ namespace Daybreak.Services.Updater
             }
         }
 
+        private async void ExecutePostUpdateActions()
+        {
+            this.logger.LogInformation("Executing post-update actions");
+            foreach(var action in this.postUpdateActionProvider.GetPostUpdateActions())
+            {
+                this.logger.LogInformation($"Starting [{action.GetType().Name}]");
+                action.DoPostUpdateAction();
+                await action.DoPostUpdateActionAsync();
+                this.logger.LogInformation($"Finished [{action.GetType().Name}]");
+            }
+        }
+
         private static void MarkUpdateInRegistry()
         {
             var homeRegistryKey = GetOrCreateHomeKey();
@@ -259,19 +278,5 @@ namespace Daybreak.Services.Updater
 
             return homeRegistryKey;
         }
-
-        private static void PerformPostUpdateActions()
-        {
-            RenameInstallerIfAvailable();
-        }
-
-        private static void RenameInstallerIfAvailable()
-        {
-            if (File.Exists(TemporaryInstallerFileName))
-            {
-                File.Copy(TemporaryInstallerFileName, InstallerFileName, true);
-                File.Delete(TemporaryInstallerFileName);
-            }
-        }
     }
 }

Daybreak/Services/Updater/PostUpdate/Actions/RenameInstallerAction.cs

@@ -0,0 +1,32 @@
+using Microsoft.Extensions.Logging;
+using System.Core.Extensions;
+using System.IO;
+
+namespace Daybreak.Services.Updater.PostUpdate.Actions
+{
+    public sealed class RenameInstallerAction : PostUpdateActionBase
+    {
+        private const string TemporaryInstallerFileName = "Daybreak.Installer.Temp.exe";
+        private const string InstallerFileName = "Daybreak.Installer.exe";
+
+        private readonly ILogger<RenameInstallerAction> logger;
+
+        public RenameInstallerAction(
+            ILogger<RenameInstallerAction> logger)
+        {
+            this.logger = logger.ThrowIfNull();
+        }
+
+        public override void DoPostUpdateAction()
+        {
+            if (File.Exists(TemporaryInstallerFileName))
+            {
+                this.logger.LogInformation("Detected new installer version. Overwriting old installer with new one");
+                File.Copy(TemporaryInstallerFileName, InstallerFileName, true);
+
+                this.logger.LogInformation("Deleting new installer temporary file");
+                File.Delete(TemporaryInstallerFileName);
+            }
+        }
+    }
+}