Preparations for AboutDialog

RolandKoenig · Dec 4, 2020 · 082fa84 · 082fa84
1 parent 478e1bd
commit 082fa84
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 12 deletions.
diff --git a/MessageCommunicator.TestGui/MainWindow.xaml b/MessageCommunicator.TestGui/MainWindow.xaml
@@ -63,6 +63,10 @@
                     <MenuItem Header="Light" PointerPressed="OnMnuThemeLight_PointerPressed" />
                     <MenuItem Header="Dark" PointerPressed="OnMnuThemeDark_PointerPressed" />
                 </MenuItem>
+                <MenuItem Header="Info"
+                          Classes="MainMenu">
+                    <MenuItem Header="About" Command="{Binding Path=Command_ShowAboutDialog}" />
+                </MenuItem>
             </Menu>
 
             <GridSplitter Grid.Column="1" Grid.Row="1"

diff --git a/MessageCommunicator.TestGui/MainWindow.xaml.cs b/MessageCommunicator.TestGui/MainWindow.xaml.cs
@@ -30,6 +30,7 @@ public MainWindow()
             this.ViewServices.Add(new ImportViewService(ctrlDialogHost));
             this.ViewServices.Add(new SaveFileDialogService(this));
             this.ViewServices.Add(new OpenFileDialogService(this));
+            this.ViewServices.Add(new AboutDialogService(ctrlDialogHost));
 
             // Load initial main view model
             this.ViewModel = new MainWindowViewModel();

diff --git a/MessageCommunicator.TestGui/MainWindowViewModel.cs b/MessageCommunicator.TestGui/MainWindowViewModel.cs
@@ -51,13 +51,16 @@ public ConnectionProfileViewModel? SelectedProfile
 
         public ReactiveCommand<object?, Unit> Command_DeleteProfile { get; }
 
+        public ReactiveCommand<object?, Unit> Command_ShowAboutDialog { get; }
+
         public MainWindowViewModel()
         {
-            this.Command_ImportProfiles = ReactiveCommand.CreateFromTask<object?>(this.ImportProfilesAsync);
-            this.Command_ExportProfiles = ReactiveCommand.CreateFromTask<object?>(this.ExportProfilesAsync);
-            this.Command_CreateProfile = ReactiveCommand.CreateFromTask<object?>(this.CreateProfileAsync);
-            this.Command_EditProfile = ReactiveCommand.CreateFromTask<object?>(this.EditProfileAsync);
-            this.Command_DeleteProfile = ReactiveCommand.CreateFromTask<object?>(this.DeleteSelectedProfile);
+            this.Command_ImportProfiles = ReactiveCommand.CreateFromTask<object?>(this.OnCommand_ImportProfiles_ExecuteAsync);
+            this.Command_ExportProfiles = ReactiveCommand.CreateFromTask<object?>(this.OnCommand_ExportProfiles_ExecuteAsync);
+            this.Command_CreateProfile = ReactiveCommand.CreateFromTask<object?>(this.OnCommand_CreateProfile_ExecuteAsync);
+            this.Command_EditProfile = ReactiveCommand.CreateFromTask<object?>(this.OnCommand_EditProfile_ExecuteAsync);
+            this.Command_DeleteProfile = ReactiveCommand.CreateFromTask<object?>(this.OnCommand_DeleteProfile_ExecuteAsync);
+            this.Command_ShowAboutDialog = ReactiveCommand.CreateFromTask<object?>(this.OnCommand_ShowAboutDialog_ExecuteAsync);
 
             this.SendMessageVM = new SendMessageViewModel();
 
@@ -97,7 +100,7 @@ protected override void OnActivated(CompositeDisposable disposables)
             disposables.Add(new DummyDisposable(() => timer.Stop()));
         }
 
-        private async Task ImportProfilesAsync(object? arg, CancellationToken cancelToken)
+        private async Task OnCommand_ImportProfiles_ExecuteAsync(object? arg, CancellationToken cancelToken)
         {
             var connectionProfiles = this.Profiles
                 .Select(actProfile => actProfile.Model.Parameters)
@@ -135,7 +138,7 @@ private async Task ImportProfilesAsync(object? arg, CancellationToken cancelToke
             }  
         }
 
