From 8f9c0f8660901d6a315b50d40c8eba802570bf21 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Wed, 15 May 2024 23:16:14 +0300
Subject: [PATCH] Clean up

---
 DiscordChatExporter.Gui/App.axaml    | 15 ++++++++++++++-
 DiscordChatExporter.Gui/App.axaml.cs |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/DiscordChatExporter.Gui/App.axaml b/DiscordChatExporter.Gui/App.axaml
index 66e43889..2d9621d9 100644
--- a/DiscordChatExporter.Gui/App.axaml
+++ b/DiscordChatExporter.Gui/App.axaml
@@ -126,7 +126,7 @@
 
         <!--  Toggle switch  -->
         <Style Selector="ToggleSwitch">
-            <Setter Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground" Value="{DynamicResource MaterialBackgroundBrush}" />
+            <Setter Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground" Value="{DynamicResource ToggleBackgroundBrush}" />
         </Style>
 
         <!--  Tooltip  -->
@@ -137,4 +137,17 @@
             <Setter Property="TextElement.FontStretch" Value="Normal" />
         </Style>
     </Application.Styles>
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Default">
+                    <SolidColorBrush x:Key="ToggleBackgroundBrush" Color="#FFFFFF" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="ToggleBackgroundBrush" Color="#8E8E8E" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/App.axaml.cs b/DiscordChatExporter.Gui/App.axaml.cs
index a62e75b9..b933efba 100644
--- a/DiscordChatExporter.Gui/App.axaml.cs
+++ b/DiscordChatExporter.Gui/App.axaml.cs
@@ -20,12 +20,12 @@ namespace DiscordChatExporter.Gui;
 
 public class App : Application, IDisposable
 {
+    private readonly DisposableCollector _eventRoot = new();
+
     private readonly ServiceProvider _services;
     private readonly SettingsService _settingsService;
     private readonly MainViewModel _mainViewModel;
 
-    private readonly DisposableCollector _eventRoot = new();
-
     public App()
     {
         var services = new ServiceCollection();