From e182934a6e5eeb4cb5244d2330772f613434b619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Climent?= Date: Thu, 30 Jan 2025 11:08:20 +0100 Subject: [PATCH] Change button type on telemetry dialog --- .../Pages/DialogPages/DialogHelper_Generic.cs | 65 +++++-------------- 1 file changed, 15 insertions(+), 50 deletions(-) diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs index 868e68d1e..88280e1d5 100644 --- a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs +++ b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs @@ -475,19 +475,9 @@ public static async void ShowTelemetryDialog() XamlRoot = Window.XamlRoot, Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style, }; - - Grid MainGrid = new() - { - RowSpacing = 16, - HorizontalAlignment = HorizontalAlignment.Stretch, - VerticalAlignment = VerticalAlignment.Stretch, - }; - - MainGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) }); - MainGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); - + var MessageBlock = new RichTextBlock(); - MainGrid.Children.Add(MessageBlock); + dialog.Content = MessageBlock; var p = new Paragraph(); MessageBlock.Blocks.Add(p); @@ -518,50 +508,25 @@ public static async void ShowTelemetryDialog() FontWeight = FontWeights.SemiBold }); - var AcceptButton = new Button() + + dialog.PrimaryButtonText = CoreTools.Translate("Decline"); + dialog.SecondaryButtonText = CoreTools.Translate("Accept"); + dialog.DefaultButton = ContentDialogButton.Secondary; + dialog.Closing += (s, e) => { - Content = CoreTools.Translate("Accept"), - HorizontalAlignment = HorizontalAlignment.Stretch, - Height = 32, - Style = (Style)Application.Current.Resources["AccentButtonStyle"], - }; - AcceptButton.Click += (_, _) => - { - dialog.Hide(); - Settings.Set("DisableTelemetry", false); + if (e.Result == ContentDialogResult.None) e.Cancel = true; }; - var DeclineButton = new HyperlinkButton() + var res = await Window.ShowDialogAsync(dialog); + + if (res is ContentDialogResult.Secondary) { - Content = CoreTools.Translate("Decline"), - HorizontalAlignment = HorizontalAlignment.Stretch, - Height = 32, - }; - DeclineButton.Click += (_, _) => + Settings.Set("DisableTelemetry", false); + } + else { - dialog.Hide(); Settings.Set("DisableTelemetry", true); - }; - - Grid sp = new() - { - Margin = new Thickness(-25, 0, -25, -25), - ColumnSpacing = 8, - Padding = new Thickness(30), - HorizontalAlignment = HorizontalAlignment.Stretch, - Background = (Brush)Application.Current.Resources["ApplicationPageBackgroundThemeBrush"] - }; - sp.ColumnDefinitions.Add(new ColumnDefinition(){Width = new(1, GridUnitType.Star)}); - sp.ColumnDefinitions.Add(new ColumnDefinition(){Width = new(1, GridUnitType.Star)}); - sp.Children.Add(DeclineButton); - Grid.SetColumn(AcceptButton, 1); - sp.Children.Add(AcceptButton); - Grid.SetRow(sp, 1); - Grid.SetColumn(sp, 0); - MainGrid.Children.Add(sp); - dialog.Content = MainGrid; - - await Window.ShowDialogAsync(dialog); + } } }