OSDN > Developer > yoshy > Chamber > TestNarou > Commit

TestNarou Prism+WPF Sample Implementation
Fork

(Original repository, No fork origin)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	733d12dc4d9cc29a2c33cde29a12dcb71f580369 (tree)
Time	2022-08-07 15:05:57
Author	yoshy <yoshy.org.bitbucket@gz.j...>
Commiter	yoshy

Log Message

[CLEAN] コードクリーンアップの適用

Change Summary

modified: 10Domain/Boundary/Service/INarouService.cs (diff)
modified: 10Domain/Model/API/NarouCategoryInfo.cs (diff)
modified: 10Domain/Translator/BookmarkCategoryRowTranslator.cs (diff)
modified: 20UseCase/Interactor/AppConfigLoadInteractor.cs (diff)
modified: 20UseCase/Interactor/NarouLogoutInteractor.cs (diff)
modified: 20UseCase/Request/NarouLoginRequest.cs (diff)
modified: 20UseCase/Request/NarouRefreshBookmarkDetailListRequest.cs (diff)
modified: 30Adaptor/AdaptorMappingProfile.cs (diff)
modified: 30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs (diff)
modified: 30Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs (diff)
modified: 30Adaptor/Gateway/ViewModel/LoginFormViewModel.cs (diff)
modified: 30Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs (diff)
modified: 40OuterEdge/UI/View/BookmarkCategoryView.xaml (diff)
modified: 40OuterEdge/UI/View/BookmarkDetailListView.xaml (diff)
modified: 40OuterEdge/UI/View/BookmarkView.xaml (diff)
modified: 40OuterEdge/UI/View/LoginFormView.xaml (diff)
modified: 40OuterEdge/UI/View/MainWindowView.xaml (diff)
modified: 90Infra/Core/Resource/AppCaptionFormatter.cs (diff)

Incremental Difference

--- a/10Domain/Boundary/Service/INarouService.cs

+++ b/10Domain/Boundary/Service/INarouService.cs

		@@ -1,9 +1,4 @@
1		-using System;
2		-using System.Collections.Generic;
3		-using System.Linq;
4		-using System.Text;
5		-using System.Threading.Tasks;
6		-using TestNarou.Domain.Model.Entity;
	1	+using TestNarou.Domain.Model.Entity;
