Merge pull request #355 from Leo-Corporation/vNext

Version 5.8.0.2312

ColorPicker.Setup/Setup.iss

@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ColorPicker Max"
-#define MyAppVersion "5.7.1.2311"
-#define MyAppFullVersion "5.7.1.2311"
+#define MyAppVersion "5.8.0.2312"
+#define MyAppFullVersion "5.8.0.2312"
 #define MyAppPublisher "Léo Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "ColorPicker.exe"

ColorPicker/Classes/Bookmarks.cs

@@ -21,7 +21,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
 */
-using PeyrSharp.Core.Converters;
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -41,19 +40,19 @@ public class BookmarkText : IEquatable<BookmarkText>
 		public string FontFamily { get; init; }
 		public string ForegroundColor { get; init; }
 		public string BackgroundColor { get; init; }
-        public BookmarkText()
-        {
+		public BookmarkText()
+		{
 			FontFamily = "Arial"; // Fallback values
 			ForegroundColor = "#000000";
 			BackgroundColor = "#FFFFFF";
-        }
+		}
 
-        public BookmarkText(string font, string fore, string back)
-        {
+		public BookmarkText(string font, string fore, string back)
+		{
 			FontFamily = font;
 			ForegroundColor = fore;
 			BackgroundColor = back;
-        }
+		}
 
 		public bool Equals(BookmarkText? obj)
 		{

ColorPicker/Classes/DEC.cs

@@ -24,11 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 using ColorHelper;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace ColorPicker.Classes;
 public class DEC

ColorPicker/Classes/Global.cs

@@ -33,7 +33,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Linq;
 using System.Threading;
 using System.Windows;
-using System.Windows.Markup.Localizer;
 using System.Windows.Media;
 
 namespace ColorPicker.Classes;
@@ -82,12 +81,14 @@ public static class Global
 		}
 	};
 
+	internal static Action RefreshButton { get; set; }
+
 	internal static string SynethiaPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\SynethiaConfig.json";
 	internal static string BookmarksPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Bookmarks.xml";
 	internal static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Settings.xml";
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/ColorPicker/5.0/Version.txt";
 
-	public static string Version => "5.7.1.2311";
+	public static string Version => "5.8.0.2312";
 
 	public static string HiSentence
 	{
@@ -161,7 +162,7 @@ public static System.Drawing.Color GenerateRandomColorDrawing()
 		int r = random.Next(0, 255); int g = random.Next(0, 255); int b = random.Next(0, 255); // Generate random values
 		return System.Drawing.Color.FromArgb(r, g, b);
 	}
-	public static Color GetColorFromResource(string resourceName) => (Color)System.Windows.Media.ColorConverter.ConvertFromString(Application.Current.Resources[resourceName].ToString());
+	public static SolidColorBrush GetColorFromResource(string resource) => (SolidColorBrush)Application.Current.Resources[resource];
 
 	public static double GetLuminance(int r, int g, int b)
 	{
@@ -253,7 +254,7 @@ public static AppPages PageInfoToAppPages(PageInfo pageInfo)
 	/// <summary>
 	/// Changes the application's theme.
 	/// </summary>
-	public static void ChangeTheme()
+	public static void ChangeTheme(bool reload = false)
 	{
 		App.Current.Resources.MergedDictionaries.Clear();
 		ResourceDictionary resourceDictionary = new(); // Create a resource dictionary
@@ -274,6 +275,15 @@ public static void ChangeTheme()
 		}
 
 		App.Current.Resources.MergedDictionaries.Add(resourceDictionary); // Add the dictionary
+
+		if (!reload) return;
+		AiGenPage.CheckButton(AiGenPage.CheckedButton);
+		BookmarksPage.CheckButton(BookmarksPage.CheckedButton);
+		ConverterPage.CheckButton(ConverterPage.SelectedColorBtn);
+		ChromaticWheelPage.CheckButton(ChromaticWheelPage.CheckedButton);
+		HarmoniesPage.CheckButton(HarmoniesPage.SelectedColorBtn);
+		PalettePage.CheckButton(PalettePage.SelectedColorBtn);
+		RefreshButton();
 	}
 
 	public static bool IsSystemThemeDark()
@@ -468,9 +478,9 @@ public static Color[] GenerateTriadicColors(Color baseColor)
 
 	public static void ColorToHSL(Color color, out float h, out float s, out float l)
 	{
-		float r = (float)color.R / 255f;
-		float g = (float)color.G / 255f;
-		float b = (float)color.B / 255f;
+		float r = color.R / 255f;
+		float g = color.G / 255f;
+		float b = color.B / 255f;
 
 		float max = Math.Max(r, Math.Max(g, b));
 		float min = Math.Min(r, Math.Min(g, b));

ColorPicker/ColorPicker.csproj

@@ -11,7 +11,7 @@
 	<Title>ColorPicker</Title>
 	<Description>Maximize your creativity.</Description>
 	<RepositoryUrl>https://github.com/Leo-Corporation/ColorPicker</RepositoryUrl>
-	<Version>5.7.1.2311</Version>
+	<Version>5.8.0.2312</Version>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	<PackageIcon>logo.png</PackageIcon>
 	<ApplicationIcon>CPM.ico</ApplicationIcon>
@@ -48,11 +48,11 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Betalgo.OpenAI" Version="7.3.1" />
+	<PackageReference Include="Betalgo.OpenAI" Version="7.4.1" />
 	<PackageReference Include="ColorHelper" Version="1.8.1" />
 	<PackageReference Include="MouseKeyHook" Version="5.7.1" />
-	<PackageReference Include="PeyrSharp.Env" Version="1.10.0.2310" />
-	<PackageReference Include="PeyrSharp.Core" Version="1.10.0.2310" />
+	<PackageReference Include="PeyrSharp.Core" Version="2.0.0.2311" />
+	<PackageReference Include="PeyrSharp.Env" Version="2.0.0.2311" />
 	<PackageReference Include="Synethia" Version="1.1.1.2302" />
   </ItemGroup>
 

ColorPicker/Enums/ColorTypes.cs

@@ -24,16 +24,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 namespace ColorPicker.Enums
 {
-    public enum ColorTypes
-    {
-        RGB,
-        HEX,
-        HSV,
-        HSL,
-        CMYK,
-        XYZ,
-        YIQ,
-        YUV,
-        DEC
-    }
+	public enum ColorTypes
+	{
+		RGB,
+		HEX,
+		HSV,
+		HSL,
+		CMYK,
+		XYZ,
+		YIQ,
+		YUV,
+		DEC
+	}
 }