OSDN > Developer > yoshy > Chamber > TestNarou2 > Commit

TestNarou2 Prism+MAUI Sample Implementation
Fork

(Original repository, No fork origin)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revisão	7d48ea9f81f06615d7841dc6b347c3270b1d8a3a (tree)
Hora	2022-08-25 04:13:52
Autor	yoshy <yoshy.org.bitbucket@gz.j...>
Commiter	yoshy

Mensagem de Log

[UPG] ObservableCollectionMod を CleanAuLait.ObservableCollectionMod に差し替え
[CLEAN] コードクリーンナップ

Mudança Sumário

modified: TestNarou2.Adaptor/Boundary/Controller/IAppWindowController.cs (diff)
modified: TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs (diff)
modified: TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs (diff)
modified: TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkViewModel.cs (diff)
modified: TestNarou2.Adaptor/Boundary/Gateway/ViewModel/ILoginFormViewModel.cs (diff)
modified: TestNarou2.Adaptor/Controller/AppWindowController.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/BookmarkViewModel.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.AfterMap.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.AfterMap.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.cs (diff)
modified: TestNarou2.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs (diff)
modified: TestNarou2.Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs (diff)
modified: TestNarou2.Adaptor/Translator/BookmarkCategoryRowViewModelTranslator.cs (diff)
modified: TestNarou2.Adaptor/Translator/BookmarkDetailListRowViewModelTranslator.cs (diff)
modified: TestNarou2.Adaptor/Translator/Converter/FlagConverter.cs (diff)
modified: TestNarou2.Adaptor/Translator/Converter/MinToHourConverter.cs (diff)
modified: TestNarou2.Adaptor/Translator/Converter/PointPerMinResolver.cs (diff)
modified: TestNarou2.Adaptor/Translator/Converter/SubstringConverter.cs (diff)
modified: TestNarou2.Adaptor/Translator/Converter/SummaryResolver.cs (diff)
modified: TestNarou2.Domain/DomainModule.cs (diff)
modified: TestNarou2.Domain/Model/Config/NarouLoginSettings.cs (diff)
modified: TestNarou2.Domain/Model/Entity/BookmarkCategory.cs (diff)
modified: TestNarou2.Domain/Model/Entity/BookmarkDetailList.cs (diff)
modified: TestNarou2.Domain/Model/Entity/Child/BookmarkCategoryRow.cs (diff)
modified: TestNarou2.Domain/Model/Entity/Child/BookmarkDetailListRow.cs (diff)
modified: TestNarou2.Domain/Service/NarouService.cs (diff)
modified: TestNarou2.Infra/Core/Resource/ImageHelper.cs (diff)
modified: TestNarou2.Infra/InfraModule.cs (diff)
modified: TestNarou2.Infra/TestNarou2.90Infra.csproj (diff)
modified: TestNarou2.OuterEdge/RegionNavigationRegistrationExtensionsPatched.cs (diff)
modified: TestNarou2.OuterEdge/Repository/API/HttpClientHelper.cs (diff)
modified: TestNarou2.OuterEdge/Repository/API/NarouRepository.cs (diff)
modified: TestNarou2.UseCase/Request/AppConfigLoadRequest.cs (diff)
modified: TestNarou2.UseCase/Request/AppConfigSaveRequest.cs (diff)
modified: TestNarou2.UseCase/Request/NarouLoginRequest.cs (diff)
modified: TestNarou2.UseCase/Request/NarouLogoutRequest.cs (diff)
modified: TestNarou2.UseCase/Request/NarouRefreshBookmarkDetailListRequest.cs (diff)
modified: TestNarou2.UseCase/UseCaseModule.cs (diff)
modified: TestNarou2.sln (diff)
modified: TestNarou2/App.xaml.cs (diff)
modified: TestNarou2/MauiProgram.cs (diff)
modified: TestNarou2/Platforms/Windows/App.xaml.cs (diff)

Diff

--- a/TestNarou2.Adaptor/Boundary/Controller/IAppWindowController.cs

+++ b/TestNarou2.Adaptor/Boundary/Controller/IAppWindowController.cs

		@@ -1,6 +1,4 @@
