refactor: move Controls to Eppie.App.UI

References: Eppie-io#382
al-kau · Nov 1, 2024 · c868438 · c868438
1 parent 1bbe30c
commit c868438
Show file tree

Hide file tree

Showing 33 changed files with 101 additions and 100 deletions.
diff --git a/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems b/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
@@ -14,8 +14,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\AuthConfig.UWP.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\WindowsAuthenticationBroker.UWP.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\UITools.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseUserControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\RichTextEditor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\BitmapTools.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IncrementalLoading\IncrementalLoadingCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Models\BrandLoader.cs" />
@@ -42,48 +40,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml.cs">
-      <DependentUpon>AccountSettingsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml.cs">
-      <DependentUpon>AttachmentListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml.cs">
-      <DependentUpon>ContactsListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml.cs">
-      <DependentUpon>DecentralizedAccountSettingsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml.cs">
-      <DependentUpon>EmailProvidersListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml.cs">
-      <DependentUpon>EmailsInputControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml.cs">
-      <DependentUpon>ErrorControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml.cs">
-      <DependentUpon>LanguageSelectionControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml.cs">
-      <DependentUpon>MailBoxesListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml.cs">
-      <DependentUpon>MessageListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml.cs">
-      <DependentUpon>NavPanelTabControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml.cs">
-      <DependentUpon>PasswordControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml.cs">
-      <DependentUpon>PromptTextInputControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml.cs">
-      <DependentUpon>ProtonAccountSettingsControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Views\AboutPage.xaml.cs">
       <DependentUpon>AboutPage.xaml</DependentUpon>
     </Compile>
