コミット: 281b6e05c99f3d3dd62848cf5313e5938c8d037a - TestNarou3 (git)

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

コミットメタ情報

• リビジョン: 281b6e05c99f3d3dd62848cf5313e5938c8d037a (tree)
• 日時: 2022-08-24 01:34:21
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[MOD] ObservableCollectionMod を本体プロジェクトから分離したことによる対応
[MOD] SortableSynchronizedCoupleView によるソート処理の実装（作者列のみ移行）

変更サマリ

• modified: TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs
• modified: TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
• modified: TestNarou3.Infra/TestNarou3.90Infra.csproj
• modified: TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml.cs
• modified: TestNarou3.sln
• modified: TestNarou3/Properties/launchSettings.json

差分

--- a/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs
+++ b/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs
@@ -1,4 +1,5 @@
-using ObservableCollections;
+using CleanAuLait.ObservableCollectionsMod;
+using ObservableCollections;
 using Reactive.Bindings;
 using TestNarou3.Adaptor.Boundary.Controller;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child;

--- a/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
@@ -1,7 +1,5 @@
-using ObservableCollections;
+using CleanAuLait.ObservableCollectionsMod;
 using Reactive.Bindings;
-using System;
-using System.ComponentModel;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child;
 using TestNarou3.Domain.Model.Entity;
 using TestNarou3.Domain.Model.Entity.Child;
@@ -23,5 +21,7 @@ namespace TestNarou3.Adaptor.Boundary.Gateway.ViewModel
         BookmarkDetailList Source { get; }
 
         void SynchronizeWith(BookmarkDetailList list);
+
+        void Sort(string tag, Func<IBookmarkDetailListRowViewModel, string> selector, bool asceding);
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -1,9 +1,11 @@
 using CleanAuLait.Core.Log;
+using CleanAuLait.ObservableCollectionsMod;
 using NLog;
 using ObservableCollections;
 using Prism.Navigation;
 using Reactive.Bindings;
 using Reactive.Bindings.Extensions;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Reactive.Disposables;
@@ -28,6 +30,7 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
         public ReactiveProperty<IBookmarkDetailListRowViewModel> SelectedItem { get; }
 
         public INotifyCollectionChangedListSynchronizedSingleView<BookmarkDetailListRow, IBookmarkDetailListRowViewModel> Rows { get; private set; } = null;
+        private ISortableSynchronizedCoupleView<BookmarkDetailListRow, string, IBookmarkDetailListRowViewModel> SortableRows { get; set; }
 
         public ReactiveCommand CommandOpenBookmark { get; }
 
@@ -83,10 +86,13 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
 
         public void SynchronizeWith(BookmarkDetailList source)
         {
+#if true
             if (this.Source == null)
             {
-                this.Rows = source.Rows
-                        .ToSynchronizedCoupleView(r => this.vmTranslator.Translate(r, this))
+                this.SortableRows = source.Rows
+                        .ToSortableSynchronizedCoupleView(r => r.NCode, r => this.vmTranslator.Translate(r, this), new DetailListComparer(r => r.Title.Value, true));
+
+                this.Rows = this.SortableRows
                         .ToSynchronizedSingleView()
                         .WithINotifyCollectionChangedList()
                         .AddTo(disposables);
@@ -101,6 +107,56 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
                 logger.Trace("BookmarkDetailListViewModel.SynchronizeWith: viewmodel already synchronized to model [{0}]",
                         this.Source.ToHashString());
             }
+#else
+            if (this.Rows != null)
+            {
+                this.Rows.Dispose();
+                this.disposables.Remove(this.Rows);
+            }
+
+            this.SortableRows = new FreezedList<BookmarkDetailListRow>(source.Rows)
+                    .ToSynchronizedSortableCoupleView(r => this.vmTranslator.Translate(r, this),
+                            new ViewComparer<IBookmarkDetailListRowViewModel, string>(r => r.Title.Value));
+
+            this.Rows = this.SortableRows
+                    .ToSynchronizedSingleView()
+                    .WithINotifyCollectionChangedList()
+                    .AddTo(disposables);
+
+            this.Source = source;
+
+            //            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Rows"));
+#endif
+        }
+
+        public void Sort(string tag, Func<IBookmarkDetailListRowViewModel, string> selector, bool ascending)
+        {
+            logger.Trace("Sort: {0}, ascending = {1}", tag, ascending);
+            this.SortableRows.Sort(new DetailListComparer(selector, ascending));
+        }
+
+        internal class DetailListComparer : IComparer<(string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel)>
+        {
+            readonly Func<IBookmarkDetailListRowViewModel, string> selector;
+            readonly int f;
+
+            public DetailListComparer(Func<IBookmarkDetailListRowViewModel, string> selector, bool ascending = true)
+            {
+                this.selector = selector;
+                this.f = ascending ? 1 : -1;
+            }
+
+            public int Compare((string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel) x, (string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel) y)
+            {
+                int c = selector(x.Item3).CompareTo(selector(y.Item3)) * f;
+
+                if (c == 0)
+                {
+                    c = x.Item1.CompareTo(y.Item1);
+                }
+
+                return c;
+            }
         }
 
         #endregion

