Show color name functionality, increased version number

martinchrzan · martinchrzan · commit 87129fe3e1ed · 2023-09-05T19:19:09.000+02:00
diff --git a/ColorPicker.nuspec b/ColorPicker.nuspec
@@ -2,14 +2,14 @@
 <package>
   <metadata>
     <id>ColorPicker</id>
-    <version>1.2.1</version>
+    <version>1.3.0</version>
     <authors>Martin Chrzan</authors>
     <owners>Martin Chrzan</owners>
     <licenseUrl>https://github.com/martinchrzan/ColorPicker/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://github.com/martinchrzan/ColorPicker</projectUrl>
     <!--<iconUrl></iconUrl>-->
     <releaseNotes>
-       Added new color formats - RGB565, decimal big-endian, decimal little-endian
+       Show name of a color - you can enable this functionality in settings
     </releaseNotes>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Color Picker</description>
diff --git a/ColorPicker/App.config b/ColorPicker/App.config
@@ -29,7 +29,10 @@
                 <value>HEX</value>
             </setting>
             <setting name="ColorsHistory" serializeAs="String">
-                <value/>
+                <value />
+            </setting>
+            <setting name="ShowColorName" serializeAs="String">
+                <value>False</value>
             </setting>
         </ColorPicker.Properties.Settings>
     </userSettings>
diff --git a/ColorPicker/ColorPicker.csproj b/ColorPicker/ColorPicker.csproj
@@ -248,6 +248,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="ColorName">
+      <Version>1.0.0</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
       <Version>1.1.39</Version>
     </PackageReference>
diff --git a/ColorPicker/Controls/CircularMenu.cs b/ColorPicker/Controls/CircularMenu.cs
@@ -1,4 +1,5 @@
-﻿using ColorPicker.Helpers;
+﻿using ColorName;
+using ColorPicker.Helpers;
 using ColorPicker.Settings;
 using System;
 using System.Collections.ObjectModel;
@@ -28,7 +29,7 @@ public bool IsOpen
         public static readonly DependencyProperty CentralItemProperty =
             DependencyProperty.Register("CentralItem", typeof(CircularMenuCentralItem), typeof(CircularMenu),
             new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.AffectsMeasure));
-        
+
 
         public CircularMenuCentralItem CentralItem
         {
@@ -57,7 +58,7 @@ public override void BeginInit()
         private void Items_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
             var newItem = e.NewItems[0] as CircularMenuItem;
-            if(newItem != null)
+            if (newItem != null)
             {
                 if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
                 {
@@ -72,10 +73,11 @@ private void Items_CollectionChanged(object sender, System.Collections.Specializ
                     newItem.PreviewMouseDown -= CircularMenuItem_MouseDown;
                 }
             }
-            
-            if(Items?.Count > 0)
+
+            if (Items?.Count > 0)
             {
                 CentralItem.ContentText = string.Empty;
+                CentralItem.ColorName = string.Empty;
             }
         }
 
@@ -92,16 +94,29 @@ private void CircularMenuItem_MouseDown(object sender, System.Windows.Input.Mous
         private void CircularMenuItem_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
         {
             CentralItem.ContentText = string.Empty;
+            CentralItem.ColorName = string.Empty;
         }
 
         private void CircularMenuItem_MouseEnter(object sender, EventArgs e)
         {
-            if(_userSettings == null)
+            if (_userSettings == null)
             {
                 _userSettings = Bootstrapper.Container.GetExportedValue<IUserSettings>();
             }
-            
+
             var color = (sender as CircularMenuItem).Color;
+
+            if (_userSettings.ShowColorName.Value)
+            {
+                var colorName = _userSettings.ShowColorName.Value ? ColorNameProvider.GetColorNameFromRGB(color.R, color.G, color.B).colorName : "";
+                CentralItem.ColorName = colorName;
+                CentralItem.IsColorNameVisible = true;
+            }
+            else
+            {
+                CentralItem.IsColorNameVisible = false;
+            }
+
             CentralItem.ContentText = ColorFormatHelper.ColorToString(color, _userSettings.SelectedColorFormat.Value);
         }
 
diff --git a/ColorPicker/Controls/CircularMenuCentralItem.cs b/ColorPicker/Controls/CircularMenuCentralItem.cs
@@ -14,10 +14,30 @@ static CircularMenuCentralItem()
             DependencyProperty.Register("ContentText", typeof(string), typeof(CircularMenuCentralItem),
                 new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.AffectsRender));
 
+        public static readonly DependencyProperty ColorNameProperty =
+            DependencyProperty.Register("ColorName", typeof(string), typeof(CircularMenuCentralItem),
+                new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.AffectsRender));
+
+        public static readonly DependencyProperty IsColorNameVisibleProperty =
+            DependencyProperty.Register("IsColorNameVisible", typeof(bool), typeof(CircularMenuCentralItem),
+                new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
+
         public string ContentText
         {
             get { return (string)GetValue(ContentTextProperty); }
             set { SetValue(ContentTextProperty, value); }
         }
+
+        public string ColorName
+        {
+            get { return (string)GetValue(ColorNameProperty); }
+            set { SetValue(ColorNameProperty, value); }
+        }
+
+        public bool IsColorNameVisible
+        {
+            get { return (bool)GetValue(IsColorNameVisibleProperty); }
+            set { SetValue(IsColorNameVisibleProperty, value); }
+        }
     }
 }
