fix: remove duplicate Color alias (now in GlobalUsings.cs)

windows/App.xaml.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using Application = System.Windows.Application;
+using Forms = System.Windows.Forms;
 
 namespace ClaudeCheckerWindows;
 
@@ -13,9 +11,9 @@ public partial class App : Application
     public static UsageViewModel ViewModel { get; } = new();
     public static UpdateManager  Updater   { get; } = new();
 
-    private NotifyIcon?   _tray;
-    private PopupWindow?  _popup;
-    private DispatcherTimer? _timer;
+    private Forms.NotifyIcon? _tray;
+    private PopupWindow?      _popup;
+    private DispatcherTimer?  _timer;
 
     protected override void OnStartup(StartupEventArgs e)
     {
@@ -33,40 +31,37 @@ public partial class App : Application
 
     private void SetupTray()
     {
-        _tray = new NotifyIcon
+        _tray = new Forms.NotifyIcon
         {
             Text    = "ClaudeChecker",
             Visible = true,
             Icon    = LoadIcon(),
         };
+
         _tray.MouseClick += (_, e) =>
         {
-            if (e.Button == MouseButtons.Left)
-                TogglePopup();
+            if (e.Button == Forms.MouseButtons.Left)
+                Dispatcher.InvokeAsync(TogglePopup);
         };
+
         _tray.ContextMenuStrip = BuildContextMenu();
 
-        ViewModel.PropertyChanged += (_, e) =>
-        {
-            if (e.PropertyName is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.ShowInTaskbar))
-                UpdateTrayText();
-        };
+        ViewModel.PropertyChanged += (_, _) => UpdateTrayText();
+        Updater.PropertyChanged   += (_, _) => UpdateTrayText();
     }
 
-    private static Icon LoadIcon()
+    private static System.Drawing.Icon LoadIcon()
     {
-        try { return new Icon("Assets/icon.ico"); }
-        catch { return SystemIcons.Application; }
+        try { return new System.Drawing.Icon("Assets/icon.ico"); }
+        catch { return System.Drawing.SystemIcons.Application; }
     }
 
-    private ContextMenuStrip BuildContextMenu()
+    private Forms.ContextMenuStrip BuildContextMenu()
     {
-        var menu = new ContextMenuStrip();
-        menu.Items.Add("Show ClaudeChecker", null, (_, _) => ShowPopup());
-        menu.Items.Add(new ToolStripSeparator());
-        menu.Items.Add("Quit", null, (_, _) => Quit());
-        menu.BackColor = System.Drawing.Color.FromArgb(40, 40, 40);
-        menu.ForeColor = System.Drawing.Color.White;
+        var menu = new Forms.ContextMenuStrip();
+        menu.Items.Add("Show ClaudeChecker", null, (_, _) => Dispatcher.InvokeAsync(ShowPopup));
+        menu.Items.Add(new Forms.ToolStripSeparator());
+        menu.Items.Add("Quit", null, (_, _) => Dispatcher.InvokeAsync(Quit));
         return menu;
     }
 
@@ -85,7 +80,6 @@ public partial class App : Application
             _popup = new PopupWindow();
             _popup.Closed += (_, _) => _popup = null;
         }
-
         PositionPopup();
         _popup.Show();
         _popup.Activate();
@@ -95,8 +89,8 @@ public partial class App : Application
     {
         if (_popup == null) return;
         var workArea = SystemParameters.WorkArea;
-        _popup.Left  = workArea.Right  - _popup.Width  - 8;
-        _popup.Top   = workArea.Bottom - _popup.Height - 8;
+        _popup.Left = workArea.Right  - _popup.Width  - 8;
+        _popup.Top  = workArea.Bottom - _popup.Height - 8;
     }
 
     public void ScheduleTimer(int seconds)

windows/AppSettings.cs

@@ -0,0 +1,43 @@
+using System;
+using System.IO;
+using System.Text.Json;
+
+namespace ClaudeCheckerWindows;
+
+public class AppSettings
+{
+    public string CookieStore     { get; set; } = "";
+    public string BurnHistory     { get; set; } = "";
+    public int    RefreshInterval { get; set; } = 120;
+    public bool   ShowInTaskbar   { get; set; } = true;
+    public bool   BetaChannel     { get; set; } = false;
+
+    private static readonly string FilePath = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+        "ClaudeChecker", "settings.json");
+
+    private static AppSettings? _instance;
+    public static AppSettings Default => _instance ??= Load();
+
+    private static AppSettings Load()
+    {
+        try
+        {
+            if (File.Exists(FilePath))
+                return JsonSerializer.Deserialize<AppSettings>(File.ReadAllText(FilePath)) ?? new();
+        }
+        catch { }
+        return new();
+    }
+
+    public void Save()
+    {
+        try
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(FilePath)!);
+            File.WriteAllText(FilePath, JsonSerializer.Serialize(this,
+                new JsonSerializerOptions { WriteIndented = true }));
+        }
+        catch { }
+    }
+}

