Move dialogs

Panda-Sharp · Panda-Sharp · commit ccb794d4bd90 · 2021-09-07T10:20:35.000+02:00
diff --git a/Yugen.Mosaic.Uwp/Services/WhatsNewDisplayService.cs b/Yugen.Mosaic.Uwp/Services/WhatsNewDisplayService.cs
@@ -3,8 +3,8 @@
 using System;
 using System.Threading.Tasks;
 using Windows.System;
-using Yugen.Mosaic.Uwp.Controls;
 using Yugen.Mosaic.Uwp.Interfaces;
+using Yugen.Mosaic.Uwp.Views.Dialogs;
 
 namespace Yugen.Mosaic.Uwp.Services
 {
diff --git a/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
@@ -1,7 +1,6 @@
 ﻿using Microsoft.AppCenter.Crashes;
 using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Toolkit.Uwp;
-using Microsoft.UI.Xaml.Controls;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using System;
@@ -17,11 +16,11 @@
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Imaging;
-using Yugen.Mosaic.Uwp.Controls;
 using Yugen.Mosaic.Uwp.Enums;
 using Yugen.Mosaic.Uwp.Helpers;
 using Yugen.Mosaic.Uwp.Interfaces;
 using Yugen.Mosaic.Uwp.Models;
+using Yugen.Mosaic.Uwp.Views.Dialogs;
 using Yugen.Toolkit.Standard.Core.Models;
 using Yugen.Toolkit.Standard.Extensions;
 using Yugen.Toolkit.Standard.Helpers;
diff --git a/Yugen.Mosaic.Uwp/Views/Dialogs/SettingsDialog.xaml b/Yugen.Mosaic.Uwp/Views/Dialogs/SettingsDialog.xaml
@@ -1,4 +1,4 @@
-﻿<dialogs:YugenDialog  x:Class="Yugen.Mosaic.Uwp.Controls.SettingsDialog"
+﻿<dialogs:YugenDialog  x:Class="Yugen.Mosaic.Uwp.Views.Dialogs.SettingsDialog"
                       x:Uid="Settings"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Yugen.Mosaic.Uwp/Views/Dialogs/SettingsDialog.xaml.cs b/Yugen.Mosaic.Uwp/Views/Dialogs/SettingsDialog.xaml.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
 using Yugen.Mosaic.Uwp.ViewModels;
 
-namespace Yugen.Mosaic.Uwp.Controls
+namespace Yugen.Mosaic.Uwp.Views.Dialogs
 {
     public sealed partial class SettingsDialog
     {
diff --git a/Yugen.Mosaic.Uwp/Views/Dialogs/WhatsNewDialog.xaml b/Yugen.Mosaic.Uwp/Views/Dialogs/WhatsNewDialog.xaml
@@ -1,4 +1,4 @@
-﻿<dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Controls.WhatsNewDialog"
+﻿<dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Views.Dialogs.WhatsNewDialog"
                      x:Uid="WhatsNew"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Yugen.Mosaic.Uwp/Views/Dialogs/WhatsNewDialog.xaml.cs b/Yugen.Mosaic.Uwp/Views/Dialogs/WhatsNewDialog.xaml.cs
@@ -2,7 +2,7 @@
 using Windows.UI.Xaml;
 using Yugen.Mosaic.Uwp.ViewModels;
 
-namespace Yugen.Mosaic.Uwp.Controls
+namespace Yugen.Mosaic.Uwp.Views.Dialogs
 {
     public sealed partial class WhatsNewDialog
     {
diff --git a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
@@ -80,7 +80,7 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\WhatsNewDialog.xaml.cs">
+    <Compile Include="Views\Dialogs\WhatsNewDialog.xaml.cs">
       <DependentUpon>WhatsNewDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Enums\FileFormat.cs" />
@@ -110,7 +110,7 @@
     <Compile Include="Services\SearchAndReplacePlainColorService.cs" />
     <Compile Include="Services\SearchAndReplaceRandomService.cs" />
     <Compile Include="Services\SearchAndReplaceService.cs" />
-    <Compile Include="Controls\SettingsDialog.xaml.cs">
+    <Compile Include="Views\Dialogs\SettingsDialog.xaml.cs">
       <DependentUpon>SettingsDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\MainViewModel.cs" />
@@ -183,15 +183,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Controls\WhatsNewDialog.xaml">
+    <Page Include="Views\Dialogs\WhatsNewDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\MainPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\SettingsDialog.xaml">
+    <Page Include="Views\Dialogs\SettingsDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using Windows.System;`
`6`		`-using Yugen.Mosaic.Uwp.Controls;`
`7`	`6`	`using Yugen.Mosaic.Uwp.Interfaces;`
	`7`	`+using Yugen.Mosaic.Uwp.Views.Dialogs;`
`8`	`8`
`9`	`9`	`namespace Yugen.Mosaic.Uwp.Services`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Controls.SettingsDialog"`
	`1`	`+<dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Views.Dialogs.SettingsDialog"`
`2`	`2`	`x:Uid="Settings"`
`3`	`3`	`xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
`4`	`4`	`xmlns:d="http://schemas.microsoft.com/expression/blend/2008"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`2`	`2`	`using Yugen.Mosaic.Uwp.ViewModels;`
`3`	`3`
`4`		`-namespace Yugen.Mosaic.Uwp.Controls`
	`4`	`+namespace Yugen.Mosaic.Uwp.Views.Dialogs`
`5`	`5`	`{`
`6`	`6`	`public sealed partial class SettingsDialog`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Windows.UI.Xaml;`
`3`	`3`	`using Yugen.Mosaic.Uwp.ViewModels;`
`4`	`4`
`5`		`-namespace Yugen.Mosaic.Uwp.Controls`
	`5`	`+namespace Yugen.Mosaic.Uwp.Views.Dialogs`
`6`	`6`	`{`
`7`	`7`	`public sealed partial class WhatsNewDialog`
`8`	`8`	`{`