diff --git a/ColorPicker/Mouse/MouseInfoProvider.cs b/ColorPicker/Mouse/MouseInfoProvider.cs
@@ -115,7 +115,7 @@ private void AppStateMonitor_AppShown(object sender, WindowType e)
                 _timer.Start();
             }
 
-            if(!_eventsSubscribed)
+            if (!_eventsSubscribed)
             {
                 _mouseHook.OnLeftMouseDown += MouseHook_OnLeftMouseDown;
                 _mouseHook.OnLeftMouseUp += MouseHook_OnLeftMouseUp;
@@ -138,7 +138,7 @@ private void MouseHook_OnLeftMouseUp(object sender, Point p)
 
         private void MouseHook_OnMouseWheel(object sender, MouseWheelEventArgs e)
         {
-            if(e.Delta == 0)
+            if (e.Delta == 0)
             {
                 return;
             }
@@ -169,7 +169,7 @@ private void DisposeMouseHook()
             {
                 _timer.Stop();
             }
-            
+
             _previousMousePosition = new System.Windows.Point(-1, 1);
             _mouseHook.OnLeftMouseDown -= MouseHook_OnLeftMouseDown;
             _mouseHook.OnLeftMouseUp -= MouseHook_OnLeftMouseUp;
diff --git a/ColorPicker/Properties/AssemblyInfo.cs b/ColorPicker/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("Windows system wide color picker")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("ColorPicker")]
-[assembly: AssemblyCopyright("Martin Chrzan © 2020")]
+[assembly: AssemblyCopyright("Martin Chrzan © 2020-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -48,6 +48,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
 [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
diff --git a/ColorPicker/Properties/Settings.Designer.cs b/ColorPicker/Properties/Settings.Designer.cs
diff --git a/ColorPicker/Properties/Settings.settings b/ColorPicker/Properties/Settings.settings
@@ -23,5 +23,8 @@
     <Setting Name="ColorsHistory" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ShowColorName" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/ColorPicker/Resources/Styles.xaml b/ColorPicker/Resources/Styles.xaml
@@ -132,7 +132,10 @@
                 <ControlTemplate TargetType="controls:CircularMenuCentralItem">
                     <Grid>
                         <Ellipse UseLayoutRounding="True" Stroke="White" StrokeThickness="4" Fill="{StaticResource CenterGradientColor}"/>
-                        <TextBlock Text="{TemplateBinding ContentText}" Foreground="White" FontSize="16" FontWeight="Light" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Margin="5" Text="{TemplateBinding ContentText}" Foreground="White" FontSize="16" FontWeight="Light" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            <TextBlock Margin="5" Text="{TemplateBinding ColorName}" Visibility="{TemplateBinding IsColorNameVisible,  Converter={StaticResource bool2VisibilityConverter}}" Foreground="White" FontSize="15" FontWeight="Normal" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" />
+                        </StackPanel>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/ColorPicker/Settings/IUserSettings.cs b/ColorPicker/Settings/IUserSettings.cs
@@ -3,7 +3,7 @@
 
 namespace ColorPicker.Settings
 {
-    public enum ColorFormat { hex, rgb, hsl, hsv, vec4, rgb565, decimalBE, decimalLE};
+    public enum ColorFormat { hex, rgb, hsl, hsv, vec4, rgb565, decimalBE, decimalLE };
 
     public interface IUserSettings
     {
@@ -15,6 +15,8 @@ public interface IUserSettings
 
         SettingItem<bool> ChangeCursor { get; }
 
+        SettingItem<bool> ShowColorName { get; }
+
         SettingItem<ColorFormat> SelectedColorFormat { get; }
 
         List<Color> ColorsHistory { get; }
diff --git a/ColorPicker/Settings/UserSettings.cs b/ColorPicker/Settings/UserSettings.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Drawing;
-using Windows.Media.Devices;
 
 namespace ColorPicker.Settings
 {
@@ -23,6 +22,7 @@ public UserSettings()
             AutomaticUpdates = new SettingItem<bool>(settings.AutomaticUpdates, (currentValue) => { settings.AutomaticUpdates = currentValue; SaveSettings(); });
             ActivationShortcut = new SettingItem<string>(settings.ActivationShortcut, (currentValue) => { settings.ActivationShortcut = currentValue; SaveSettings(); });
             ChangeCursor = new SettingItem<bool>(settings.ChangeCursorWhenPickingColor, (currentValue) => { settings.ChangeCursorWhenPickingColor = currentValue; SaveSettings(); });
+            ShowColorName = new SettingItem<bool>(settings.ShowColorName, (currentValue) => { settings.ShowColorName = currentValue; SaveSettings(); });
             SelectedColorFormat = new SettingItem<ColorFormat>((ColorFormat)Enum.Parse(typeof(ColorFormat), settings.SelectedColorFormat, true), (currentValue) => { settings.SelectedColorFormat = currentValue.ToString(); SaveSettings(); });
             LoadColorsHistory();
         }
@@ -35,6 +35,8 @@ public UserSettings()
 
         public SettingItem<bool> ChangeCursor { get; }
 
+        public SettingItem<bool> ShowColorName { get; }
+
         public SettingItem<ColorFormat> SelectedColorFormat { get; }
 
         public List<Color> ColorsHistory { get; } = new List<Color>();
diff --git a/ColorPicker/ViewModelContracts/ISettingsViewModel.cs b/ColorPicker/ViewModelContracts/ISettingsViewModel.cs
@@ -13,14 +13,16 @@ public interface ISettingsViewModel
 
         bool ChangeCursorWhenPickingColor { get; set; }
 
+        bool ShowColorName { get; set; }
+
         string ShortCut { get; }
 
         string ShortCutPreview { get; set; }
 
         string ApplicationVersion { get; }
 
         ColorFormat SelectedColorFormat { get; }
-        
+
         bool CheckingForUpdateInProgress { get; }
 
         ICommand ChangeShortcutCommand { get; }
diff --git a/ColorPicker/ViewModels/MainViewModel.cs b/ColorPicker/ViewModels/MainViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using ColorMeter.Helpers;
+using ColorName;
 using ColorPicker.Common;
 using ColorPicker.Helpers;
 using ColorPicker.Keyboard;
@@ -28,10 +29,10 @@ public class MainViewModel : ViewModelBase, IMainViewModel
 
         [ImportingConstructor]
         public MainViewModel(
-            IMouseInfoProvider mouseInfoProvider, 
-            ZoomWindowHelper zoomWindowHelper, 
-            AppStateHandler appStateHandler, 
-            KeyboardMonitor keyboardMonitor, 
+            IMouseInfoProvider mouseInfoProvider,
+            ZoomWindowHelper zoomWindowHelper,
+            AppStateHandler appStateHandler,
+            KeyboardMonitor keyboardMonitor,
             AppUpdateManager appUpdateManager,
             IUserSettings userSettings,
             IColorProvider colorProvider)
@@ -49,10 +50,10 @@ public MainViewModel(
             mouseInfoProvider.OnMouseWheel += MouseInfoProvider_OnMouseWheel;
 
             keyboardMonitor.Start();
-            
-            #if !DEBUG
+
+#if !DEBUG
             CheckForUpdates(appUpdateManager, userSettings);
-            #endif
+#endif
         }
 
         private static void CheckForUpdates(AppUpdateManager appUpdateManager, IUserSettings userSettings)
@@ -75,6 +76,10 @@ public string ColorString
         {
             get
             {
+                if (_userSettings.ShowColorName.Value)
+                {
+                    return $"{_colorString} - {ColorNameProvider.GetColorNameFromRGB(_currentColor.R, _currentColor.G, _currentColor.B).colorName}";
+                }
                 return _colorString;
             }
             set
diff --git a/ColorPicker/ViewModels/SettingsViewModel.cs b/ColorPicker/ViewModels/SettingsViewModel.cs
@@ -59,7 +59,7 @@ public bool RunOnStartup
             set
             {
                 // only set value if registry save successful 
-                if(RegistryHelper.SetRunOnStartup(value))
+                if (RegistryHelper.SetRunOnStartup(value))
                 {
                     _userSettings.RunOnStartup.Value = value;
                     OnPropertyChanged();
@@ -157,12 +157,25 @@ public bool ChangeCursorWhenPickingColor
             }
         }
 
+        public bool ShowColorName
+        {
+            get
+            {
+                return _userSettings.ShowColorName.Value;
+            }
+            set
+            {
+                _userSettings.ShowColorName.Value = value;
+                OnPropertyChanged();
+            }
+        }
+
         public string ApplicationVersion { get { return Assembly.GetExecutingAssembly().GetName().Version.ToString(); } }
 
         public ICommand ChangeShortcutCommand { get; }
-        
+
         public ICommand CheckForUpdatesCommand { get; }
-        
+
         public ICommand ConfirmShortcutCommand { get; }
 
         public ICommand CancelShortcutCommand { get; }
diff --git a/ColorPicker/Views/SettingsView.xaml b/ColorPicker/Views/SettingsView.xaml
@@ -31,6 +31,8 @@
             <CheckBox Margin="5,0" IsChecked="{Binding RunOnStartup}" FontWeight="Light" Content="Run on startup"/>
             <CheckBox Margin="5,0" IsChecked="{Binding AutomaticUpdates}" FontWeight="Light" Content="Automatic updates"/>
             <CheckBox Margin="5,0" IsChecked="{Binding ChangeCursorWhenPickingColor}" FontWeight="Light" Content="Change cursor when picking a color"/>
+            <CheckBox Margin="5,0" IsChecked="{Binding ShowColorName}" FontWeight="Light" Content="Show color name"/>
+
             <Rectangle Height="1" Fill="DarkGray" Margin="5"/>
             <WrapPanel>
                 <TextBlock VerticalAlignment="Center" Style="{StaticResource NormalTextBlock}" FontWeight="Light" Margin="7" Text="Copied color format:"/>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using ColorPicker.Helpers;`
	`1`	`+using ColorName;`
	`2`	`+using ColorPicker.Helpers;`
`2`	`3`	`using ColorPicker.Settings;`
`3`	`4`	`using System;`
`4`	`5`	`using System.Collections.ObjectModel;`
`@@ -28,7 +29,7 @@ public bool IsOpen`
`28`	`29`	`public static readonly DependencyProperty CentralItemProperty =`
`29`	`30`	`DependencyProperty.Register("CentralItem", typeof(CircularMenuCentralItem), typeof(CircularMenu),`
`30`	`31`	`new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender \| FrameworkPropertyMetadataOptions.AffectsMeasure));`
`31`		`-`
	`32`	`+`
`32`	`33`
`33`	`34`	`public CircularMenuCentralItem CentralItem`
`34`	`35`	`{`
`@@ -57,7 +58,7 @@ public override void BeginInit()`
`57`	`58`	`private void Items_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)`
`58`	`59`	`{`
`59`	`60`	`var newItem = e.NewItems[0] as CircularMenuItem;`
`60`		`- if(newItem != null)`
	`61`	`+ if (newItem != null)`
`61`	`62`	`{`
`62`	`63`	`if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)`
`63`	`64`	`{`
`@@ -72,10 +73,11 @@ private void Items_CollectionChanged(object sender, System.Collections.Specializ`
`72`	`73`	`newItem.PreviewMouseDown -= CircularMenuItem_MouseDown;`
`73`	`74`	`}`
`74`	`75`	`}`
`75`		`-`
`76`		`- if(Items?.Count > 0)`
	`76`	`+`
	`77`	`+ if (Items?.Count > 0)`
`77`	`78`	`{`
`78`	`79`	`CentralItem.ContentText = string.Empty;`
	`80`	`+ CentralItem.ColorName = string.Empty;`
`79`	`81`	`}`
`80`	`82`	`}`
`81`	`83`
`@@ -92,16 +94,29 @@ private void CircularMenuItem_MouseDown(object sender, System.Windows.Input.Mous`
`92`	`94`	`private void CircularMenuItem_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)`
`93`	`95`	`{`
`94`	`96`	`CentralItem.ContentText = string.Empty;`
	`97`	`+ CentralItem.ColorName = string.Empty;`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`private void CircularMenuItem_MouseEnter(object sender, EventArgs e)`
`98`	`101`	`{`
`99`		`- if(_userSettings == null)`
	`102`	`+ if (_userSettings == null)`
`100`	`103`	`{`
`101`	`104`	`_userSettings = Bootstrapper.Container.GetExportedValue<IUserSettings>();`
`102`	`105`	`}`
`103`		`-`
	`106`	`+`
`104`	`107`	`var color = (sender as CircularMenuItem).Color;`
	`108`	`+`
	`109`	`+ if (_userSettings.ShowColorName.Value)`
	`110`	`+ {`
	`111`	`+ var colorName = _userSettings.ShowColorName.Value ? ColorNameProvider.GetColorNameFromRGB(color.R, color.G, color.B).colorName : "";`
	`112`	`+ CentralItem.ColorName = colorName;`
	`113`	`+ CentralItem.IsColorNameVisible = true;`
	`114`	`+ }`
	`115`	`+ else`
	`116`	`+ {`
	`117`	`+ CentralItem.IsColorNameVisible = false;`
	`118`	`+ }`
	`119`	`+`
`105`	`120`	`CentralItem.ContentText = ColorFormatHelper.ColorToString(color, _userSettings.SelectedColorFormat.Value);`
`106`	`121`	`}`
`107`	`122`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private void AppStateMonitor_AppShown(object sender, WindowType e)`
`115`	`115`	`_timer.Start();`
`116`	`116`	`}`
`117`	`117`
`118`		`- if(!_eventsSubscribed)`
	`118`	`+ if (!_eventsSubscribed)`
`119`	`119`	`{`
`120`	`120`	`_mouseHook.OnLeftMouseDown += MouseHook_OnLeftMouseDown;`
`121`	`121`	`_mouseHook.OnLeftMouseUp += MouseHook_OnLeftMouseUp;`
`@@ -138,7 +138,7 @@ private void MouseHook_OnLeftMouseUp(object sender, Point p)`
`138`	`138`
`139`	`139`	`private void MouseHook_OnMouseWheel(object sender, MouseWheelEventArgs e)`
`140`	`140`	`{`
`141`		`- if(e.Delta == 0)`
	`141`	`+ if (e.Delta == 0)`
`142`	`142`	`{`
`143`	`143`	`return;`
`144`	`144`	`}`
`@@ -169,7 +169,7 @@ private void DisposeMouseHook()`
`169`	`169`	`{`
`170`	`170`	`_timer.Stop();`
`171`	`171`	`}`
`172`		`-`
	`172`	`+`
`173`	`173`	`_previousMousePosition = new System.Windows.Point(-1, 1);`
`174`	`174`	`_mouseHook.OnLeftMouseDown -= MouseHook_OnLeftMouseDown;`
`175`	`175`	`_mouseHook.OnLeftMouseUp -= MouseHook_OnLeftMouseUp;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace ColorPicker.Settings`
`5`	`5`	`{`
`6`		`- public enum ColorFormat { hex, rgb, hsl, hsv, vec4, rgb565, decimalBE, decimalLE};`
	`6`	`+ public enum ColorFormat { hex, rgb, hsl, hsv, vec4, rgb565, decimalBE, decimalLE };`
`7`	`7`
`8`	`8`	`public interface IUserSettings`
`9`	`9`	`{`
`@@ -15,6 +15,8 @@ public interface IUserSettings`
`15`	`15`
`16`	`16`	`SettingItem<bool> ChangeCursor { get; }`
`17`	`17`
	`18`	`+ SettingItem<bool> ShowColorName { get; }`
	`19`	`+`
`18`	`20`	`SettingItem<ColorFormat> SelectedColorFormat { get; }`
`19`	`21`
`20`	`22`	`List<Color> ColorsHistory { get; }`