コミット: 71ec7075978b32b6f50058d8f72c8b0ac870b142 - TestNarou3 (git)

なろうブックマーク分析用ツールのPrism+WinUI3サンプル実装

コミットメタ情報

• リビジョン: 71ec7075978b32b6f50058d8f72c8b0ac870b142 (tree)
• 日時: 2022-08-18 00:28:38
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[UPD] アプリケーション終了時に各 ViewModel を明示的に破棄するようにした

変更サマリ

• modified: TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IMainWindowViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/LoginFormViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
• modified: TestNarou3.OuterEdge/UI/View/MainWindowView.xaml.cs
• modified: TestNarou3/App.xaml.cs

差分

--- a/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IMainWindowViewModel.cs
+++ b/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IMainWindowViewModel.cs
@@ -7,6 +7,7 @@ namespace TestNarou3.Adaptor.Boundary.Gateway.ViewModel
         public static readonly string REGION_NAME = "MainContentPane";
 
         ReactiveProperty<string> Title { get; }
-        ReactiveCommand CommandClosed { get; }
+
+        void OnClosing();
     }
 }
\ No newline at end of file

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
@@ -16,7 +16,7 @@ using TestNarou3.Domain.Model.Entity.Child;
 namespace TestNarou3.Adaptor.Gateway.ViewModel
 {
     internal class BookmarkCategoryViewModel
-            : IBookmarkCategoryViewModel, INotifyPropertyChanged, IDestructible
+            : IBookmarkCategoryViewModel, INotifyPropertyChanged, IDestructible, IDisposable
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
@@ -33,7 +33,9 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
         public IAppWindowController WindowController { get; }
 
         private readonly IBookmarkCategoryRowViewModelTranslator vmTranslator;
+
         private readonly CompositeDisposable disposables = new();
+        private bool disposedValue;
 
         public BookmarkCategoryViewModel(
                 IAppWindowController wc,
@@ -46,6 +48,8 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             this.SelectedItem.Subscribe(OnSelectedItemChanged).AddTo(disposables);
         }
 
+        #region event handler
+
         private void OnSelectedItemChanged(IBookmarkCategoryRowViewModel row)
         {
             if (row == null)
@@ -55,6 +59,10 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             this.WindowController.NavigateBookmarkListView(row.Index);
         }
 
+        #endregion
+
+        #region vm operation
+
         public void SynchronizeWith(BookmarkCategory source)
         {
             if (this.Source == null)
@@ -83,10 +91,55 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             }
         }
 
+        #endregion
+
+        #region IDestructible
+
         public void Destroy()
         {
-            this.disposables.Dispose();
+            this.Dispose();
         }
 