-        private async Task ExportProfilesAsync(object? arg, CancellationToken cancelToken)
+        private async Task OnCommand_ExportProfiles_ExecuteAsync(object? arg, CancellationToken cancelToken)
         {
             if (this.Profiles.Count == 0)
             {
@@ -154,7 +157,7 @@ await srvExportDlg.ExportAsync(
                 Constants.DATA_TYPE_CONNECTION_PROFILES);
         }
 
-        private async Task CreateProfileAsync(object? arg, CancellationToken cancelToken)
+        private async Task OnCommand_CreateProfile_ExecuteAsync(object? arg, CancellationToken cancelToken)
         {
             var srvConnectionConfig = this.GetViewService<IConnectionConfigViewService>();
             var connParams = await srvConnectionConfig.ConfigureConnectionAsync(null);
@@ -171,7 +174,7 @@ private async Task CreateProfileAsync(object? arg, CancellationToken cancelToken
             }
         }
 
-        private async Task EditProfileAsync(object? arg, CancellationToken cancelToken)
+        private async Task OnCommand_EditProfile_ExecuteAsync(object? arg, CancellationToken cancelToken)
         {
             var selectedProfileVM = this.SelectedProfile;
             if (selectedProfileVM == null) { return; }
@@ -200,7 +203,7 @@ private async Task EditProfileAsync(object? arg, CancellationToken cancelToken)
             }
         }
 
-        private async Task DeleteSelectedProfile(object? arg, CancellationToken cancelToken)
+        private async Task OnCommand_DeleteProfile_ExecuteAsync(object? arg, CancellationToken cancelToken)
         {
             var selectedProfile = this.SelectedProfile;
             if (selectedProfile == null) { return; }
@@ -222,5 +225,11 @@ private async Task DeleteSelectedProfile(object? arg, CancellationToken cancelTo
             ConnectionProfileStore.Current.StoreConnectionProfiles(
                 this.Profiles.Select(actProfileVM => actProfileVM.Model));
         }
+
+        private Task OnCommand_ShowAboutDialog_ExecuteAsync(object? arg, CancellationToken cancelToken)
+        {
+            var srvAboutDlg = this.GetViewService<IAboutDialogService>();
+            return srvAboutDlg.ShowAboutDialogAsync();
+        }
     }
 }
diff --git a/MessageCommunicator.TestGui/MessageCommunicator.TestGui.csproj b/MessageCommunicator.TestGui/MessageCommunicator.TestGui.csproj
@@ -43,6 +43,7 @@
     <None Remove="Assets\MessageCommunicator.ico" />
     <None Remove="Assets\Styles\Common.xaml" />
     <None Remove="MessageCommunicator.TestGui.csproj.DotSettings" />
+    <None Remove="ViewServices\_AboutDialog\AboutDialogControl.xaml" />
     <None Remove="ViewServices\_ExportDialog\ExportDialogControl.xaml" />
     <None Remove="ViewServices\_ImportDialog\ImportDialogControl.xaml" />
     <None Remove="Views\_SendMessage\SendMessageView.xaml" />
@@ -60,6 +61,9 @@
     <AvaloniaResource Update="Assets\Icons.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaResource>
+    <AvaloniaResource Update="ViewServices\_AboutDialog\AboutDialogControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
     <AvaloniaResource Update="ViewServices\_ExportDialog\ExportDialogControl.xaml">
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaResource>
@@ -71,6 +75,9 @@
     </AvaloniaResource>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="ViewServices\_AboutDialog\AboutDialogControl.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
     <Compile Update="ViewServices\_ExportDialog\ExportDialogControl.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>

