部分交互逻辑调整

Blessing-Studio · Nov 18, 2024 · b3eb309 · b3eb309
1 parent 1b4d976
commit b3eb309
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 40 deletions.
diff --git a/WonderLab.Desktop/Program.cs b/WonderLab.Desktop/Program.cs
@@ -1,7 +1,6 @@
 using Avalonia;
 using System;
 using System.Runtime.InteropServices;
-using WonderLab.Extensions;
 
 namespace WonderLab.Desktop;
 

diff --git a/WonderLab/App.axaml b/WonderLab/App.axaml
@@ -13,6 +13,7 @@
 		<StyleInclude Source="/Controls/Style/SelectorBarStyle.axaml"/>
 		<StyleInclude Source="/Controls/Style/ToggleButtonStyle.axaml"/>
 		<StyleInclude Source="avares://DialogHost.Avalonia/Styles.xaml"/>
+		<StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml"/>
     </Application.Styles>
 
 	<Application.Resources>

diff --git a/WonderLab/App.axaml.cs b/WonderLab/App.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
@@ -10,14 +9,14 @@
 using Microsoft.Extensions.Logging;
 using Serilog;
 using System;
-using System.Diagnostics;
 using System.IO;
 using WonderLab.Extensions;
 using WonderLab.Extensions.Hosting;
 using WonderLab.Services;
-using WonderLab.Services.Account;
+using WonderLab.Services.Accounts;
 using WonderLab.Services.Launch;
 using WonderLab.Services.UI;
+using WonderLab.ViewModels.Dialog;
 using WonderLab.ViewModels.Page;
 using WonderLab.ViewModels.Page.Download;
 using WonderLab.ViewModels.Page.Setting;
