From 55bc7853255bd75c98fb656dfee4ce15592d5692 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 15 Nov 2021 16:58:36 +0900
Subject: [PATCH] Remove HardCoded Color in Setting Window

---
 Flow.Launcher/App.xaml                        |  2 +-
 .../Resources/CustomControlTemplate.xaml      | 14 +++----
 Flow.Launcher/Resources/Dark.xaml             |  8 ++++
 Flow.Launcher/Resources/Light.xaml            |  8 ++++
 Flow.Launcher/SettingWindow.xaml              | 39 +++++++++++--------
 5 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 9049f8e7e..6efff03c8 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -8,7 +8,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources RequestedTheme="Light">
+                <ui:ThemeResources RequestedTheme="Dark">
                     <ui:ThemeResources.ThemeDictionaries>
                         <ResourceDictionary x:Key="Light">
                             <ResourceDictionary.MergedDictionaries>
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 113b726a7..9677fdc8e 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -32,7 +32,7 @@
     </Style>
 
     <Style x:Key="TitleBarButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource WindowTextBrush}" />
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
@@ -41,7 +41,7 @@
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border
                         x:Name="border"
-                        Background="#f3f3f3"
+                        Background="{StaticResource Color01B}"
                         BorderThickness="0"
                         SnapsToDevicePixels="true">
                         <ContentPresenter
@@ -54,10 +54,10 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="#C6C6C6" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color06B}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="#B0B0B0" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color09B}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -66,7 +66,7 @@
     </Style>
 
     <Style x:Key="TitleBarCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Foreground" Value="{StaticResource Color05B}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
@@ -88,11 +88,11 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="#E10000" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color10B}" />
                             <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="border" Property="Background" Value="{DynamicResource PressedWindowCloseButtonBackgroundBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource Color11B}" />
                             <Setter Property="Foreground" Value="{DynamicResource MouseOverWindowCloseButtonForegroundBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 9e67f16a9..18d5e9743 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -13,6 +13,10 @@
     <SolidColorBrush x:Key="Color05B" Color="#ffffff" />
     <SolidColorBrush x:Key="Color06B" Color="#2d2d2d" />
     <SolidColorBrush x:Key="Color07B" Color="#363636" />
+    <SolidColorBrush x:Key="Color08B" Color="#878787" />
+    <SolidColorBrush x:Key="Color09B" Color="#292929" />
+    <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
+    <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
     <Color x:Key="Color01">#202020</Color>
     <Color x:Key="Color02">#2b2b2b</Color>
     <Color x:Key="Color03">#1d1d1d</Color>
@@ -20,6 +24,10 @@
     <Color x:Key="Color05">#ffffff</Color>
     <Color x:Key="Color06">#2d2d2d</Color>
     <Color x:Key="Color07">#363636</Color>
+    <Color x:Key="Color08">#878787</Color>
+    <Color x:Key="Color09">#292929</Color>
+    <Color x:Key="Color10">#c42b1c</Color>
+    <Color x:Key="Color11">#c81c31</Color>
 
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 5f45944d7..0e9f07513 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -13,6 +13,10 @@
     <SolidColorBrush x:Key="Color05B" Color="#000000" />
     <SolidColorBrush x:Key="Color06B" Color="#eaeaea" />
     <SolidColorBrush x:Key="Color07B" Color="#f6f6f6" />
+    <SolidColorBrush x:Key="Color08B" Color="#878787" />
+    <SolidColorBrush x:Key="Color09B" Color="#ededed" />
+    <SolidColorBrush x:Key="Color10B" Color="#c42b1c" />
+    <SolidColorBrush x:Key="Color11B" Color="#c83c31" />
     <Color x:Key="Color01">#f3f3f3</Color>
     <Color x:Key="Color02">#ffffff</Color>
     <Color x:Key="Color03">#e5e5e5</Color>
@@ -20,6 +24,10 @@
     <Color x:Key="Color05">#000000</Color>
     <Color x:Key="Color06">#eaeaea</Color>
     <Color x:Key="Color07">#f6f6f6</Color>
+    <Color x:Key="Color08">#878787</Color>
+    <Color x:Key="Color09">#ededed</Color>
+    <Color x:Key="Color10">#c42b1c</Color>
+    <Color x:Key="Color11">#c81c31</Color>
 
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b632f011b..842fa12e4 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -252,8 +252,8 @@
                                 <MultiTrigger.Conditions>
                                     <Condition Property="IsMouseOver" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color07B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
 
                             </MultiTrigger>
@@ -262,8 +262,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
@@ -273,8 +273,8 @@
                                     <Condition Property="Selector.IsSelectionActive" Value="True" />
                                     <Condition Property="IsSelected" Value="True" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource Color02B}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Color03B}" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
                                 <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
@@ -417,12 +417,14 @@
                 Margin="4,0,0,0"
                 VerticalAlignment="Center"
                 FontSize="12"