@@ -147,62 +103,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </ApplicationDefinition>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)StaticResources\StaticStringResources.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/...ared/Controls/AccountSettingsControl.xaml → ...ared/Controls/AccountSettingsControl.xaml b/...ared/Controls/AccountSettingsControl.xaml → ...ared/Controls/AccountSettingsControl.xaml
diff --git a/...d/Controls/AccountSettingsControl.xaml.cs → ...d/Controls/AccountSettingsControl.xaml.cs b/...d/Controls/AccountSettingsControl.xaml.cs → ...d/Controls/AccountSettingsControl.xaml.cs
diff --git a/...hared/Controls/AttachmentListControl.xaml → ...hared/Controls/AttachmentListControl.xaml b/...hared/Controls/AttachmentListControl.xaml → ...hared/Controls/AttachmentListControl.xaml
diff --git a/...ed/Controls/AttachmentListControl.xaml.cs → ...ed/Controls/AttachmentListControl.xaml.cs b/...ed/Controls/AttachmentListControl.xaml.cs → ...ed/Controls/AttachmentListControl.xaml.cs
diff --git a/...ie.App.Shared/Controls/BaseUserControl.cs → ...App.UI.Shared/Controls/BaseUserControl.cs b/...ie.App.Shared/Controls/BaseUserControl.cs → ...App.UI.Shared/Controls/BaseUserControl.cs
diff --git a/....Shared/Controls/ContactsListControl.xaml → ....Shared/Controls/ContactsListControl.xaml b/....Shared/Controls/ContactsListControl.xaml → ....Shared/Controls/ContactsListControl.xaml
diff --git a/...ared/Controls/ContactsListControl.xaml.cs → ...ared/Controls/ContactsListControl.xaml.cs b/...ared/Controls/ContactsListControl.xaml.cs → ...ared/Controls/ContactsListControl.xaml.cs
diff --git a/.../DecentralizedAccountSettingsControl.xaml → .../DecentralizedAccountSettingsControl.xaml b/.../DecentralizedAccountSettingsControl.xaml → .../DecentralizedAccountSettingsControl.xaml
diff --git a/...centralizedAccountSettingsControl.xaml.cs → ...centralizedAccountSettingsControl.xaml.cs b/...centralizedAccountSettingsControl.xaml.cs → ...centralizedAccountSettingsControl.xaml.cs
diff --git a/...d/Controls/EmailProvidersListControl.xaml → ...d/Controls/EmailProvidersListControl.xaml b/...d/Controls/EmailProvidersListControl.xaml → ...d/Controls/EmailProvidersListControl.xaml
diff --git a/...ontrols/EmailProvidersListControl.xaml.cs → ...ontrols/EmailProvidersListControl.xaml.cs b/...ontrols/EmailProvidersListControl.xaml.cs → ...ontrols/EmailProvidersListControl.xaml.cs
diff --git a/...p.Shared/Controls/EmailsInputControl.xaml → ...I.Shared/Controls/EmailsInputControl.xaml b/...p.Shared/Controls/EmailsInputControl.xaml → ...I.Shared/Controls/EmailsInputControl.xaml
diff --git a/...hared/Controls/EmailsInputControl.xaml.cs → ...hared/Controls/EmailsInputControl.xaml.cs b/...hared/Controls/EmailsInputControl.xaml.cs → ...hared/Controls/EmailsInputControl.xaml.cs
diff --git a/...pie.App.Shared/Controls/ErrorControl.xaml → ....App.UI.Shared/Controls/ErrorControl.xaml b/...pie.App.Shared/Controls/ErrorControl.xaml → ....App.UI.Shared/Controls/ErrorControl.xaml
diff --git a/....App.Shared/Controls/ErrorControl.xaml.cs → ...p.UI.Shared/Controls/ErrorControl.xaml.cs b/....App.Shared/Controls/ErrorControl.xaml.cs → ...p.UI.Shared/Controls/ErrorControl.xaml.cs
diff --git a/...ed/Controls/LanguageSelectionControl.xaml → ...ed/Controls/LanguageSelectionControl.xaml b/...ed/Controls/LanguageSelectionControl.xaml → ...ed/Controls/LanguageSelectionControl.xaml
diff --git a/...Controls/LanguageSelectionControl.xaml.cs → ...Controls/LanguageSelectionControl.xaml.cs b/...Controls/LanguageSelectionControl.xaml.cs → ...Controls/LanguageSelectionControl.xaml.cs
diff --git a/...Shared/Controls/MailBoxesListControl.xaml → ...Shared/Controls/MailBoxesListControl.xaml b/...Shared/Controls/MailBoxesListControl.xaml → ...Shared/Controls/MailBoxesListControl.xaml
diff --git a/...red/Controls/MailBoxesListControl.xaml.cs → ...red/Controls/MailBoxesListControl.xaml.cs b/...red/Controls/MailBoxesListControl.xaml.cs → ...red/Controls/MailBoxesListControl.xaml.cs
diff --git a/...p.Shared/Controls/MessageListControl.xaml → ...I.Shared/Controls/MessageListControl.xaml b/...p.Shared/Controls/MessageListControl.xaml → ...I.Shared/Controls/MessageListControl.xaml
diff --git a/...hared/Controls/MessageListControl.xaml.cs → ...hared/Controls/MessageListControl.xaml.cs b/...hared/Controls/MessageListControl.xaml.cs → ...hared/Controls/MessageListControl.xaml.cs
diff --git a/...p.Shared/Controls/NavPanelTabControl.xaml → ...I.Shared/Controls/NavPanelTabControl.xaml b/...p.Shared/Controls/NavPanelTabControl.xaml → ...I.Shared/Controls/NavPanelTabControl.xaml
diff --git a/...hared/Controls/NavPanelTabControl.xaml.cs → ...hared/Controls/NavPanelTabControl.xaml.cs b/...hared/Controls/NavPanelTabControl.xaml.cs → ...hared/Controls/NavPanelTabControl.xaml.cs
diff --git a/....App.Shared/Controls/PasswordControl.xaml → ...p.UI.Shared/Controls/PasswordControl.xaml b/....App.Shared/Controls/PasswordControl.xaml → ...p.UI.Shared/Controls/PasswordControl.xaml
diff --git a/...p.Shared/Controls/PasswordControl.xaml.cs → ...I.Shared/Controls/PasswordControl.xaml.cs b/...p.Shared/Controls/PasswordControl.xaml.cs → ...I.Shared/Controls/PasswordControl.xaml.cs
diff --git a/...ared/Controls/PromptTextInputControl.xaml → ...ared/Controls/PromptTextInputControl.xaml b/...ared/Controls/PromptTextInputControl.xaml → ...ared/Controls/PromptTextInputControl.xaml
diff --git a/...d/Controls/PromptTextInputControl.xaml.cs → ...d/Controls/PromptTextInputControl.xaml.cs b/...d/Controls/PromptTextInputControl.xaml.cs → ...d/Controls/PromptTextInputControl.xaml.cs
diff --git a/...ontrols/ProtonAccountSettingsControl.xaml → ...ontrols/ProtonAccountSettingsControl.xaml b/...ontrols/ProtonAccountSettingsControl.xaml → ...ontrols/ProtonAccountSettingsControl.xaml
diff --git a/...rols/ProtonAccountSettingsControl.xaml.cs → ...rols/ProtonAccountSettingsControl.xaml.cs b/...rols/ProtonAccountSettingsControl.xaml.cs → ...rols/ProtonAccountSettingsControl.xaml.cs
diff --git a/...pie.App.Shared/Controls/RichTextEditor.cs → ....App.UI.Shared/Controls/RichTextEditor.cs b/...pie.App.Shared/Controls/RichTextEditor.cs → ....App.UI.Shared/Controls/RichTextEditor.cs
diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
@@ -18,6 +18,50 @@
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ObjectToFileBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\PasteFromClipboardBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\TreeViewItemInvokeBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml.cs">
+      <DependentUpon>AccountSettingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml.cs">
+      <DependentUpon>AttachmentListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseUserControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml.cs">
+      <DependentUpon>ContactsListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml.cs">
+      <DependentUpon>DecentralizedAccountSettingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml.cs">
+      <DependentUpon>EmailProvidersListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml.cs">
+      <DependentUpon>EmailsInputControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml.cs">
+      <DependentUpon>ErrorControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml.cs">
+      <DependentUpon>LanguageSelectionControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml.cs">
+      <DependentUpon>MailBoxesListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml.cs">
+      <DependentUpon>MessageListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml.cs">
+      <DependentUpon>NavPanelTabControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml.cs">
+      <DependentUpon>PasswordControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml.cs">
+      <DependentUpon>PromptTextInputControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml.cs">
+      <DependentUpon>ProtonAccountSettingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\RichTextEditor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BitmapSourceConverters.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BoolToValueConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\ConverterChain.cs" />
@@ -31,6 +75,62 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\WebViewExtension.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Converters\ConvertersDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
@@ -106,6 +106,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" />
     <PackageReference Include="Microsoft.UI.Xaml" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" />
   </ItemGroup>