Merge pull request #3 from VictorGrycuk/dev/1.3

[v1.3] Fix dark color detection
VictorGrycuk · Sep 17, 2020 · 5c16360 · 5c16360
2 parents 9eef787 + 04350dc
commit 5c16360
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/StreamDeck.ColorPicker/StreamDeck.ColorPicker/Helpers/ColorHelper.cs b/StreamDeck.ColorPicker/StreamDeck.ColorPicker/Helpers/ColorHelper.cs
@@ -40,7 +40,7 @@ internal static string GetColorName(Color pixelColor, List<DefinitionColor> colo
         internal static bool IsDarkColor(Color color)
         {
             var luminance = 0.2126 * color.R + 0.7152 * color.G + 0.0722 * color.B;
-            return luminance < 0.179;
+            return luminance < 150;
         }
     }
 }
diff --git a/StreamDeck.ColorPicker/StreamDeck.ColorPicker/Properties/AssemblyInfo.cs b/StreamDeck.ColorPicker/StreamDeck.ColorPicker/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("StreamDeck.ColorPicker")]
+[assembly: AssemblyTitle("Color Picker")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("StreamDeck.ColorPicker")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyProduct("Color Picker for Stream Deck")]
+[assembly: AssemblyCopyright("Copyright © Victor Grycuk 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // 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.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/StreamDeck.ColorPicker/StreamDeck.ColorPicker/StreamDeck.ColorPicker.csproj b/StreamDeck.ColorPicker/StreamDeck.ColorPicker/StreamDeck.ColorPicker.csproj
@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>colorpicker.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommandLine, Version=2.7.82.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.7.82\lib\net461\CommandLine.dll</HintPath>
@@ -102,6 +105,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="colorpicker.ico" />
     <Content Include="Images\categoryIcon%402x.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/StreamDeck.ColorPicker/StreamDeck.ColorPicker/colorpicker.ico b/StreamDeck.ColorPicker/StreamDeck.ColorPicker/colorpicker.ico
diff --git a/StreamDeck.ColorPicker/StreamDeck.ColorPicker/manifest.json b/StreamDeck.ColorPicker/StreamDeck.ColorPicker/manifest.json
@@ -21,7 +21,7 @@
   "Description": "Colorblind Helper & Color Picker for Stream Deck.\nShows a color's name, its RGB or hexadecimal value.",
   "Icon": "Images/pluginIcon",
   "URL": "https://github.com/VictorGrycuk/streamdeck-color-picker",
-  "Version": "1.2",
+  "Version": "1.3",
   "CodePath": "StreamDeck.ColorPicker",
   "Category": "Color Picker",
   "CategoryIcon": "Images/categoryIcon",