+                Foreground="{StaticResource Color05B}"
                 Text="{DynamicResource flowlauncher_settings}">
                 <TextBlock.Style>
                     <Style TargetType="TextBlock">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
-                                <Setter Property="Foreground" Value="{DynamicResource WindowTitleBarInactiveText}" />
+                                <Setter Property="Foreground" Value="{StaticResource Color07B}" />
+                                <!--  Not work. check  -->
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -955,12 +957,13 @@
                                                     </StackPanel>
                                                     <StackPanel Grid.Column="1" Margin="12,0,14,0">
                                                         <TextBlock
+                                                            Foreground="{StaticResource Color05B}"
                                                             Text="{Binding PluginPair.Metadata.Name}"
                                                             TextWrapping="Wrap"
                                                             ToolTip="{Binding PluginPair.Metadata.Version}" />
                                                         <TextBlock
                                                             Margin="0,2,0,0"
-                                                            Foreground="#5f5f5f"
+                                                            Foreground="{StaticResource Color04B}"
                                                             TextWrapping="WrapWithOverflow">
                                                             <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
                                                         </TextBlock>
@@ -971,6 +974,7 @@
                                                             Margin="0,0,8,0"
                                                             VerticalAlignment="Center"
                                                             FontSize="12"
+                                                            Foreground="{StaticResource Color08B}"
                                                             Text="{DynamicResource priority}" />
                                                         <Border>
                                                             <Button
@@ -992,10 +996,10 @@
                                                                         <Setter Property="Padding" Value="12,8,12,8" />
                                                                         <Setter Property="BorderThickness" Value="0" />
                                                                         <Setter Property="FontWeight" Value="DemiBold" />
-                                                                        <Setter Property="Foreground" Value="Black" />
+                                                                        <Setter Property="Foreground" Value="{StaticResource Color02B}" />
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
-                                                                                <Setter Property="Foreground" Value="#878787" />
+                                                                                <Setter Property="Foreground" Value="{StaticResource Color08B}" />
                                                                                 <Setter Property="FontWeight" Value="Normal" />
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
@@ -1074,8 +1078,8 @@
                                                             Padding="0"
                                                             HorizontalAlignment="Stretch"
                                                             VerticalAlignment="Center"
-                                                            Background="White"
-                                                            BorderBrush="#e6e6e6"
+                                                            Background="{StaticResource Color02B}"
+                                                            BorderBrush="{StaticResource Color03B}"
                                                             BorderThickness="0,1,0,0">
                                                             <!--#region SubInfo Styling-->
                                                             <Border.Style>
@@ -1100,7 +1104,6 @@
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
                                                             Content="{Binding SettingControl}" />
-
                                                     </StackPanel>
 
                                                     <StackPanel>
@@ -1383,17 +1386,18 @@
                                                     </StackPanel.Style>
                                                     <TextBlock
                                                         Padding="0,0,20,0"
+                                                        Foreground="{StaticResource Color05B}"
                                                         Text="{Binding Name}"
                                                         TextWrapping="WrapWithOverflow"
                                                         ToolTip="{Binding Version}" />
                                                     <TextBlock
                                                         Margin="0,2,0,0"
                                                         Padding="0,0,20,0"
-                                                        Foreground="#5f5f5f"
+                                                        Foreground="{StaticResource Color04B}"
                                                         TextWrapping="WrapWithOverflow">
                                                         <Run
                                                             FontSize="12"
-                                                            Foreground="#5f5f5f"
+                                                            Foreground="{StaticResource Color04B}"
                                                             Text="{Binding Description}" />
                                                     </TextBlock>
 
@@ -1436,12 +1440,14 @@
                                                                     Margin="20,0,0,0"
                                                                     Padding="0,0,0,0"
                                                                     FontWeight="Bold"
+                                                                    Foreground="{StaticResource Color05B}"
                                                                     Text="{Binding Name}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Name}" />
                                                                 <TextBlock
                                                                     Margin="10,0,0,0"
                                                                     Padding="0,0,20,0"
+                                                                    Foreground="{StaticResource Color05B}"
                                                                     Text="{Binding Version}"
                                                                     TextWrapping="WrapWithOverflow"
                                                                     ToolTip="{Binding Version}" />
@@ -1449,7 +1455,7 @@
                                                             <StackPanel Margin="20,2,120,0" Orientation="Vertical">
                                                                 <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
                                                                     <Hyperlink
-                                                                        Foreground="#5F5F5F"
+                                                                        Foreground="{StaticResource Color04B}"
                                                                         NavigateUri="{Binding Website}"
                                                                         RequestNavigate="OnRequestNavigate">
                                                                         <Run FontSize="12" Text="{Binding Author}" />
@@ -2074,6 +2080,7 @@
                                     Padding="0,12,0,0"
                                     VerticalAlignment="Center"
                                     FontSize="14"
+                                    Foreground="{StaticResource Color05B}"
                                     Text="{DynamicResource customQueryHotkey}" />
                                 <ListView
                                     Grid.Row="4"