UI - Updated logo

src/Artemis.UI/Screens/Home/HomeView.xaml

@@ -7,6 +7,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:home="clr-namespace:Artemis.UI.Screens.Home"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              mc:Ignorable="d"
              d:DesignHeight="574.026"
              d:DesignWidth="1029.87"
@@ -37,7 +38,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             
-            <shared:ArtemisIcon SvgSource="/Resources/Images/Logo/bow.svg" Width="100" Height="100"/>
+            <Image Source="{svgc:SvgImage Source=/Resources/Images/Logo/bow.svg}" Height="100" Width="100"/>
             <StackPanel Grid.Column="1" Margin="24 0 0 0" VerticalAlignment="Center">
                 <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap">Welcome to Artemis, RGB on steroids.</TextBlock>
                 <Button Style="{StaticResource MaterialDesignFlatButton}"

src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml

@@ -18,7 +18,7 @@
                          d:DesignHeight="800"
                          d:DesignWidth="800"
                          d:DataContext="{d:DesignInstance windows:LayerBrushSettingsWindowViewModel}"
-                         Icon="/Resources/Images/Logo/logo-512.png">
+                         Icon="/Resources/Images/Logo/bow.ico">
     <materialDesign:DialogHost IsTabStop="False"
                                Focusable="False"
                                Identifier="BrushSettingsDialog"

src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml

@@ -20,7 +20,7 @@
                          d:DesignHeight="800"
                          d:DesignWidth="800"
                          d:DataContext="{d:DesignInstance windows:LayerEffectSettingsWindowViewModel}"
-                         Icon="/Resources/Images/Logo/logo-512.png">
+                         Icon="/Resources/Images/Logo/bow.ico">
     <DockPanel>
         <controls:AppBar Type="Dense" Title="{Binding ActiveItem.LayerEffect.Descriptor.DisplayName}" DockPanel.Dock="Top" Margin="-18 0 0 0" ShowShadow="False">
             <controls:AppBar.AppIcon>

src/Artemis.UI/Screens/RootView.xaml

@@ -8,11 +8,12 @@
                     xmlns:screens="clr-namespace:Artemis.UI.Screens"
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                     xmlns:converters="clr-namespace:Artemis.UI.Converters"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     FadeContentIfInactive="False"
-                    Icon="/Resources/Images/Logo/logo-512.png"
+                    Icon="/Resources/Images/Logo/bow.ico"
                     Title="{Binding WindowTitle}"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"

src/Artemis.UI/Screens/RootViewModel.cs

@@ -27,7 +27,6 @@ namespace Artemis.UI.Screens
     {
         private readonly IRegistrationService _builtInRegistrationService;
         private readonly IMessageService _messageService;
-        private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
         private readonly ICoreService _coreService;
         private readonly IWindowManager _windowManager;
         private readonly IDebugService _debugService;
@@ -36,7 +35,6 @@ namespace Artemis.UI.Screens
         private readonly ISettingsService _settingsService;
         private readonly Timer _frameTimeUpdateTimer;
         private readonly SidebarViewModel _sidebarViewModel;
-        private readonly ThemeWatcher _themeWatcher;
         private readonly PluginSetting<WindowSize> _windowSize;
         private bool _activeItemReady;
         private string _frameTime;
@@ -67,12 +65,7 @@ namespace Artemis.UI.Screens
             _sidebarViewModel = sidebarViewModel;
             _frameTimeUpdateTimer = new Timer(500);
 
-            _colorScheme = _settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
             _windowSize = _settingsService.GetSetting<WindowSize>("UI.RootWindowSize");
-
-            _themeWatcher = new ThemeWatcher();
-            ApplyColorSchemeSetting();
-
             _sidebarViewModel.ConductWith(this);
 
             ActiveItem = sidebarViewModel.SelectedItem;
@@ -191,52 +184,12 @@ namespace Artemis.UI.Screens
 
             }
         }