--- a/TestNarou3.Infra/TestNarou3.90Infra.csproj
+++ b/TestNarou3.Infra/TestNarou3.90Infra.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj" />
     <ProjectReference Include="..\..\CleanAuLait.Prism.WinUI3\CleanAuLait.Prism.WinUI3.csproj" />
-    <ProjectReference Include="..\..\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj" />
   </ItemGroup>
 </Project>

--- a/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml.cs
+++ b/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml.cs
@@ -49,14 +49,16 @@ namespace TestNarou3.OuterEdge.UI.View
                 case "Writer":
                     if ((e.Column.SortDirection == null) || (direction == DataGridSortDirection.Descending))
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.Writer.Value ascending select item);
+                        //dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
+                        //        from item in ViewModel.Rows orderby item.Writer.Value ascending select item);
+                        this.ViewModel.Sort(tag, r => r.Writer.Value, true);
                         e.Column.SortDirection = DataGridSortDirection.Ascending;
                     }
                     else
                     {
-                        dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
-                                from item in ViewModel.Rows orderby item.Writer.Value descending select item);
+                        //dg.ItemsSource = new ObservableCollection<IBookmarkDetailListRowViewModel>(
+                        //        from item in ViewModel.Rows orderby item.Writer.Value descending select item);
+                        this.ViewModel.Sort(tag, r => r.Writer.Value, false);
                         e.Column.SortDirection = DataGridSortDirection.Descending;
                     }
                     break;
@@ -359,7 +361,6 @@ namespace TestNarou3.OuterEdge.UI.View
                     dgColumn.SortDirection = null;
                 }
             }
-
         }
     }
 }

--- a/TestNarou3.sln
+++ b/TestNarou3.sln
@@ -19,13 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.WinUI", "D:\Rep
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait", "..\CleanAuLait\CleanAuLait.csproj", "{543C3E97-A0BC-4AC6-8780-701902406542}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CleanAuLait.Prism.WinUI3", "..\CleanAuLait.Prism.WinUI3\CleanAuLait.Prism.WinUI3.csproj", "{F804C913-6C3E-4116-82DB-24BFD501E397}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.Prism.WinUI3", "..\CleanAuLait.Prism.WinUI3\CleanAuLait.Prism.WinUI3.csproj", "{F804C913-6C3E-4116-82DB-24BFD501E397}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestNarou3.10Domain", "TestNarou3.Domain\TestNarou3.10Domain.csproj", "{9D49E4D8-8D72-4273-8393-D39EB047E8EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestNarou3.10Domain", "TestNarou3.Domain\TestNarou3.10Domain.csproj", "{9D49E4D8-8D72-4273-8393-D39EB047E8EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections", "..\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj", "{17A69251-440F-4665-ACD1-986351AC168E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestNarou3.20UseCase", "TestNarou3.UseCase\TestNarou3.20UseCase.csproj", "{7A85A717-EFEF-4F87-A2BB-76D03F864287}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestNarou3.20UseCase", "TestNarou3.UseCase\TestNarou3.20UseCase.csproj", "{7A85A717-EFEF-4F87-A2BB-76D03F864287}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.ObservableCollectionsMod", "..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj", "{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -207,22 +207,6 @@ Global
 		{9D49E4D8-8D72-4273-8393-D39EB047E8EE}.Release|x64.Build.0 = Release|Any CPU
 		{9D49E4D8-8D72-4273-8393-D39EB047E8EE}.Release|x86.ActiveCfg = Release|Any CPU
 		{9D49E4D8-8D72-4273-8393-D39EB047E8EE}.Release|x86.Build.0 = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|x64.Build.0 = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Debug|x86.Build.0 = Debug|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|arm64.Build.0 = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|x64.ActiveCfg = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|x64.Build.0 = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|x86.ActiveCfg = Release|Any CPU
-		{17A69251-440F-4665-ACD1-986351AC168E}.Release|x86.Build.0 = Release|Any CPU
 		{7A85A717-EFEF-4F87-A2BB-76D03F864287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A85A717-EFEF-4F87-A2BB-76D03F864287}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A85A717-EFEF-4F87-A2BB-76D03F864287}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -239,6 +223,22 @@ Global
 		{7A85A717-EFEF-4F87-A2BB-76D03F864287}.Release|x64.Build.0 = Release|Any CPU
 		{7A85A717-EFEF-4F87-A2BB-76D03F864287}.Release|x86.ActiveCfg = Release|Any CPU
 		{7A85A717-EFEF-4F87-A2BB-76D03F864287}.Release|x86.Build.0 = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|arm64.Build.0 = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Debug|x86.Build.0 = Debug|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|arm64.Build.0 = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x64.Build.0 = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/TestNarou3/Properties/launchSettings.json
+++ b/TestNarou3/Properties/launchSettings.json
@@ -1,7 +1,8 @@
 {
   "profiles": {
     "TestNarou3 (Package)": {
-      "commandName": "MsixPackage"
+      "commandName": "MsixPackage",
+      "nativeDebugging": false
     },
     "TestNarou3 (Unpackaged)": {
       "commandName": "Project"