Fixed Version String replacements

Scripts/Replace-Version-Strings.ps1

@@ -19,15 +19,15 @@ function Replace-Version {
 }
 
 # Update SoraV2BatteryHelperSetup.vdproj
-$vdprojFile = "SoraV2BatteryHelperSetup\SoraV2BatteryHelperSetup.vdproj"
+$vdprojFile = "SoraV2Utils_Setup\SoraV2Utils_Setup.vdproj"
 $vdprojPattern = '(\s*)"ProductVersion" = "8:\d+\.\d+\.\d+"'
 $vdprojReplacement = '$1"ProductVersion" = "8:' + $version + '"'
 Replace-Version -filePath $vdprojFile -regexPattern $vdprojPattern -replacement $vdprojReplacement
 
 # Update AssemblyInfo.cs files
 $assemblyFiles = @(
-    "SoraV2BatteryHelperSvc\Properties\AssemblyInfo.cs",
-    "SoraV2BatteryHelperNotification\Properties\AssemblyInfo.cs"
+    "SoraV2Utils_Service\Properties\AssemblyInfo.cs",
+    "SoraV2Utils_Agent\Properties\AssemblyInfo.cs"
 )
 
 $assemblyVersionPattern = '(\s*)\[assembly: AssemblyVersion\("(\d+\.\d+\.\d+\.\d+)"\)\]'

SoraV2Utils_Agent/DynamicIcon.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing.Imaging;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Drawing.Text;
+
+namespace SoraV2Utils_Agent
+{
+    internal class DynamicIcon
+    {
+        public static Icon CreateIcon(string text, Color textColor, Font font)
+        {
+            if (string.IsNullOrEmpty(text) || text.Length > 3)
+                throw new ArgumentException("Text must be between 1 and 3 characters long.", nameof(text));
+
+            // Create a 32x32 transparent bitmap
+            using (Bitmap bitmap = new Bitmap(32, 32))
+            {
+                using (Graphics g = Graphics.FromImage(bitmap))
+                {
+                    // Set up transparency
+                    g.Clear(Color.Transparent);
+
+                    // Enable anti-aliasing for smoother text
+                    g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
+
+                    // Determine the largest font size that will fit within 32x32
+                    float maxFontSize = 48; // Start with a large font size
+                    SizeF textSize;
+                    Font adjustedFont;
+                    do
+                    {
+                        maxFontSize--;
+                        adjustedFont = new Font(font.FontFamily, maxFontSize, font.Style);
+                        textSize = g.MeasureString(text, adjustedFont);
+                    }
+                    while ((textSize.Width > 42 || textSize.Height > 42) && maxFontSize > 1);
+
+                    if (textSize.Width > 42 || textSize.Height > 42)
+                    {
+                        // Reduce back if the scaled size exceeds 32x32
+                        maxFontSize /= 1.25f;
+                        adjustedFont = new Font(font.FontFamily, maxFontSize, font.Style);
+                        textSize = g.MeasureString(text, adjustedFont);
+                    }
+
+                    // Calculate the position to center the text
+                    float x = (32 - textSize.Width) / 2;
+                    float y = (32 - textSize.Height) / 2;
+
+                    // Draw the text
+                    using (SolidBrush textBrush = new SolidBrush(textColor))
+                    {
+                        g.DrawString(text, adjustedFont, textBrush, x, y);
+                    }
+                }
+
+                // Create and return the icon
+                return Icon.FromHandle(bitmap.GetHicon());
+            }
+        }
+    }
+}

SoraV2Utils_Agent/Program.cs

@@ -28,7 +28,7 @@ namespace SoraV2Utils_Agent
                 System.Environment.Exit(1);
             }; ;
 
-            var trayicon = new TrayIcon();
+            var trayicon = new TrayIconForm();
             trayicon.Display();
         }
     }

SoraV2Utils_Agent/SoraV2Utils_Agent.csproj

@@ -74,6 +74,7 @@
     <Reference Include="Windows.UI" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DynamicIcon.cs" />
     <Compile Include="NotificationInstaller.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -85,7 +86,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceMonitor.cs" />
-    <Compile Include="TrayIcon.cs" />
+    <Compile Include="TrayIconForm.cs" />
     <Compile Include="UpdateCheck.cs" />
   </ItemGroup>
   <ItemGroup>

SoraV2Utils_Agent/TrayIconForm.cs

@@ -9,15 +9,15 @@ using System.Threading;
 
 namespace SoraV2Utils_Agent
 {
-    public class TrayIcon
+    public class TrayIconForm
     {
-        public TrayIcon() 
+        public TrayIconForm() 
         {
             // Create a NotifyIcon instance
             using (NotifyIcon trayIcon = new NotifyIcon())
             {
                 // Set up the tray icon properties
-                trayIcon.Icon = new Icon(SystemIcons.WinLogo, 40, 40); // Choose your own icon
+                trayIcon.Icon = new Icon(DynamicIcon.CreateIcon("##",Color.Red, SystemFonts.IconTitleFont), 40, 40); // Choose your own icon
                 trayIcon.Visible = true;
 
                 // Create a context menu
@@ -54,6 +54,7 @@ namespace SoraV2Utils_Agent
                         batteryLevelItem.Text = batteryLevelText;
                         batteryRuntimeItem.Text = $"Battery Runtime: {batteryRuntimeText}";
                         batteryRuntimeItem.Text = $"Battery Runtime: {batteryRuntimeText}";
+                        trayIcon.Icon = new Icon(DynamicIcon.CreateIcon(ServiceIPC.DeviceStatus.Battery.ToString(), Color.White, new Font("Arial",32)), 32, 32);
 
                         // Update every second
                         Thread.Sleep(1000);