提交: 87e58c084a85279aa2ad83d3cdb09dc632aca535 - TestNarou3 (git)

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

Commit MetaInfo

• 修订版: 87e58c084a85279aa2ad83d3cdb09dc632aca535 (tree)
• 时间: 2022-08-25 03:24:46
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] 詳細リストの ViewComparer/ValueComparer をライブラリ側に移動

更改概述

• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs

差异

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -1,15 +1,12 @@
 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;
-using System.Windows.Input;
 using TestNarou3.Adaptor.Boundary.Controller;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child;
@@ -30,8 +27,10 @@ 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 INotifyCollectionChangedListSynchronizedSingleView<
+                BookmarkDetailListRow, IBookmarkDetailListRowViewModel> Rows { get; private set; } = null;
+        private ISortableSynchronizedCoupleView<
+                BookmarkDetailListRow, string, IBookmarkDetailListRowViewModel> SortableRows { get; set; }
 
         public ReactiveCommand CommandOpenBookmark { get; }
 
@@ -90,7 +89,9 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             if (this.Source == null)
             {
                 this.SortableRows = source.Rows
-                        .ToSortableSynchronizedCoupleView(r => r.NCode, r => this.vmTranslator.Translate(r, this), new DetailListViewComparer<string>(r => r.Title.Value, true));
+                        .ToSortableSynchronizedCoupleView(
+                                r => r.NCode, r => this.vmTranslator.Translate(r, this),
+                                new DetailListViewComparer<string>(r => r.Title.Value));
 
                 this.Rows = this.SortableRows
                         .ToSynchronizedSingleView()
@@ -109,19 +110,23 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             }
         }
 
-        public void SortByViewColumn<TViewColumn>(string tag, Func<IBookmarkDetailListRowViewModel, TViewColumn> selector, bool ascending)
+        public void SortByViewColumn<TViewColumn>(
+                string tag, Func<IBookmarkDetailListRowViewModel, TViewColumn> selector, bool ascending)
         {
             logger.Trace("Sort: {0}, ascending = {1}", tag, ascending);
-            this.SortableRows.Sort(new DetailListViewComparer<TViewColumn>(selector, ascending));
+            this.SortableRows.Sort(this.SortableRows.CreateViewComparer(selector, ascending));
         }
 
-        public void SortByValueColumn<TValueColumn>(string tag, Func<BookmarkDetailListRow, TValueColumn> selector, bool ascending)
+        public void SortByValueColumn<TValueColumn>(
+                string tag, Func<BookmarkDetailListRow, TValueColumn> selector, bool ascending)
         {
             logger.Trace("Sort: {0}, ascending = {1}", tag, ascending);
-            this.SortableRows.Sort(new DetailListValueComparer<TValueColumn>(selector, ascending));
+            this.SortableRows.Sort(this.SortableRows.CreateValueComparer(selector, ascending));
         }
 
-        internal class DetailListViewComparer<TViewColumn> : ViewComparer<string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel, TViewColumn>
+        private class DetailListViewComparer<TViewColumn>
+                : SortableSynchronizedCoupleViewViewComparer<
+                        string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel, TViewColumn>
         {
             public DetailListViewComparer(
                     Func<IBookmarkDetailListRowViewModel, TViewColumn> selector, bool ascending = true
@@ -130,31 +135,9 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             }
         }
 
-        internal class ViewComparer<TKey, T, TView, TViewColumn> : IComparer<(TKey, T, TView)>
-        {
-            readonly Func<TView, TViewColumn> selector;
-            readonly int f;
-
-            public ViewComparer(Func<TView, TViewColumn> selector, bool ascending = true)
-            {
-                this.selector = selector;
-                this.f = ascending ? 1 : -1;
-            }
-
-            public int Compare((TKey, T, TView) x, (TKey, T, TView) y)
-            {
-                int c = Comparer<TViewColumn>.Default.Compare(selector(x.Item3), selector(y.Item3)) * f;
-
-                if (c == 0)
-                {
-                    c = Comparer<TKey>.Default.Compare(x.Item1, y.Item1) * f;
-                }
-
-                return c;
-            }
-        }
-
-        internal class DetailListValueComparer<TValueColumn> : ValueComparer<string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel, TValueColumn>
+        private class DetailListValueComparer<TValueColumn>
+                : SortableSynchronizedCoupleViewValueComparer<
+                        string, BookmarkDetailListRow, IBookmarkDetailListRowViewModel, TValueColumn>
         {
             public DetailListValueComparer(
                     Func<BookmarkDetailListRow, TValueColumn> selector, bool ascending = true
@@ -163,30 +146,6 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             }
         }
 
-        internal class ValueComparer<TKey, T, TView, TValueColumn> : IComparer<(TKey, T, TView)>
-        {
-            readonly Func<T, TValueColumn> selector;
-            readonly int f;
-
-            public ValueComparer(Func<T, TValueColumn> selector, bool ascending = true)
-            {
-                this.selector = selector;
-                this.f = ascending ? 1 : -1;
-            }
-
-            public int Compare((TKey, T, TView) x, (TKey, T, TView) y)
-            {
-                int c = Comparer<TValueColumn>.Default.Compare(selector(x.Item2), selector(y.Item2)) * f;
-
-                if (c == 0)
-                {
-                    c = Comparer<TKey>.Default.Compare(x.Item1, y.Item1) * f;
-                }
-
-                return c;
-            }
-        }
-
         #endregion
 
         #region IDestructible, IDisposable
@@ -213,7 +172,6 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
 
         public void Dispose()
         {
-            // このコードを変更しないでください。クリーンアップ コードを 'Dispose(bool disposing)' メソッドに記述します
             Dispose(disposing: true);
             GC.SuppressFinalize(this);
         }