@@ -33,9 +32,9 @@ public sealed class App : Application {
 
     private static IServiceProvider ServiceProvider { get; set; }
 
-    private static TKey Get<TKey>() {
+    public static TKey Get<TKey>() {
         return ServiceProvider.GetRequiredService<TKey>();
-    } 
+    }
 
     public override void Initialize() {
         AvaloniaXamlLoader.Load(this);
@@ -81,6 +80,7 @@ private void OnStartup(object sender, ControlledApplicationLifetimeStartupEventA
         configService.Load();
 
         Get<GameService>().Initialize();
+        Get<AccountService>().Initialize();
 
         //Override AccentColors
         Current.Resources["NormalAccentBrush"] =
@@ -116,11 +116,14 @@ private static IHost ConfigureIoC(out IHost host) {
         builder.Services.AddSingleton<LaunchService>();
         builder.Services.AddSingleton<AccountService>();
         builder.Services.AddSingleton<NotificationService>();
-        
+
         //Configure Window
         builder.Services.AddSingleton<MainWindow>();
         builder.Services.AddSingleton<MainWindowViewModel>();
 
+        //Configure Dialog
+        builder.Services.AddTransient<ChooseAccountTypeDialogViewModel>();
+
         //Configure Page
         var page = builder.PageProvider;
         page.AddPage<HomePage, HomePageViewModel>("Home");

diff --git a/WonderLab/Controls/Frame.cs b/WonderLab/Controls/Frame.cs
@@ -55,21 +55,23 @@ public AvaloniaPageProvider PageProvider {
         set => SetValue(PageProviderProperty, value);
     }
 
-    private async void RunAnimation(object page) {
+    private void RunAnimation(object page) {
         using (_cancellationTokenSource) {
             _cancellationTokenSource.Cancel();
             _cancellationTokenSource = new();
         }
-
-        if (_controlType is ControlType.Control1) {
-            _PART_LeftContentPresenter.Content = page;
-            await PageTransition.Start(_PART_RightContentPresenter, _PART_LeftContentPresenter, true, _cancellationTokenSource.Token);
-            _controlType = ControlType.Control2;
-        }else {
-            _PART_RightContentPresenter.Content = page;
-            await PageTransition.Start(_PART_LeftContentPresenter, _PART_RightContentPresenter, false, _cancellationTokenSource.Token);
-            _controlType = ControlType.Control1;
-        }
+
+        Dispatcher.UIThread.Post(async () => {
+            if (_controlType is ControlType.Control1) {
+                _PART_LeftContentPresenter.Content = page;
+                await PageTransition.Start(_PART_RightContentPresenter, _PART_LeftContentPresenter, true, _cancellationTokenSource.Token);
+                _controlType = ControlType.Control2;
+            } else {
+                _PART_RightContentPresenter.Content = page;
+                await PageTransition.Start(_PART_LeftContentPresenter, _PART_RightContentPresenter, false, _cancellationTokenSource.Token);
+                _controlType = ControlType.Control1;
+            }
+        }, DispatcherPriority.Render);
     }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e) {

diff --git a/WonderLab/Controls/Theme/NotificationCardTheme.axaml b/WonderLab/Controls/Theme/NotificationCardTheme.axaml
@@ -97,6 +97,7 @@
 		<Style Selector="^:information /template/ Panel#PART_HeaderBar">
 			<Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
 		</Style>
+
 		<Style Selector="^:success /template/ Panel#PART_HeaderBar">
 			<Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
 		</Style>

diff --git a/WonderLab/Services/Account/AccountService.cs b/WonderLab/Services/Account/AccountService.cs
@@ -1,4 +1,18 @@
-namespace WonderLab.Services.Account;
+using MinecraftLaunch.Classes.Models.Auth;
+using System.Collections.ObjectModel;
+
+namespace WonderLab.Services.Accounts;
 
 public sealed class AccountService {
+    private readonly ConfigService _configService;
+
+    public ObservableCollection<Account> Accounts { get; set; }
+
+    public AccountService(ConfigService configService) {
+        _configService = configService;
+    }
+
+    public void Initialize() {
+        Accounts = new(_configService?.Entries?.Accounts ?? []);
+    }
 }
diff --git a/WonderLab/Services/Launch/LaunchService.cs b/WonderLab/Services/Launch/LaunchService.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using WonderLab.Infrastructure.Models;
 using WonderLab.Infrastructure.Models.Launch;
-using WonderLab.Services.Account;
+using WonderLab.Services.Accounts;
 using WonderLab.Services.UI;
 using WonderLab.ViewModels.Tasks;
 
@@ -27,8 +27,8 @@ public sealed class LaunchService {
     public LaunchService(
         GameService gameService,
         TaskService taskService,
-        AccountService accountService,
         ConfigService configService,
+        AccountService accountService,
         NotificationService notificationService) {
         _taskService = taskService;
         _gameService = gameService;

diff --git a/WonderLab/ViewModels/Dialog/ChooseAccountTypeDialogViewModel.cs b/WonderLab/ViewModels/Dialog/ChooseAccountTypeDialogViewModel.cs
@@ -0,0 +1,6 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace WonderLab.ViewModels.Dialog;
+
+public sealed partial class ChooseAccountTypeDialogViewModel : ObservableObject {
+}
diff --git a/WonderLab/ViewModels/Page/Setting/AccountPageViewModel.cs b/WonderLab/ViewModels/Page/Setting/AccountPageViewModel.cs
@@ -1,18 +1,36 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using DialogHostAvalonia;
 using MinecraftLaunch.Classes.Models.Auth;
-using MinecraftLaunch.Components.Authenticator;
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using WonderLab.Services.Accounts;
+using WonderLab.ViewModels.Dialog;
 
 namespace WonderLab.ViewModels.Page.Setting;
 
 public sealed partial class AccountPageViewModel : ObservableObject {
-    public List<Account> Test => [
-        new OfflineAuthenticator("Account1").Authenticate(),
-        new OfflineAuthenticator("Account2").Authenticate(),
-        new OfflineAuthenticator("Account3").Authenticate(),
-        new OfflineAuthenticator("Account4").Authenticate(),
-        new OfflineAuthenticator("Account5").Authenticate(),
-        new OfflineAuthenticator("Account6").Authenticate(),
-        new OfflineAuthenticator("Account7").Authenticate(),
-    ];
+    private readonly AccountService _accountService;
+
+    public bool HasAccount => Accounts?.Count > 0;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(HasAccount))]
+    private ReadOnlyObservableCollection<Account> _accounts;
+
+    public AccountPageViewModel(AccountService accountService) {
+        _accountService = accountService;
+
+        Accounts = new(_accountService.Accounts);
+    }
+
+    [RelayCommand]
+    private Task CreateAccount() => Dispatcher.UIThread.InvokeAsync(async () => {
+        ChooseAccountTypeDialog dialog = new() {
+            DataContext = App.Get<ChooseAccountTypeDialogViewModel>()
+        };
+
+        await DialogHost.Show(dialog, "PART_DialogHost");
+    });
 }
diff --git a/WonderLab/ViewModels/Page/Setting/AppearancePageViewModel.cs b/WonderLab/ViewModels/Page/Setting/AppearancePageViewModel.cs
@@ -45,8 +45,6 @@ public sealed partial class AppearancePageViewModel : ObservableObject {
 
     public IEnumerable<Color> ImageColors => ActiveImage?.ToRgba32Bitmap()?.GetPaletteFromBitmap().Select(x => x.Color);
 
-    public List<Color> Colors { get; } = ColorExtension.Colors;
-
     public List<CultureInfo> Languages { get; } = [
         new("zh-Hans"),
         new("zh-Hant"),

diff --git a/WonderLab/Views/Dialog/ChooseAccountTypeDialog.axaml b/WonderLab/Views/Dialog/ChooseAccountTypeDialog.axaml
@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+			 x:Class="WonderLab.ChooseAccountTypeDialog">
+	Welcome to Avalonia!
+</UserControl>
diff --git a/WonderLab/Views/Dialog/ChooseAccountTypeDialog.axaml.cs b/WonderLab/Views/Dialog/ChooseAccountTypeDialog.axaml.cs
@@ -0,0 +1,7 @@
+using Avalonia.Controls;
+
+namespace WonderLab;
+
+public partial class ChooseAccountTypeDialog : UserControl {
+    public ChooseAccountTypeDialog() => InitializeComponent();
+}
diff --git a/WonderLab/Views/Page/Setting/AccountPage.axaml b/WonderLab/Views/Page/Setting/AccountPage.axaml
@@ -25,16 +25,31 @@
 			<wc:SettingExpander Glyph="&#xE8B7;"
 								Header="{I18N {x:Static w:LanguageKeys.Settings_Account_Title}}">
 				<wc:SettingExpanderItem Description="{I18N {x:Static w:LanguageKeys.Settings_Account_Add_Description}}">
-					<Button Content="{I18N {x:Static w:LanguageKeys.Item_Add}}"/>
+					<Button Command="{Binding CreateAccountCommand}"
+							Content="{I18N {x:Static w:LanguageKeys.Item_Add}}"/>
 				</wc:SettingExpanderItem>
 			</wc:SettingExpander>
 
 			<TextBlock Margin="0 20 0 0"
 					   Classes="BodyStrong"
 					   Text="保存的游戏账户"/>
 
+			<StackPanel Spacing="8"
+						Grid.Row="1"
+						Margin="0 50"
+						VerticalAlignment="Center"
+						HorizontalAlignment="Center"
+						IsVisible="{Binding HasAccount, Converter={StaticResource BooleanReverseConverter}}">
+				<wc:FontIcon FontSize="28"
+							 Glyph="&#xF133;"
+							 HorizontalAlignment="Center"/>
+
+				<TextBlock Classes="BodyStrong"
+						   Text="没有任何账户"/>
+			</StackPanel>
+
 			<ItemsRepeater Margin="0 8 0 0"
-						   ItemsSource="{Binding Test}">
+						   ItemsSource="{Binding Accounts}">
 				<ItemsRepeater.Layout>
 					<UniformGridLayout MinItemWidth="260"
 									   ItemsStretch="Fill"

diff --git a/WonderLab/Views/Page/Setting/AppearancePage.axaml b/WonderLab/Views/Page/Setting/AppearancePage.axaml
@@ -108,10 +108,11 @@
 				</wc:SettingExpanderItem>
 
 				<wc:SettingExpanderItem Description="{I18N {x:Static w:LanguageKeys.Settings_Appearance_Color}}">
-					<ListBox Classes="colorbox"
+					<!--<ListBox Classes="colorbox"
 							 ItemsSource="{Binding Colors}"
 							 SelectedItem="{Binding Color}">
-					</ListBox>
+					</ListBox>-->
+					<ColorPicker Color="{Binding Color}"/>
 				</wc:SettingExpanderItem>
 
 				<wc:SettingExpanderItem IsVisible="{Binding IsImageBackground}"

diff --git a/WonderLab/WonderLab.csproj b/WonderLab/WonderLab.csproj
@@ -76,7 +76,6 @@
 
 	<ItemGroup>
 		<Folder Include="Platform\Linux\Wayland\" />
-		<Folder Include="Views\Dialog\" />
 	</ItemGroup>
 
 	<ItemGroup>