windows/ClaudeCheckerWindows.csproj

@@ -4,19 +4,22 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyName>ClaudeChecker</AssemblyName>
     <RootNamespace>ClaudeCheckerWindows</RootNamespace>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <Version>1.1.3</Version>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <Version>1.0.0</Version>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 
+  <!-- WinForms referenced explicitly so NotifyIcon is available without polluting global namespace -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64" />
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64"/>
   </ItemGroup>
 
   <ItemGroup>
@@ -28,12 +31,4 @@
     </None>
   </ItemGroup>
 
-  <!-- App settings for user preferences -->
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
 </Project>

windows/Controls/GaugeControl.cs

@@ -1,3 +1,6 @@
+using Brush = System.Windows.Media.Brush;
+using Pen   = System.Windows.Media.Pen;
+using Point = System.Windows.Point;
 using System;
 using System.Globalization;
 using System.Windows;
@@ -18,7 +21,6 @@ public class GaugeControl : FrameworkElement
     public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
     public Brush  Accent  { get => (Brush)GetValue(AccentProperty);   set => SetValue(AccentProperty, value); }
 
-    // Arc sweeps 270° starting at 135° (bottom-left to bottom-right, like macOS version)
     private const double StartAngleDeg = 135;
     private const double SweepDeg      = 270;
     private const double StrokeWidth   = 6;
@@ -29,38 +31,30 @@ public class GaugeControl : FrameworkElement
         var cy     = RenderSize.Height / 2;
         var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
 
-        // Track
         DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
             new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth));
 
-        // Fill
         if (Percent > 0)
-        {
-            var sweep = SweepDeg * (Percent / 100.0);
-            DrawArc(dc, cx, cy, radius, StartAngleDeg, sweep, new Pen(Accent, StrokeWidth));
-        }
+            DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
+                new Pen(Accent, StrokeWidth));
 
-        var dpi  = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+        var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
 
-        // Percent label
         var pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
-            CultureInfo.CurrentCulture,
-            FlowDirection.LeftToRight,
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
             14, Brushes.White, dpi);
-
         dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
 
-        // Sub-label
         var sub = new FormattedText(
             "Updated\nnow",
-            CultureInfo.CurrentCulture,
-            FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"),
-            7, new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi);
-        sub.TextAlignment = TextAlignment.Center;
-
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
+            new Typeface("Segoe UI"), 7,
+            new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi)
+        {
+            TextAlignment = TextAlignment.Center
+        };
         dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
     }
 
@@ -68,10 +62,9 @@ public class GaugeControl : FrameworkElement
         double startDeg, double sweepDeg, Pen pen)
     {
         if (sweepDeg <= 0) return;
-
-        var start    = PointOnCircle(cx, cy, r, startDeg);
-        var end      = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
-        var isLarge  = sweepDeg > 180;
+        var start   = PointOnCircle(cx, cy, r, startDeg);
+        var end     = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
+        var isLarge = sweepDeg > 180;
 
         var geo = new StreamGeometry();
         using (var ctx = geo.Open())

windows/Controls/SparklineControl.cs

@@ -1,4 +1,4 @@
-using System;
+using Point = System.Windows.Point;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Media;
@@ -29,33 +29,32 @@ public class SparklineControl : FrameworkElement
         var h    = RenderSize.Height;
         var minV = double.MaxValue;
         var maxV = double.MinValue;
-
-        foreach (var v in plot) { minV = Math.Min(minV, v); maxV = Math.Max(maxV, v); }
-        var range = Math.Max(maxV - minV, 1);
+        foreach (var v in plot) { if (v < minV) minV = v; if (v > maxV) maxV = v; }
+        var range = System.Math.Max(maxV - minV, 1);
 
         Point Pt(int i) => new(
-            i / (double)(plot.Count - 1) * w,
+            i / (double)(plot.Length - 1) * w,
             h - (plot[i] - minV) / range * (h - 6) - 3);
 
-        // Fill
         var fill = new StreamGeometry();
         using (var ctx = fill.Open())
         {
             ctx.BeginFigure(new Point(0, h), true, true);
-            for (var i = 0; i < plot.Count; i++) ctx.LineTo(Pt(i), true, false);
+            for (var i = 0; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
             ctx.LineTo(new Point(w, h), true, false);
         }
         fill.Freeze();
         dc.DrawGeometry(new SolidColorBrush(Color.FromArgb(26, LineColor.R, LineColor.G, LineColor.B)), null, fill);
 
-        // Line
         var line = new StreamGeometry();
         using (var ctx = line.Open())
         {
             ctx.BeginFigure(Pt(0), false, false);
-            for (var i = 1; i < plot.Count; i++) ctx.LineTo(Pt(i), true, false);
+            for (var i = 1; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
         }
         line.Freeze();
-        dc.DrawGeometry(null, new Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round }, line);
+        dc.DrawGeometry(null,
+            new System.Windows.Media.Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round },
+            line);
     }
 }