7	2
8	3	namespace TestNarou.Domain.Boundary.Service
9	4	{

--- a/10Domain/Model/API/NarouCategoryInfo.cs

+++ b/10Domain/Model/API/NarouCategoryInfo.cs

		@@ -1,10 +1,4 @@
1		-using System;
2		-using System.Collections.Generic;
3		-using System.Linq;
4		-using System.Text;
5		-using System.Threading.Tasks;
6		-
7		-namespace TestNarou.Domain.Model.API
	1	+namespace TestNarou.Domain.Model.API
8	2	{
9	3	public record class NarouCategoryInfo(
10	4	string Name,

--- a/10Domain/Translator/BookmarkCategoryRowTranslator.cs

+++ b/10Domain/Translator/BookmarkCategoryRowTranslator.cs

		@@ -1,8 +1,4 @@
1	1	using AutoMapper;
2		-using Reactive.Bindings.Extensions;
3		-using TestNarou.Adaptor.Boundary.Gateway.ViewModel.Child;
4		-using TestNarou.Adaptor.Gateway.ViewModel.Child;
5		-using TestNarou.Adaptor.Translator.Converter;
6	2	using TestNarou.Domain.Model.API;
7	3	using TestNarou.Domain.Model.Entity.Child;
8	4

--- a/20UseCase/Interactor/AppConfigLoadInteractor.cs

+++ b/20UseCase/Interactor/AppConfigLoadInteractor.cs

		@@ -3,7 +3,6 @@ using CleanAuLait.UseCase.Interactor;
3	3	using CleanAuLait.UseCase.Response;
4	4	using TestNarou.Domain.Boundary.Service;
5	5	using TestNarou.Domain.Model.Config;
6		-using TestNarou.Domain.Model.Entity;
7	6	using TestNarou.UseCase.Boundary.Interactor;
8	7	using TestNarou.UseCase.Boundary.Presenter;
9	8	using TestNarou.UseCase.Request;

--- a/20UseCase/Interactor/NarouLogoutInteractor.cs

+++ b/20UseCase/Interactor/NarouLogoutInteractor.cs

		@@ -2,9 +2,7 @@
2	2	using CleanAuLait.UseCase.Interactor;
3	3	using CleanAuLait.UseCase.Response;
4	4	using TestNarou.Domain.Boundary.Service;
5		-using TestNarou.Domain.Model.Entity;
6	5	using TestNarou.UseCase.Boundary.Interactor;
7		-using TestNarou.UseCase.Boundary.Presenter;
8	6	using TestNarou.UseCase.Request;
9	7	using TestNarou.UseCase.Response;
10	8

--- a/20UseCase/Request/NarouLoginRequest.cs

+++ b/20UseCase/Request/NarouLoginRequest.cs

		@@ -1,7 +1,6 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using TestNarou.UseCase.Boundary.Interactor;
3	2	using System;
4		-using System.Collections.Generic;
	3	+using TestNarou.UseCase.Boundary.Interactor;
5	4
6	5	namespace TestNarou.UseCase.Request
7	6	{

--- a/20UseCase/Request/NarouRefreshBookmarkDetailListRequest.cs

+++ b/20UseCase/Request/NarouRefreshBookmarkDetailListRequest.cs

		@@ -1,7 +1,6 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using TestNarou.UseCase.Boundary.Interactor;
3	2	using System;
4		-using System.Collections.Generic;
	3	+using TestNarou.UseCase.Boundary.Interactor;
5	4
6	5	namespace TestNarou.UseCase.Request
7	6	{

--- a/30Adaptor/AdaptorMappingProfile.cs

+++ b/30Adaptor/AdaptorMappingProfile.cs

		@@ -1,5 +1,4 @@
1	1	using AutoMapper;
2		-using AutoMapper.Internal;
3	2	using TestNarou.Adaptor.Gateway.ViewModel.Child;
4	3	using TestNarou.Adaptor.Translator;
5	4	using TestNarou.Domain.Model.Entity.Child;

--- a/30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs

+++ b/30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs

		@@ -4,7 +4,6 @@ using Prism.Navigation;
4	4	using Prism.Regions;
5	5	using Reactive.Bindings;
6	6	using Reactive.Bindings.Extensions;
7		-using System.Collections.Generic;
8	7	using System.ComponentModel;
9	8	using System.Diagnostics;
10	9	using System.Reactive.Disposables;

--- a/30Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs

+++ b/30Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs

		@@ -6,7 +6,6 @@ using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
6	6	using TestNarou.Adaptor.Boundary.Gateway.ViewModel.Child;
7	7	using TestNarou.Domain.Model.Entity.Child;
8	8	using TestNarou.Infra.Core.Resource;
9		-using TestNarou.UseCase.Request;
10	9
11	10	namespace TestNarou.Adaptor.Gateway.ViewModel.Child
12	11	{

--- a/30Adaptor/Gateway/ViewModel/LoginFormViewModel.cs

+++ b/30Adaptor/Gateway/ViewModel/LoginFormViewModel.cs

		@@ -1,6 +1,4 @@
1		-using NLog;
2		-using Prism.Navigation;
3		-using Prism.Regions;
	1	+using Prism.Navigation;
4	2	using Reactive.Bindings;
5	3	using Reactive.Bindings.Extensions;
6	4	using System.ComponentModel;

--- a/30Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs

+++ b/30Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs

		@@ -1,5 +1,4 @@
1	1	using TestNarou.Adaptor.Boundary.Controller;
2		-using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
3	2	using TestNarou.UseCase.Boundary.Presenter;
4	3	using TestNarou.UseCase.Request;
5	4	using TestNarou.UseCase.Response;

--- a/40OuterEdge/UI/View/BookmarkCategoryView.xaml

+++ b/40OuterEdge/UI/View/BookmarkCategoryView.xaml

		@@ -3,10 +3,7 @@
3	3	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4	4	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5	5	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6		- xmlns:bh="http://schemas.microsoft.com/xaml/behaviors"
7		- xmlns:rp="clr-namespace:Reactive.Bindings.Interactivity;assembly=ReactiveProperty.WPF"
8	6	xmlns:vm="clr-namespace:TestNarou.Adaptor.Boundary.Gateway.ViewModel"
9		- xmlns:v="clr-namespace:TestNarou.OuterEdge.UI.View"
10	7	mc:Ignorable="d"
11	8	d:DataContext="{d:DesignInstance Type=vm:IBookmarkCategoryViewModel}"
12	9	d:DesignHeight="450" d:DesignWidth="200">

		@@ -28,14 +25,6 @@
28	25	</DataTemplate>
29	26	</ListView.ItemTemplate>
30	27
31		- <!--
32		- <bh:Interaction.Triggers>
33		- <bh:EventTrigger EventName="SelectionChanged">
34		- <rp:EventToReactiveCommand Command="{Binding CommandSelectionChange}" />
35		- </bh:EventTrigger>
36		- </bh:Interaction.Triggers>
37		- -->
38		-
39	28	</ListView>
40	29
41	30	</UserControl>

--- a/40OuterEdge/UI/View/BookmarkDetailListView.xaml

+++ b/40OuterEdge/UI/View/BookmarkDetailListView.xaml

		@@ -4,7 +4,6 @@
4	4	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5	5	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6	6	xmlns:vm="clr-namespace:TestNarou.Adaptor.Boundary.Gateway.ViewModel"
7		- xmlns:v="clr-namespace:TestNarou.OuterEdge.UI.View"
8	7	mc:Ignorable="d"
9	8	d:DataContext="{d:DesignInstance Type=vm:IBookmarkDetailListViewModel}"
10	9	d:DesignHeight="450" d:DesignWidth="1600">

--- a/40OuterEdge/UI/View/BookmarkView.xaml

+++ b/40OuterEdge/UI/View/BookmarkView.xaml

		@@ -17,8 +17,12 @@
17	17	<ColumnDefinition/>
18	18	</Grid.ColumnDefinitions>
19	19
20		- <ContentControl Grid.Column="0" prism:RegionManager.RegionName="BookmarkCategoryPane" />
21		- <ContentControl Grid.Column="1" prism:RegionManager.RegionName="BookmarkDetailListPane" />
	20	+ <ContentControl Grid.Column="0" prism:RegionManager.RegionName="BookmarkCategoryPane">
	21	+ <v:BookmarkCategoryView />
	22	+ </ContentControl>
	23	+ <ContentControl Grid.Column="1" prism:RegionManager.RegionName="BookmarkDetailListPane">
	24	+ <v:BookmarkDetailListView />
	25	+ </ContentControl>
22	26	</Grid>
23	27
24	28	</UserControl>

--- a/40OuterEdge/UI/View/LoginFormView.xaml

+++ b/40OuterEdge/UI/View/LoginFormView.xaml

		@@ -5,9 +5,7 @@
5	5	xmlns:bh="http://schemas.microsoft.com/xaml/behaviors"
6	6	xmlns:cbh="http://schemas.drillion.net/cleanaulait/xaml/behavior"
7	7	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8		- xmlns:prism="http://prismlibrary.com/"
9	8	xmlns:vm="clr-namespace:TestNarou.Adaptor.Boundary.Gateway.ViewModel"
10		- xmlns:v="clr-namespace:TestNarou.OuterEdge.UI.View"
11	9	mc:Ignorable="d"
12	10	d:DataContext="{d:DesignInstance Type=vm:ILoginFormViewModel}"
13	11	d:DesignHeight="180" d:DesignWidth="300"

--- a/40OuterEdge/UI/View/MainWindowView.xaml

+++ b/40OuterEdge/UI/View/MainWindowView.xaml

		@@ -20,8 +20,12 @@
20	20	<mbh:DataContextDisposeAction />
21	21	</bh:EventTrigger>
22	22	</bh:Interaction.Triggers>
23		-
	23	+
24	24	<ContentControl IsTabStop="False" Focusable="False"
25		- prism:RegionManager.RegionName="MainContentPane" />
	25	+ prism:RegionManager.RegionName="MainContentPane">
	26	+ <ContentControl.Content>
	27	+ <v:LoginFormView />
	28	+ </ContentControl.Content>
	29	+ </ContentControl>
26	30
27	31	</Window>

--- a/90Infra/Core/Resource/AppCaptionFormatter.cs

+++ b/90Infra/Core/Resource/AppCaptionFormatter.cs

		@@ -1,5 +1,4 @@
1		-using CleanAuLait.Adaptor.Gateway.UI.Dialog;
2		-using CleanAuLait.Core.Resource;
	1	+using CleanAuLait.Core.Resource;
3	2	using TestNarou.Infra.Boundary.Resource;
4	3
5	4	namespace TestNarou.Infra.Core.Resource

TestNarou Prism+WPF Sample Implementation Fork