Compare commits

...
Author SHA1 Message Date
SuperDooper ad525ef8d1 fix: only auto-close login on explicit post-login redirect, not initial load 2026-05-08 13:14:48 +02:00
SuperDooper e6fa66bc73 fix: suppress Deactivated hide during login dialog, restore popup after sign-in 2026-05-08 13:14:47 +02:00
SuperDooper 2d000bca5e fix: correct session cookie detection and auto-close on login 2026-05-08 13:07:06 +02:00
SuperDooper c7a663c42b fix: use RELEASE_TOKEN to bypass branch protection when writing version JSON 2026-05-08 12:59:04 +02:00
SuperDooper a182b7ca59 fix: use RELEASE_TOKEN to bypass branch protection when writing version JSON 2026-05-08 12:59:03 +02:00
SuperDooper 182acb1f21 fix: use GitHub API to update version JSON, avoid git push to protected main 2026-05-08 12:52:21 +02:00
SuperDooper 3ff5067d49 fix: use GitHub API to update version JSON, avoid git push to protected main 2026-05-08 12:52:20 +02:00
SuperDooper 2816a5cedb fix: remove duplicate Color alias (now in GlobalUsings.cs) 2026-05-08 12:40:03 +02:00
SuperDooper a4a4d70530 fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:34:04 +02:00
SuperDooper 073d3b14ef fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:34:02 +02:00
SuperDooper 5603b94f8a fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:34:01 +02:00
SuperDooper 28a449b060 fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:34:00 +02:00
SuperDooper d2ba7365b0 fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:33:59 +02:00
SuperDooper 93862686b6 fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:33:57 +02:00
SuperDooper 8170f3a1b3 fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:33:56 +02:00
SuperDooper 5fbdaab2d0 fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:33:55 +02:00
SuperDooper 7db17fb53d fix: resolve build errors — AppSettings, GlobalUsings, namespace aliases 2026-05-08 12:33:54 +02:00
SuperDooper f6f1982390 fix: add explicit using aliases to resolve System.Drawing ambiguity 2026-05-08 12:24:36 +02:00
SuperDooper de61499bab fix: add explicit using aliases to resolve System.Drawing ambiguity 2026-05-08 12:24:35 +02:00
12 changed files with 187 additions and 127 deletions
+16 -10
View File
@@ -53,19 +53,25 @@ jobs:
- name: Update version-windows-beta.json on main - name: Update version-windows-beta.json on main
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
shell: bash shell: bash
run: | run: |
notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}") notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
git config user.name "github-actions[bot]" content=$(jq -n \
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main
git checkout main
jq -n \
--arg version "${{ steps.version.outputs.version }}" \ --arg version "${{ steps.version.outputs.version }}" \
--arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \ --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
--arg notes "$notes" \ --arg notes "$notes" \
'{version: $version, url: $url, notes: $notes}' > version-windows-beta.json '{version: $version, url: $url, notes: $notes}' | base64 -w0)
git add version-windows-beta.json sha=$(gh api "repos/${{ github.repository }}/contents/version-windows-beta.json?ref=main" --jq .sha 2>/dev/null || echo "")
git commit -m "Windows beta release ${{ github.ref_name }}" if [ -n "$sha" ]; then
git push origin main gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
--field "message=Windows beta release ${{ github.ref_name }}" \
--field "content=$content" \
--field "branch=main" \
--field "sha=$sha"
else
gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
--field "message=Windows beta release ${{ github.ref_name }}" \
--field "content=$content" \
--field "branch=main"
fi
+17 -11
View File
@@ -3,7 +3,7 @@ name: Release Windows
on: on:
push: push:
tags: tags:
- 'win-v*' - 'win-v[0-9]*'
- '!win-v*-*' - '!win-v*-*'
jobs: jobs:
@@ -53,19 +53,25 @@ jobs:
- name: Update version-windows.json on main - name: Update version-windows.json on main
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
shell: bash shell: bash
run: | run: |
notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}") notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
git config user.name "github-actions[bot]" content=$(jq -n \
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main
git checkout main
jq -n \
--arg version "${{ steps.version.outputs.version }}" \ --arg version "${{ steps.version.outputs.version }}" \
--arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \ --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
--arg notes "$notes" \ --arg notes "$notes" \
'{version: $version, url: $url, notes: $notes}' > version-windows.json '{version: $version, url: $url, notes: $notes}' | base64 -w0)
git add version-windows.json sha=$(gh api "repos/${{ github.repository }}/contents/version-windows.json?ref=main" --jq .sha 2>/dev/null || echo "")
git commit -m "Windows release ${{ github.ref_name }}" if [ -n "$sha" ]; then
git push origin main gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
--field "message=Windows release ${{ github.ref_name }}" \
--field "content=$content" \
--field "branch=main" \
--field "sha=$sha"
else
gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
--field "message=Windows release ${{ github.ref_name }}" \
--field "content=$content" \
--field "branch=main"
fi
+21 -27
View File
@@ -1,10 +1,8 @@
using System; using System;
using System.Drawing;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Forms;
using System.Windows.Threading; using System.Windows.Threading;
using Application = System.Windows.Application; using Forms = System.Windows.Forms;
namespace ClaudeCheckerWindows; namespace ClaudeCheckerWindows;
@@ -13,9 +11,9 @@ public partial class App : Application
public static UsageViewModel ViewModel { get; } = new(); public static UsageViewModel ViewModel { get; } = new();
public static UpdateManager Updater { get; } = new(); public static UpdateManager Updater { get; } = new();
private NotifyIcon? _tray; private Forms.NotifyIcon? _tray;
private PopupWindow? _popup; private PopupWindow? _popup;
private DispatcherTimer? _timer; private DispatcherTimer? _timer;
protected override void OnStartup(StartupEventArgs e) protected override void OnStartup(StartupEventArgs e)
{ {
@@ -33,40 +31,37 @@ public partial class App : Application
private void SetupTray() private void SetupTray()
{ {
_tray = new NotifyIcon _tray = new Forms.NotifyIcon
{ {
Text = "ClaudeChecker", Text = "ClaudeChecker",
Visible = true, Visible = true,
Icon = LoadIcon(), Icon = LoadIcon(),
}; };
_tray.MouseClick += (_, e) => _tray.MouseClick += (_, e) =>
{ {
if (e.Button == MouseButtons.Left) if (e.Button == Forms.MouseButtons.Left)
TogglePopup(); Dispatcher.InvokeAsync(TogglePopup);
}; };
_tray.ContextMenuStrip = BuildContextMenu(); _tray.ContextMenuStrip = BuildContextMenu();
ViewModel.PropertyChanged += (_, e) => ViewModel.PropertyChanged += (_, _) => UpdateTrayText();
{ Updater.PropertyChanged += (_, _) => UpdateTrayText();
if (e.PropertyName is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.ShowInTaskbar))
UpdateTrayText();
};
} }
private static Icon LoadIcon() private static System.Drawing.Icon LoadIcon()
{ {
try { return new Icon("Assets/icon.ico"); } try { return new System.Drawing.Icon("Assets/icon.ico"); }
catch { return SystemIcons.Application; } catch { return System.Drawing.SystemIcons.Application; }
} }
private ContextMenuStrip BuildContextMenu() private Forms.ContextMenuStrip BuildContextMenu()
{ {
var menu = new ContextMenuStrip(); var menu = new Forms.ContextMenuStrip();
menu.Items.Add("Show ClaudeChecker", null, (_, _) => ShowPopup()); menu.Items.Add("Show ClaudeChecker", null, (_, _) => Dispatcher.InvokeAsync(ShowPopup));
menu.Items.Add(new ToolStripSeparator()); menu.Items.Add(new Forms.ToolStripSeparator());
menu.Items.Add("Quit", null, (_, _) => Quit()); menu.Items.Add("Quit", null, (_, _) => Dispatcher.InvokeAsync(Quit));
menu.BackColor = System.Drawing.Color.FromArgb(40, 40, 40);
menu.ForeColor = System.Drawing.Color.White;
return menu; return menu;
} }
@@ -85,7 +80,6 @@ public partial class App : Application
_popup = new PopupWindow(); _popup = new PopupWindow();
_popup.Closed += (_, _) => _popup = null; _popup.Closed += (_, _) => _popup = null;
} }
PositionPopup(); PositionPopup();
_popup.Show(); _popup.Show();
_popup.Activate(); _popup.Activate();
@@ -95,8 +89,8 @@ public partial class App : Application
{ {
if (_popup == null) return; if (_popup == null) return;
var workArea = SystemParameters.WorkArea; var workArea = SystemParameters.WorkArea;
_popup.Left = workArea.Right - _popup.Width - 8; _popup.Left = workArea.Right - _popup.Width - 8;
_popup.Top = workArea.Bottom - _popup.Height - 8; _popup.Top = workArea.Bottom - _popup.Height - 8;
} }
public void ScheduleTimer(int seconds) public void ScheduleTimer(int seconds)
+43
View File
@@ -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 { }
}
}
+7 -12
View File
@@ -4,19 +4,22 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>ClaudeChecker</AssemblyName> <AssemblyName>ClaudeChecker</AssemblyName>
<RootNamespace>ClaudeCheckerWindows</RootNamespace> <RootNamespace>ClaudeCheckerWindows</RootNamespace>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon> <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<Version>1.1.3</Version> <Version>1.0.0</Version>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
</PropertyGroup> </PropertyGroup>
<!-- WinForms referenced explicitly so NotifyIcon is available without polluting global namespace -->
<ItemGroup> <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>
<ItemGroup> <ItemGroup>
@@ -28,12 +31,4 @@
</None> </None>
</ItemGroup> </ItemGroup>
<!-- App settings for user preferences -->
<ItemGroup>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
</Project> </Project>
+16 -23
View File
@@ -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;
using System.Globalization; using System.Globalization;
using System.Windows; using System.Windows;
@@ -18,7 +21,6 @@ public class GaugeControl : FrameworkElement
public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); } public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
public Brush Accent { get => (Brush)GetValue(AccentProperty); set => SetValue(AccentProperty, 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 StartAngleDeg = 135;
private const double SweepDeg = 270; private const double SweepDeg = 270;
private const double StrokeWidth = 6; private const double StrokeWidth = 6;
@@ -29,38 +31,30 @@ public class GaugeControl : FrameworkElement
var cy = RenderSize.Height / 2; var cy = RenderSize.Height / 2;
var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1; var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
// Track
DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg, DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth)); new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth));
// Fill
if (Percent > 0) if (Percent > 0)
{ DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
var sweep = SweepDeg * (Percent / 100.0); new Pen(Accent, StrokeWidth));
DrawArc(dc, cx, cy, radius, StartAngleDeg, sweep, new Pen(Accent, StrokeWidth));
}
var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip; var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
// Percent label
var pctText = new FormattedText( var pctText = new FormattedText(
$"{(int)Math.Round(Percent)}%", $"{(int)Math.Round(Percent)}%",
CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
FlowDirection.LeftToRight,
new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal), new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
14, Brushes.White, dpi); 14, Brushes.White, dpi);
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1)); dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
// Sub-label
var sub = new FormattedText( var sub = new FormattedText(
"Updated\nnow", "Updated\nnow",
CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
FlowDirection.LeftToRight, new Typeface("Segoe UI"), 7,
new Typeface("Segoe UI"), new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi)
7, new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi); {
sub.TextAlignment = TextAlignment.Center; TextAlignment = TextAlignment.Center
};
dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2)); 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) double startDeg, double sweepDeg, Pen pen)
{ {
if (sweepDeg <= 0) return; if (sweepDeg <= 0) return;
var start = PointOnCircle(cx, cy, r, startDeg);
var start = PointOnCircle(cx, cy, r, startDeg); var end = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
var end = PointOnCircle(cx, cy, r, startDeg + sweepDeg); var isLarge = sweepDeg > 180;
var isLarge = sweepDeg > 180;
var geo = new StreamGeometry(); var geo = new StreamGeometry();
using (var ctx = geo.Open()) using (var ctx = geo.Open())
+9 -10
View File
@@ -1,4 +1,4 @@
using System; using Point = System.Windows.Point;
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
@@ -29,33 +29,32 @@ public class SparklineControl : FrameworkElement
var h = RenderSize.Height; var h = RenderSize.Height;
var minV = double.MaxValue; var minV = double.MaxValue;
var maxV = double.MinValue; var maxV = double.MinValue;
foreach (var v in plot) { if (v < minV) minV = v; if (v > maxV) maxV = v; }
foreach (var v in plot) { minV = Math.Min(minV, v); maxV = Math.Max(maxV, v); } var range = System.Math.Max(maxV - minV, 1);
var range = Math.Max(maxV - minV, 1);
Point Pt(int i) => new( 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); h - (plot[i] - minV) / range * (h - 6) - 3);
// Fill
var fill = new StreamGeometry(); var fill = new StreamGeometry();
using (var ctx = fill.Open()) using (var ctx = fill.Open())
{ {
ctx.BeginFigure(new Point(0, h), true, true); 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); ctx.LineTo(new Point(w, h), true, false);
} }
fill.Freeze(); fill.Freeze();
dc.DrawGeometry(new SolidColorBrush(Color.FromArgb(26, LineColor.R, LineColor.G, LineColor.B)), null, fill); dc.DrawGeometry(new SolidColorBrush(Color.FromArgb(26, LineColor.R, LineColor.G, LineColor.B)), null, fill);
// Line
var line = new StreamGeometry(); var line = new StreamGeometry();
using (var ctx = line.Open()) using (var ctx = line.Open())
{ {
ctx.BeginFigure(Pt(0), false, false); 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(); 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);
} }
} }
+9
View File
@@ -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;
+25 -12
View File
@@ -1,5 +1,6 @@
using Microsoft.Web.WebView2.Core; using Microsoft.Web.WebView2.Core;
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
@@ -28,18 +29,25 @@ public partial class LoginWindow : Window
{ {
if (!e.IsSuccess) return; if (!e.IsSuccess) return;
var uri = Browser.CoreWebView2.Source; var uri = Browser.CoreWebView2.Source;
if (uri.Contains("claude.ai") && !uri.Contains("/login")) if (!uri.Contains("claude.ai")) return;
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
var signedIn = cookies.Any(c =>
c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
await Dispatcher.InvokeAsync(() =>
{ {
// Likely signed in — enable done button DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai"); StatusText.Text = signedIn
var hasSess = cookies.Any(c => c.Name.Contains("session") || c.Name.Contains("sk-")); ? "Signed in — click Done to continue."
await Dispatcher.InvokeAsync(() => : "Complete sign-in, then click Done.";
{ });
DoneButton.IsEnabled = hasSess || uri.Contains("/chats") || uri.Contains("/new");
StatusText.Text = DoneButton.IsEnabled // Auto-close only on explicit post-login redirects, not on initial load
? "Signed in! Click Done to continue." if (signedIn && (uri.Contains("/chats") || uri.Contains("/new")))
: "Waiting for sign-in…"; {
}); await SaveAndClose(cookies);
} }
}; };
} }
@@ -47,7 +55,12 @@ public partial class LoginWindow : Window
private async void Done_Click(object sender, RoutedEventArgs e) private async void Done_Click(object sender, RoutedEventArgs e)
{ {
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai"); var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
await SaveAndClose(cookies);
}
private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
{
UsageViewModel.SaveCookies(cookies); UsageViewModel.SaveCookies(cookies);
DialogResult = true; await Dispatcher.InvokeAsync(() => DialogResult = true);
} }
} }
+6 -1
View File
@@ -12,6 +12,7 @@ public partial class PopupWindow : Window
private static readonly UsageViewModel VM = App.ViewModel; private static readonly UsageViewModel VM = App.ViewModel;
private static readonly UpdateManager Updater = App.Updater; private static readonly UpdateManager Updater = App.Updater;
private readonly DispatcherTimer _clockTimer; private readonly DispatcherTimer _clockTimer;
private bool _dialogOpen;
public PopupWindow() public PopupWindow()
{ {
@@ -29,7 +30,7 @@ public partial class PopupWindow : Window
UpdateBannerState(); UpdateBannerState();
UpdateFooter(); UpdateFooter();
Deactivated += (_, _) => Hide(); Deactivated += (_, _) => { if (!_dialogOpen) Hide(); };
} }
// ── Card rendering ─────────────────────────────────────────────── // ── Card rendering ───────────────────────────────────────────────
@@ -299,12 +300,16 @@ public partial class PopupWindow : Window
private void SignIn_Click(object s, RoutedEventArgs e) private void SignIn_Click(object s, RoutedEventArgs e)
{ {
_dialogOpen = true;
var login = new LoginWindow { Owner = this }; var login = new LoginWindow { Owner = this };
if (login.ShowDialog() == true) if (login.ShowDialog() == true)
{ {
_ = VM.RefreshAsync(); _ = VM.RefreshAsync();
InitSettings(); InitSettings();
} }
_dialogOpen = false;
Show();
Activate();
} }
private async void SignOut_Click(object s, RoutedEventArgs e) private async void SignOut_Click(object s, RoutedEventArgs e)
+3 -3
View File
@@ -48,8 +48,8 @@ public class UpdateManager : INotifyPropertyChanged
set set
{ {
Set(ref _betaChannel, value); Set(ref _betaChannel, value);
Properties.Settings.Default.BetaChannel = value; AppSettings.Default.BetaChannel = value;
Properties.Settings.Default.Save(); AppSettings.Default.Save();
} }
} }
@@ -59,7 +59,7 @@ public class UpdateManager : INotifyPropertyChanged
public UpdateManager() public UpdateManager()
{ {
_betaChannel = Properties.Settings.Default.BetaChannel; _betaChannel = AppSettings.Default.BetaChannel;
} }
public async Task CheckForUpdatesAsync() public async Task CheckForUpdatesAsync()
+15 -18
View File
@@ -46,8 +46,8 @@ public class UsageViewModel : INotifyPropertyChanged
set set
{ {
Set(ref _refreshInterval, value); Set(ref _refreshInterval, value);
Properties.Settings.Default.RefreshInterval = value; AppSettings.Default.RefreshInterval = value;
Properties.Settings.Default.Save(); AppSettings.Default.Save();
} }
} }
@@ -58,16 +58,16 @@ public class UsageViewModel : INotifyPropertyChanged
set set
{ {
Set(ref _showInTaskbar, value); Set(ref _showInTaskbar, value);
Properties.Settings.Default.ShowInTaskbar = value; AppSettings.Default.ShowInTaskbar = value;
Properties.Settings.Default.Save(); AppSettings.Default.Save();
} }
} }
public UsageViewModel() public UsageViewModel()
{ {
_refreshInterval = Properties.Settings.Default.RefreshInterval > 0 _refreshInterval = AppSettings.Default.RefreshInterval > 0
? Properties.Settings.Default.RefreshInterval : 120; ? AppSettings.Default.RefreshInterval : 120;
_showInTaskbar = Properties.Settings.Default.ShowInTaskbar; _showInTaskbar = AppSettings.Default.ShowInTaskbar;
LoadBurnHistory(); LoadBurnHistory();
LoadPlaceholders(); LoadPlaceholders();
} }
@@ -137,11 +137,8 @@ public class UsageViewModel : INotifyPropertyChanged
public async Task SignOutAsync() public async Task SignOutAsync()
{ {
var env = await CoreWebView2Environment.CreateAsync(); AppSettings.Default.CookieStore = "";
var dataManager = env.CreateCoreWebView2CookieManager(); AppSettings.Default.Save();
// Clear via settings — simplest approach is to delete the stored cookies
Properties.Settings.Default.CookieStore = "";
Properties.Settings.Default.Save();
await Application.Current.Dispatcher.InvokeAsync(() => await Application.Current.Dispatcher.InvokeAsync(() =>
{ {
@@ -155,7 +152,7 @@ public class UsageViewModel : INotifyPropertyChanged
// Cookie store: we persist cookies as JSON in settings after login // 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() 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 []; if (string.IsNullOrEmpty(raw)) return [];
try try
{ {
@@ -172,8 +169,8 @@ public class UsageViewModel : INotifyPropertyChanged
.Where(c => c.Domain.Contains("claude.ai")) .Where(c => c.Domain.Contains("claude.ai"))
.Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path }) .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
.ToList(); .ToList();
Properties.Settings.Default.CookieStore = JsonSerializer.Serialize(entries); AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
Properties.Settings.Default.Save(); AppSettings.Default.Save();
} }
private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies) private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies)
@@ -280,7 +277,7 @@ public class UsageViewModel : INotifyPropertyChanged
{ {
try try
{ {
var raw = Properties.Settings.Default.BurnHistory; var raw = AppSettings.Default.BurnHistory;
if (string.IsNullOrEmpty(raw)) return; if (string.IsNullOrEmpty(raw)) return;
var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw); var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw);
if (saved != null) if (saved != null)
@@ -291,8 +288,8 @@ public class UsageViewModel : INotifyPropertyChanged
private void SaveBurnHistory() private void SaveBurnHistory()
{ {
Properties.Settings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory); AppSettings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
Properties.Settings.Default.Save(); AppSettings.Default.Save();
} }
public event PropertyChangedEventHandler? PropertyChanged; public event PropertyChangedEventHandler? PropertyChanged;