Skip to content

Commit 39e131f

Browse files
authored
refactor: remove v11, promote Avalonia v12 to root, rename namespace (#20)
* feat: add Avalonia v12 rewrite (GeneralUpdate.Tools.V12) - net10.0 + Avalonia 12.0.3 + Semi 12.0.1 + Ursa 2.0.0 - Simplified Patch: 2 folder pickers + manual fields, no csproj/update_config - Extension package with manifest.json support - OSS config with SHA256 + JSON export - Semi theme (zh-CN), SideNav navigation, MVVM architecture * fix: button-based navigation, add UseSkia for render backend - Replace ListBox with Button-based ItemsControl for reliable page switching - Add UseSkia() in Program.cs for Avalonia v12 rendering - Semi theme confirmed working * refactor: remove old v11 project, rename v12 to root - Delete old Avalonia 11 project (src/*) and imgs/ - Move src/GeneralUpdate.Tools.V12/* → src/ - Rename namespace GeneralUpdate.Tools.V12 → GeneralUpdate.Tools - Rename project file and solution - Keep Semi v12 theme, net10.0, Avalonia 12.0.3
1 parent 3951661 commit 39e131f

48 files changed

Lines changed: 511 additions & 3064 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

imgs/GeneralUpdate_h.png

-20.8 KB
Binary file not shown.

src/App.axaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
<Application xmlns="https://github.com/avaloniaui"
1+
<Application xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
x:Class="GeneralUpdate.Tool.Avalonia.App"
4-
xmlns:local="using:GeneralUpdate.Tool.Avalonia"
3+
x:Class="GeneralUpdate.Tools.App"
4+
xmlns:local="using:GeneralUpdate.Tools"
55
xmlns:semi="https://irihi.tech/semi"
6-
xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
76
RequestedThemeVariant="Default">
8-
<Application.Resources>
9-
<ResourceDictionary>
10-
<ResourceDictionary.MergedDictionaries>
11-
<ResourceInclude Source="avares://Nlnet.Avalonia.MessageBox/Assets/Themes.axaml" />
12-
</ResourceDictionary.MergedDictionaries>
13-
</ResourceDictionary>
14-
</Application.Resources>
7+
8+
<Application.DataTemplates>
9+
<local:ViewLocator/>
10+
</Application.DataTemplates>
11+
1512
<Application.Styles>
16-
<semi:SemiTheme Locale="en" />
17-
<u-semi:SemiTheme Locale="en"/>
13+
<FluentTheme />
14+
<semi:SemiTheme Locale="zh-CN" />
1815
</Application.Styles>
19-
</Application>
16+
</Application>

src/App.axaml.cs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
using Avalonia;
1+
using Avalonia;
22
using Avalonia.Controls.ApplicationLifetimes;
33
using Avalonia.Markup.Xaml;
4-
using GeneralUpdate.Tool.Avalonia.ViewModels;
5-
using GeneralUpdate.Tool.Avalonia.Views;
4+
using GeneralUpdate.Tools.ViewModels;
5+
using GeneralUpdate.Tools.Views;
66

7-
namespace GeneralUpdate.Tool.Avalonia;
7+
namespace GeneralUpdate.Tools;
88

99
public partial class App : Application
1010
{
11-
public override void Initialize()
12-
{
13-
AvaloniaXamlLoader.Load(this);
14-
}
15-
11+
public override void Initialize() { AvaloniaXamlLoader.Load(this); }
1612
public override void OnFrameworkInitializationCompleted()
1713
{
1814
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
19-
{
20-
desktop.MainWindow = new MainWindow();
21-
}
22-
15+
desktop.MainWindow = new MainWindow { DataContext = new MainWindowViewModel() };
2316
base.OnFrameworkInitializationCompleted();
2417
}
25-
}
18+
}

src/Assets/avalonia-logo.ico

-236 Bytes
Binary file not shown.

src/Common/CsprojReader.cs

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)