From 2ebb45dd568213f23a4a76c1d41b85a8db469815 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Tue, 4 May 2021 00:14:32 +0200
Subject: [PATCH] UI - Added accent colors

---
 src/Artemis.UI/App.xaml                       | 48 +++++--------------
 src/Artemis.UI/Screens/Home/HomeView.xaml     |  2 +
 .../DataBindings/DataBindingView.xaml         |  4 +-
 .../LayerProperties/LayerPropertiesView.xaml  |  3 +-
 .../Tabs/Devices/DeviceSettingsView.xaml      |  2 +-
 .../Tabs/Plugins/PluginSettingsView.xaml      |  2 +-
 .../Screens/Sidebar/SidebarView.xaml          |  1 +
 7 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/src/Artemis.UI/App.xaml b/src/Artemis.UI/App.xaml
index ea1d2f328..1e96c39a4 100644
--- a/src/Artemis.UI/App.xaml
+++ b/src/Artemis.UI/App.xaml
@@ -17,7 +17,17 @@
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Teal.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Teal.xaml" />
+
+                <!-- Custom accent based on logo colors -->
+                <ResourceDictionary>
+                    <ResourceDictionary.MergedDictionaries>
+                        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.DeepPurple.xaml" />
+                    </ResourceDictionary.MergedDictionaries>
+
+                    <!-- include a single secondary accent color (and the associated forecolour) -->
+                    <SolidColorBrush x:Key="SecondaryHueMidBrush" Color="#854FF2"/>
+                    <SolidColorBrush x:Key="SecondaryHueMidForegroundBrush" Color="White"/>
+                </ResourceDictionary>
 
                 <!-- Material design extensions -->
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignExtensions;component/Themes/Generic.xaml" />
@@ -33,41 +43,7 @@
 
             <!-- Some general convertes etc. -->
             <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-            <DrawingImage x:Key="BowIcon">
-                <DrawingImage.Drawing>
-                    <DrawingGroup>
-                        <GeometryDrawing Brush="White"
-                                         Geometry="M1518 3378 c-48 -63 -61 -101 -66 -184 -4 -70 -1 -91 27 
-                                     -170 l31 -89 -27 -20 c-32 -24 -849 -601 -981 -693 l-93 -64 -87 40 
-                                     c-48 22 -91 37 -95 32 -5 -4 9 -41 29 -83 l37 -75 -28 -24 c-23 -20 
-                                     -29 -35 -33 -81 l-4 -56 -82 -19 c-109 -25 -109 -41 4 -91 l85 -38 7 
-                                     -64 c15 -137 90 -1279 85 -1293 -3 -7 -35 -24 -70 -35 -159 -53 -257                                     
-                                     -168 -257 -302 0 -35 2 -38 47 -53 54 -18 185 -21 232 -5 29 10 31 
-                                     14 31 58 0 26 6 56 14 66 13 18 15 18 46 -8 44 -37 78 -35 119 7 l34
-                                     35 -17 41 c-9 23 -12 39 -6 35 6 -4 43 -1 83 6 39 6 219 14 398 18 
-                                     l327 6 113 57 c158 78 256 166 317 282 24 46 27 62 27 152 0 98 -1 
-                                     103 -41 184 l-42 83 44 69 c24 37 51 68 59 68 9 0 44 -14 78 -32 l62
-                                     -31 -93 -44 c-58 -26 -92 -48 -90 -55 9 -27 353 -68 570 -68 108 0 
-                                     108 0 108 24 0 34 -105 171 -220 286 -122 122 -238 216 -250 204 -6 
-                                     -6 -1 -42 16 -98 14 -49 23 -91 19 -94 -3 -3 -36 9 -73 27 l-69 33 24
-                                     71 c13 39 23 76 23 82 0 6 28 17 63 24 279 58 399 300 314 632 -32 
-                                     121 -49 155 -134 255 -37 45 -106 126 -152 180 -73 87 -241 326 -241
-                                     343 0 3 15 13 32 21 21 10 35 25 40 45 15 60 -16 103 -81 108 -43 3 
-                                     -39 22 14 74 l45 43 -25 50 c-35 69 -77 114 -130 139 -63 30 -88 27 
-                                     -117 -11z m215 -835 c188 -279 250 -417 250 -548 0 -133 -74 -214 -243
-                                     -265 l-55 -16 -37 -138 c-21 -76 -39 -140 -40 -141 -6 -5 -814 377 -823
-                                     390 -6 7 -19 46 -29 86 -10 41 -25 81 -33 91 -8 9 -57 35 -109 59 -52 
-                                     23 -93 46 -92 51 2 4 233 169 513 366 l510 358 26 -46 c15 -25 88 -136
-                                     162 -247z m-1108 -898 c61 21 88 26 107 19 14 -5 204 -92 421 -194 l395
-                                     -185 -27 -35 c-15 -19 -53 -72 -84 -117 l-57 -81 30 -90 c39 -117 40 
-                                     -179 2 -253 -45 -90 -147 -145 -347 -189 -71 -15 -435 -59 -600 -73 l
-                                     -29 -2 -37 540 c-20 297 -40 581 -43 632 l-7 92 98 -46 97 -46 81 28z" />
-                    </DrawingGroup>
-                </DrawingImage.Drawing>
-            </DrawingImage>
-
-
+            
             <FontFamily x:Key="RobotoMono">pack://application:,,,/Resources/Fonts/#Roboto Mono</FontFamily>
 
             <!-- Disable tab stop/focusable on all content controls -->