-
-        private void ApplyColorSchemeSetting()
-        {
-            if (_colorScheme.Value == ApplicationColorScheme.Automatic)
-                ApplyWindowsTheme(_themeWatcher.GetWindowsTheme());
-            else
-                ChangeMaterialColors(_colorScheme.Value);
-        }
-
-        private void ApplyWindowsTheme(ThemeWatcher.WindowsTheme windowsTheme)
-        {
-            if (_colorScheme.Value != ApplicationColorScheme.Automatic)
-                return;
-
-            if (windowsTheme == ThemeWatcher.WindowsTheme.Dark)
-                ChangeMaterialColors(ApplicationColorScheme.Dark);
-            else
-                ChangeMaterialColors(ApplicationColorScheme.Light);
-        }
-
-        private void ChangeMaterialColors(ApplicationColorScheme colorScheme)
-        {
-            PaletteHelper paletteHelper = new();
-            ITheme theme = paletteHelper.GetTheme();
-            theme.SetBaseTheme(colorScheme == ApplicationColorScheme.Dark ? Theme.Dark : Theme.Light);
-            paletteHelper.SetTheme(theme);
-
-            MaterialDesignExtensions.Themes.PaletteHelper extensionsPaletteHelper = new();
-            extensionsPaletteHelper.SetLightDark(colorScheme == ApplicationColorScheme.Dark);
-        }
-
+        
         private void OnFrameTimeUpdateTimerOnElapsed(object sender, ElapsedEventArgs args)
         {
             UpdateFrameTime();
         }
