diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4445140..347de3c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,13 +10,13 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
@@ -29,7 +29,7 @@
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/SFP/Models/Utils.cs b/SFP/Models/Utils.cs
index 1dd9e6e..b2376be 100644
--- a/SFP/Models/Utils.cs
+++ b/SFP/Models/Utils.cs
@@ -62,4 +62,16 @@ public static List GetCommandLine(Process? process)
return new List();
}
+
+ public static string ConvertARGBtoRGBA(string argb)
+ {
+ if (argb.Length != 9 || !argb.StartsWith("#"))
+ {
+ throw new ArgumentException("Invalid ARGB format");
+ }
+ var alpha = argb.Substring(1, 2);
+ var rgb = argb[3..];
+ return "#" + rgb + alpha;
+ }
+
}
diff --git a/SFP/packages.lock.json b/SFP/packages.lock.json
index db25d1d..238afbe 100644
--- a/SFP/packages.lock.json
+++ b/SFP/packages.lock.json
@@ -22,15 +22,15 @@
},
"FileWatcherEx": {
"type": "Direct",
- "requested": "[2.5.0, )",
- "resolved": "2.5.0",
- "contentHash": "XmNJt94gt/xlr0RY5w6gKcZhwQ2wNSA7j+VqakpEHY3kk8dXVnYShNZMBVyEPUcDdCzFrI+4d7BvGnmDHB/m/w=="
+ "requested": "[2.6.0, )",
+ "resolved": "2.6.0",
+ "contentHash": "zHDfVCmqguDYzcRhUmsAzUVBMm5G3nvkD5+p3/f5TjqPHcxFvDoEfSKvxZ4/Mid6fVDZJOU+7xxittk+AIE2Bw=="
},
"Flurl.Http": {
"type": "Direct",
- "requested": "[4.0.0-pre4, )",
- "resolved": "4.0.0-pre4",
- "contentHash": "gK20RSLGp1QBG7FCgu6/pmUUmhP6FGIRU0LBWWHdhTDicdHq760jP9QdD6UPyaVMLlhJrvwrSZ4HHLkHT8ZrjQ==",
+ "requested": "[4.0.0-pre6, )",
+ "resolved": "4.0.0-pre6",
+ "contentHash": "YwWbb/egekWqLmoYZLY2PTzwmN4l6/C4iQKuUsWuNrjxYQ84Oa+OBfQzPYx+04lpOAhhjoBeXFB8y7C+F0CpJA==",
"dependencies": {
"Flurl": "4.0.0-pre4"
}
@@ -54,9 +54,9 @@
},
"NLog": {
"type": "Direct",
- "requested": "[5.2.5, )",
- "resolved": "5.2.5",
- "contentHash": "mMXtbAxfNzqkXcBjhJ3wN3rH7kwUZ0JL0GrUBI/lso7+tQ/HC4e5SnlmR3R5qQ9zWbqMbjxeH37rIf0yQGWTiA=="
+ "requested": "[5.2.6, )",
+ "resolved": "5.2.6",
+ "contentHash": "7/RQ4VBu6HT6kieczhwfI52ugcxrsrMNWIGy43Q36SdfN5dApZW7otsgXuIXx2rKspIGkPhD99JVWIs6FtIilA=="
},
"PortableJsonSettingsProvider": {
"type": "Direct",
diff --git a/SFP_UI/App.axaml.cs b/SFP_UI/App.axaml.cs
index 596608f..591c91a 100644
--- a/SFP_UI/App.axaml.cs
+++ b/SFP_UI/App.axaml.cs
@@ -79,6 +79,7 @@ private static IEnumerable GetColorValues()
{
if (Current!.Styles[0] is not FluentAvaloniaTheme faTheme)
{
+ Log.Logger.Warn("Could not get color values, FluentAvaloniaTheme is null");
return Array.Empty();
}
var colorValues = new string[7];
@@ -86,9 +87,12 @@ private static IEnumerable GetColorValues()
{
if (!faTheme.Resources.TryGetResource(Injector.ColorNames[i], null, out var c))
{
+ Log.Logger.Warn("Could not get color value for {ColorName}", Injector.ColorNames[i]);
continue;
}
- colorValues[i] = c?.ToString() ?? colorValues[i];
+
+ var rgbaStr = Utils.ConvertARGBtoRGBA(c!.ToString()!);
+ colorValues[i] = rgbaStr;
}
return colorValues;
diff --git a/SFP_UI/packages.lock.json b/SFP_UI/packages.lock.json
index ba04786..026b464 100644
--- a/SFP_UI/packages.lock.json
+++ b/SFP_UI/packages.lock.json
@@ -87,9 +87,9 @@
},
"NLog": {
"type": "Direct",
- "requested": "[5.2.5, )",
- "resolved": "5.2.5",
- "contentHash": "mMXtbAxfNzqkXcBjhJ3wN3rH7kwUZ0JL0GrUBI/lso7+tQ/HC4e5SnlmR3R5qQ9zWbqMbjxeH37rIf0yQGWTiA=="
+ "requested": "[5.2.6, )",
+ "resolved": "5.2.6",
+ "contentHash": "7/RQ4VBu6HT6kieczhwfI52ugcxrsrMNWIGy43Q36SdfN5dApZW7otsgXuIXx2rKspIGkPhD99JVWIs6FtIilA=="
},
"ReactiveUI.Fody": {
"type": "Direct",
@@ -1525,10 +1525,10 @@
"sfp": {
"type": "Project",
"dependencies": {
- "FileWatcherEx": "[2.5.0, )",
- "Flurl.Http": "[4.0.0-pre4, )",
+ "FileWatcherEx": "[2.6.0, )",
+ "Flurl.Http": "[4.0.0-pre6, )",
"Gameloop.Vdf": "[0.6.2, )",
- "NLog": "[5.2.5, )",
+ "NLog": "[5.2.6, )",
"PortableJsonSettingsProvider": "[0.2.2, )",
"PuppeteerSharp": "[6.2.0, )",
"WindowsShortcutFactory": "[1.1.0, )",
@@ -1537,15 +1537,15 @@
},
"FileWatcherEx": {
"type": "CentralTransitive",
- "requested": "[2.5.0, )",
- "resolved": "2.5.0",
- "contentHash": "XmNJt94gt/xlr0RY5w6gKcZhwQ2wNSA7j+VqakpEHY3kk8dXVnYShNZMBVyEPUcDdCzFrI+4d7BvGnmDHB/m/w=="
+ "requested": "[2.6.0, )",
+ "resolved": "2.6.0",
+ "contentHash": "zHDfVCmqguDYzcRhUmsAzUVBMm5G3nvkD5+p3/f5TjqPHcxFvDoEfSKvxZ4/Mid6fVDZJOU+7xxittk+AIE2Bw=="
},
"Flurl.Http": {
"type": "CentralTransitive",
- "requested": "[4.0.0-pre4, )",
- "resolved": "4.0.0-pre4",
- "contentHash": "gK20RSLGp1QBG7FCgu6/pmUUmhP6FGIRU0LBWWHdhTDicdHq760jP9QdD6UPyaVMLlhJrvwrSZ4HHLkHT8ZrjQ==",
+ "requested": "[4.0.0-pre6, )",
+ "resolved": "4.0.0-pre6",
+ "contentHash": "YwWbb/egekWqLmoYZLY2PTzwmN4l6/C4iQKuUsWuNrjxYQ84Oa+OBfQzPYx+04lpOAhhjoBeXFB8y7C+F0CpJA==",
"dependencies": {
"Flurl": "4.0.0-pre4"
}