windows/GlobalUsings.cs

@@ -0,0 +1,9 @@
+// Global aliases to resolve ambiguities between System.Windows.* and System.Drawing.*
+global using Application  = System.Windows.Application;
+global using Brushes      = System.Windows.Media.Brushes;
+global using Color        = System.Windows.Media.Color;
+global using FlowDirection = System.Windows.FlowDirection;
+global using FontFamily   = System.Windows.Media.FontFamily;
+global using Orientation  = System.Windows.Controls.Orientation;
+global using ProgressBar  = System.Windows.Controls.ProgressBar;
+global using Size         = System.Windows.Size;

windows/UpdateManager.cs

@@ -48,8 +48,8 @@ public class UpdateManager : INotifyPropertyChanged
         set
         {
             Set(ref _betaChannel, value);
-            Properties.Settings.Default.BetaChannel = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.BetaChannel = value;
+            AppSettings.Default.Save();
         }
     }
 
@@ -59,7 +59,7 @@ public class UpdateManager : INotifyPropertyChanged
 
     public UpdateManager()
     {
-        _betaChannel = Properties.Settings.Default.BetaChannel;
+        _betaChannel = AppSettings.Default.BetaChannel;
     }
 
     public async Task CheckForUpdatesAsync()

windows/UsageViewModel.cs

@@ -46,8 +46,8 @@ public class UsageViewModel : INotifyPropertyChanged
         set
         {
             Set(ref _refreshInterval, value);
-            Properties.Settings.Default.RefreshInterval = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.RefreshInterval = value;
+            AppSettings.Default.Save();
         }
     }
 
@@ -58,16 +58,16 @@ public class UsageViewModel : INotifyPropertyChanged
         set
         {
             Set(ref _showInTaskbar, value);
-            Properties.Settings.Default.ShowInTaskbar = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.ShowInTaskbar = value;
+            AppSettings.Default.Save();
         }
     }
 
     public UsageViewModel()
     {
-        _refreshInterval = Properties.Settings.Default.RefreshInterval > 0
-            ? Properties.Settings.Default.RefreshInterval : 120;
-        _showInTaskbar = Properties.Settings.Default.ShowInTaskbar;
+        _refreshInterval = AppSettings.Default.RefreshInterval > 0
+            ? AppSettings.Default.RefreshInterval : 120;
+        _showInTaskbar = AppSettings.Default.ShowInTaskbar;
         LoadBurnHistory();
         LoadPlaceholders();
     }
@@ -137,11 +137,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
     public async Task SignOutAsync()
     {
-        var env = await CoreWebView2Environment.CreateAsync();
-        var dataManager = env.CreateCoreWebView2CookieManager();
-        // Clear via settings — simplest approach is to delete the stored cookies
-        Properties.Settings.Default.CookieStore = "";
-        Properties.Settings.Default.Save();
+        AppSettings.Default.CookieStore = "";
+        AppSettings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
         {
@@ -155,7 +152,7 @@ public class UsageViewModel : INotifyPropertyChanged
     // Cookie store: we persist cookies as JSON in settings after login
     public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
     {
-        var raw = Properties.Settings.Default.CookieStore;
+        var raw = AppSettings.Default.CookieStore;
         if (string.IsNullOrEmpty(raw)) return [];
         try
         {
@@ -172,8 +169,8 @@ public class UsageViewModel : INotifyPropertyChanged
             .Where(c => c.Domain.Contains("claude.ai"))
             .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
             .ToList();
-        Properties.Settings.Default.CookieStore = JsonSerializer.Serialize(entries);
-        Properties.Settings.Default.Save();
+        AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
+        AppSettings.Default.Save();
     }
 
     private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies)
@@ -280,7 +277,7 @@ public class UsageViewModel : INotifyPropertyChanged
     {
         try
         {
-            var raw = Properties.Settings.Default.BurnHistory;
+            var raw = AppSettings.Default.BurnHistory;
             if (string.IsNullOrEmpty(raw)) return;
             var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw);
             if (saved != null)
@@ -291,8 +288,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
     private void SaveBurnHistory()
     {
-        Properties.Settings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
-        Properties.Settings.Default.Save();
+        AppSettings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
+        AppSettings.Default.Save();
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;