-
-        private void ThemeWatcherOnThemeChanged(object sender, WindowsThemeEventArgs e)
-        {
-            ApplyWindowsTheme(e.Theme);
-        }
-
-        private void ColorSchemeOnSettingChanged(object sender, EventArgs e)
-        {
-            ApplyColorSchemeSetting();
-        }
-
+        
         private void PinSidebarOnSettingChanged(object sender, EventArgs e)
         {
             UpdateSidebarPinState();
@@ -280,8 +233,6 @@ namespace Artemis.UI.Screens
             _builtInRegistrationService.RegisterBuiltInPropertyEditors();
 
             _frameTimeUpdateTimer.Elapsed += OnFrameTimeUpdateTimerOnElapsed;
-            _colorScheme.SettingChanged += ColorSchemeOnSettingChanged;
-            _themeWatcher.ThemeChanged += ThemeWatcherOnThemeChanged;
             _sidebarViewModel.PropertyChanged += SidebarViewModelOnPropertyChanged;
             PinSidebar.SettingChanged += PinSidebarOnSettingChanged;
 
@@ -315,8 +266,6 @@ namespace Artemis.UI.Screens
             _windowSize.Save();
 
             _frameTimeUpdateTimer.Elapsed -= OnFrameTimeUpdateTimerOnElapsed;
-            _colorScheme.SettingChanged -= ColorSchemeOnSettingChanged;
-            _themeWatcher.ThemeChanged -= ThemeWatcherOnThemeChanged;
             _sidebarViewModel.PropertyChanged -= SidebarViewModelOnPropertyChanged;
             PinSidebar.SettingChanged -= PinSidebarOnSettingChanged;
 

src/Artemis.UI/Screens/Settings/Debug/DebugView.xaml

@@ -7,9 +7,10 @@
                     xmlns:s="https://github.com/canton7/Stylet"
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                     xmlns:debug="clr-namespace:Artemis.UI.Screens.Settings.Debug"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     Title="Artemis debugger"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
@@ -18,7 +19,7 @@
                     Width="1200"
                     Height="800"
                     d:DesignHeight="800" d:DesignWidth="800" d:DataContext="{d:DesignInstance debug:DebugViewModel}"
-                    Icon="/Resources/Images/Logo/logo-512.png"
+                    Icon="/Resources/Images/Logo/bow.ico"
                     Topmost="{Binding StayOnTopSetting.Value}">
     <materialDesign:DialogHost IsTabStop="False"
                                Focusable="False"

src/Artemis.UI/Screens/Settings/Device/DeviceDialogView.xaml

@@ -8,9 +8,10 @@
                     xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                     xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
                     xmlns:device="clr-namespace:Artemis.UI.Screens.Settings.Device"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     Title="{Binding DisplayName}"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
@@ -20,7 +21,7 @@
                     Height="800"
                     d:DesignHeight="800" d:DesignWidth="800"
                     d:DataContext="{d:DesignInstance device:DeviceDialogViewModel}"
-                    Icon="/Resources/Images/Logo/logo-512.png">
+                    Icon="/Resources/Images/Logo/bow.ico">
     <mde:MaterialWindow.Resources>
         <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
     </mde:MaterialWindow.Resources>

src/Artemis.UI/Screens/Settings/Tabs/About/AboutTabView.xaml

@@ -6,13 +6,14 @@
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Tabs.About"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:AboutTabViewModel}">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
         <StackPanel Margin="15" MaxWidth="800">
             <StackPanel Orientation="Horizontal">
-                <shared:ArtemisIcon SvgSource="/Resources/Images/Logo/bow.svg" Width="60" Height="80" Margin="0 0 20 0" />
+                <Image Source="{svgc:SvgImage Source=/Resources/Images/Logo/bow.svg}" Width="60" Height="80" Margin="0 0 20 0" />
                 <TextBlock Style="{StaticResource MaterialDesignHeadline2TextBlock}">
                     Artemis 2
                 </TextBlock>
@@ -49,7 +50,8 @@
                     </StackPanel>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" LineHeight="25" Margin="10 0 0 0">
                         - All the people on Discord providing feedback and testing<LineBreak />
-                        - Aureshion - Default device images
+                        - Aureshion - Default device images<LineBreak />
+                        - kaisax - Logo design
                     </TextBlock>
                 </StackPanel>
             </materialDesign:Card>

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml

@@ -18,7 +18,7 @@
                          d:DesignHeight="800"
                          d:DesignWidth="800"
                          d:DataContext="{d:DesignInstance local:PluginSettingsWindowViewModel}"
-                         Icon="/Resources/Images/Logo/logo-512.png">
+                         Icon="/Resources/Images/Logo/bow.ico">
     <materialDesign:DialogHost IsTabStop="False"
                                Focusable="False"
                                Identifier="PluginSettingsDialog"

src/Artemis.UI/Screens/Splash/SplashView.xaml

@@ -6,28 +6,29 @@
                          xmlns:splash="clr-namespace:Artemis.UI.Screens.Splash"
                          xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                          xmlns:s="https://github.com/canton7/Stylet"
+                         xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                          mc:Ignorable="d"
                          Title=" "
                          ResizeMode="NoResize"
-                         BorderBackgroundBrush="{DynamicResource PrimaryHueMidBrush}"
+                         BorderBackgroundBrush="{DynamicResource MaterialDesignPaper}"
                          Height="450"
                          Width="400"
                          WindowStartupLocation="CenterScreen"
                          FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
                          MouseDown="{s:Action MouseDown}"
                          d:DataContext="{d:DesignInstance splash:SplashViewModel}">
-    <Grid Background="{DynamicResource PrimaryHueMidBrush}">
+    <Grid Background="{DynamicResource MaterialDesignPaper}">
         <Grid.RowDefinitions>
             <RowDefinition Height="250" />
             <RowDefinition Height="50" />
             <RowDefinition Height="Auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Image Source="{StaticResource BowIcon}" Stretch="Uniform" Margin="50" />
-        <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="White" FontSize="16">
+        <Image Source="{svgc:SvgImage Source=/Resources/Images/Logo/bow.svg}" Stretch="Uniform" Margin="50"/>
+        <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Foreground="{DynamicResource MaterialDesignBody}" FontSize="16">
             Artemis is initializing...
         </TextBlock>
-        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Foreground="#FFDDDDDD" Text="{Binding Status}" />
-        <ProgressBar Grid.Row="3" IsIndeterminate="True" Maximum="1" Minimum="1" Margin="16 0" />
+        <TextBlock Grid.Row="2" HorizontalAlignment="Center" Foreground="{DynamicResource MaterialDesignBody}" Text="{Binding Status}" />
+        <ProgressBar  Grid.Row="3" IsIndeterminate="True" Maximum="1" Minimum="1" Margin="16 0" />
     </Grid>
 </controls:MaterialWindow>

src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml

@@ -6,13 +6,14 @@
                     xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
                     xmlns:s="https://github.com/canton7/Stylet"
                     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+                    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
                     mc:Ignorable="d"
                     Width="800"
                     Height="600"
                     ResizeMode="NoResize"
-                    Icon="/Resources/Images/Logo/logo-512.png"
+                    Icon="/Resources/Images/Logo/bow.ico"
                     Title="Artemis startup wizard"
-                    TitleBarIcon="{StaticResource BowIcon}"
+                    TitleBarIcon="{svgc:SvgImage Source=/Resources/Images/Logo/bow-white.svg}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"

src/Artemis.UI/Screens/TrayView.xaml

@@ -7,7 +7,7 @@
         xmlns:s="https://github.com/canton7/Stylet"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d">
-    <tb:TaskbarIcon IconSource="/Resources/Images/Logo/logo-512.ico"
+    <tb:TaskbarIcon IconSource="/Resources/Images/Logo/bow-white.ico"
                     MenuActivation="LeftOrRightClick"
                     PopupActivation="DoubleClick"
                     DoubleClickCommand="{s:Action TrayBringToForeground}"

src/Artemis.UI/Screens/TrayViewModel.cs

@@ -5,11 +5,14 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Events;
+using Artemis.UI.Screens.Settings.Tabs.General;
 using Artemis.UI.Screens.Splash;
 using Artemis.UI.Services;
 using Artemis.UI.Shared.Services;
+using Artemis.UI.Utilities;
 using Hardcodet.Wpf.TaskbarNotification;
 using MaterialDesignThemes.Wpf;
 using Ninject;
@@ -24,10 +27,12 @@ namespace Artemis.UI.Screens
         private readonly IEventAggregator _eventAggregator;
         private readonly IKernel _kernel;
         private readonly IWindowManager _windowManager;
+        private readonly ThemeWatcher _themeWatcher;
+        private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
         private RootViewModel _rootViewModel;
         private SplashViewModel _splashViewModel;
         private TaskbarIcon _taskBarIcon;
-
+        
         public TrayViewModel(IKernel kernel,
             IWindowManager windowManager,
             IWindowService windowService,
@@ -46,6 +51,13 @@ namespace Artemis.UI.Screens
             Core.Utilities.ShutdownRequested += UtilitiesOnShutdownRequested;
             Core.Utilities.RestartRequested += UtilitiesOnShutdownRequested;
 
+            _themeWatcher = new ThemeWatcher();
+            _colorScheme = settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
+            _colorScheme.SettingChanged += ColorSchemeOnSettingChanged;
+            _themeWatcher.ThemeChanged += ThemeWatcherOnThemeChanged;
+
+            ApplyColorSchemeSetting();
+
             windowService.ConfigureMainWindowProvider(this);
             messageService.ConfigureNotificationProvider(this);
             bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun");
@@ -151,6 +163,50 @@ namespace Artemis.UI.Screens
             OnMainWindowClosed();
         }
 
+        #region Theme
+
+        private void ApplyColorSchemeSetting()
+        {
+            if (_colorScheme.Value == ApplicationColorScheme.Automatic)
+                ApplyWindowsTheme(_themeWatcher.GetWindowsTheme());
+            else
+                ChangeMaterialColors(_colorScheme.Value);
+        }
+
+        private void ApplyWindowsTheme(ThemeWatcher.WindowsTheme windowsTheme)
+        {
+            if (_colorScheme.Value != ApplicationColorScheme.Automatic)
+                return;
+
+            if (windowsTheme == ThemeWatcher.WindowsTheme.Dark)
+                ChangeMaterialColors(ApplicationColorScheme.Dark);
+            else
+                ChangeMaterialColors(ApplicationColorScheme.Light);
+        }
+
+        private void ChangeMaterialColors(ApplicationColorScheme colorScheme)
+        {
+            PaletteHelper paletteHelper = new();
+            ITheme theme = paletteHelper.GetTheme();
+            theme.SetBaseTheme(colorScheme == ApplicationColorScheme.Dark ? Theme.Dark : Theme.Light);
+            paletteHelper.SetTheme(theme);
+
+            MaterialDesignExtensions.Themes.PaletteHelper extensionsPaletteHelper = new();
+            extensionsPaletteHelper.SetLightDark(colorScheme == ApplicationColorScheme.Dark);
+        }
+
+        private void ThemeWatcherOnThemeChanged(object sender, WindowsThemeEventArgs e)
+        {
+            ApplyWindowsTheme(e.Theme);
+        }
+
+        private void ColorSchemeOnSettingChanged(object sender, EventArgs e)
+        {
+            ApplyColorSchemeSetting();
+        }
+
+        #endregion
+
         #region Implementation of INotificationProvider
 
         /// <inheritdoc />