diff --git a/src/Artemis.UI/Screens/Home/HomeView.xaml b/src/Artemis.UI/Screens/Home/HomeView.xaml
index 0842eb9dc..c43d79aea 100644
--- a/src/Artemis.UI/Screens/Home/HomeView.xaml
+++ b/src/Artemis.UI/Screens/Home/HomeView.xaml
@@ -42,6 +42,8 @@
             <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}"
+                        Foreground="{StaticResource SecondaryHueMidBrush}"
+                        materialDesign:RippleAssist.Feedback="{StaticResource SecondaryHueMidBrush}"
                         Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="Binoculars" />
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml
index 24122a327..34fe61836 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml
@@ -144,7 +144,7 @@
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Button Grid.Column="0"
-                            Style="{StaticResource MaterialDesignRaisedDarkButton}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
                             Margin="0 0 5 0"
                             ToolTip="Copy the entire data binding"
                             Command="{s:Action CopyDataBinding}">
@@ -154,7 +154,7 @@
                         </StackPanel>
                     </Button>
                     <Button Grid.Column="1"
-                            Style="{StaticResource MaterialDesignRaisedDarkButton}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
                             Margin="5 0 0 0"
                             ToolTip="Paste the entire data binding"
                             Command="{s:Action PasteDataBinding}">
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
index a747494d1..a22dfb527 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
@@ -389,7 +389,7 @@
                         IsEnabled="{Binding SelectedProfileElement, Converter={StaticResource NullToBooleanConverter}}"
                         Visibility="{Binding TimelineVisible, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
                     <Button.Style>
-                        <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFlatMidBgButton}">
+                        <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFlatAccentBgButton}">
                             <Style.Triggers>
                                 <EventTrigger RoutedEvent="Click">
                                     <EventTrigger.Actions>
@@ -440,6 +440,7 @@
                         IsSnapToTickEnabled="True"
                         AutoToolTipPlacement="TopLeft"
                         Value="{Binding ProfileEditorService.PixelsPerSecond}"
+                        Foreground="{StaticResource SecondaryHueMidBrush}"
                         Width="319" />
 
             </Grid>
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsView.xaml
index c3e0be65e..34a5d27a0 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsView.xaml
@@ -49,7 +49,7 @@
                 </TextBlock>
             </StackPanel>
             <StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Margin="8">
-                <CheckBox Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding IsDeviceEnabled}">
+                <CheckBox Style="{StaticResource MaterialDesignAccentCheckBox}" IsChecked="{Binding IsDeviceEnabled}">
                     Device enabled
                 </CheckBox>
                 <materialDesign:PopupBox Style="{StaticResource MaterialDesignToolPopupBox}" Padding="2 0 2 0" Foreground="{StaticResource MaterialDesignBody}">
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsView.xaml
index 66042a7c3..85d0783ab 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsView.xaml
@@ -132,7 +132,7 @@
                       VerticalAlignment="Bottom"
                       Margin="8"
                       Visibility="{Binding Enabling, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}"
-                      Style="{StaticResource MaterialDesignCheckBox}" IsChecked="{Binding IsEnabled}">
+                      Style="{StaticResource MaterialDesignAccentCheckBox}" IsChecked="{Binding IsEnabled}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock>Plugin enabled</TextBlock>
                     <materialDesign:PackIcon Kind="ShieldHalfFull"
diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarView.xaml b/src/Artemis.UI/Screens/Sidebar/SidebarView.xaml
index 5c8f4b037..e5829e573 100644
--- a/src/Artemis.UI/Screens/Sidebar/SidebarView.xaml
+++ b/src/Artemis.UI/Screens/Sidebar/SidebarView.xaml
@@ -52,6 +52,7 @@
                                  Items="{Binding SidebarItems}"
                                  SelectedItem="{Binding SelectedItem}"
                                  WillSelectNavigationItemCommand="{s:Action SelectItem}"
+                                 materialDesign:RippleAssist.Feedback="{StaticResource SecondaryHueMidBrush}"
                                  Margin="0 5 0 0" />
     </Grid>