replace messagedialog with contentdialog #193

Author: christiannagel

4_Apps/Patterns/BooksApp/BooksApp/Services/WinUIDialogService.cs

@@ -1,21 +1,15 @@
-using WinRT.Interop;
-
-namespace BooksApp.Services;
+namespace BooksApp.Services;
 
 public class WinUIDialogService : IDialogService
 {
     public async Task ShowMessageAsync(string message)
     {
-        MessageDialog dlg = new(message);
-        var hwnd = GetActiveWindow();
-        if (hwnd == IntPtr.Zero)
+        ContentDialog dlg = new()
         {
-            throw new InvalidOperationException();
-        }
-        InitializeWithWindow.Initialize(dlg, hwnd);
+            Title = "Message",
+            Content = message,
+            PrimaryButtonText = "OK",   
+        };
         await dlg.ShowAsync();
     }
-
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetActiveWindow();
 }

4_Apps/Patterns/BooksLib/ViewModels/BookDetailViewModel.cs

@@ -47,6 +47,8 @@ public override async Task OnSaveAsync()
         {
             if (EditItem is null) throw new InvalidOperationException();
 
+            await _dialogService.ShowMessageAsync("TEst save");
+
             await _itemsService.AddOrUpdateAsync(EditItem);
         }
         catch (Exception ex)

4_Apps/Windows/ControlsSamples/ControlsSamples/Views/ButtonsPage.xaml.cs

@@ -13,10 +13,13 @@ public sealed partial class ButtonsPage : Page
 
         private async void OnButtonClick(object sender, RoutedEventArgs e)
         {         
-            MessageDialog dlg = new("button 1 clicked");
-
-            IntPtr hwnd = WindowNative.GetWindowHandle(this);
-            InitializeWithWindow.Initialize(dlg, hwnd);
+            ContentDialog dlg = new()
+            {
+                Title = "Message",
+                Content = "button 1 clicked",
+                PrimaryButtonText = "OK",
+                XamlRoot = this.Content.XamlRoot
+            };
             await dlg.ShowAsync();
         }
     }

4_Apps/Windows/ControlsSamples/ControlsSamples/Views/DateSelectionPage.xaml.cs

@@ -98,33 +98,33 @@ private async void OnDatesChanged(CalendarView sender, CalendarViewSelectedDates
 
         string selectedDates = string.Join(", ", currentDatesSelected.Select(d => d.ToString("d")));
 
-        // await new MessageDialog($"dates selected: {selectedDates}").ShowAsync();
         await ShowMessageAsync($"dates selected: {selectedDates}");
     }
 
     private async void OnDateChanged(CalendarDatePicker sender, CalendarDatePickerDateChangedEventArgs args)
     {
-        // await new MessageDialog($"date changed to {args.NewDate}").ShowAsync();
         await ShowMessageAsync($"date changed to: {args.NewDate}");
     }
 
     private async void OnDateChanged1(object sender, DatePickerValueChangedEventArgs e)
     {
-        // await new MessageDialog($"date changed to {e.NewDate}").ShowAsync();
         await ShowMessageAsync($"date changed to: {e.NewDate}");
     }
 
     private async void OnDatePicked(DatePickerFlyout sender, DatePickedEventArgs args)
     {
-        // await new MessageDialog($"date changed to {args.NewDate}").ShowAsync();
         await ShowMessageAsync($"date changed to: {args.NewDate}");
     }
 
     private async Task ShowMessageAsync(string message)
     {
-        MessageDialog dlg = new(message);
-        IntPtr hwnd = WindowNative.GetWindowHandle(this);
-        InitializeWithWindow.Initialize(dlg, hwnd);
+        ContentDialog dlg = new()
+        {
+            Title = "Message",
+            Content = message,
+            PrimaryButtonText = "OK",
+            XamlRoot = this.XamlRoot
+        };
         await dlg.ShowAsync();
     }
 }

4_Apps/Windows/XAMLIntro/Intro/Intro/Intro/MainWindow.xaml.cs

@@ -24,9 +24,14 @@ public MainWindow()
 
         button2.Click += async (sender, e) =>
         {
-            MessageDialog dlg = new("button 2 clicked");
-            IntPtr hwnd = WindowNative.GetWindowHandle(this);
-            InitializeWithWindow.Initialize(dlg, hwnd);
+            ContentDialog dlg = new()
+            {
+                Title = "Message",
+                Content = "button 2 clicked",
+                PrimaryButtonText = "OK",
+                XamlRoot = this.Content.XamlRoot
+            };
+
             await dlg.ShowAsync();
         };
 
@@ -37,9 +42,13 @@ public MainWindow()
 
     private async void OnButtonClick(object sender, RoutedEventArgs e)
     {
-        MessageDialog dlg = new("button 1 clicked");
-        IntPtr hwnd = WindowNative.GetWindowHandle(this);
-        InitializeWithWindow.Initialize(dlg, hwnd);
+        ContentDialog dlg = new()
+        {
+            Title = "Message",
+            Content = "button 1 clicked",
+            PrimaryButtonText = "OK",
+            XamlRoot = this.Content.XamlRoot
+        };
         await dlg.ShowAsync();
     }
 }