なろうブックマーク分析用ツールのPrism+WPFサンプル実装
Révision | 040eddae1b19e492bca69693afdd45fa30759400 (tree) |
---|---|
l'heure | 2023-09-30 20:32:35 |
Auteur | yoshy <yoshy.org.bitbucket@gz.j...> |
Commiter | yoshy |
[MOD] 外部パッケージへの依存関係の修正
[UPG] ClearAuLaitのCaptionFormatterの変更に伴う修正
@@ -1,4 +1,5 @@ | ||
1 | -using ObservableCollections; | |
1 | +using CleanAuLait.ObservableCollectionsMod; | |
2 | +using ObservableCollections; | |
2 | 3 | using TestNarou.Adaptor.Boundary.Controller; |
3 | 4 | using TestNarou.Adaptor.Boundary.Gateway.ViewModel.Child; |
4 | 5 | using TestNarou.Domain.Model.Entity; |
@@ -10,7 +11,7 @@ namespace TestNarou.Adaptor.Boundary.Gateway.ViewModel | ||
10 | 11 | { |
11 | 12 | IAppWindowController WindowController { get; } |
12 | 13 | |
13 | - ISynchronizedListView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; } | |
14 | + INotifyCollectionChangedListSynchronizedSingleView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; } | |
14 | 15 | |
15 | 16 | void SynchronizeWith(BookmarkCategory list); |
16 | 17 | } |
@@ -1,4 +1,5 @@ | ||
1 | -using NLog; | |
1 | +using CleanAuLait.ObservableCollectionsMod; | |
2 | +using NLog; | |
2 | 3 | using ObservableCollections; |
3 | 4 | using Prism.Navigation; |
4 | 5 | using Reactive.Bindings.Extensions; |
@@ -22,7 +23,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel | ||
22 | 23 | public event PropertyChangedEventHandler PropertyChanged; |
23 | 24 | #pragma warning restore CS0067 |
24 | 25 | |
25 | - public ISynchronizedListView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; private set; } = null; | |
26 | + public INotifyCollectionChangedListSynchronizedSingleView<BookmarkCategoryRow, IBookmarkCategoryRowViewModel> Rows { get; private set; } = null; | |
26 | 27 | |
27 | 28 | public BookmarkCategory Source { get; private set; } |
28 | 29 |
@@ -50,7 +51,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel | ||
50 | 51 | this.Rows = source.Rows |
51 | 52 | .ToSynchronizedCoupleView(r => this.vmTranslator.Translate(r, this)) |
52 | 53 | .ToSynchronizedSingleView() |
53 | - .WithIListINotifyCollectionChanged() | |
54 | + .WithINotifyCollectionChangedList() | |
54 | 55 | .AddTo(disposables); |
55 | 56 | |
56 | 57 | logger.Trace("BookmarkCategoryViewModel.SynchronizeWith: collection view [{0}]", this.Rows.GetType().FullName); |
@@ -1,4 +1,5 @@ | ||
1 | -using NLog; | |
1 | +using CleanAuLait.ObservableCollectionsMod; | |
2 | +using NLog; | |
2 | 3 | using ObservableCollections; |
3 | 4 | using Prism.Navigation; |
4 | 5 | using Prism.Regions; |
@@ -34,7 +35,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel | ||
34 | 35 | |
35 | 36 | private int CategoryNo { get; set; } = -1; |
36 | 37 | |
37 | - private ISynchronizedListView<BookmarkDetailListRow, IBookmarkDetailListRowViewModel> internalRows; | |
38 | + private INotifyCollectionChangedListSynchronizedSingleView<BookmarkDetailListRow, IBookmarkDetailListRowViewModel> internalRows; | |
38 | 39 | private IBookmarkDetailListRowViewModel selectedRow; |
39 | 40 | |
40 | 41 | private readonly IBookmarkDetailListRowViewModelTranslator vmTranslator; |
@@ -83,7 +84,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel | ||
83 | 84 | this.internalRows = source.Rows |
84 | 85 | .ToSynchronizedCoupleView(r => this.vmTranslator.Translate(r, this)) |
85 | 86 | .ToSynchronizedSingleView() |
86 | - .WithIListINotifyCollectionChanged() | |
87 | + .WithINotifyCollectionChangedList() | |
87 | 88 | .AddTo(disposables); |
88 | 89 | |
89 | 90 | this.Rows = CollectionViewSource.GetDefaultView(this.internalRows); |
@@ -25,7 +25,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel | ||
25 | 25 | { |
26 | 26 | this.wc = wc; |
27 | 27 | |
28 | - this.Title = new ReactiveProperty<string>(caption.GetCaption()).AddTo(disposables); | |
28 | + this.Title = new ReactiveProperty<string>(caption.GetDefaultCaption()).AddTo(disposables); | |
29 | 29 | |
30 | 30 | this.CommandClosed = new ReactiveCommand().WithSubscribe(OnClosed).AddTo(disposables); |
31 | 31 | } |
@@ -1,5 +1,5 @@ | ||
1 | 1 | Caption = テストなろう |
2 | -Caption.Info = {0} - 通知 | |
3 | -Caption.Warn = {0} - 警告 | |
4 | -Caption.Error = {0} - エラー | |
5 | -Caption.Exception = {0} - {1} | |
2 | +Caption.Format.Info = {0} - 通知 | |
3 | +Caption.Format.Warn = {0} - 警告 | |
4 | +Caption.Format.Error = {0} - エラー | |
5 | +Caption.Format.Exception = {0} - {1} |
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.WPF", "..\Clean | ||
11 | 11 | EndProject |
12 | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.Prism", "..\CleanAuLait.Prism\CleanAuLait.Prism.csproj", "{19FB56B4-A69D-4D7B-A78A-F2667A3C1355}" |
13 | 13 | EndProject |
14 | -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections", "D:\Repo\gitroot\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj", "{0AA2B580-29AC-48CD-B838-2ABBE4341ADB}" | |
15 | -EndProject | |
16 | 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.ObservableCollectionsMod", "..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj", "{9C249B13-843A-46A5-BCC7-27BAC103BD98}" |
17 | 15 | EndProject |
18 | 16 | Global |
@@ -37,10 +35,6 @@ Global | ||
37 | 35 | {19FB56B4-A69D-4D7B-A78A-F2667A3C1355}.Debug|Any CPU.Build.0 = Debug|Any CPU |
38 | 36 | {19FB56B4-A69D-4D7B-A78A-F2667A3C1355}.Release|Any CPU.ActiveCfg = Release|Any CPU |
39 | 37 | {19FB56B4-A69D-4D7B-A78A-F2667A3C1355}.Release|Any CPU.Build.0 = Release|Any CPU |
40 | - {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | |
41 | - {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU | |
42 | - {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU | |
43 | - {0AA2B580-29AC-48CD-B838-2ABBE4341ADB}.Release|Any CPU.Build.0 = Release|Any CPU | |
44 | 38 | {9C249B13-843A-46A5-BCC7-27BAC103BD98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
45 | 39 | {9C249B13-843A-46A5-BCC7-27BAC103BD98}.Debug|Any CPU.Build.0 = Debug|Any CPU |
46 | 40 | {9C249B13-843A-46A5-BCC7-27BAC103BD98}.Release|Any CPU.ActiveCfg = Release|Any CPU |