+        #endregion
+
+        #region IDisposable
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    DisposeSynchronizedView();
+
+                    this.disposables.Dispose();
+
+                    logger.Trace("BookmarkCategoryViewModel disposed.");
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        private void DisposeSynchronizedView()
+        {
+            foreach (var row in this.Rows)
+            {
+                if (row is IDisposable disposable)
+                {
+                    disposable.Dispose();
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            // このコードを変更しないでください。クリーンアップ コードを 'Dispose(bool disposing)' メソッドに記述します
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
+
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -17,7 +17,7 @@ using TestNarou3.Domain.Model.Entity.Child;
 namespace TestNarou3.Adaptor.Gateway.ViewModel
 {
     internal class BookmarkDetailListViewModel
-            : IBookmarkDetailListViewModel, INotifyPropertyChanged, IDestructible
+            : IBookmarkDetailListViewModel, INotifyPropertyChanged, IDestructible, IDisposable
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
@@ -36,9 +36,10 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
         private IAppWindowController WindowController { get; }
 
         private IBookmarkDetailListRowViewModel selectedRow;
-
         private readonly IBookmarkDetailListRowViewModelTranslator vmTranslator;
+
         private readonly CompositeDisposable disposables = new();
+        private bool disposedValue;
 
         public BookmarkDetailListViewModel(
                 IAppWindowController wc,
@@ -54,6 +55,8 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
                     .WithSubscribe(OpenBookmark).AddTo(disposables);
         }
 
+        #region event handler
+
         private void OnSelectedItemChanged(IBookmarkDetailListRowViewModel selectedRow)
         {
             this.selectedRow = selectedRow;
@@ -74,6 +77,10 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
         }
 
+        #endregion
+
+        #region vm operation
+
         public void SynchronizeWith(BookmarkDetailList source)
         {
             if (this.Source == null)
@@ -96,10 +103,55 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             }
         }
 
+        #endregion
+
+        #region IDestructible
+
         public void Destroy()
         {
-            this.disposables.Dispose();
+            this.Dispose();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    DisposeSynchronizedView();
+
+                    this.disposables.Dispose();
+
+                    logger.Trace("BookmarkDetailListViewModel disposed.");
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        private void DisposeSynchronizedView()
+        {
+            foreach (var row in this.Rows)
+            {
+                if (row is IDisposable disposable)
+                {
+                    disposable.Dispose();
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            // このコードを変更しないでください。クリーンアップ コードを 'Dispose(bool disposing)' メソッドに記述します
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
         }
 
+        #endregion
+
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkViewModel.cs
@@ -1,24 +1,56 @@
-using Prism.Navigation;
+using NLog;
+using Prism.Navigation;
 using System.ComponentModel;
 using System.Reactive.Disposables;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel;
 
 namespace TestNarou3.Adaptor.Gateway.ViewModel
 {
-    internal class BookmarkViewModel : IBookmarkViewModel, IDestructible
+    internal class BookmarkViewModel : IBookmarkViewModel, IDestructible, IDisposable
     {
-        //private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
+        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
 #pragma warning disable CS0067
         public event PropertyChangedEventHandler PropertyChanged;
 #pragma warning restore CS0067
 
         private readonly CompositeDisposable disposables = new();
+        private bool disposedValue;
+
+        #region IDestructible
 
         public void Destroy()
         {
-            this.disposables.Dispose();
+            this.Dispose();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    this.disposables.Dispose();
+
+                    logger.Trace("BookmarkViewModel disposed.");
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // このコードを変更しないでください。クリーンアップ コードを 'Dispose(bool disposing)' メソッドに記述します
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
         }
 
+        #endregion
+
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/LoginFormViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/LoginFormViewModel.cs
@@ -11,7 +11,7 @@ using TestNarou3.UseCase.Request;
 
 namespace TestNarou3.Adaptor.Gateway.ViewModel
 {
-    internal class LoginFormViewModel : ILoginFormViewModel, IDestructible
+    internal class LoginFormViewModel : ILoginFormViewModel, IDestructible, IDisposable
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
@@ -26,6 +26,7 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
         private readonly IAppWindowController wc;
 
         private readonly CompositeDisposable disposables = new();
+        private bool disposedValue;
 
         public LoginFormViewModel(IAppWindowController wc)
         {
@@ -37,11 +38,41 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             this.CommandLogin = new ReactiveCommand().WithSubscribe(OnLogin).AddTo(disposables);
         }
 
+        #region IDestructible
+
         public void Destroy()
         {
-            this.disposables.Dispose();
+            this.Dispose();
         }
 
+        #endregion
+
+        #region IDisposable
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    this.disposables.Dispose();
+
+                    logger.Trace("LoginFormViewModel disposed.");
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // このコードを変更しないでください。クリーンアップ コードを 'Dispose(bool disposing)' メソッドに記述します
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
+
         #region event handler
 
         private void OnLogin()
@@ -72,5 +103,6 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
         }
 
         #endregion
+
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
@@ -1,4 +1,6 @@
-using Prism.Navigation;
+using NLog;
+using Prism.Navigation;
+using Prism.Regions;
 using Reactive.Bindings;
 using Reactive.Bindings.Extensions;
 using System.Reactive.Disposables;
@@ -9,37 +11,75 @@ using TestNarou3.UseCase.Request;
 
 namespace TestNarou3.Adaptor.Gateway.ViewModel
 {
-    internal class MainWindowViewModel : IMainWindowViewModel, IDestructible
+    internal class MainWindowViewModel : IMainWindowViewModel, IDestructible, IDisposable
     {
-        private IAppWindowController wc;
+        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
         public ReactiveProperty<string> Title { get; }
 
-        public ReactiveCommand CommandClosed { get; }
+        private readonly IAppWindowController wc;
+        private readonly IRegionManager rm;
 
         private readonly CompositeDisposable disposables = new();
+        private bool disposedValue;
 
         public MainWindowViewModel(
                 IAppCaptionFormatter caption,
-                IAppWindowController wc)
+                IAppWindowController wc,
+                IRegionManager rm)
         {
             this.wc = wc;
+            this.rm = rm;
 
             this.Title = new ReactiveProperty<string>(caption.GetCaption()).AddTo(disposables);
-
-            this.CommandClosed = new ReactiveCommand().WithSubscribe(OnClosed).AddTo(disposables);
         }
 
-        private void OnClosed()
+        public void OnClosing()
         {
             _ = this.wc.Execute(new NarouLogoutRequest());
             _ = this.wc.Execute(new AppConfigSaveRequest());
+
+            this.Dispose();
         }
 
+        #region IDestructible
+
         public void Destroy()
         {
-            this.disposables.Dispose();
+            this.Dispose();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    this.disposables.Dispose();
+
+                    logger.Trace("MainWindowViewModel disposed.");
+
+                    foreach (IRegion region in rm.Regions)
+                    {
+                        region.RemoveAll();
+                    }
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // このコードを変更しないでください。クリーンアップ コードを 'Dispose(bool disposing)' メソッドに記述します
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
         }
+        #endregion
 
     }
 }

--- a/TestNarou3.OuterEdge/UI/View/MainWindowView.xaml.cs
+++ b/TestNarou3.OuterEdge/UI/View/MainWindowView.xaml.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using TestNarou3.Adaptor.Boundary.Gateway.ViewModel;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
@@ -20,8 +21,12 @@ namespace TestNarou3.OuterEdge.UI.View
 {
     public sealed partial class MainWindowView : UserControl
     {
-        public MainWindowView()
+        public IMainWindowViewModel ViewModel { get; }
+
+        public MainWindowView(IMainWindowViewModel viewModel)
         {
+            this.ViewModel = viewModel;
+
             this.InitializeComponent();
         }
     }

--- a/TestNarou3/App.xaml.cs
+++ b/TestNarou3/App.xaml.cs
@@ -3,6 +3,8 @@
 using AutoMapper;
 using CleanAuLait;
 using CleanAuLait.Core.Log;
+using Microsoft.UI;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using NLog;
@@ -14,6 +16,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using TestNarou3.Adaptor;
 using TestNarou3.Adaptor.Boundary.Controller;
+using TestNarou3.Adaptor.Boundary.Gateway.ViewModel;
 using TestNarou3.Core.Mapper;
 using TestNarou3.Domain;
 using TestNarou3.Infra;
@@ -243,6 +246,9 @@ public partial class App : PrismApplication
 
         PrepareInitialView();
 
+        AppWindow appWindow = GetCurrentAppWindow();
+        appWindow.Closing += OnClosing;
+
         logger.Trace("OnStartup end");
     }
 
@@ -257,6 +263,24 @@ public partial class App : PrismApplication
         wc.NavigateLoginFormView();
     }
 
+    private AppWindow GetCurrentAppWindow()
+    {
+        IntPtr hwnd = WinRT.Interop.WindowNative.GetWindowHandle(MainWindow);
+        WindowId winId = Win32Interop.GetWindowIdFromWindow(hwnd);
+
+        return AppWindow.GetFromWindowId(winId);
+    }
+
+    private void OnClosing(AppWindow sender, AppWindowClosingEventArgs args)
+    {
+        logger.Trace("OnClosing called.");
+
+        var vm = Container.Resolve<IMainWindowViewModel>();
+        vm.OnClosing();
+
+        LogManager.Shutdown();
+    }
+
 #if false
     protected override void OnExit(ExitEventArgs e)
     {