Skip to content

Commit ec30306

Browse files
committed
fix(Avalonia): make AboutWindow donate button call Donation dialog
1 parent 69a7036 commit ec30306

5 files changed

Lines changed: 27 additions & 6 deletions

File tree

SnapX.Avalonia/Views/About/AboutWindow.axaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,9 @@
132132
</StackPanel>
133133
</Button>
134134
<Button
135-
Click="DynamicURL_OnPointerPressed"
135+
Click="DonateButton_Click"
136136
ClickMode="Press"
137-
Cursor="Hand"
138-
ToolTip.Tip="{Binding Donate}">
137+
Cursor="Hand">
139138
<StackPanel Orientation="Horizontal" Spacing="5">
140139
<avalonia:FluentIcon
141140
Icon="MoneyHand"

SnapX.Avalonia/Views/About/AboutWindow.axaml.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
using Avalonia.Media.Immutable;
77
using Avalonia.Styling;
88
using FluentAvalonia.Styling;
9+
using FluentAvalonia.UI.Controls;
910
using FluentAvalonia.UI.Media;
1011
using FluentAvalonia.UI.Windowing;
1112
using SnapX.Avalonia.ViewModels;
13+
using SnapX.Avalonia.Views.Controls;
1214
using SnapX.Core;
1315
using SnapX.Core.Utils;
1416

@@ -122,4 +124,22 @@ private async void AboutWindow_OnInitialized(object? Sender, EventArgs E)
122124
{
123125
await ViewModel.InitDataCommand.ExecuteAsync(this);
124126
}
127+
128+
private void DonateButton_Click(object? Sender, RoutedEventArgs E)
129+
{
130+
var donationMenu = new Donation();
131+
var dialog = new ContentDialog
132+
{
133+
Title = Lang.KeepSnapXOpenAndFree,
134+
Content = donationMenu,
135+
IsPrimaryButtonEnabled = true,
136+
PrimaryButtonText = Lang.CountMeIn,
137+
IsSecondaryButtonEnabled = true,
138+
SecondaryButtonText = Lang.MaybeLater,
139+
DefaultButton = ContentDialogButton.Primary,
140+
PrimaryButtonCommand = donationMenu.PrimaryClickCommand,
141+
FullSizeDesired = true
142+
};
143+
dialog.ShowAsync(this);
144+
}
125145
}

SnapX.Avalonia/Views/Donation.axaml renamed to SnapX.Avalonia/Views/Controls/Donation.axaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
d:DesignHeight="450"
33
d:DesignWidth="800"
44
mc:Ignorable="d"
5-
x:Class="SnapX.Avalonia.Views.Donation"
5+
x:Class="SnapX.Avalonia.Views.Controls.Donation"
66
xmlns="https://github.com/avaloniaui"
77
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
88
xmlns:core="clr-namespace:SnapX.Core.Utils;assembly=SnapX.Core"
@@ -17,13 +17,14 @@
1717
<Image
1818
Height="150"
1919
Name="BurritoImage"
20-
Source="../Assets/SnapX_Icon.ico"
20+
Source="avares://snapx-ui/SnapX_Logo.png"
2121
Stretch="Uniform"
2222
Width="150" />
2323
<SelectableTextBlock
2424
FontStyle="Italic"
2525
FontWeight="SemiLight"
2626
HorizontalAlignment="Center"
27+
TextAlignment="Center"
2728
TextWrapping="Wrap"
2829
VerticalAlignment="Center">
2930
SnapX is free to use, but the work that goes into it isn't.

SnapX.Avalonia/Views/Donation.axaml.cs renamed to SnapX.Avalonia/Views/Controls/Donation.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using SnapX.Core;
77
using SnapX.Core.Utils;
88

9-
namespace SnapX.Avalonia.Views;
9+
namespace SnapX.Avalonia.Views.Controls;
1010

1111

1212
public partial class Donation : UserControl

SnapX.Avalonia/Views/MainView.axaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using CommunityToolkit.Mvvm.Input;
66
using FluentAvalonia.UI.Controls;
77
using SnapX.Avalonia.ViewModels;
8+
using SnapX.Avalonia.Views.Controls;
89
using SnapX.Core;
910
using SnapX.Core.Job;
1011
using SnapX.Core.Upload;

0 commit comments

Comments
 (0)