diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml index ffea7b7e4..07e7c57c0 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml @@ -38,10 +38,10 @@ - - + + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Badge.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Badge.xaml new file mode 100644 index 000000000..5bc488ecf --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Badge.xaml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Badge.xaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Badge.xaml.cs new file mode 100644 index 000000000..045bc5678 --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/Badge.xaml.cs @@ -0,0 +1,30 @@ +using Avalonia; +using Avalonia.Collections; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.Metadata; +using System.Collections; + +namespace System.Application.UI.Views.Controls +{ + public class Badge : ContentControl + { + public static readonly StyledProperty TextProperty = + AvaloniaProperty.Register(nameof(Text), string.Empty); + + public static readonly StyledProperty IconProperty = + AvaloniaProperty.Register(nameof(Icon)); + + public string Text + { + get => GetValue(TextProperty); + set => SetValue(TextProperty, value); + } + + public Control Icon + { + get => GetValue(IconProperty); + set => SetValue(IconProperty, value); + } + } +} diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/ProgressRing.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRing.xaml similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/ProgressRing.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRing.xaml diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRing.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRing.xaml.cs similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRing.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRing.xaml.cs diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/ProgressRingArc.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRingArc.xaml similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/ProgressRingArc.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRingArc.xaml diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRingArc.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRingArc.xaml.cs similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRingArc.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ProgressRingArc.xaml.cs diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/Badge.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/Badge.axaml deleted file mode 100644 index bb86ad2bc..000000000 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/Badge.axaml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/Badge.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/Badge.axaml.cs deleted file mode 100644 index 1c4456ed2..000000000 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/Badge.axaml.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Avalonia; -using Avalonia.Collections; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.Metadata; -using System.Collections; - -namespace System.Application.UI.Views.Controls -{ - public partial class Badge : UserControl - { - public Badge() - { - InitializeComponent(); - - } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } - } -} diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_DonatePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_DonatePage.axaml index 091bb32a5..bc49e28c7 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_DonatePage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_DonatePage.axaml @@ -46,7 +46,13 @@ - + + + + + + + @@ -57,6 +63,8 @@ diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml index 408d8dc1f..eeb569aae 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_SoftwarePage.axaml @@ -125,7 +125,7 @@ VerticalAlignment="Center" VerticalContentAlignment="Center"/> - + -English: 沙中金 + English: 沙中金 -Spanish: EspRoy + Spanish: EspRoy -Italian: Zhengye + Italian: Zhengye - + @@ -334,11 +334,11 @@ Italian: Zhengye - + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml index 9ef047a9e..e66993c11 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml @@ -282,8 +282,34 @@ - + + + + + + + + + + + + + + + + + + - - + --> diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml index 88777a9b2..030333e52 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml @@ -201,6 +201,7 @@ diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml index d75fac7df..5777c9bf5 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml @@ -10,7 +10,7 @@ xmlns:ms="using:System.Application.Settings" FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" UseLayoutRounding="True" - WindowStartupLocation="CenterOwner" + WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" MinWidth="450" MinHeight="50" MaxWidth="900" MaxHeight="600" diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj index 7683837e4..f750506bb 100644 --- a/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj +++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Avalonia.csproj @@ -33,6 +33,10 @@ + + + + @@ -58,6 +62,13 @@ + + + + + + MSBuild:Compile + @@ -110,8 +121,8 @@ - - Badge.axaml + + Badge.xaml diff --git a/src/ST.Client/MessageBox.cs b/src/ST.Client/MessageBox.cs index 16ec90347..a4c211cb8 100644 --- a/src/ST.Client/MessageBox.cs +++ b/src/ST.Client/MessageBox.cs @@ -83,6 +83,11 @@ namespace System.Application /// 解锁成就提示 /// UnLockAchievement = 1, + + /// + /// 捐助提示 + /// + Donate = 2, } /// diff --git a/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs b/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs index 785a98b37..94d4ae60e 100644 --- a/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs +++ b/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs @@ -174,5 +174,19 @@ namespace System.Application.UI.ViewModels } }).ForgetAndDispose(); } + + //public async override void Activation() + //{ + // if (IsFirstActivation) + // { + // if (UISettings.DoNotShowMessageBoxs.Value?.Contains(MessageBox.DontPromptType.Donate) == false) + // { + // //INotificationService.Instance.Notify("如果你觉得Steam++好用，你可以考虑给我们一些捐助以支持我们继续开发，谢谢！", NotificationType.Message); + // await MessageBox.ShowAsync("如果你觉得Steam++好用，你可以考虑给我们一些捐助以支持我们继续开发，谢谢！", button: MessageBox.Button.OK, + // rememberChooseKey: MessageBox.DontPromptType.Donate); + // } + // } + // base.Activation(); + //} } } \ No newline at end of file diff --git a/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs index 8d13e6c8a..045ce8dd6 100644 --- a/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Pages/About/AboutPageViewModel.cs @@ -36,7 +36,10 @@ namespace System.Application.UI.ViewModels set => this.RaiseAndSetIfChanged(ref _DonateFliterDate, value); } - private const int DonateListPageSize = 50; + public static readonly DateTimeOffset StartYear = new(2020, 1, 1, 0, 0, 0, TimeSpan.Zero); + public static readonly DateTimeOffset ThisYear = new DateTimeOffset(DateTimeOffset.Now.Year + 1, 1, 1, 0, 0, 0, TimeSpan.Zero).AddDays(-1); + + private const int DonateListPageSize = 100; public AboutPageViewModel() { @@ -173,7 +176,7 @@ namespace System.Application.UI.ViewModels public string LabelVersionDisplay => ThisAssembly.IsAlphaRelease ? "Alpha Version:" : (ThisAssembly.IsBetaRelease ? "Beta Version:" : "Current Version:"); - public string Copyright + public static string Copyright { get {