diff --git a/MessageCommunicator.TestGui/MessageCommunicator.TestGui.xml b/MessageCommunicator.TestGui/MessageCommunicator.TestGui.xml
diff --git a/MessageCommunicator.TestGui/ViewServices/IAboutDialogService.cs b/MessageCommunicator.TestGui/ViewServices/IAboutDialogService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MessageCommunicator.TestGui.ViewServices
+{
+    public interface IAboutDialogService : IViewService
+    {
+        Task ShowAboutDialogAsync();
+    }
+}
diff --git a/MessageCommunicator.TestGui/ViewServices/_AboutDialog/AboutDialogControl.xaml b/MessageCommunicator.TestGui/ViewServices/_AboutDialog/AboutDialogControl.xaml
@@ -0,0 +1,14 @@
+<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"
+        xmlns:local="clr-namespace:MessageCommunicator.TestGui.ViewServices;assembly=MessageCommunicator.TestGui"
+        xmlns:localRoot="clr-namespace:MessageCommunicator.TestGui;assembly=MessageCommunicator.TestGui"
+        mc:Ignorable="d"
+        Width="610" Height="400"
+        x:Class="MessageCommunicator.TestGui.ViewServices.AboutDialogControl">
+
+    <Grid>
+        <TextBox>About ;)</TextBox>
+    </Grid>
+</UserControl>
diff --git a/MessageCommunicator.TestGui/ViewServices/_AboutDialog/AboutDialogControl.xaml.cs b/MessageCommunicator.TestGui/ViewServices/_AboutDialog/AboutDialogControl.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel;
+using System.Reactive.Disposables;
+using System.Runtime.InteropServices.ComTypes;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+
+namespace MessageCommunicator.TestGui.ViewServices
+{
+    public class AboutDialogControl : OwnUserControlDialog<OwnViewModelBase>
+    {
+        public AboutDialogControl()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/MessageCommunicator.TestGui/ViewServices/_AboutDialog/AboutDialogService.cs b/MessageCommunicator.TestGui/ViewServices/_AboutDialog/AboutDialogService.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MessageCommunicator.TestGui.ViewServices
+{
+    public class AboutDialogService : ViewServiceBase, IAboutDialogService
+    {
+        private DialogHostControl _host;
+
+        public AboutDialogService(DialogHostControl host)
+        {
+            _host = host;
+        }
+
+        /// <inheritdoc />
+        public Task ShowAboutDialogAsync()
+        {
+            var aboutDialogControl = new AboutDialogControl();
+            return _host.ShowDialogAsync(aboutDialogControl, "About");
+        }
+    }
+}
diff --git a/MessageCommunicator.TestGui/_Util/_View/DialogHostControl.cs b/MessageCommunicator.TestGui/_Util/_View/DialogHostControl.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -37,6 +38,11 @@ public DialogHostControl()
         }
 
         public void ShowDialog(Control controlToShow, string headerText)
+        {
+            this.ShowDialogAsync(controlToShow, headerText);
+        }
+
+        public Task ShowDialogAsync(Control controlToShow, string headerText)
         {
             var currentChild = controlToShow;
             var currentChildInitialSize = new Size(currentChild.Width, currentChild.Height);
@@ -55,7 +61,11 @@ public void ShowDialog(Control controlToShow, string headerText)
             var currentBackground = new Grid();
             currentBackground.Background = _backgroundDialog;
 
-            _children.Push(new ChildInfo(currentChild, currentChildBorder, currentChildInitialSize, currentBackground));
+            var taskComplSource = new TaskCompletionSource<object?>();
+            _children.Push(new ChildInfo(
+                currentChild, currentChildBorder, 
+                currentChildInitialSize, currentBackground,
+                taskComplSource));
 
             this.Children.Add(currentBackground);
             this.Children.Add(borderControl);
@@ -67,6 +77,8 @@ public void ShowDialog(Control controlToShow, string headerText)
             }
 
             this.UpdateBorderSize();
+
+            return taskComplSource.Task;
         }
 
         public void CloseDialog()
@@ -77,6 +89,7 @@ public void CloseDialog()
             }
             this.Children.Remove(removedChild.ChildBorder);
             this.Children.Remove(removedChild.ChildBackground);
+            removedChild.TaskComplSource.TrySetResult(null);
 
             if (_children.Count == 0)
             {
@@ -156,12 +169,21 @@ public Size InitialSize
                 get;
             }
 
-            internal ChildInfo(Control child, Control childBorder, Size initialSize, Grid childBackground)
+            public TaskCompletionSource<object?> TaskComplSource
+            {
+                get;
+            }
+
+            internal ChildInfo(
+                Control child, Control childBorder, 
+                Size initialSize, Grid childBackground,
+                TaskCompletionSource<object?> taskComplSource)
             {
                 this.Child = child;
                 this.ChildBorder = childBorder;
                 this.InitialSize = initialSize;
                 this.ChildBackground = childBackground;
+                this.TaskComplSource = taskComplSource;
             }
         }
     }