1	1	using CleanAuLait.Adaptor.Boundary.Controller;
2		-using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
3		-using TestNarou2.Domain.Model.Entity;
4	2
5	3	namespace TestNarou2.Adaptor.Boundary.Controller
6	4	{

--- a/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs

+++ b/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkCategoryViewModel.cs

		@@ -1,4 +1,4 @@
1		-using ObservableCollections;
	1	+using CleanAuLait.ObservableCollectionsMod;
2	2	using Reactive.Bindings;
3	3	using TestNarou2.Adaptor.Boundary.Controller;
4	4	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel.Child;

--- a/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs

+++ b/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs

		@@ -1,7 +1,5 @@
1		-using ObservableCollections;
	1	+using CleanAuLait.ObservableCollectionsMod;
2	2	using Reactive.Bindings;
3		-using System;
4		-using System.ComponentModel;
5	3	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel.Child;
6	4	using TestNarou2.Domain.Model.Entity;
7	5	using TestNarou2.Domain.Model.Entity.Child;

--- a/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkViewModel.cs

+++ b/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/IBookmarkViewModel.cs

		@@ -1,6 +1,4 @@
1		-using System;
2		-
3		-namespace TestNarou2.Adaptor.Boundary.Gateway.ViewModel
	1	+namespace TestNarou2.Adaptor.Boundary.Gateway.ViewModel
4	2	{
5	3	public interface IBookmarkViewModel
6	4	{

--- a/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/ILoginFormViewModel.cs

+++ b/TestNarou2.Adaptor/Boundary/Gateway/ViewModel/ILoginFormViewModel.cs

		@@ -1,5 +1,4 @@
1	1	using Reactive.Bindings;
2		-using System;
3	2	using TestNarou2.Domain.Model.Config;
4	3
5	4	namespace TestNarou2.Adaptor.Boundary.Gateway.ViewModel

--- a/TestNarou2.Adaptor/Controller/AppWindowController.cs

+++ b/TestNarou2.Adaptor/Controller/AppWindowController.cs

		@@ -3,8 +3,6 @@ using CleanAuLait.Adaptor.Controller;
3	3	using CleanAuLait.Adaptor.Controller.DI;
4	4	using NLog;
5	5	using TestNarou2.Adaptor.Boundary.Controller;
6		-using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
7		-using TestNarou2.Domain.Model.Entity;
8	6	using TestNarou2.UseCase.Request;
9	7
10	8	namespace TestNarou2.Adaptor.Controller

--- a/TestNarou2.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs

+++ b/TestNarou2.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs

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

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

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

		@@ -1,5 +1,5 @@
1		-using NLog;
2		-using ObservableCollections;
	1	+using CleanAuLait.ObservableCollectionsMod;
	2	+using NLog;
3	3	using Reactive.Bindings;
4	4	using Reactive.Bindings.Extensions;
5	5	using System.ComponentModel;

--- a/TestNarou2.Adaptor/Gateway/ViewModel/BookmarkViewModel.cs

+++ b/TestNarou2.Adaptor/Gateway/ViewModel/BookmarkViewModel.cs

		@@ -1,5 +1,4 @@
1		-using Prism.Navigation;
2		-using System.ComponentModel;
	1	+using System.ComponentModel;
3	2	using System.Reactive.Disposables;
4	3	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
5	4

--- a/TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.AfterMap.cs

+++ b/TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.AfterMap.cs

		@@ -1,6 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings.Extensions;
3		-using System;
4	3	using TestNarou2.Domain.Model.Entity.Child;
5	4
6	5	namespace TestNarou2.Adaptor.Gateway.ViewModel.Child

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

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

		@@ -1,5 +1,4 @@
1	1	using Reactive.Bindings;
2		-using System;
3	2	using System.Reactive.Disposables;
4	3	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
5	4	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel.Child;

--- a/TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.AfterMap.cs

+++ b/TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.AfterMap.cs

		@@ -1,6 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings.Extensions;
3		-using System;
4	3	using TestNarou2.Domain.Model.Entity.Child;
5	4
6	5	namespace TestNarou2.Adaptor.Gateway.ViewModel.Child

--- a/TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.cs

+++ b/TestNarou2.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.cs

		@@ -1,5 +1,4 @@
1	1	using Reactive.Bindings;
2		-using System;
3	2	using System.Reactive.Disposables;
4	3	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
5	4	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel.Child;

--- a/TestNarou2.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs

+++ b/TestNarou2.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs

		@@ -1,5 +1,4 @@
1		-using Prism.Navigation;
2		-using Reactive.Bindings;
	1	+using Reactive.Bindings;
3	2	using Reactive.Bindings.Extensions;
4	3	using System.Reactive.Disposables;
5	4	using TestNarou2.Adaptor.Boundary.Controller;

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

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

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

--- a/TestNarou2.Adaptor/Translator/BookmarkCategoryRowViewModelTranslator.cs

+++ b/TestNarou2.Adaptor/Translator/BookmarkCategoryRowViewModelTranslator.cs

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

--- a/TestNarou2.Adaptor/Translator/BookmarkDetailListRowViewModelTranslator.cs

+++ b/TestNarou2.Adaptor/Translator/BookmarkDetailListRowViewModelTranslator.cs

		@@ -1,6 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings;
3		-using Reactive.Bindings.Extensions;
4	3	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
5	4	using TestNarou2.Adaptor.Boundary.Gateway.ViewModel.Child;
6	5	using TestNarou2.Adaptor.Gateway.ViewModel.Child;

--- a/TestNarou2.Adaptor/Translator/Converter/FlagConverter.cs

+++ b/TestNarou2.Adaptor/Translator/Converter/FlagConverter.cs

		@@ -1,7 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings;
3		-using System;
4		-using System.Linq;
5	3	using System.Reactive.Linq;
6	4
7	5	namespace TestNarou2.Adaptor.Translator.Converter

--- a/TestNarou2.Adaptor/Translator/Converter/MinToHourConverter.cs

+++ b/TestNarou2.Adaptor/Translator/Converter/MinToHourConverter.cs

		@@ -1,7 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings;
3		-using System;
4		-using System.Linq;
5	3	using System.Reactive.Linq;
6	4
7	5	namespace TestNarou2.Adaptor.Translator.Converter

--- a/TestNarou2.Adaptor/Translator/Converter/PointPerMinResolver.cs

+++ b/TestNarou2.Adaptor/Translator/Converter/PointPerMinResolver.cs

		@@ -1,6 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings;
3		-using System;
4	3	using System.Reactive.Linq;
5	4	using TestNarou2.Adaptor.Gateway.ViewModel.Child;
6	5	using TestNarou2.Domain.Model.Entity.Child;

--- a/TestNarou2.Adaptor/Translator/Converter/SubstringConverter.cs

+++ b/TestNarou2.Adaptor/Translator/Converter/SubstringConverter.cs

		@@ -1,7 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings;
3		-using System;
4		-using System.Linq;
5	3	using System.Reactive.Linq;
6	4
7	5	namespace TestNarou2.Adaptor.Translator.Converter

--- a/TestNarou2.Adaptor/Translator/Converter/SummaryResolver.cs

+++ b/TestNarou2.Adaptor/Translator/Converter/SummaryResolver.cs

		@@ -1,6 +1,5 @@
1	1	using AutoMapper;
2	2	using Reactive.Bindings;
3		-using System.Collections.Generic;
4	3	using System.Reactive.Linq;
5	4	using System.Text;
6	5	using TestNarou2.Adaptor.Gateway.ViewModel.Child;

--- a/TestNarou2.Domain/DomainModule.cs

+++ b/TestNarou2.Domain/DomainModule.cs

		@@ -1,6 +1,4 @@
1	1	using NLog;
2		-using Prism.Ioc;
3		-using Prism.Modularity;
4	2	using TestNarou2.Domain.Boundary.Service;
5	3	using TestNarou2.Domain.Service;
6	4	using TestNarou2.Domain.Translator;

--- a/TestNarou2.Domain/Model/Config/NarouLoginSettings.cs

+++ b/TestNarou2.Domain/Model/Config/NarouLoginSettings.cs

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.Core.Converter;
2		-using System;
3	2	using System.Text.Json.Serialization;
4	3
5	4	namespace TestNarou2.Domain.Model.Config

--- a/TestNarou2.Domain/Model/Entity/BookmarkCategory.cs

+++ b/TestNarou2.Domain/Model/Entity/BookmarkCategory.cs

		@@ -1,6 +1,4 @@
1	1	using ObservableCollections;
2		-using System;
3		-using System.Collections.Generic;
4	2	using TestNarou2.Domain.Model.Entity.Child;
5	3
6	4	namespace TestNarou2.Domain.Model.Entity

--- a/TestNarou2.Domain/Model/Entity/BookmarkDetailList.cs

+++ b/TestNarou2.Domain/Model/Entity/BookmarkDetailList.cs

		@@ -1,6 +1,4 @@
1	1	using ObservableCollections;
2		-using System;
3		-using System.Collections.Generic;
4	2	using TestNarou2.Domain.Model.Entity.Child;
5	3
6	4	namespace TestNarou2.Domain.Model.Entity

--- a/TestNarou2.Domain/Model/Entity/Child/BookmarkCategoryRow.cs

+++ b/TestNarou2.Domain/Model/Entity/Child/BookmarkCategoryRow.cs

		@@ -1,6 +1,5 @@
1	1	using Reactive.Bindings;
2	2	using Reactive.Bindings.Extensions;
3		-using System;
4	3	using System.Reactive.Disposables;
5	4
6	5	namespace TestNarou2.Domain.Model.Entity.Child

--- a/TestNarou2.Domain/Model/Entity/Child/BookmarkDetailListRow.cs

+++ b/TestNarou2.Domain/Model/Entity/Child/BookmarkDetailListRow.cs

		@@ -1,6 +1,5 @@
1	1	using Reactive.Bindings;
2	2	using Reactive.Bindings.Extensions;
3		-using System;
4	3	using System.Reactive.Disposables;
5	4
6	5	namespace TestNarou2.Domain.Model.Entity.Child

--- a/TestNarou2.Domain/Service/NarouService.cs

+++ b/TestNarou2.Domain/Service/NarouService.cs

		@@ -1,7 +1,4 @@
1	1	using NLog;
2		-using Prism.Navigation;
3		-using System.Collections.Generic;
4		-using System.Linq;
5	2	using TestNarou2.Domain.Boundary.Repository;
6	3	using TestNarou2.Domain.Boundary.Service;
7	4	using TestNarou2.Domain.Model.API;

--- a/TestNarou2.Infra/Core/Resource/ImageHelper.cs

+++ b/TestNarou2.Infra/Core/Resource/ImageHelper.cs

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.Core.Resource;
2		-using TestNarou2.Infra.Core.Resource;
3	2
4	3	namespace TestNarou2.Infra.Core.Resource
5	4	{

--- a/TestNarou2.Infra/InfraModule.cs

+++ b/TestNarou2.Infra/InfraModule.cs

		@@ -1,7 +1,5 @@
1	1	using CleanAuLait.Core.Resource;
2	2	using NLog;
3		-using Prism.Ioc;
4		-using Prism.Modularity;
5	3	using TestNarou2.Infra.Boundary.Resource;
6	4	using TestNarou2.Infra.Core.Resource;
7	5

--- a/TestNarou2.Infra/TestNarou2.90Infra.csproj

+++ b/TestNarou2.Infra/TestNarou2.90Infra.csproj

		@@ -25,7 +25,7 @@
25	25
26	26	<ItemGroup>
27	27	<PackageReference Include="AutoMapper" Version="11.0.1" />
28		- <PackageReference Include="NLog" Version="5.0.1" />
	28	+ <PackageReference Include="NLog" Version="5.0.2" />
29	29	<PackageReference Include="Prism.DryIoc.Maui" Version="8.1.254-beta" />
30	30	<PackageReference Include="Prism.Maui.Rx" Version="8.1.254-beta" />
31	31	<PackageReference Include="ReactiveProperty" Version="8.1.2" />

		@@ -33,7 +33,7 @@
33	33
34	34	<ItemGroup>
35	35	<ProjectReference Include="..\..\CleanAuLait.MAUI\CleanAuLait.MAUI.csproj" />
36		- <ProjectReference Include="..\..\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj" />
	36	+ <ProjectReference Include="..\..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj" />
37	37	</ItemGroup>
38	38
39	39	</Project>

--- a/TestNarou2.OuterEdge/RegionNavigationRegistrationExtensionsPatched.cs

+++ b/TestNarou2.OuterEdge/RegionNavigationRegistrationExtensionsPatched.cs

		@@ -1,9 +1,4 @@
1	1	using Prism.Common;
2		-using System;
3		-using System.Collections.Generic;
4		-using System.Linq;
5		-using System.Text;
6		-using System.Threading.Tasks;
7	2
8	3	namespace TestNarou2.OuterEdge
9	4	{

--- a/TestNarou2.OuterEdge/Repository/API/HttpClientHelper.cs

+++ b/TestNarou2.OuterEdge/Repository/API/HttpClientHelper.cs

		@@ -1,13 +1,7 @@
1	1	using NLog;
2		-using Prism.Navigation;
3		-using System;
4		-using System.Collections.Generic;
5		-using System.IO;
6	2	using System.IO.Compression;
7	3	using System.Net;
8		-using System.Net.Http;
9	4	using System.Text;
10		-using System.Threading.Tasks;
11	5
12	6	namespace TestNarou2.OuterEdge.Repository.API
13	7	{

--- a/TestNarou2.OuterEdge/Repository/API/NarouRepository.cs

+++ b/TestNarou2.OuterEdge/Repository/API/NarouRepository.cs

		@@ -1,7 +1,6 @@
1	1	using CleanAuLait.Core.Converter;
2	2	using CleanAuLait.OuterEdge.Repository;
3	3	using NLog;
4		-using System.Collections.Generic;
5	4	using System.Text.RegularExpressions;
6	5	using TestNarou2.Domain.Boundary.Repository;
7	6	using TestNarou2.Domain.Model.API;

--- a/TestNarou2.UseCase/Request/AppConfigLoadRequest.cs

+++ b/TestNarou2.UseCase/Request/AppConfigLoadRequest.cs

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using System;
3	2	using TestNarou2.UseCase.Boundary.Interactor;
4	3
5	4	namespace TestNarou2.UseCase.Request

--- a/TestNarou2.UseCase/Request/AppConfigSaveRequest.cs

+++ b/TestNarou2.UseCase/Request/AppConfigSaveRequest.cs

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using System;
3	2	using TestNarou2.UseCase.Boundary.Interactor;
4	3
5	4	namespace TestNarou2.UseCase.Request

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

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

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using System;
3	2	using TestNarou2.UseCase.Boundary.Interactor;
4	3
5	4	namespace TestNarou2.UseCase.Request

--- a/TestNarou2.UseCase/Request/NarouLogoutRequest.cs

+++ b/TestNarou2.UseCase/Request/NarouLogoutRequest.cs

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using System;
3	2	using TestNarou2.UseCase.Boundary.Interactor;
4	3
5	4	namespace TestNarou2.UseCase.Request

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

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

		@@ -1,5 +1,4 @@
1	1	using CleanAuLait.UseCase.Request;
2		-using System;
3	2	using TestNarou2.UseCase.Boundary.Interactor;
4	3
5	4	namespace TestNarou2.UseCase.Request

--- a/TestNarou2.UseCase/UseCaseModule.cs

+++ b/TestNarou2.UseCase/UseCaseModule.cs

		@@ -1,6 +1,4 @@
1	1	using NLog;
2		-using Prism.Ioc;
3		-using Prism.Modularity;
4	2	using TestNarou2.UseCase.Boundary.Interactor;
5	3	using TestNarou2.UseCase.Interactor;
6	4

--- a/TestNarou2.sln

+++ b/TestNarou2.sln

		@@ -20,12 +20,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestNarou2.40OuterEdge", "T
20	20	EndProject
21	21	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait", "..\CleanAuLait\CleanAuLait.csproj", "{66EAF439-CE6C-40F3-8B5D-166D36A7DE3C}"
22	22	EndProject
23		-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections", "..\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj", "{9EA4EC49-C44A-4955-989A-443E126B3FCA}"
24		-EndProject
25	23	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.MAUI", "..\CleanAuLait.MAUI\CleanAuLait.MAUI.csproj", "{6992DC9A-930F-4380-B56E-7F64610636A9}"
26	24	EndProject
27	25	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.Prism", "..\CleanAuLait.Prism\CleanAuLait.Prism.csproj", "{63D09642-E21C-44FE-981D-0E0CC5DA6D7E}"
28	26	EndProject
	27	+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.ObservableCollectionsMod", "..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj", "{6901733E-1944-48C0-8C61-2418ACE94AD3}"
	28	+EndProject
29	29	Global
30	30	GlobalSection(SolutionConfigurationPlatforms) = preSolution
31	31	Debug\|Any CPU = Debug\|Any CPU

		@@ -62,10 +62,6 @@ Global
62	62	{66EAF439-CE6C-40F3-8B5D-166D36A7DE3C}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
63	63	{66EAF439-CE6C-40F3-8B5D-166D36A7DE3C}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
64	64	{66EAF439-CE6C-40F3-8B5D-166D36A7DE3C}.Release\|Any CPU.Build.0 = Release\|Any CPU
65		- {9EA4EC49-C44A-4955-989A-443E126B3FCA}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
66		- {9EA4EC49-C44A-4955-989A-443E126B3FCA}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
67		- {9EA4EC49-C44A-4955-989A-443E126B3FCA}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
68		- {9EA4EC49-C44A-4955-989A-443E126B3FCA}.Release\|Any CPU.Build.0 = Release\|Any CPU
69	65	{6992DC9A-930F-4380-B56E-7F64610636A9}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
70	66	{6992DC9A-930F-4380-B56E-7F64610636A9}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
71	67	{6992DC9A-930F-4380-B56E-7F64610636A9}.Release\|Any CPU.ActiveCfg = Release\|Any CPU

		@@ -74,6 +70,10 @@ Global
74	70	{63D09642-E21C-44FE-981D-0E0CC5DA6D7E}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
75	71	{63D09642-E21C-44FE-981D-0E0CC5DA6D7E}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
76	72	{63D09642-E21C-44FE-981D-0E0CC5DA6D7E}.Release\|Any CPU.Build.0 = Release\|Any CPU
	73	+ {6901733E-1944-48C0-8C61-2418ACE94AD3}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
	74	+ {6901733E-1944-48C0-8C61-2418ACE94AD3}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
	75	+ {6901733E-1944-48C0-8C61-2418ACE94AD3}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
	76	+ {6901733E-1944-48C0-8C61-2418ACE94AD3}.Release\|Any CPU.Build.0 = Release\|Any CPU
77	77	EndGlobalSection
78	78	GlobalSection(SolutionProperties) = preSolution
79	79	HideSolutionNode = FALSE

--- a/TestNarou2/App.xaml.cs

+++ b/TestNarou2/App.xaml.cs

		@@ -1,6 +1,4 @@
1		-using TestNarou2.OuterEdge.UI.View;
2		-
3		-namespace TestNarou2;
	1	+namespace TestNarou2;
4	2
5	3	public partial class App : Application
6	4	{

--- a/TestNarou2/MauiProgram.cs

+++ b/TestNarou2/MauiProgram.cs

		@@ -2,12 +2,8 @@
2	2	using CleanAuLait;
3	3	using CleanAuLait.Core.Log;
4	4	using NLog;
5		-using Prism.Common;
6		-using Prism.Ioc;
7		-using Prism.Navigation.Xaml;
8	5	using System.Reflection;
9	6	using TestNarou2.Adaptor;
10		-using TestNarou2.Adaptor.Boundary.Gateway.ViewModel;
11	7	using TestNarou2.Core.Mapper;
12	8	using TestNarou2.Domain;
13	9	using TestNarou2.Infra;

--- a/TestNarou2/Platforms/Windows/App.xaml.cs

+++ b/TestNarou2/Platforms/Windows/App.xaml.cs

		@@ -1,6 +1,4 @@
1		-using Microsoft.UI.Xaml;
2		-
3		-// To learn more about WinUI, the WinUI project structure,
	1	+// To learn more about WinUI, the WinUI project structure,
4	2	// and more about our project templates, see: http://aka.ms/winui-project-info.
5	3
6	4	namespace TestNarou2.WinUI;

TestNarou2 Prism+MAUI Sample Implementation Fork