diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 810c5f6e..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: [bkaankose]
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 4b61a31b..00000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Bug Report
-about: Something is not working as intended
-title: "[Bug]"
-labels: bug
-assignees: bkaankose
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-proposal.md b/.github/ISSUE_TEMPLATE/feature-proposal.md
deleted file mode 100644
index 0fc10d0b..00000000
--- a/.github/ISSUE_TEMPLATE/feature-proposal.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature Proposal
-about: Suggest an idea for this project
-title: "[Proposal]"
-labels: enhancement
-assignees: ''
-
----
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Is your proposal implemented in Windows Mail?**
-Wino's priority is to catch up with the feature set of Windows Mail first.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/Wino.BackgroundTasks/Wino.BackgroundTasks.NET8.csproj b/Wino.BackgroundTasks/Wino.BackgroundTasks.NET8.csproj
index ae774d76..d0272eaf 100644
--- a/Wino.BackgroundTasks/Wino.BackgroundTasks.NET8.csproj
+++ b/Wino.BackgroundTasks/Wino.BackgroundTasks.NET8.csproj
@@ -1,9 +1,8 @@
- net8.0-windows10.0.22621.0
- 10.0.19041.0
+ net8.0-windows10.0.19041.0
+ 10.0.17763.0
Wino.BackgroundTasks.NET8
-
win-x86;win-x64;win-arm64
win10-x86;win10-x64;win10-arm64
true
diff --git a/Wino.Calendar/App.xaml b/Wino.Calendar/App.xaml
new file mode 100644
index 00000000..5707d1ac
--- /dev/null
+++ b/Wino.Calendar/App.xaml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/Wino.Calendar/App.xaml.cs b/Wino.Calendar/App.xaml.cs
new file mode 100644
index 00000000..971e694b
--- /dev/null
+++ b/Wino.Calendar/App.xaml.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Wino.Calendar
+{
+ ///
+ /// Provides application-specific behavior to supplement the default Application class.
+ ///
+ sealed partial class App : Application
+ {
+ ///
+ /// Initializes the singleton application object. This is the first line of authored code
+ /// executed, and as such is the logical equivalent of main() or WinMain().
+ ///
+ public App()
+ {
+ this.InitializeComponent();
+ this.Suspending += OnSuspending;
+ }
+
+ ///
+ /// Invoked when the application is launched normally by the end user. Other entry points
+ /// will be used such as when the application is launched to open a specific file.
+ ///
+ /// Details about the launch request and process.
+ protected override void OnLaunched(LaunchActivatedEventArgs e)
+ {
+ Frame rootFrame = Window.Current.Content as Frame;
+
+ // Do not repeat app initialization when the Window already has content,
+ // just ensure that the window is active
+ if (rootFrame == null)
+ {
+ // Create a Frame to act as the navigation context and navigate to the first page
+ rootFrame = new Frame();
+
+ rootFrame.NavigationFailed += OnNavigationFailed;
+
+ if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+ {
+ //TODO: Load state from previously suspended application
+ }
+
+ // Place the frame in the current Window
+ Window.Current.Content = rootFrame;
+ }
+
+ if (e.PrelaunchActivated == false)
+ {
+ if (rootFrame.Content == null)
+ {
+ // When the navigation stack isn't restored navigate to the first page,
+ // configuring the new page by passing required information as a navigation
+ // parameter
+ rootFrame.Navigate(typeof(MainPage), e.Arguments);
+ }
+ // Ensure the current window is active
+ Window.Current.Activate();
+ }
+ }
+
+ ///
+ /// Invoked when Navigation to a certain page fails
+ ///
+ /// The Frame which failed navigation
+ /// Details about the navigation failure
+ void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+ {
+ throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+ }
+
+ ///
+ /// Invoked when application execution is being suspended. Application state is saved
+ /// without knowing whether the application will be terminated or resumed with the contents
+ /// of memory still intact.
+ ///
+ /// The source of the suspend request.
+ /// Details about the suspend request.
+ private void OnSuspending(object sender, SuspendingEventArgs e)
+ {
+ var deferral = e.SuspendingOperation.GetDeferral();
+ //TODO: Save application state and stop any background activity
+ deferral.Complete();
+ }
+ }
+}
diff --git a/Wino.Calendar/Assets/LockScreenLogo.scale-200.png b/Wino.Calendar/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 00000000..735f57ad
Binary files /dev/null and b/Wino.Calendar/Assets/LockScreenLogo.scale-200.png differ
diff --git a/Wino.Calendar/Assets/SplashScreen.scale-200.png b/Wino.Calendar/Assets/SplashScreen.scale-200.png
new file mode 100644
index 00000000..023e7f1f
Binary files /dev/null and b/Wino.Calendar/Assets/SplashScreen.scale-200.png differ
diff --git a/Wino.Calendar/Assets/Square150x150Logo.scale-200.png b/Wino.Calendar/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..af49fec1
Binary files /dev/null and b/Wino.Calendar/Assets/Square150x150Logo.scale-200.png differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.scale-200.png b/Wino.Calendar/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..ce342a2e
Binary files /dev/null and b/Wino.Calendar/Assets/Square44x44Logo.scale-200.png differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..f6c02ce9
Binary files /dev/null and b/Wino.Calendar/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Wino.Calendar/Assets/StoreLogo.png b/Wino.Calendar/Assets/StoreLogo.png
new file mode 100644
index 00000000..7385b56c
Binary files /dev/null and b/Wino.Calendar/Assets/StoreLogo.png differ
diff --git a/Wino.Calendar/Assets/Wide310x150Logo.scale-200.png b/Wino.Calendar/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..288995b3
Binary files /dev/null and b/Wino.Calendar/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/Wino.Calendar/MainPage.xaml b/Wino.Calendar/MainPage.xaml
new file mode 100644
index 00000000..136e046c
--- /dev/null
+++ b/Wino.Calendar/MainPage.xaml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/Wino.Calendar/MainPage.xaml.cs b/Wino.Calendar/MainPage.xaml.cs
new file mode 100644
index 00000000..281f422f
--- /dev/null
+++ b/Wino.Calendar/MainPage.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
+
+namespace Wino.Calendar
+{
+ ///
+ /// An empty page that can be used on its own or navigated to within a Frame.
+ ///
+ public sealed partial class MainPage : Page
+ {
+ public MainPage()
+ {
+ this.InitializeComponent();
+ }
+ }
+}
diff --git a/Wino.Calendar/Package.appxmanifest b/Wino.Calendar/Package.appxmanifest
new file mode 100644
index 00000000..6e261c84
--- /dev/null
+++ b/Wino.Calendar/Package.appxmanifest
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Wino Calendar
+ Burak KÖSE
+ Assets\StoreLogo.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Wino.Calendar/Properties/AssemblyInfo.cs b/Wino.Calendar/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..979badd3
--- /dev/null
+++ b/Wino.Calendar/Properties/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wino.Calendar")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Wino.Calendar")]
+[assembly: AssemblyCopyright("Copyright © 2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Wino.Calendar/Properties/Default.rd.xml b/Wino.Calendar/Properties/Default.rd.xml
new file mode 100644
index 00000000..af00722c
--- /dev/null
+++ b/Wino.Calendar/Properties/Default.rd.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Wino.Calendar/Wino.Calendar.csproj b/Wino.Calendar/Wino.Calendar.csproj
new file mode 100644
index 00000000..2a0e6530
--- /dev/null
+++ b/Wino.Calendar/Wino.Calendar.csproj
@@ -0,0 +1,172 @@
+
+
+
+
+ Debug
+ x86
+ {600F4979-DB7E-409D-B7DA-B60BE4C55C35}
+ AppContainerExe
+ Properties
+ Wino.Calendar
+ Wino.Calendar
+ en-US
+ UAP
+ 10.0.22621.0
+ 10.0.17763.0
+ 14
+ 512
+ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ true
+ True
+ 125A5273FCFE8D551C3FED87F67C87A663E98F1B
+
+ True
+
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x86
+ false
+ prompt
+ true
+
+
+ bin\x86\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x86
+ false
+ prompt
+ true
+ true
+
+
+ true
+ bin\ARM\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM
+ false
+ prompt
+ true
+
+
+ bin\ARM\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM
+ false
+ prompt
+ true
+ true
+
+
+ true
+ bin\ARM64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+ bin\ARM64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x64
+ false
+ prompt
+ true
+
+
+ bin\x64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x64
+ false
+ prompt
+ true
+ true
+
+
+ PackageReference
+
+
+
+ App.xaml
+
+
+ MainPage.xaml
+
+
+
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+
+
+ 6.2.14
+
+
+
+ 14.0
+
+
+
+
\ No newline at end of file
diff --git a/Wino.Core.Domain/Wino.Core.Domain.NET8.csproj b/Wino.Core.Domain/Wino.Core.Domain.NET8.csproj
index 66ebaf5b..7dc4c8e4 100644
--- a/Wino.Core.Domain/Wino.Core.Domain.NET8.csproj
+++ b/Wino.Core.Domain/Wino.Core.Domain.NET8.csproj
@@ -56,6 +56,7 @@
+
diff --git a/Wino.Core.UWP/CoreUWPContainerSetup.cs b/Wino.Core.UWP/CoreUWPContainerSetup.cs
index 3ff22c19..40529d1e 100644
--- a/Wino.Core.UWP/CoreUWPContainerSetup.cs
+++ b/Wino.Core.UWP/CoreUWPContainerSetup.cs
@@ -21,8 +21,7 @@ namespace Wino.Core.UWP
services.AddSingleton();
services.AddSingleton();
services.AddSingleton();
-
-
+ services.AddSingleton();
services.AddTransient();
services.AddTransient();
services.AddTransient();
diff --git a/Wino.Core.UWP/UWPDispatcher.cs b/Wino.Core.UWP/Dispatcher.cs
similarity index 100%
rename from Wino.Core.UWP/UWPDispatcher.cs
rename to Wino.Core.UWP/Dispatcher.cs
diff --git a/Wino.Core.UWP/Wino.Core.WinUI.csproj b/Wino.Core.UWP/Wino.Core.WinUI.csproj
index bb2046be..db104424 100644
--- a/Wino.Core.UWP/Wino.Core.WinUI.csproj
+++ b/Wino.Core.UWP/Wino.Core.WinUI.csproj
@@ -1,13 +1,12 @@
- net8.0-windows10.0.22621.0
- 10.0.19041.0
+ net8.0-windows10.0.19041.0
+ 10.0.17763.0
Wino.Core.WinUI
win-x86;win-x64;win-arm64
win10-x86;win10-x64;win10-arm64
true
-
diff --git a/Wino.Mail.WinUI/App.xaml b/Wino.Mail.WinUI/App.xaml
index f0538f18..98d017e8 100644
--- a/Wino.Mail.WinUI/App.xaml
+++ b/Wino.Mail.WinUI/App.xaml
@@ -1,16 +1,234 @@
+ xmlns:controls="using:Wino.Controls"
+ xmlns:selectors="using:Wino.Selectors"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+
+
+
+
+
+
+
+
+
+
+ 19
+ 19
+ 24,24,24,24
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
-
diff --git a/Wino.Mail.WinUI/App.xaml.cs b/Wino.Mail.WinUI/App.xaml.cs
index bb36f1d4..ca532336 100644
--- a/Wino.Mail.WinUI/App.xaml.cs
+++ b/Wino.Mail.WinUI/App.xaml.cs
@@ -1,4 +1,5 @@
-using System.Text;
+using System;
+using System.Text;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
@@ -9,8 +10,7 @@ using Wino.Core.Services;
using Wino.Core.WinUI.Services;
using Wino.Views;
using WinUIEx;
-
-namespace Wino.Mail.WinUI
+namespace Wino
{
public partial class App : Application
{
@@ -62,7 +62,7 @@ namespace Wino.Mail.WinUI
m_Window.Activate();
}
- private void ConfigureWindow()
+ private async void ConfigureWindow()
{
m_Window = new WindowEx
{
diff --git a/Wino.Mail.WinUI/AppThemes/Custom.xaml b/Wino.Mail.WinUI/AppThemes/Custom.xaml
index 97df0020..9323c48c 100644
--- a/Wino.Mail.WinUI/AppThemes/Custom.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Custom.xaml
@@ -1,4 +1,4 @@
-
diff --git a/Wino.Mail.WinUI/Assets/LargeTile.scale-100.png b/Wino.Mail.WinUI/Assets/LargeTile.scale-100.png
index aca6e4e2..914dbf12 100644
Binary files a/Wino.Mail.WinUI/Assets/LargeTile.scale-100.png and b/Wino.Mail.WinUI/Assets/LargeTile.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/LargeTile.scale-125.png b/Wino.Mail.WinUI/Assets/LargeTile.scale-125.png
index b80bf9d4..064a430a 100644
Binary files a/Wino.Mail.WinUI/Assets/LargeTile.scale-125.png and b/Wino.Mail.WinUI/Assets/LargeTile.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/LargeTile.scale-150.png b/Wino.Mail.WinUI/Assets/LargeTile.scale-150.png
index 1ed2a001..926ef868 100644
Binary files a/Wino.Mail.WinUI/Assets/LargeTile.scale-150.png and b/Wino.Mail.WinUI/Assets/LargeTile.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/LargeTile.scale-200.png b/Wino.Mail.WinUI/Assets/LargeTile.scale-200.png
index a8e471dd..942e65af 100644
Binary files a/Wino.Mail.WinUI/Assets/LargeTile.scale-200.png and b/Wino.Mail.WinUI/Assets/LargeTile.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/LargeTile.scale-400.png b/Wino.Mail.WinUI/Assets/LargeTile.scale-400.png
index 54cea310..23fa4eec 100644
Binary files a/Wino.Mail.WinUI/Assets/LargeTile.scale-400.png and b/Wino.Mail.WinUI/Assets/LargeTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/SmallTile.scale-100.png b/Wino.Mail.WinUI/Assets/SmallTile.scale-100.png
index f0d52390..bd9d3edf 100644
Binary files a/Wino.Mail.WinUI/Assets/SmallTile.scale-100.png and b/Wino.Mail.WinUI/Assets/SmallTile.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/SmallTile.scale-125.png b/Wino.Mail.WinUI/Assets/SmallTile.scale-125.png
index 4a0404cf..af9bc65c 100644
Binary files a/Wino.Mail.WinUI/Assets/SmallTile.scale-125.png and b/Wino.Mail.WinUI/Assets/SmallTile.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/SmallTile.scale-150.png b/Wino.Mail.WinUI/Assets/SmallTile.scale-150.png
index f801334e..809bd4cc 100644
Binary files a/Wino.Mail.WinUI/Assets/SmallTile.scale-150.png and b/Wino.Mail.WinUI/Assets/SmallTile.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/SmallTile.scale-200.png b/Wino.Mail.WinUI/Assets/SmallTile.scale-200.png
index bb2c20c9..e1fb3314 100644
Binary files a/Wino.Mail.WinUI/Assets/SmallTile.scale-200.png and b/Wino.Mail.WinUI/Assets/SmallTile.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/SmallTile.scale-400.png b/Wino.Mail.WinUI/Assets/SmallTile.scale-400.png
index c931a5dd..c0126862 100644
Binary files a/Wino.Mail.WinUI/Assets/SmallTile.scale-400.png and b/Wino.Mail.WinUI/Assets/SmallTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/SplashScreen.scale-100.png b/Wino.Mail.WinUI/Assets/SplashScreen.scale-100.png
index 23c8f147..07f543a6 100644
Binary files a/Wino.Mail.WinUI/Assets/SplashScreen.scale-100.png and b/Wino.Mail.WinUI/Assets/SplashScreen.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/SplashScreen.scale-125.png b/Wino.Mail.WinUI/Assets/SplashScreen.scale-125.png
index ceb2dff6..f73d3264 100644
Binary files a/Wino.Mail.WinUI/Assets/SplashScreen.scale-125.png and b/Wino.Mail.WinUI/Assets/SplashScreen.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/SplashScreen.scale-150.png b/Wino.Mail.WinUI/Assets/SplashScreen.scale-150.png
index 885d9bc2..741dfbab 100644
Binary files a/Wino.Mail.WinUI/Assets/SplashScreen.scale-150.png and b/Wino.Mail.WinUI/Assets/SplashScreen.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/SplashScreen.scale-200.png b/Wino.Mail.WinUI/Assets/SplashScreen.scale-200.png
index 58c8ca7c..f8877820 100644
Binary files a/Wino.Mail.WinUI/Assets/SplashScreen.scale-200.png and b/Wino.Mail.WinUI/Assets/SplashScreen.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/SplashScreen.scale-400.png b/Wino.Mail.WinUI/Assets/SplashScreen.scale-400.png
index fa77f2b7..824c4aa7 100644
Binary files a/Wino.Mail.WinUI/Assets/SplashScreen.scale-400.png and b/Wino.Mail.WinUI/Assets/SplashScreen.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-100.png b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-100.png
index a5f235b8..8cdf8794 100644
Binary files a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-100.png and b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-125.png b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-125.png
index be92b5ae..c666ed70 100644
Binary files a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-125.png and b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-150.png b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-150.png
index d0039797..6f82a0ba 100644
Binary files a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-150.png and b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-200.png b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-200.png
index 430e6fa3..8071f410 100644
Binary files a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-200.png and b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-400.png b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-400.png
index 9726829b..831d82c2 100644
Binary files a/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-400.png and b/Wino.Mail.WinUI/Assets/Square150x150Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
index 4d6b9dfe..3e5ca37f 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
index c0aa2ba3..a1469030 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
index 7be00300..bacb0965 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
index a6e4b0a2..3bc97a80 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
index 07514cc2..9518de76 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
index 4d6b9dfe..3e5ca37f 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
index 7be00300..bacb0965 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
index a6e4b0a2..3bc97a80 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
index 07514cc2..9518de76 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-100.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-100.png
index 7432521d..ae2a25af 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-100.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-125.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-125.png
index fe38dbdf..8b69ca05 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-125.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-150.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-150.png
index 1ee950af..690da58d 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-150.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-200.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-200.png
index 807e9ed4..44080349 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-200.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-400.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-400.png
index f4457476..c1aa666e 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-400.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-16.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-16.png
index 9acb3cc8..8c7301ae 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-16.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24.png
index c1e08a4f..258ea791 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index c0aa2ba3..a1469030 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-256.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-256.png
index 37f8decd..2a315657 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-256.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-32.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-32.png
index 93c856d9..1bb3d19c 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-32.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-48.png b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-48.png
index a2ca3afc..6b414eab 100644
Binary files a/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-48.png and b/Wino.Mail.WinUI/Assets/Square44x44Logo.targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.backup.png b/Wino.Mail.WinUI/Assets/StoreLogo.backup.png
index 7385b56c..a4586f26 100644
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.backup.png and b/Wino.Mail.WinUI/Assets/StoreLogo.backup.png differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.png b/Wino.Mail.WinUI/Assets/StoreLogo.png
deleted file mode 100644
index a4586f26..00000000
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.png and /dev/null differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.scale-100.png b/Wino.Mail.WinUI/Assets/StoreLogo.scale-100.png
index 4c4b4b34..019e7c19 100644
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.scale-100.png and b/Wino.Mail.WinUI/Assets/StoreLogo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.scale-125.png b/Wino.Mail.WinUI/Assets/StoreLogo.scale-125.png
index 1c325127..597bfcb8 100644
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.scale-125.png and b/Wino.Mail.WinUI/Assets/StoreLogo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.scale-150.png b/Wino.Mail.WinUI/Assets/StoreLogo.scale-150.png
index bb194ef7..98adf39d 100644
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.scale-150.png and b/Wino.Mail.WinUI/Assets/StoreLogo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.scale-200.png b/Wino.Mail.WinUI/Assets/StoreLogo.scale-200.png
index b77a5ddc..7d7106c5 100644
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.scale-200.png and b/Wino.Mail.WinUI/Assets/StoreLogo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/StoreLogo.scale-400.png b/Wino.Mail.WinUI/Assets/StoreLogo.scale-400.png
index 8d0a133e..59fe9b24 100644
Binary files a/Wino.Mail.WinUI/Assets/StoreLogo.scale-400.png and b/Wino.Mail.WinUI/Assets/StoreLogo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-100.png b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-100.png
index f330133d..d8715395 100644
Binary files a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-100.png and b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-125.png b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-125.png
index e4656fa7..0ce162bd 100644
Binary files a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-125.png and b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-150.png b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-150.png
index 884084b3..b1676d1a 100644
Binary files a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-150.png and b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-200.png b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-200.png
index 23c8f147..07f543a6 100644
Binary files a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-200.png and b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-400.png b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-400.png
index 58c8ca7c..f8877820 100644
Binary files a/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-400.png and b/Wino.Mail.WinUI/Assets/Wide310x150Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/BasePage.cs b/Wino.Mail.WinUI/BasePage.cs
index 57474c96..cd67561c 100644
--- a/Wino.Mail.WinUI/BasePage.cs
+++ b/Wino.Mail.WinUI/BasePage.cs
@@ -6,9 +6,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using Wino.Core.Messages.Shell;
-using Wino.Core.WinUI;
using Wino.Mail.ViewModels;
-using Wino.Mail.WinUI;
namespace Wino
{
diff --git a/Wino.Mail.WinUI/Package.appxmanifest b/Wino.Mail.WinUI/Package.appxmanifest
index 90343c7f..d61e59d4 100644
--- a/Wino.Mail.WinUI/Package.appxmanifest
+++ b/Wino.Mail.WinUI/Package.appxmanifest
@@ -7,16 +7,25 @@
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap rescap">
-
+
+
+
+
+
+
+
+
-
+
+
+
- Wino.Mail.WinUI
- bkaan
+ Wino Mail (Preview)
+ Burak KÖSE
Assets\StoreLogo.png
@@ -34,14 +43,53 @@
Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Google Auth Protocol
+
+
+
+
+
+
+
+
+
+ EML\eml.png
+
+ .eml
+
+
+
+
+
diff --git a/Wino.Mail.WinUI/Properties/launchSettings.json b/Wino.Mail.WinUI/Properties/launchSettings.json
new file mode 100644
index 00000000..8d2cf66c
--- /dev/null
+++ b/Wino.Mail.WinUI/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+ "profiles": {
+ "Wino.Mail.WinUI (Package)": {
+ "commandName": "MsixPackage"
+ },
+ "Wino.Mail.WinUI (Unpackaged)": {
+ "commandName": "Project"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Wino.Mail.WinUI/Views/WelcomePage.xaml b/Wino.Mail.WinUI/Views/WelcomePage.xaml
index 743d5944..c9eb0f75 100644
--- a/Wino.Mail.WinUI/Views/WelcomePage.xaml
+++ b/Wino.Mail.WinUI/Views/WelcomePage.xaml
@@ -1,36 +1,15 @@
-
+
+ mc:Ignorable="d"
+ Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-
-
+
-
-
-
-
-
+
+
diff --git a/Wino.Mail.WinUI/Views/WelcomePage.xaml.cs b/Wino.Mail.WinUI/Views/WelcomePage.xaml.cs
index 056c1811..d529cc18 100644
--- a/Wino.Mail.WinUI/Views/WelcomePage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/WelcomePage.xaml.cs
@@ -1,17 +1,31 @@
-using Wino.Views.Abstract;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Wino.Views
{
- public sealed partial class WelcomePage : WelcomePageAbstract
+ ///
+ /// An empty page that can be used on its own or navigated to within a Frame.
+ ///
+ public sealed partial class WelcomePage : Page
{
public WelcomePage()
{
- InitializeComponent();
+ this.InitializeComponent();
}
-
- //private async void HyperlinkClicked(object sender, Microsoft.Toolkit.Uwp.UI.Controls.LinkClickedEventArgs e)
- //{
- // await Launcher.LaunchUriAsync(new System.Uri(e.Link));
- //}
}
}
diff --git a/Wino.Core.UWP/WinAppDispatcher.cs b/Wino.Mail.WinUI/WinAppDispatcher.cs
similarity index 95%
rename from Wino.Core.UWP/WinAppDispatcher.cs
rename to Wino.Mail.WinUI/WinAppDispatcher.cs
index 9966606d..9df43663 100644
--- a/Wino.Core.UWP/WinAppDispatcher.cs
+++ b/Wino.Mail.WinUI/WinAppDispatcher.cs
@@ -4,7 +4,7 @@ using CommunityToolkit.WinUI;
using Microsoft.UI.Dispatching;
using Wino.Core.Domain.Interfaces;
-namespace Wino.Core.WinUI
+namespace Wino
{
public class WinAppDispatcher : IDispatcher
{
diff --git a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
index e9814396..79466454 100644
--- a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
+++ b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
@@ -1,47 +1,207 @@
WinExe
- net8.0-windows10.0.22621.0
- 10.0.19041.0
- Wino.Mail.WinUI
+ net8.0-windows10.0.19041.0
+ 10.0.17763.0
+ Wino
app.manifest
x86;x64;ARM64
win-x86;win-x64;win-arm64
win10-x86;win10-x64;win10-arm64
- 10.0.22621.35-preview
win-$(Platform).pubxml
-
true
true
- True
+ 10.0.19041.35-preview
+ True
+ False
+ True
+ False
+ SHA256
+ False
+ C:\Users\bkaan\Desktop\Packages\WinUI\
+ True
+ True
+ Always
+ x86|x64|arm64
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
@@ -54,14 +214,215 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+
+
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
diff --git a/Wino.Mail/App.xaml.cs b/Wino.Mail/App.xaml.cs
new file mode 100644
index 00000000..fd1b9051
--- /dev/null
+++ b/Wino.Mail/App.xaml.cs
@@ -0,0 +1,226 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.AppService;
+using Windows.ApplicationModel.Background;
+using Windows.Storage;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Wino.Activation;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Services;
+using Wino.Core.WinUI.Services;
+
+namespace Wino
+{
+ public sealed partial class App : Application
+ {
+ private BackgroundTaskDeferral backgroundTaskDeferral;
+
+ private readonly IApplicationConfiguration _applicationFolderConfiguration;
+
+ public App()
+ {
+ InitializeComponent();
+
+ UnhandledException += OnAppUnhandledException;
+ EnteredBackground += OnEnteredBackground;
+ LeavingBackground += OnLeavingBackground;
+
+ Resuming += OnResuming;
+ Suspending += OnSuspending;
+
+ Services = ConfigureServices();
+
+ _logInitializer = Services.GetService();
+
+ ConfigureLogger();
+ ConfigureAppCenter();
+ ConfigurePrelaunch();
+ ConfigureXbox();
+
+ _applicationFolderConfiguration = Services.GetService();
+
+ // Make sure the paths are setup on app start.
+ _applicationFolderConfiguration.ApplicationDataFolderPath = ApplicationData.Current.LocalFolder.Path;
+ _applicationFolderConfiguration.PublisherSharedFolderPath = ApplicationData.Current.GetPublisherCacheFolder(ApplicationConfiguration.SharedFolderName).Path;
+
+ _appServiceConnectionManager = Services.GetService>();
+ _themeService = Services.GetService();
+ _databaseService = Services.GetService();
+ _translationService = Services.GetService();
+ _appShellService = Services.GetService();
+
+ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+ }
+
+ private async void OnResuming(object sender, object e)
+ {
+ // App Service connection was lost on suspension.
+ // We must restore it.
+ // Server might be running already, but re-launching it will trigger a new connection attempt.
+
+ await _appServiceConnectionManager.ConnectAsync();
+ }
+
+ private void OnSuspending(object sender, SuspendingEventArgs e)
+ {
+ var deferral = e.SuspendingOperation.GetDeferral();
+ deferral.Complete();
+ }
+
+ private void LogActivation(string log) => Log.Information($"{WinoLaunchLogPrefix}{log}");
+ private void OnLeavingBackground(object sender, LeavingBackgroundEventArgs e) => LogActivation($"Wino went foreground.");
+ private void OnEnteredBackground(object sender, EnteredBackgroundEventArgs e) => LogActivation($"Wino went background.");
+
+
+ protected override void OnWindowCreated(WindowCreatedEventArgs args)
+ {
+ base.OnWindowCreated(args);
+
+ _appShellService.AppWindow = args.Window;
+
+ LogActivation("Window is created.");
+
+ ConfigureTitleBar();
+ }
+
+ protected override async void OnLaunched(LaunchActivatedEventArgs args)
+ {
+ LogActivation($"OnLaunched -> {args.GetType().Name}, Kind -> {args.Kind}, PreviousExecutionState -> {args.PreviousExecutionState}, IsPrelaunch -> {args.PrelaunchActivated}");
+
+ if (!args.PrelaunchActivated)
+ {
+ await ActivateWinoAsync(args);
+ }
+ }
+
+ protected override async void OnFileActivated(FileActivatedEventArgs args)
+ {
+ base.OnFileActivated(args);
+
+ Log.Information($"File activation for {args.Files.Count} item(s).");
+
+ await ActivateWinoAsync(args);
+ }
+
+ protected override async void OnActivated(IActivatedEventArgs args)
+ {
+ base.OnActivated(args);
+
+ Log.Information($"OnActivated -> {args.GetType().Name}, Kind -> {args.Kind}, Prev Execution State -> {args.PreviousExecutionState}");
+
+ await ActivateWinoAsync(args);
+ }
+
+ protected override async void OnBackgroundActivated(BackgroundActivatedEventArgs args)
+ {
+ base.OnBackgroundActivated(args);
+
+ // This can only be handled in App.xaml.cs
+ // Using handler activation makes it crash at runtime with a COM error...
+ if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails appServiceTriggerDetails)
+ {
+ // Only accept connections from callers in the same package
+ if (appServiceTriggerDetails.CallerPackageFamilyName == Package.Current.Id.FamilyName)
+ {
+ // Connection established from the fulltrust process
+
+ backgroundTaskDeferral = args.TaskInstance.GetDeferral();
+ args.TaskInstance.Canceled += OnBackgroundTaskCanceled;
+
+ _appServiceConnectionManager.Connection = appServiceTriggerDetails.AppServiceConnection;
+ }
+ }
+
+ LogActivation($"OnBackgroundActivated -> {args.GetType().Name}, TaskInstanceIdName -> {args.TaskInstance?.Task?.Name ?? "NA"}");
+
+ await ActivateWinoAsync(args);
+ }
+
+ private void OnAppUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
+ {
+ var parameters = new Dictionary()
+ {
+ { "BaseMessage", e.Exception.GetBaseException().Message },
+ { "BaseStackTrace", e.Exception.GetBaseException().StackTrace },
+ { "StackTrace", e.Exception.StackTrace },
+ { "Message", e.Exception.Message },
+ };
+
+ Log.Error(e.Exception, "[Wino Crash]");
+
+ Crashes.TrackError(e.Exception, parameters);
+ Analytics.TrackEvent("Wino Crashed", parameters);
+ }
+
+ private bool IsInteractiveLaunchArgs(object args) => args is IActivatedEventArgs;
+
+ private async Task ActivateWinoAsync(object args)
+ {
+ foreach (var service in initializeServices)
+ {
+ await service.InitializeAsync();
+ }
+
+ if (IsInteractiveLaunchArgs(args))
+ {
+ if (Window.Current.Content == null)
+ {
+ var mainFrame = new Frame();
+
+ Window.Current.Content = mainFrame;
+
+ await _themeService.InitializeAsync();
+ }
+ }
+
+ await HandleActivationAsync(args);
+
+ if (IsInteractiveLaunchArgs(args))
+ {
+ Window.Current.Activate();
+
+ LogActivation("Window activated");
+ }
+ }
+
+ private async Task HandleActivationAsync(object activationArgs)
+ {
+ var activationHandler = GetActivationHandlers().FirstOrDefault(h => h.CanHandle(activationArgs));
+
+ if (activationHandler != null)
+ {
+ await activationHandler.HandleAsync(activationArgs);
+ }
+
+ if (IsInteractiveLaunchArgs(activationArgs))
+ {
+ var defaultHandler = new DefaultActivationHandler();
+ if (defaultHandler.CanHandle(activationArgs))
+ {
+ await defaultHandler.HandleAsync(activationArgs);
+ }
+ }
+ }
+
+ public async void OnBackgroundTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
+ {
+ Log.Information($"Background task {sender.Task.Name} was canceled. Reason: {reason}");
+
+ await _appServiceConnectionManager.DisconnectAsync();
+
+ backgroundTaskDeferral?.Complete();
+ backgroundTaskDeferral = null;
+
+ _appServiceConnectionManager.Connection = null;
+ }
+ }
+}
diff --git a/Wino.Mail.WinUI/AppShell.xaml b/Wino.Mail/AppShell.xaml
similarity index 99%
rename from Wino.Mail.WinUI/AppShell.xaml
rename to Wino.Mail/AppShell.xaml
index f8f886f2..b839ea34 100644
--- a/Wino.Mail.WinUI/AppShell.xaml
+++ b/Wino.Mail/AppShell.xaml
@@ -514,6 +514,14 @@
IsOpen="False"
PreferredPlacement="Bottom"
Target="{x:Bind ShellInfoBar}" />
+
+
+
+
diff --git a/Wino.Mail.WinUI/AppShell.xaml.cs b/Wino.Mail/AppShell.xaml.cs
similarity index 91%
rename from Wino.Mail.WinUI/AppShell.xaml.cs
rename to Wino.Mail/AppShell.xaml.cs
index 1638bd25..fe54c0cc 100644
--- a/Wino.Mail.WinUI/AppShell.xaml.cs
+++ b/Wino.Mail/AppShell.xaml.cs
@@ -4,12 +4,9 @@ using System.Linq;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Input;
using Windows.ApplicationModel.Core;
using Windows.Foundation;
+
using Wino.Controls;
using Wino.Core.Domain;
using Wino.Core.Domain.Entities;
@@ -25,6 +22,22 @@ using Wino.Mail.ViewModels.Data;
using Wino.MenuFlyouts;
using Wino.MenuFlyouts.Context;
using Wino.Views.Abstract;
+using Microsoft.UI.Xaml.Controls;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Navigation;
+using Microsoft.Extensions.DependencyInjection;
+#endif
namespace Wino.Views
{
@@ -32,14 +45,20 @@ namespace Wino.Views
IRecipient,
IRecipient,
IRecipient,
- IRecipient
+ IRecipient,
+ IRecipient
{
public AppShell() : base()
{
InitializeComponent();
+#if !NET8_0
+ // BackdropMaterial is not available in WinUI 3.0.
+ // We manually apply it for UWP version only.
+ SetupMica();
var coreTitleBar = CoreApplication.GetCurrentView().TitleBar;
coreTitleBar.LayoutMetricsChanged += TitleBarLayoutUpdated;
+#endif
}
private void TitleBarLayoutUpdated(CoreApplicationViewTitleBar sender, object args) => UpdateTitleBarLayout(sender);
@@ -200,7 +219,7 @@ namespace Wino.Views
}
}
- private void ShellFrameContentNavigated(object sender, Microsoft.UI.Xaml.Navigation.NavigationEventArgs e)
+ private void ShellFrameContentNavigated(object sender, NavigationEventArgs e)
=> RealAppBar.ShellFrameContent = (e.Content as BasePage).ShellContent;
private void BackButtonClicked(Controls.Advanced.WinoAppTitleBar sender, RoutedEventArgs args)
@@ -277,7 +296,7 @@ namespace Wino.Views
///
public async void Receive(InfoBarMessageRequested message)
{
- await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+ await ViewModel.ExecuteUIThread(() =>
{
if (string.IsNullOrEmpty(message.ActionButtonTitle) || message.Action == null)
{
@@ -298,5 +317,22 @@ namespace Wino.Views
ShellInfoBar.IsOpen = true;
});
}
+
+
+ private void SetupMica()
+ {
+#if !NET8_0
+ var resourceManager = App.Current.Services.GetService>();
+
+ if (resourceManager.ContainsResourceKey("UseMica"))
+ {
+ bool isMicaEnabled = resourceManager.GetResource("UseMica");
+
+ BackdropMaterial.SetApplyToRootOrPageBackground(this, isMicaEnabled);
+ }
+#endif
+ }
+
+ public void Receive(ApplicationThemeChanged message) => SetupMica();
}
}
diff --git a/Wino.Mail.WinUI/AppThemes/Acrylic.xaml b/Wino.Mail/AppThemes/Acrylic.xaml
similarity index 63%
rename from Wino.Mail.WinUI/AppThemes/Acrylic.xaml
rename to Wino.Mail/AppThemes/Acrylic.xaml
index ef5325f4..fb84bf43 100644
--- a/Wino.Mail.WinUI/AppThemes/Acrylic.xaml
+++ b/Wino.Mail/AppThemes/Acrylic.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.UI.Xaml.Media"
- xmlns:xaml="using:Microsoft.UI.Xaml">
+ xmlns:xaml="using:Windows.UI.Xaml">
Acrylic
False
@@ -15,11 +15,23 @@
#ecf0f1
+
#2C2C2C
+
diff --git a/Wino.Mail.WinUI/AppThemes/Clouds.xaml b/Wino.Mail/AppThemes/Clouds.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/Clouds.xaml
rename to Wino.Mail/AppThemes/Clouds.xaml
diff --git a/Wino.Mail/AppThemes/Custom.xaml b/Wino.Mail/AppThemes/Custom.xaml
new file mode 100644
index 00000000..71bbf1a3
--- /dev/null
+++ b/Wino.Mail/AppThemes/Custom.xaml
@@ -0,0 +1,47 @@
+
+
+ Custom
+ ms-appdata:///local/CustomWallpaper.jpg
+ False
+
+
+
+
+ 0,0,0,0
+ 0,1,0,0
+ 0,0,0,0
+
+
+
+
+ #ecf0f1
+
+ #D9FFFFFF
+
+
+
+
+
+
+
+
+ #1f1f1f
+
+ #E61F1F1F
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Wino.Mail.WinUI/AppThemes/Forest.xaml b/Wino.Mail/AppThemes/Forest.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/Forest.xaml
rename to Wino.Mail/AppThemes/Forest.xaml
diff --git a/Wino.Mail.WinUI/AppThemes/Garden.xaml b/Wino.Mail/AppThemes/Garden.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/Garden.xaml
rename to Wino.Mail/AppThemes/Garden.xaml
diff --git a/Wino.Mail.WinUI/AppThemes/Mica.xaml b/Wino.Mail/AppThemes/Mica.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/Mica.xaml
rename to Wino.Mail/AppThemes/Mica.xaml
diff --git a/Wino.Mail.WinUI/AppThemes/Nighty.xaml b/Wino.Mail/AppThemes/Nighty.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/Nighty.xaml
rename to Wino.Mail/AppThemes/Nighty.xaml
diff --git a/Wino.Mail.WinUI/AppThemes/Snowflake.xaml b/Wino.Mail/AppThemes/Snowflake.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/Snowflake.xaml
rename to Wino.Mail/AppThemes/Snowflake.xaml
diff --git a/Wino.Mail.WinUI/AppThemes/TestTheme.xaml b/Wino.Mail/AppThemes/TestTheme.xaml
similarity index 100%
rename from Wino.Mail.WinUI/AppThemes/TestTheme.xaml
rename to Wino.Mail/AppThemes/TestTheme.xaml
diff --git a/Wino.Mail.WinUI/Assets/BadgeLogo.scale-100.png b/Wino.Mail/Assets/BadgeLogo.scale-100.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/BadgeLogo.scale-100.png
rename to Wino.Mail/Assets/BadgeLogo.scale-100.png
diff --git a/Wino.Mail.WinUI/Assets/BadgeLogo.scale-125.png b/Wino.Mail/Assets/BadgeLogo.scale-125.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/BadgeLogo.scale-125.png
rename to Wino.Mail/Assets/BadgeLogo.scale-125.png
diff --git a/Wino.Mail.WinUI/Assets/BadgeLogo.scale-150.png b/Wino.Mail/Assets/BadgeLogo.scale-150.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/BadgeLogo.scale-150.png
rename to Wino.Mail/Assets/BadgeLogo.scale-150.png
diff --git a/Wino.Mail.WinUI/Assets/BadgeLogo.scale-200.png b/Wino.Mail/Assets/BadgeLogo.scale-200.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/BadgeLogo.scale-200.png
rename to Wino.Mail/Assets/BadgeLogo.scale-200.png
diff --git a/Wino.Mail.WinUI/Assets/BadgeLogo.scale-400.png b/Wino.Mail/Assets/BadgeLogo.scale-400.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/BadgeLogo.scale-400.png
rename to Wino.Mail/Assets/BadgeLogo.scale-400.png
diff --git a/Wino.Mail.WinUI/Assets/EML/eml.png b/Wino.Mail/Assets/EML/eml.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/EML/eml.png
rename to Wino.Mail/Assets/EML/eml.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_archive.png b/Wino.Mail/Assets/FileTypes/type_archive.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_archive.png
rename to Wino.Mail/Assets/FileTypes/type_archive.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_audio.png b/Wino.Mail/Assets/FileTypes/type_audio.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_audio.png
rename to Wino.Mail/Assets/FileTypes/type_audio.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_executable.png b/Wino.Mail/Assets/FileTypes/type_executable.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_executable.png
rename to Wino.Mail/Assets/FileTypes/type_executable.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_html.png b/Wino.Mail/Assets/FileTypes/type_html.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_html.png
rename to Wino.Mail/Assets/FileTypes/type_html.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_image.png b/Wino.Mail/Assets/FileTypes/type_image.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_image.png
rename to Wino.Mail/Assets/FileTypes/type_image.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_none.png b/Wino.Mail/Assets/FileTypes/type_none.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_none.png
rename to Wino.Mail/Assets/FileTypes/type_none.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_other.png b/Wino.Mail/Assets/FileTypes/type_other.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_other.png
rename to Wino.Mail/Assets/FileTypes/type_other.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_pdf.png b/Wino.Mail/Assets/FileTypes/type_pdf.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_pdf.png
rename to Wino.Mail/Assets/FileTypes/type_pdf.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_rar.png b/Wino.Mail/Assets/FileTypes/type_rar.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_rar.png
rename to Wino.Mail/Assets/FileTypes/type_rar.png
diff --git a/Wino.Mail.WinUI/Assets/FileTypes/type_video.png b/Wino.Mail/Assets/FileTypes/type_video.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/FileTypes/type_video.png
rename to Wino.Mail/Assets/FileTypes/type_video.png
diff --git a/Wino.Mail/Assets/LargeTile.scale-100.png b/Wino.Mail/Assets/LargeTile.scale-100.png
new file mode 100644
index 00000000..aca6e4e2
Binary files /dev/null and b/Wino.Mail/Assets/LargeTile.scale-100.png differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-125.png b/Wino.Mail/Assets/LargeTile.scale-125.png
new file mode 100644
index 00000000..b80bf9d4
Binary files /dev/null and b/Wino.Mail/Assets/LargeTile.scale-125.png differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-150.png b/Wino.Mail/Assets/LargeTile.scale-150.png
new file mode 100644
index 00000000..1ed2a001
Binary files /dev/null and b/Wino.Mail/Assets/LargeTile.scale-150.png differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-200.png b/Wino.Mail/Assets/LargeTile.scale-200.png
new file mode 100644
index 00000000..a8e471dd
Binary files /dev/null and b/Wino.Mail/Assets/LargeTile.scale-200.png differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-400.png b/Wino.Mail/Assets/LargeTile.scale-400.png
new file mode 100644
index 00000000..54cea310
Binary files /dev/null and b/Wino.Mail/Assets/LargeTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/delete.png b/Wino.Mail/Assets/NotificationIcons/delete.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/NotificationIcons/delete.png
rename to Wino.Mail/Assets/NotificationIcons/delete.png
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.png b/Wino.Mail/Assets/NotificationIcons/dismiss.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.png
rename to Wino.Mail/Assets/NotificationIcons/dismiss.png
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/markread.png b/Wino.Mail/Assets/NotificationIcons/markread.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/NotificationIcons/markread.png
rename to Wino.Mail/Assets/NotificationIcons/markread.png
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/profile-dark.png b/Wino.Mail/Assets/NotificationIcons/profile-dark.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/NotificationIcons/profile-dark.png
rename to Wino.Mail/Assets/NotificationIcons/profile-dark.png
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/profile-light.png b/Wino.Mail/Assets/NotificationIcons/profile-light.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/NotificationIcons/profile-light.png
rename to Wino.Mail/Assets/NotificationIcons/profile-light.png
diff --git a/Wino.Mail.WinUI/Assets/Providers/Gmail.png b/Wino.Mail/Assets/Providers/Gmail.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Providers/Gmail.png
rename to Wino.Mail/Assets/Providers/Gmail.png
diff --git a/Wino.Mail.WinUI/Assets/Providers/IMAP4.png b/Wino.Mail/Assets/Providers/IMAP4.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Providers/IMAP4.png
rename to Wino.Mail/Assets/Providers/IMAP4.png
diff --git a/Wino.Mail.WinUI/Assets/Providers/Office 365.png b/Wino.Mail/Assets/Providers/Office 365.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Providers/Office 365.png
rename to Wino.Mail/Assets/Providers/Office 365.png
diff --git a/Wino.Mail.WinUI/Assets/Providers/Outlook.png b/Wino.Mail/Assets/Providers/Outlook.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Providers/Outlook.png
rename to Wino.Mail/Assets/Providers/Outlook.png
diff --git a/Wino.Mail.WinUI/Assets/Providers/Yahoo.png b/Wino.Mail/Assets/Providers/Yahoo.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Providers/Yahoo.png
rename to Wino.Mail/Assets/Providers/Yahoo.png
diff --git a/Wino.Mail.WinUI/Assets/ReleaseNotes/176.md b/Wino.Mail/Assets/ReleaseNotes/176.md
similarity index 100%
rename from Wino.Mail.WinUI/Assets/ReleaseNotes/176.md
rename to Wino.Mail/Assets/ReleaseNotes/176.md
diff --git a/Wino.Mail/Assets/SmallTile.scale-100.png b/Wino.Mail/Assets/SmallTile.scale-100.png
new file mode 100644
index 00000000..f0d52390
Binary files /dev/null and b/Wino.Mail/Assets/SmallTile.scale-100.png differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-125.png b/Wino.Mail/Assets/SmallTile.scale-125.png
new file mode 100644
index 00000000..4a0404cf
Binary files /dev/null and b/Wino.Mail/Assets/SmallTile.scale-125.png differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-150.png b/Wino.Mail/Assets/SmallTile.scale-150.png
new file mode 100644
index 00000000..f801334e
Binary files /dev/null and b/Wino.Mail/Assets/SmallTile.scale-150.png differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-200.png b/Wino.Mail/Assets/SmallTile.scale-200.png
new file mode 100644
index 00000000..bb2c20c9
Binary files /dev/null and b/Wino.Mail/Assets/SmallTile.scale-200.png differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-400.png b/Wino.Mail/Assets/SmallTile.scale-400.png
new file mode 100644
index 00000000..c931a5dd
Binary files /dev/null and b/Wino.Mail/Assets/SmallTile.scale-400.png differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-100.png b/Wino.Mail/Assets/SplashScreen.scale-100.png
new file mode 100644
index 00000000..23c8f147
Binary files /dev/null and b/Wino.Mail/Assets/SplashScreen.scale-100.png differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-125.png b/Wino.Mail/Assets/SplashScreen.scale-125.png
new file mode 100644
index 00000000..ceb2dff6
Binary files /dev/null and b/Wino.Mail/Assets/SplashScreen.scale-125.png differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-150.png b/Wino.Mail/Assets/SplashScreen.scale-150.png
new file mode 100644
index 00000000..885d9bc2
Binary files /dev/null and b/Wino.Mail/Assets/SplashScreen.scale-150.png differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-200.png b/Wino.Mail/Assets/SplashScreen.scale-200.png
new file mode 100644
index 00000000..58c8ca7c
Binary files /dev/null and b/Wino.Mail/Assets/SplashScreen.scale-200.png differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-400.png b/Wino.Mail/Assets/SplashScreen.scale-400.png
new file mode 100644
index 00000000..fa77f2b7
Binary files /dev/null and b/Wino.Mail/Assets/SplashScreen.scale-400.png differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-100.png b/Wino.Mail/Assets/Square150x150Logo.scale-100.png
new file mode 100644
index 00000000..a5f235b8
Binary files /dev/null and b/Wino.Mail/Assets/Square150x150Logo.scale-100.png differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-125.png b/Wino.Mail/Assets/Square150x150Logo.scale-125.png
new file mode 100644
index 00000000..be92b5ae
Binary files /dev/null and b/Wino.Mail/Assets/Square150x150Logo.scale-125.png differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-150.png b/Wino.Mail/Assets/Square150x150Logo.scale-150.png
new file mode 100644
index 00000000..d0039797
Binary files /dev/null and b/Wino.Mail/Assets/Square150x150Logo.scale-150.png differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-200.png b/Wino.Mail/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..430e6fa3
Binary files /dev/null and b/Wino.Mail/Assets/Square150x150Logo.scale-200.png differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-400.png b/Wino.Mail/Assets/Square150x150Logo.scale-400.png
new file mode 100644
index 00000000..9726829b
Binary files /dev/null and b/Wino.Mail/Assets/Square150x150Logo.scale-400.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
new file mode 100644
index 00000000..4d6b9dfe
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
new file mode 100644
index 00000000..c0aa2ba3
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
new file mode 100644
index 00000000..7be00300
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
new file mode 100644
index 00000000..a6e4b0a2
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
new file mode 100644
index 00000000..07514cc2
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
new file mode 100644
index 00000000..4d6b9dfe
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
new file mode 100644
index 00000000..7be00300
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
new file mode 100644
index 00000000..a6e4b0a2
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
new file mode 100644
index 00000000..07514cc2
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-100.png b/Wino.Mail/Assets/Square44x44Logo.scale-100.png
new file mode 100644
index 00000000..7432521d
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.scale-100.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-125.png b/Wino.Mail/Assets/Square44x44Logo.scale-125.png
new file mode 100644
index 00000000..fe38dbdf
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.scale-125.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-150.png b/Wino.Mail/Assets/Square44x44Logo.scale-150.png
new file mode 100644
index 00000000..1ee950af
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.scale-150.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-200.png b/Wino.Mail/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..807e9ed4
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.scale-200.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-400.png b/Wino.Mail/Assets/Square44x44Logo.scale-400.png
new file mode 100644
index 00000000..f4457476
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.scale-400.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png
new file mode 100644
index 00000000..9acb3cc8
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png
new file mode 100644
index 00000000..c1e08a4f
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..c0aa2ba3
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png
new file mode 100644
index 00000000..37f8decd
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png
new file mode 100644
index 00000000..93c856d9
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png
new file mode 100644
index 00000000..a2ca3afc
Binary files /dev/null and b/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png differ
diff --git a/Wino.Mail/Assets/StoreLogo.backup.png b/Wino.Mail/Assets/StoreLogo.backup.png
new file mode 100644
index 00000000..7385b56c
Binary files /dev/null and b/Wino.Mail/Assets/StoreLogo.backup.png differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-100.png b/Wino.Mail/Assets/StoreLogo.scale-100.png
new file mode 100644
index 00000000..4c4b4b34
Binary files /dev/null and b/Wino.Mail/Assets/StoreLogo.scale-100.png differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-125.png b/Wino.Mail/Assets/StoreLogo.scale-125.png
new file mode 100644
index 00000000..1c325127
Binary files /dev/null and b/Wino.Mail/Assets/StoreLogo.scale-125.png differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-150.png b/Wino.Mail/Assets/StoreLogo.scale-150.png
new file mode 100644
index 00000000..bb194ef7
Binary files /dev/null and b/Wino.Mail/Assets/StoreLogo.scale-150.png differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-200.png b/Wino.Mail/Assets/StoreLogo.scale-200.png
new file mode 100644
index 00000000..b77a5ddc
Binary files /dev/null and b/Wino.Mail/Assets/StoreLogo.scale-200.png differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-400.png b/Wino.Mail/Assets/StoreLogo.scale-400.png
new file mode 100644
index 00000000..8d0a133e
Binary files /dev/null and b/Wino.Mail/Assets/StoreLogo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/airbnb.com.png b/Wino.Mail/Assets/Thumbnails/airbnb.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/airbnb.com.png
rename to Wino.Mail/Assets/Thumbnails/airbnb.com.png
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/apple.com.png b/Wino.Mail/Assets/Thumbnails/apple.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/apple.com.png
rename to Wino.Mail/Assets/Thumbnails/apple.com.png
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/google.com.png b/Wino.Mail/Assets/Thumbnails/google.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/google.com.png
rename to Wino.Mail/Assets/Thumbnails/google.com.png
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/microsoft.com.png b/Wino.Mail/Assets/Thumbnails/microsoft.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/microsoft.com.png
rename to Wino.Mail/Assets/Thumbnails/microsoft.com.png
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/steampowered.com.png b/Wino.Mail/Assets/Thumbnails/steampowered.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/steampowered.com.png
rename to Wino.Mail/Assets/Thumbnails/steampowered.com.png
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/uber.com.png b/Wino.Mail/Assets/Thumbnails/uber.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/uber.com.png
rename to Wino.Mail/Assets/Thumbnails/uber.com.png
diff --git a/Wino.Mail.WinUI/Assets/Thumbnails/youtube.com.png b/Wino.Mail/Assets/Thumbnails/youtube.com.png
similarity index 100%
rename from Wino.Mail.WinUI/Assets/Thumbnails/youtube.com.png
rename to Wino.Mail/Assets/Thumbnails/youtube.com.png
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-100.png b/Wino.Mail/Assets/Wide310x150Logo.scale-100.png
new file mode 100644
index 00000000..f330133d
Binary files /dev/null and b/Wino.Mail/Assets/Wide310x150Logo.scale-100.png differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-125.png b/Wino.Mail/Assets/Wide310x150Logo.scale-125.png
new file mode 100644
index 00000000..e4656fa7
Binary files /dev/null and b/Wino.Mail/Assets/Wide310x150Logo.scale-125.png differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-150.png b/Wino.Mail/Assets/Wide310x150Logo.scale-150.png
new file mode 100644
index 00000000..884084b3
Binary files /dev/null and b/Wino.Mail/Assets/Wide310x150Logo.scale-150.png differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-200.png b/Wino.Mail/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..23c8f147
Binary files /dev/null and b/Wino.Mail/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-400.png b/Wino.Mail/Assets/Wide310x150Logo.scale-400.png
new file mode 100644
index 00000000..58c8ca7c
Binary files /dev/null and b/Wino.Mail/Assets/Wide310x150Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/WinoIcons.ttf b/Wino.Mail/Assets/WinoIcons.ttf
similarity index 100%
rename from Wino.Mail.WinUI/Assets/WinoIcons.ttf
rename to Wino.Mail/Assets/WinoIcons.ttf
diff --git a/Wino.Mail.WinUI/BackgroundImages/Acrylic.jpg b/Wino.Mail/BackgroundImages/Acrylic.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Acrylic.jpg
rename to Wino.Mail/BackgroundImages/Acrylic.jpg
diff --git a/Wino.Mail.WinUI/BackgroundImages/Clouds.jpg b/Wino.Mail/BackgroundImages/Clouds.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Clouds.jpg
rename to Wino.Mail/BackgroundImages/Clouds.jpg
diff --git a/Wino.Mail.WinUI/BackgroundImages/Forest.jpg b/Wino.Mail/BackgroundImages/Forest.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Forest.jpg
rename to Wino.Mail/BackgroundImages/Forest.jpg
diff --git a/Wino.Mail.WinUI/BackgroundImages/Garden.jpg b/Wino.Mail/BackgroundImages/Garden.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Garden.jpg
rename to Wino.Mail/BackgroundImages/Garden.jpg
diff --git a/Wino.Mail.WinUI/BackgroundImages/Mica.jpg b/Wino.Mail/BackgroundImages/Mica.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Mica.jpg
rename to Wino.Mail/BackgroundImages/Mica.jpg
diff --git a/Wino.Mail.WinUI/BackgroundImages/Nighty.jpg b/Wino.Mail/BackgroundImages/Nighty.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Nighty.jpg
rename to Wino.Mail/BackgroundImages/Nighty.jpg
diff --git a/Wino.Mail.WinUI/BackgroundImages/Snowflake.jpg b/Wino.Mail/BackgroundImages/Snowflake.jpg
similarity index 100%
rename from Wino.Mail.WinUI/BackgroundImages/Snowflake.jpg
rename to Wino.Mail/BackgroundImages/Snowflake.jpg
diff --git a/Wino.Mail/BasePage.cs b/Wino.Mail/BasePage.cs
new file mode 100644
index 00000000..71d29561
--- /dev/null
+++ b/Wino.Mail/BasePage.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Diagnostics;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+using Wino.Core.Messages.Shell;
+using Wino.Core.UWP;
+using Wino.Mail.ViewModels;
+
+namespace Wino
+{
+ public class BasePage : Page, IRecipient
+ {
+ public UIElement ShellContent
+ {
+ get { return (UIElement)GetValue(ShellContentProperty); }
+ set { SetValue(ShellContentProperty, value); }
+ }
+
+ public static readonly DependencyProperty ShellContentProperty = DependencyProperty.Register(nameof(ShellContent), typeof(UIElement), typeof(BasePage), new PropertyMetadata(null));
+
+ public void Receive(LanguageChanged message)
+ {
+ OnLanguageChanged();
+ }
+
+ public virtual void OnLanguageChanged() { }
+ }
+
+ public abstract class BasePage : BasePage where T : BaseViewModel
+ {
+ public T ViewModel { get; } = App.Current.Services.GetService();
+
+ protected BasePage()
+ {
+ ViewModel.Dispatcher = new UWPDispatcher(Dispatcher);
+ }
+
+ ~BasePage()
+ {
+ Debug.WriteLine($"Disposed {this.GetType().Name}");
+ }
+
+ protected override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ base.OnNavigatedTo(e);
+
+ var mode = GetNavigationMode(e.NavigationMode);
+ var parameter = e.Parameter;
+
+ WeakReferenceMessenger.Default.UnregisterAll(this);
+ WeakReferenceMessenger.Default.RegisterAll(this);
+
+ ViewModel.OnNavigatedTo(mode, parameter);
+ }
+
+ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+ {
+ base.OnNavigatingFrom(e);
+
+ var mode = GetNavigationMode(e.NavigationMode);
+ var parameter = e.Parameter;
+
+ WeakReferenceMessenger.Default.UnregisterAll(this);
+
+ ViewModel.OnNavigatedFrom(mode, parameter);
+
+ GC.Collect();
+ }
+
+ private Core.Domain.Models.Navigation.NavigationMode GetNavigationMode(NavigationMode mode)
+ {
+ return (Core.Domain.Models.Navigation.NavigationMode)mode;
+ }
+ }
+}
diff --git a/Wino.Mail.WinUI/Behaviors/BindableCommandBarBehavior.cs b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
similarity index 100%
rename from Wino.Mail.WinUI/Behaviors/BindableCommandBarBehavior.cs
rename to Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
diff --git a/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs b/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
similarity index 100%
rename from Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
rename to Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
diff --git a/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs b/Wino.Mail/Controls/AccountNavigationItem.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
rename to Wino.Mail/Controls/AccountNavigationItem.cs
diff --git a/Wino.Mail.WinUI/Controls/Advanced/WinoAppTitleBar.xaml b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Controls/Advanced/WinoAppTitleBar.xaml
rename to Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
diff --git a/Wino.Mail.WinUI/Controls/Advanced/WinoAppTitleBar.xaml.cs b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Controls/Advanced/WinoAppTitleBar.xaml.cs
rename to Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
index a6817184..4c0232d8 100644
--- a/Wino.Mail.WinUI/Controls/Advanced/WinoAppTitleBar.xaml.cs
+++ b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
@@ -1,8 +1,6 @@
using Windows.Foundation;
using Wino.Core.WinUI.Services;
using Microsoft.Extensions.DependencyInjection;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Controls/Advanced/WinoListView.cs b/Wino.Mail/Controls/Advanced/WinoListView.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/Advanced/WinoListView.cs
rename to Wino.Mail/Controls/Advanced/WinoListView.cs
diff --git a/Wino.Mail.WinUI/Controls/ControlConstants.cs b/Wino.Mail/Controls/ControlConstants.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/ControlConstants.cs
rename to Wino.Mail/Controls/ControlConstants.cs
diff --git a/Wino.Mail.WinUI/Controls/ImagePreviewControl.cs b/Wino.Mail/Controls/ImagePreviewControl.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/ImagePreviewControl.cs
rename to Wino.Mail/Controls/ImagePreviewControl.cs
diff --git a/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
rename to Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
diff --git a/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml.cs b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml.cs
rename to Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
diff --git a/Wino.Mail.WinUI/Controls/RendererCommandBar.cs b/Wino.Mail/Controls/RendererCommandBar.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/RendererCommandBar.cs
rename to Wino.Mail/Controls/RendererCommandBar.cs
diff --git a/Wino.Mail.WinUI/Controls/SettingsMenuItemControl.cs b/Wino.Mail/Controls/SettingsMenuItemControl.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/SettingsMenuItemControl.cs
rename to Wino.Mail/Controls/SettingsMenuItemControl.cs
diff --git a/Wino.Mail.WinUI/Controls/WinoFontIcon.cs b/Wino.Mail/Controls/WinoFontIcon.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoFontIcon.cs
rename to Wino.Mail/Controls/WinoFontIcon.cs
diff --git a/Wino.Mail.WinUI/Controls/WinoFontIconSource.cs b/Wino.Mail/Controls/WinoFontIconSource.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoFontIconSource.cs
rename to Wino.Mail/Controls/WinoFontIconSource.cs
diff --git a/Wino.Mail.WinUI/Controls/WinoInfoBar.cs b/Wino.Mail/Controls/WinoInfoBar.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoInfoBar.cs
rename to Wino.Mail/Controls/WinoInfoBar.cs
diff --git a/Wino.Mail.WinUI/Controls/WinoNavigationViewItem.cs b/Wino.Mail/Controls/WinoNavigationViewItem.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoNavigationViewItem.cs
rename to Wino.Mail/Controls/WinoNavigationViewItem.cs
diff --git a/Wino.Mail.WinUI/Controls/WinoPivotControl.xaml b/Wino.Mail/Controls/WinoPivotControl.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoPivotControl.xaml
rename to Wino.Mail/Controls/WinoPivotControl.xaml
diff --git a/Wino.Mail.WinUI/Controls/WinoPivotControl.xaml.cs b/Wino.Mail/Controls/WinoPivotControl.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoPivotControl.xaml.cs
rename to Wino.Mail/Controls/WinoPivotControl.xaml.cs
diff --git a/Wino.Mail.WinUI/Controls/WinoSwipeControlItems.cs b/Wino.Mail/Controls/WinoSwipeControlItems.cs
similarity index 100%
rename from Wino.Mail.WinUI/Controls/WinoSwipeControlItems.cs
rename to Wino.Mail/Controls/WinoSwipeControlItems.cs
diff --git a/Wino.Mail.WinUI/Converters/ReverseBooleanConverter.cs b/Wino.Mail/Converters/ReverseBooleanConverter.cs
similarity index 100%
rename from Wino.Mail.WinUI/Converters/ReverseBooleanConverter.cs
rename to Wino.Mail/Converters/ReverseBooleanConverter.cs
diff --git a/Wino.Mail.WinUI/Converters/ReverseBooleanToVisibilityConverter.cs b/Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs
similarity index 100%
rename from Wino.Mail.WinUI/Converters/ReverseBooleanToVisibilityConverter.cs
rename to Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs
diff --git a/Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml b/Wino.Mail/Dialogs/AccountCreationDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml
rename to Wino.Mail/Dialogs/AccountCreationDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml.cs b/Wino.Mail/Dialogs/AccountCreationDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml.cs
rename to Wino.Mail/Dialogs/AccountCreationDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/AccountEditDialog.xaml b/Wino.Mail/Dialogs/AccountEditDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountEditDialog.xaml
rename to Wino.Mail/Dialogs/AccountEditDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/AccountEditDialog.xaml.cs b/Wino.Mail/Dialogs/AccountEditDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountEditDialog.xaml.cs
rename to Wino.Mail/Dialogs/AccountEditDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml b/Wino.Mail/Dialogs/AccountPickerDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml
rename to Wino.Mail/Dialogs/AccountPickerDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml.cs b/Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml.cs
rename to Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml b/Wino.Mail/Dialogs/AccountReorderDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
rename to Wino.Mail/Dialogs/AccountReorderDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs b/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
similarity index 98%
rename from Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs
rename to Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
index 84bf6dae..735db769 100644
--- a/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
@@ -2,8 +2,6 @@
using System.Linq;
using Microsoft.Extensions.DependencyInjection;
using Wino.Core.Domain.Interfaces;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml.Controls;
diff --git a/Wino.Mail.WinUI/Dialogs/BaseAccountCreationDialog.cs b/Wino.Mail/Dialogs/BaseAccountCreationDialog.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/BaseAccountCreationDialog.cs
rename to Wino.Mail/Dialogs/BaseAccountCreationDialog.cs
diff --git a/Wino.Mail.WinUI/Dialogs/ConfirmationDialog.xaml b/Wino.Mail/Dialogs/ConfirmationDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/ConfirmationDialog.xaml
rename to Wino.Mail/Dialogs/ConfirmationDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/ConfirmationDialog.xaml.cs b/Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/ConfirmationDialog.xaml.cs
rename to Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml b/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml
rename to Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs b/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs
similarity index 98%
rename from Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
rename to Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs
index 1a0fc8a0..8c0054e9 100644
--- a/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs
@@ -2,8 +2,6 @@
using CommunityToolkit.WinUI.Helpers;
using Microsoft.Extensions.DependencyInjection;
using Wino.Core.Domain.Interfaces;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml b/Wino.Mail/Dialogs/MoveMailDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
rename to Wino.Mail/Dialogs/MoveMailDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs b/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs
rename to Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml b/Wino.Mail/Dialogs/NewAccountDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml
rename to Wino.Mail/Dialogs/NewAccountDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml.cs b/Wino.Mail/Dialogs/NewAccountDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml.cs
rename to Wino.Mail/Dialogs/NewAccountDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/NewImapSetupDialog.xaml b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/NewImapSetupDialog.xaml
rename to Wino.Mail/Dialogs/NewImapSetupDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/NewImapSetupDialog.xaml.cs b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/NewImapSetupDialog.xaml.cs
rename to Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
rename to Wino.Mail/Dialogs/SignatureEditorDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs
rename to Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
index 99c99720..3878ec20 100644
--- a/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
@@ -10,8 +10,6 @@ using Wino.Core.Domain.Entities;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Domain.Models.Reader;
using Wino.Views.Settings;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Dialogs/StoreRatingDialog.xaml b/Wino.Mail/Dialogs/StoreRatingDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/StoreRatingDialog.xaml
rename to Wino.Mail/Dialogs/StoreRatingDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/StoreRatingDialog.xaml.cs b/Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/StoreRatingDialog.xaml.cs
rename to Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml b/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
rename to Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs b/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs
rename to Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml b/Wino.Mail/Dialogs/TextInputDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml
rename to Wino.Mail/Dialogs/TextInputDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml.cs b/Wino.Mail/Dialogs/TextInputDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml.cs
rename to Wino.Mail/Dialogs/TextInputDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Dialogs/WinoMessageDialog.xaml b/Wino.Mail/Dialogs/WinoMessageDialog.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/WinoMessageDialog.xaml
rename to Wino.Mail/Dialogs/WinoMessageDialog.xaml
diff --git a/Wino.Mail.WinUI/Dialogs/WinoMessageDialog.xaml.cs b/Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Dialogs/WinoMessageDialog.xaml.cs
rename to Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs
diff --git a/Wino.Mail.WinUI/Extensions/AnimationExtensions.cs b/Wino.Mail/Extensions/AnimationExtensions.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/AnimationExtensions.cs
rename to Wino.Mail/Extensions/AnimationExtensions.cs
diff --git a/Wino.Mail.WinUI/Extensions/CompositionEnums.cs b/Wino.Mail/Extensions/CompositionEnums.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/CompositionEnums.cs
rename to Wino.Mail/Extensions/CompositionEnums.cs
diff --git a/Wino.Mail.WinUI/Extensions/CompositionExtensions.Implicit.cs b/Wino.Mail/Extensions/CompositionExtensions.Implicit.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/CompositionExtensions.Implicit.cs
rename to Wino.Mail/Extensions/CompositionExtensions.Implicit.cs
diff --git a/Wino.Mail.WinUI/Extensions/CompositionExtensions.Size.cs b/Wino.Mail/Extensions/CompositionExtensions.Size.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/CompositionExtensions.Size.cs
rename to Wino.Mail/Extensions/CompositionExtensions.Size.cs
diff --git a/Wino.Mail.WinUI/Extensions/EnumerableExtensions.cs b/Wino.Mail/Extensions/EnumerableExtensions.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/EnumerableExtensions.cs
rename to Wino.Mail/Extensions/EnumerableExtensions.cs
diff --git a/Wino.Mail.WinUI/Extensions/MimeKitExtensions.cs b/Wino.Mail/Extensions/MimeKitExtensions.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/MimeKitExtensions.cs
rename to Wino.Mail/Extensions/MimeKitExtensions.cs
diff --git a/Wino.Mail.WinUI/Extensions/UIExtensions.cs b/Wino.Mail/Extensions/UIExtensions.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/UIExtensions.cs
rename to Wino.Mail/Extensions/UIExtensions.cs
diff --git a/Wino.Mail.WinUI/Extensions/UtilExtensions.cs b/Wino.Mail/Extensions/UtilExtensions.cs
similarity index 100%
rename from Wino.Mail.WinUI/Extensions/UtilExtensions.cs
rename to Wino.Mail/Extensions/UtilExtensions.cs
diff --git a/Wino.Mail/GlobalSuppressions.cs b/Wino.Mail/GlobalSuppressions.cs
new file mode 100644
index 00000000..7d5444aa
--- /dev/null
+++ b/Wino.Mail/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Minor Code Smell", "S2094:Classes should not be empty", Justification = "", Scope = "type", Target = "~T:Wino.PubSub.BackBreadcrumNavigationRequest")]
diff --git a/Wino.Mail.WinUI/Helpers/SettingsStorageExtensions.cs b/Wino.Mail/Helpers/SettingsStorageExtensions.cs
similarity index 100%
rename from Wino.Mail.WinUI/Helpers/SettingsStorageExtensions.cs
rename to Wino.Mail/Helpers/SettingsStorageExtensions.cs
diff --git a/Wino.Mail.WinUI/Helpers/WinoVisualTreeHelper.cs b/Wino.Mail/Helpers/WinoVisualTreeHelper.cs
similarity index 100%
rename from Wino.Mail.WinUI/Helpers/WinoVisualTreeHelper.cs
rename to Wino.Mail/Helpers/WinoVisualTreeHelper.cs
diff --git a/Wino.Mail.WinUI/Helpers/XamlHelpers.cs b/Wino.Mail/Helpers/XamlHelpers.cs
similarity index 100%
rename from Wino.Mail.WinUI/Helpers/XamlHelpers.cs
rename to Wino.Mail/Helpers/XamlHelpers.cs
diff --git a/Wino.Mail.WinUI/JS/editor.html b/Wino.Mail/JS/editor.html
similarity index 100%
rename from Wino.Mail.WinUI/JS/editor.html
rename to Wino.Mail/JS/editor.html
diff --git a/Wino.Mail.WinUI/JS/editor.js b/Wino.Mail/JS/editor.js
similarity index 100%
rename from Wino.Mail.WinUI/JS/editor.js
rename to Wino.Mail/JS/editor.js
diff --git a/Wino.Mail.WinUI/JS/global.css b/Wino.Mail/JS/global.css
similarity index 100%
rename from Wino.Mail.WinUI/JS/global.css
rename to Wino.Mail/JS/global.css
diff --git a/Wino.Mail.WinUI/JS/libs/darkreader.js b/Wino.Mail/JS/libs/darkreader.js
similarity index 100%
rename from Wino.Mail.WinUI/JS/libs/darkreader.js
rename to Wino.Mail/JS/libs/darkreader.js
diff --git a/Wino.Mail.WinUI/JS/libs/jodit.min.css b/Wino.Mail/JS/libs/jodit.min.css
similarity index 100%
rename from Wino.Mail.WinUI/JS/libs/jodit.min.css
rename to Wino.Mail/JS/libs/jodit.min.css
diff --git a/Wino.Mail.WinUI/JS/libs/jodit.min.js b/Wino.Mail/JS/libs/jodit.min.js
similarity index 100%
rename from Wino.Mail.WinUI/JS/libs/jodit.min.js
rename to Wino.Mail/JS/libs/jodit.min.js
diff --git a/Wino.Mail.WinUI/JS/reader.html b/Wino.Mail/JS/reader.html
similarity index 100%
rename from Wino.Mail.WinUI/JS/reader.html
rename to Wino.Mail/JS/reader.html
diff --git a/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs b/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
rename to Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs b/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
rename to Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/FolderOperationFlyout.cs b/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/FolderOperationFlyout.cs
rename to Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/FolderOperationMenuFlyoutItem.cs b/Wino.Mail/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
rename to Wino.Mail/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/MailOperationFlyout.cs b/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/MailOperationFlyout.cs
rename to Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/MailOperationMenuFlyoutItem.cs b/Wino.Mail/MenuFlyouts/MailOperationMenuFlyoutItem.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/MailOperationMenuFlyoutItem.cs
rename to Wino.Mail/MenuFlyouts/MailOperationMenuFlyoutItem.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/MoveButtonFlyout.cs b/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/MoveButtonFlyout.cs
rename to Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/RendererCommandBarItem.cs b/Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/RendererCommandBarItem.cs
rename to Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyout.cs b/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyout.cs
rename to Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
diff --git a/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs b/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
similarity index 100%
rename from Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
rename to Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
diff --git a/Wino.Mail/Package.appxmanifest b/Wino.Mail/Package.appxmanifest
new file mode 100644
index 00000000..4bab3762
--- /dev/null
+++ b/Wino.Mail/Package.appxmanifest
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Wino Mail
+ Burak KÖSE
+ Assets\StoreLogo.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Google Auth Protocol
+
+
+
+
+
+
+ EML\eml.png
+
+ .eml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Wino.Mail.WinUI/PartialApp.cs b/Wino.Mail/PartialApp.cs
similarity index 98%
rename from Wino.Mail.WinUI/PartialApp.cs
rename to Wino.Mail/PartialApp.cs
index c5c80b27..6d2b22aa 100644
--- a/Wino.Mail.WinUI/PartialApp.cs
+++ b/Wino.Mail/PartialApp.cs
@@ -17,9 +17,10 @@ using Wino.Mail.ViewModels;
using Wino.Services;
using Wino.Core.Services;
using Windows.ApplicationModel.AppService;
-using Wino.Core.UWP.Services;
using Wino.Core.WinUI.Services;
+
+
#if NET8_0
using Microsoft.UI.Xaml;
using Microsoft.UI;
@@ -28,7 +29,7 @@ using Windows.UI.Xaml;
using Windows.UI;
#endif
-namespace Wino.Mail.WinUI
+namespace Wino
{
public partial class App : Application
{
@@ -120,7 +121,6 @@ namespace Wino.Mail.WinUI
{
services.AddSingleton, ApplicationResourceManager>();
services.AddSingleton();
- services.AddSingleton();
services.AddSingleton();
services.AddSingleton();
services.AddSingleton();
diff --git a/Wino.Mail/Properties/AssemblyInfo.cs b/Wino.Mail/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..c05af972
--- /dev/null
+++ b/Wino.Mail/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wino")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Wino")]
+[assembly: AssemblyCopyright("Copyright © 2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
diff --git a/Wino.Mail/Properties/Default.rd.xml b/Wino.Mail/Properties/Default.rd.xml
new file mode 100644
index 00000000..86ecf18c
--- /dev/null
+++ b/Wino.Mail/Properties/Default.rd.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Wino.Mail.WinUI/Selectors/AccountProviderViewModelTemplateSelector.cs b/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/AccountProviderViewModelTemplateSelector.cs
rename to Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/AccountReorderTemplateSelector.cs b/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/AccountReorderTemplateSelector.cs
rename to Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/AppThemePreviewTemplateSelector.cs b/Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/AppThemePreviewTemplateSelector.cs
rename to Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/FileAttachmentTypeSelector.cs b/Wino.Mail/Selectors/FileAttachmentTypeSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/FileAttachmentTypeSelector.cs
rename to Wino.Mail/Selectors/FileAttachmentTypeSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/MailItemContainerStyleSelector.cs b/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/MailItemContainerStyleSelector.cs
rename to Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/MailItemDisplayModePreviewTemplateSelector.cs b/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
rename to Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/MailItemDisplaySelector.cs b/Wino.Mail/Selectors/MailItemDisplaySelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/MailItemDisplaySelector.cs
rename to Wino.Mail/Selectors/MailItemDisplaySelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/NavigationMenuTemplateSelector.cs b/Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/NavigationMenuTemplateSelector.cs
rename to Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs
diff --git a/Wino.Mail.WinUI/Selectors/RendererCommandBarItemTemplateSelector.cs b/Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs
similarity index 100%
rename from Wino.Mail.WinUI/Selectors/RendererCommandBarItemTemplateSelector.cs
rename to Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs
diff --git a/Wino.Mail.WinUI/Services/ApplicationResourceManager.cs b/Wino.Mail/Services/ApplicationResourceManager.cs
similarity index 97%
rename from Wino.Mail.WinUI/Services/ApplicationResourceManager.cs
rename to Wino.Mail/Services/ApplicationResourceManager.cs
index 690a0512..98f63a5c 100644
--- a/Wino.Mail.WinUI/Services/ApplicationResourceManager.cs
+++ b/Wino.Mail/Services/ApplicationResourceManager.cs
@@ -1,7 +1,5 @@
using System.Linq;
using Wino.Core.Domain.Interfaces;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Services/DialogService.cs b/Wino.Mail/Services/DialogService.cs
similarity index 100%
rename from Wino.Mail.WinUI/Services/DialogService.cs
rename to Wino.Mail/Services/DialogService.cs
diff --git a/Wino.Mail.WinUI/Services/LaunchProtocolService.cs b/Wino.Mail/Services/LaunchProtocolService.cs
similarity index 100%
rename from Wino.Mail.WinUI/Services/LaunchProtocolService.cs
rename to Wino.Mail/Services/LaunchProtocolService.cs
diff --git a/Wino.Mail.WinUI/Services/ToastActivationService.cs b/Wino.Mail/Services/ToastActivationService.cs
similarity index 100%
rename from Wino.Mail.WinUI/Services/ToastActivationService.cs
rename to Wino.Mail/Services/ToastActivationService.cs
diff --git a/Wino.Mail.WinUI/Services/WinoNavigationService.cs b/Wino.Mail/Services/WinoNavigationService.cs
similarity index 100%
rename from Wino.Mail.WinUI/Services/WinoNavigationService.cs
rename to Wino.Mail/Services/WinoNavigationService.cs
diff --git a/Wino.Mail.WinUI/Styles/Colors.xaml b/Wino.Mail/Styles/Colors.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/Colors.xaml
rename to Wino.Mail/Styles/Colors.xaml
diff --git a/Wino.Mail.WinUI/Styles/CommandBarItems.xaml b/Wino.Mail/Styles/CommandBarItems.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/CommandBarItems.xaml
rename to Wino.Mail/Styles/CommandBarItems.xaml
diff --git a/Wino.Mail.WinUI/Styles/CommandBarItems.xaml.cs b/Wino.Mail/Styles/CommandBarItems.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Styles/CommandBarItems.xaml.cs
rename to Wino.Mail/Styles/CommandBarItems.xaml.cs
diff --git a/Wino.Mail.WinUI/Styles/ContentPresenters.xaml b/Wino.Mail/Styles/ContentPresenters.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/ContentPresenters.xaml
rename to Wino.Mail/Styles/ContentPresenters.xaml
diff --git a/Wino.Mail.WinUI/Styles/Converters.xaml b/Wino.Mail/Styles/Converters.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/Converters.xaml
rename to Wino.Mail/Styles/Converters.xaml
diff --git a/Wino.Mail.WinUI/Styles/FontIcons.xaml b/Wino.Mail/Styles/FontIcons.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/FontIcons.xaml
rename to Wino.Mail/Styles/FontIcons.xaml
diff --git a/Wino.Mail.WinUI/Styles/ImagePreviewControl.xaml b/Wino.Mail/Styles/ImagePreviewControl.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/ImagePreviewControl.xaml
rename to Wino.Mail/Styles/ImagePreviewControl.xaml
diff --git a/Wino.Mail.WinUI/Styles/ItemContainerStyles.xaml b/Wino.Mail/Styles/ItemContainerStyles.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/ItemContainerStyles.xaml
rename to Wino.Mail/Styles/ItemContainerStyles.xaml
diff --git a/Wino.Mail.WinUI/Styles/WinoInfoBar.xaml b/Wino.Mail/Styles/WinoInfoBar.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Styles/WinoInfoBar.xaml
rename to Wino.Mail/Styles/WinoInfoBar.xaml
diff --git a/Wino.Mail/Views/Abstract/AboutPageAbstract.cs b/Wino.Mail/Views/Abstract/AboutPageAbstract.cs
new file mode 100644
index 00000000..16d785c5
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/AboutPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class AboutPageAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/AccountDetailsPageAbstract.cs b/Wino.Mail/Views/Abstract/AccountDetailsPageAbstract.cs
new file mode 100644
index 00000000..036ff394
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/AccountDetailsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class AccountDetailsPageAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/AccountManagementPageAbstract.cs b/Wino.Mail/Views/Abstract/AccountManagementPageAbstract.cs
new file mode 100644
index 00000000..c92876a7
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/AccountManagementPageAbstract.cs
@@ -0,0 +1,10 @@
+using Windows.UI.Xaml.Navigation;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class AccountManagementPageAbstract : BasePage
+ {
+
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/AppShellAbstract.cs b/Wino.Mail/Views/Abstract/AppShellAbstract.cs
new file mode 100644
index 00000000..5817c572
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/AppShellAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class AppShellAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/ComposePageAbstract.cs b/Wino.Mail/Views/Abstract/ComposePageAbstract.cs
new file mode 100644
index 00000000..fbe85077
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/ComposePageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class ComposePageAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/IdlePageAbstract.cs b/Wino.Mail/Views/Abstract/IdlePageAbstract.cs
new file mode 100644
index 00000000..9e28d8ff
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/IdlePageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class IdlePageAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/LanguageTimePageAbstract.cs b/Wino.Mail/Views/Abstract/LanguageTimePageAbstract.cs
new file mode 100644
index 00000000..492966d4
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/LanguageTimePageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class LanguageTimePageAbstract : BasePage { }
+}
diff --git a/Wino.Mail/Views/Abstract/MailListPageAbstract.cs b/Wino.Mail/Views/Abstract/MailListPageAbstract.cs
new file mode 100644
index 00000000..70a4cb4c
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/MailListPageAbstract.cs
@@ -0,0 +1,9 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public class MailListPageAbstract : BasePage
+ {
+
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/MailRenderingPageAbstract.cs b/Wino.Mail/Views/Abstract/MailRenderingPageAbstract.cs
new file mode 100644
index 00000000..30fbb8d9
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/MailRenderingPageAbstract.cs
@@ -0,0 +1,26 @@
+using Windows.UI.Xaml;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class MailRenderingPageAbstract : BasePage
+ {
+ public bool IsDarkEditor
+ {
+ get { return (bool)GetValue(IsDarkEditorProperty); }
+ set { SetValue(IsDarkEditorProperty, value); }
+ }
+
+ public static readonly DependencyProperty IsDarkEditorProperty = DependencyProperty.Register(nameof(IsDarkEditor), typeof(bool), typeof(MailRenderingPageAbstract), new PropertyMetadata(false, OnIsComposerDarkModeChanged));
+
+ private static void OnIsComposerDarkModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+ {
+ if (obj is MailRenderingPageAbstract page)
+ {
+ page.OnEditorThemeChanged();
+ }
+ }
+
+ public virtual void OnEditorThemeChanged() { }
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/MergedAccountDetailsPageAbstract.cs b/Wino.Mail/Views/Abstract/MergedAccountDetailsPageAbstract.cs
new file mode 100644
index 00000000..29f1a364
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/MergedAccountDetailsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class MergedAccountDetailsPageAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/MessageListPageAbstract.cs b/Wino.Mail/Views/Abstract/MessageListPageAbstract.cs
new file mode 100644
index 00000000..d474c4be
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/MessageListPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class MessageListPageAbstract : BasePage { }
+}
diff --git a/Wino.Mail/Views/Abstract/NewAccountManagementPageAbstract.cs b/Wino.Mail/Views/Abstract/NewAccountManagementPageAbstract.cs
new file mode 100644
index 00000000..cdd8b272
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/NewAccountManagementPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class NewAccountManagementPageAbstract : BasePage
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/PersonalizationPageAbstract.cs b/Wino.Mail/Views/Abstract/PersonalizationPageAbstract.cs
new file mode 100644
index 00000000..ca4d0da0
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/PersonalizationPageAbstract.cs
@@ -0,0 +1,10 @@
+using Windows.UI.Xaml;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class PersonalizationPageAbstract : SettingsPageBase
+ {
+
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/ReadingPanePageAbstract.cs b/Wino.Mail/Views/Abstract/ReadingPanePageAbstract.cs
new file mode 100644
index 00000000..01ab1f48
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/ReadingPanePageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class ReadingPanePageAbstract : BasePage { }
+}
diff --git a/Wino.Mail/Views/Abstract/SettingOptionsPageAbstract.cs b/Wino.Mail/Views/Abstract/SettingOptionsPageAbstract.cs
new file mode 100644
index 00000000..c9939223
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/SettingOptionsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class SettingOptionsPageAbstract : SettingsPageBase
+ {
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/SettingsPageAbstract.cs b/Wino.Mail/Views/Abstract/SettingsPageAbstract.cs
new file mode 100644
index 00000000..5abe8aed
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/SettingsPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class SettingsPageAbstract : BasePage { }
+}
diff --git a/Wino.Mail/Views/Abstract/SettingsPageBase.cs b/Wino.Mail/Views/Abstract/SettingsPageBase.cs
new file mode 100644
index 00000000..8b0b7109
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/SettingsPageBase.cs
@@ -0,0 +1,16 @@
+using Windows.UI.Xaml;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public class SettingsPageBase : BasePage where T : BaseViewModel
+ {
+ public string Title
+ {
+ get { return (string)GetValue(TitleProperty); }
+ set { SetValue(TitleProperty, value); }
+ }
+
+ public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(nameof(Title), typeof(string), typeof(SettingsPageBase), new PropertyMetadata(string.Empty));
+ }
+}
diff --git a/Wino.Mail/Views/Abstract/SignatureManagementPageAbstract.cs b/Wino.Mail/Views/Abstract/SignatureManagementPageAbstract.cs
new file mode 100644
index 00000000..22936f9c
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/SignatureManagementPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class SignatureManagementPageAbstract : BasePage { }
+}
diff --git a/Wino.Mail/Views/Abstract/WelcomePageAbstract.cs b/Wino.Mail/Views/Abstract/WelcomePageAbstract.cs
new file mode 100644
index 00000000..17959876
--- /dev/null
+++ b/Wino.Mail/Views/Abstract/WelcomePageAbstract.cs
@@ -0,0 +1,9 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+ public abstract class WelcomePageAbstract : BasePage
+ {
+
+ }
+}
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
rename to Wino.Mail/Views/Account/AccountDetailsPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs b/Wino.Mail/Views/Account/AccountDetailsPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs
rename to Wino.Mail/Views/Account/AccountDetailsPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml b/Wino.Mail/Views/Account/AccountManagementPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
rename to Wino.Mail/Views/Account/AccountManagementPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml.cs b/Wino.Mail/Views/Account/AccountManagementPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml.cs
rename to Wino.Mail/Views/Account/AccountManagementPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml b/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
rename to Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml.cs b/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml.cs
rename to Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/ComposePage.xaml b/Wino.Mail/Views/ComposePage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/ComposePage.xaml
rename to Wino.Mail/Views/ComposePage.xaml
diff --git a/Wino.Mail.WinUI/Views/ComposePage.xaml.cs b/Wino.Mail/Views/ComposePage.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Views/ComposePage.xaml.cs
rename to Wino.Mail/Views/ComposePage.xaml.cs
index 212501d9..04d36c10 100644
--- a/Wino.Mail.WinUI/Views/ComposePage.xaml.cs
+++ b/Wino.Mail/Views/ComposePage.xaml.cs
@@ -29,8 +29,6 @@ using Wino.Views.Abstract;
using CommunityToolkit.WinUI.Controls;
using Wino.Helpers;
using System.Text.Json;
-using Wino.Mail.WinUI;
-
#if NET8_0
diff --git a/Wino.Mail.WinUI/Views/IdlePage.xaml b/Wino.Mail/Views/IdlePage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/IdlePage.xaml
rename to Wino.Mail/Views/IdlePage.xaml
diff --git a/Wino.Mail.WinUI/Views/IdlePage.xaml.cs b/Wino.Mail/Views/IdlePage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/IdlePage.xaml.cs
rename to Wino.Mail/Views/IdlePage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/AdvancedImapSetupPage.xaml b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/AdvancedImapSetupPage.xaml
rename to Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
rename to Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/ImapConnectionFailedPage.xaml b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/ImapConnectionFailedPage.xaml
rename to Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
similarity index 98%
rename from Wino.Mail.WinUI/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
rename to Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
index 82dd7206..432098c8 100644
--- a/Wino.Mail.WinUI/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
@@ -4,8 +4,6 @@ using Wino.Core.Domain;
using Wino.Core.Domain.Exceptions;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Messages.Mails;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/PreparingImapFoldersPage.xaml b/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/PreparingImapFoldersPage.xaml
rename to Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs b/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
rename to Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml
rename to Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml.cs b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
rename to Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
index 80bf03b6..129acb22 100644
--- a/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
@@ -7,8 +7,6 @@ using Wino.Core.Domain.Exceptions;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Domain.Models.AutoDiscovery;
using Wino.Core.Messages.Mails;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml.Controls;
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/WelcomeImapSetupPage.xaml b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/ImapSetup/WelcomeImapSetupPage.xaml
rename to Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
rename to Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
index 8d9cf4f2..cb44c4f3 100644
--- a/Wino.Mail.WinUI/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
@@ -8,8 +8,6 @@ using Wino.Core.Domain.Exceptions;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Domain.Models.AutoDiscovery;
using Wino.Core.Messages.Mails;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
diff --git a/Wino.Mail.WinUI/Views/MailListPage.xaml b/Wino.Mail/Views/MailListPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/MailListPage.xaml
rename to Wino.Mail/Views/MailListPage.xaml
diff --git a/Wino.Mail.WinUI/Views/MailListPage.xaml.cs b/Wino.Mail/Views/MailListPage.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Views/MailListPage.xaml.cs
rename to Wino.Mail/Views/MailListPage.xaml.cs
index c7ab0a7c..00a1493c 100644
--- a/Wino.Mail.WinUI/Views/MailListPage.xaml.cs
+++ b/Wino.Mail/Views/MailListPage.xaml.cs
@@ -23,8 +23,6 @@ using Wino.Mail.ViewModels.Data;
using Wino.Mail.ViewModels.Messages;
using Wino.MenuFlyouts.Context;
using Wino.Views.Abstract;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/MailRenderingPage.xaml
rename to Wino.Mail/Views/MailRenderingPage.xaml
diff --git a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs b/Wino.Mail/Views/MailRenderingPage.xaml.cs
similarity index 99%
rename from Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs
rename to Wino.Mail/Views/MailRenderingPage.xaml.cs
index 24ac6a3e..324692c4 100644
--- a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs
+++ b/Wino.Mail/Views/MailRenderingPage.xaml.cs
@@ -16,8 +16,6 @@ using Wino.Core.Messages.Mails;
using Wino.Core.Messages.Shell;
using Wino.Mail.ViewModels.Data;
using Wino.Views.Abstract;
-using Wino.Mail.WinUI;
-
#if NET8_0
using Microsoft.UI.Xaml;
diff --git a/Wino.Mail.WinUI/Views/NewAccountManagementPage.xaml b/Wino.Mail/Views/NewAccountManagementPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/NewAccountManagementPage.xaml
rename to Wino.Mail/Views/NewAccountManagementPage.xaml
diff --git a/Wino.Mail.WinUI/Views/NewAccountManagementPage.xaml.cs b/Wino.Mail/Views/NewAccountManagementPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/NewAccountManagementPage.xaml.cs
rename to Wino.Mail/Views/NewAccountManagementPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/AboutPage.xaml b/Wino.Mail/Views/Settings/AboutPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/AboutPage.xaml
rename to Wino.Mail/Views/Settings/AboutPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/AboutPage.xaml.cs b/Wino.Mail/Views/Settings/AboutPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/AboutPage.xaml.cs
rename to Wino.Mail/Views/Settings/AboutPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/LanguageTimePage.xaml b/Wino.Mail/Views/Settings/LanguageTimePage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/LanguageTimePage.xaml
rename to Wino.Mail/Views/Settings/LanguageTimePage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/LanguageTimePage.xaml.cs b/Wino.Mail/Views/Settings/LanguageTimePage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/LanguageTimePage.xaml.cs
rename to Wino.Mail/Views/Settings/LanguageTimePage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml b/Wino.Mail/Views/Settings/MessageListPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml
rename to Wino.Mail/Views/Settings/MessageListPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml.cs b/Wino.Mail/Views/Settings/MessageListPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml.cs
rename to Wino.Mail/Views/Settings/MessageListPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml b/Wino.Mail/Views/Settings/PersonalizationPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
rename to Wino.Mail/Views/Settings/PersonalizationPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml.cs b/Wino.Mail/Views/Settings/PersonalizationPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml.cs
rename to Wino.Mail/Views/Settings/PersonalizationPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/ReadingPanePage.xaml b/Wino.Mail/Views/Settings/ReadingPanePage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/ReadingPanePage.xaml
rename to Wino.Mail/Views/Settings/ReadingPanePage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/ReadingPanePage.xaml.cs b/Wino.Mail/Views/Settings/ReadingPanePage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/ReadingPanePage.xaml.cs
rename to Wino.Mail/Views/Settings/ReadingPanePage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/SettingOptionsPage.xaml b/Wino.Mail/Views/Settings/SettingOptionsPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/SettingOptionsPage.xaml
rename to Wino.Mail/Views/Settings/SettingOptionsPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/SettingOptionsPage.xaml.cs b/Wino.Mail/Views/Settings/SettingOptionsPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/SettingOptionsPage.xaml.cs
rename to Wino.Mail/Views/Settings/SettingOptionsPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml
rename to Wino.Mail/Views/Settings/SignatureManagementPage.xaml
diff --git a/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml.cs b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml.cs
rename to Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
diff --git a/Wino.Mail.WinUI/Views/SettingsPage.xaml b/Wino.Mail/Views/SettingsPage.xaml
similarity index 100%
rename from Wino.Mail.WinUI/Views/SettingsPage.xaml
rename to Wino.Mail/Views/SettingsPage.xaml
diff --git a/Wino.Mail.WinUI/Views/SettingsPage.xaml.cs b/Wino.Mail/Views/SettingsPage.xaml.cs
similarity index 100%
rename from Wino.Mail.WinUI/Views/SettingsPage.xaml.cs
rename to Wino.Mail/Views/SettingsPage.xaml.cs
diff --git a/Wino.Mail/Views/WelcomePage.xaml b/Wino.Mail/Views/WelcomePage.xaml
new file mode 100644
index 00000000..7d6c45cd
--- /dev/null
+++ b/Wino.Mail/Views/WelcomePage.xaml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Wino.Mail/Views/WelcomePage.xaml.cs b/Wino.Mail/Views/WelcomePage.xaml.cs
new file mode 100644
index 00000000..b5206aeb
--- /dev/null
+++ b/Wino.Mail/Views/WelcomePage.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using Windows.System;
+using Wino.Views.Abstract;
+
+namespace Wino.Views
+{
+ public sealed partial class WelcomePage : WelcomePageAbstract
+ {
+ public WelcomePage()
+ {
+ InitializeComponent();
+ }
+
+ private async void HyperlinkClicked(object sender, Microsoft.Toolkit.Uwp.UI.Controls.LinkClickedEventArgs e)
+ {
+ await Launcher.LaunchUriAsync(new System.Uri(e.Link));
+ }
+ }
+}
diff --git a/Wino.Mail/Wino.Mail.csproj b/Wino.Mail/Wino.Mail.csproj
new file mode 100644
index 00000000..0105cc3c
--- /dev/null
+++ b/Wino.Mail/Wino.Mail.csproj
@@ -0,0 +1,888 @@
+
+
+
+
+ 8.0
+
+
+
+
+ Debug
+ x86
+ {68A432B8-C1B7-494C-8D6D-230788EA683E}
+ AppContainerExe
+ Properties
+ Wino
+ Wino
+ en-US
+ UAP
+ 10.0.22621.0
+ 10.0.17763.0
+ 14
+ 512
+ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ true
+ Wino.Mail_TemporaryKey.pfx
+ False
+ SHA256
+ False
+ True
+ Always
+ x86|x64|arm
+ 0
+ True
+ True
+ C:\Users\bkaan\Desktop\Packages\
+ True
+
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ x86
+ false
+ prompt
+ true
+
+
+ bin\x86\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x86
+ false
+ prompt
+ true
+
+ true
+ false
+ true
+ true
+
+
+
+ true
+ bin\ARM\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM
+ false
+ prompt
+ true
+
+
+ bin\ARM\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM
+ false
+ prompt
+ true
+
+ true
+ false
+ true
+ true
+
+
+ true
+ bin\ARM64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ ;2008
+ full
+ ARM64
+ false
+ prompt
+ true
+ true
+
+
+ bin\ARM64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ ARM64
+ false
+ prompt
+ false
+
+ true
+ false
+ true
+ true
+
+
+ true
+ bin\x64\Debug\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS; DEBUG
+
+
+ full
+ x64
+ false
+ prompt
+ true
+
+
+ bin\x64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP
+ true
+ ;2008
+ pdbonly
+ x64
+ false
+ prompt
+
+ true
+ false
+ true
+ true
+
+
+ PackageReference
+
+ false
+
+
+
+ 1.2.2
+
+
+ 1.0.0
+
+
+ 8.2.2
+
+
+ 8.2.2
+
+
+ 8.2.2
+
+
+ 8.0.240109
+
+
+ 8.0.240109
+
+
+ 8.0.240109
+
+
+ 8.0.240109
+
+
+ 1.2.0
+
+
+ 5.0.4
+
+
+ 5.0.4
+
+
+ 8.0.0
+
+
+ 2.2.12-rel-33220-00
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+ 6.2.14
+
+
+ 7.1.3
+
+
+ 2.8.6
+
+
+ 2.0.1
+
+
+ 5.1.2
+
+
+ 19.6.1
+
+
+ 3.1.1
+
+
+ 8.4.0
+
+
+ 1.8.116
+
+
+ 1.27.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ WinoAppTitleBar.xaml
+
+
+
+
+
+
+
+
+ AccountEditDialog.xaml
+
+
+ AccountPickerDialog.xaml
+
+
+ AccountReorderDialog.xaml
+
+
+
+ CustomThemeBuilderDialog.xaml
+
+
+ MoveMailDialog.xaml
+
+
+ SignatureEditorDialog.xaml
+
+
+ NewImapSetupDialog.xaml
+
+
+ StoreRatingDialog.xaml
+
+
+ SystemFolderConfigurationDialog.xaml
+
+
+ WinoMessageDialog.xaml
+
+
+ TextInputDialog.xaml
+
+
+
+
+
+
+
+
+
+
+
+
+
+ WinoPivotControl.xaml
+
+
+
+ AccountCreationDialog.xaml
+
+
+
+
+
+
+
+
+
+
+
+ MailItemDisplayInformationControl.xaml
+
+
+
+
+
+
+ ConfirmationDialog.xaml
+
+
+ NewAccountDialog.xaml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CommandBarItems.xaml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AccountDetailsPage.xaml
+
+
+ AccountManagementPage.xaml
+
+
+ MergedAccountDetailsPage.xaml
+
+
+ ComposePage.xaml
+
+
+ IdlePage.xaml
+
+
+ AdvancedImapSetupPage.xaml
+
+
+ ImapConnectionFailedPage.xaml
+
+
+ PreparingImapFoldersPage.xaml
+
+
+ TestingImapConnectionPage.xaml
+
+
+ WelcomeImapSetupPage.xaml
+
+
+ MailListPage.xaml
+
+
+ MailRenderingPage.xaml
+
+
+ NewAccountManagementPage.xaml
+
+
+ SettingsPage.xaml
+
+
+ AboutPage.xaml
+
+
+ LanguageTimePage.xaml
+
+
+ MessageListPage.xaml
+
+
+ PersonalizationPage.xaml
+
+
+ AppShell.xaml
+
+
+ ReadingPanePage.xaml
+
+
+ SettingOptionsPage.xaml
+
+
+ SignatureManagementPage.xaml
+
+
+ WelcomePage.xaml
+
+
+
+
+ App.xaml
+
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+
+
+ {d9ef0f59-f5f2-4d6c-a5ba-84043d8f3e08}
+ Wino.BackgroundTasks
+
+
+ {CF3312E5-5DA0-4867-9945-49EA7598AF1F}
+ Wino.Core.Domain
+
+
+ {395f19ba-1e42-495c-9db5-1a6f537fccb8}
+ Wino.Core.UWP
+
+
+ {E6B1632A-8901-41E8-9DDF-6793C7698B0B}
+ Wino.Core
+
+
+ {d62f1c03-da57-4709-a640-0283296a8e66}
+ Wino.Mail.ViewModels
+
+
+ {0c307d7e-256f-448c-8265-5622a812fbcc}
+ Wino.Messaging
+
+
+
+
+ Windows Desktop Extensions for the UWP
+
+
+
+
+ 14.0
+
+
+ bin\x86\Debug .NET Native\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ false
+ ;2008
+ true
+ pdbonly
+ x86
+ false
+ 7.3
+ prompt
+ true
+ true
+ true
+
+ true
+ x64
+ true
+ true
+ true
+ true
+
+ true
+
+
+
+ bin\ARM\Debug .NET Native\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ true
+ ;2008
+ true
+ pdbonly
+ ARM
+ false
+ 7.3
+ prompt
+ true
+
+
+ bin\ARM64\Debug .NET Native\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ true
+ ;2008
+ true
+ pdbonly
+ ARM64
+ false
+ 7.3
+ prompt
+ true
+
+
+ bin\x64\Debug .NET Native\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ true
+ ;2008
+ true
+ pdbonly
+ x64
+ false
+ 7.3
+ prompt
+ true
+
+
+
+
\ No newline at end of file
diff --git a/Wino.Mail/Wino.sln b/Wino.Mail/Wino.sln
new file mode 100644
index 00000000..eee1b122
--- /dev/null
+++ b/Wino.Mail/Wino.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Mail", "Wino.Mail.csproj", "{0B5C02DC-6B11-437C-9C46-EAB6430C3155}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0B5C02DC-6B11-437C-9C46-EAB6430C3155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0B5C02DC-6B11-437C-9C46-EAB6430C3155}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0B5C02DC-6B11-437C-9C46-EAB6430C3155}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0B5C02DC-6B11-437C-9C46-EAB6430C3155}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {0254B19E-9B52-4594-9F8A-8616BE750243}
+ EndGlobalSection
+EndGlobal
diff --git a/Wino.Packaging/Package.appxmanifest b/Wino.Packaging/Package.appxmanifest
index 2a15c9ec..c9afaa63 100644
--- a/Wino.Packaging/Package.appxmanifest
+++ b/Wino.Packaging/Package.appxmanifest
@@ -96,7 +96,7 @@
-
+
diff --git a/Wino.Packaging/Wino.Packaging.wapproj b/Wino.Packaging/Wino.Packaging.wapproj
index f0e2dd06..bf6efb39 100644
--- a/Wino.Packaging/Wino.Packaging.wapproj
+++ b/Wino.Packaging/Wino.Packaging.wapproj
@@ -52,7 +52,7 @@
760f5f31-8ee3-4b83-80f3-0e4ffbcc737c
10.0.22621.0
- 10.0.19041.0
+ 10.0.17763.0
en-US
false
$(NoWarn);NU1702
@@ -64,7 +64,7 @@
x64
True
0
- ..\Wino.Server.NET8\Wino.Server.NET8.csproj
+ ..\Wino.Mail.WinUI\Wino.Mail.WinUI.csproj
Always
@@ -160,6 +160,7 @@
-
+
+
\ No newline at end of file
diff --git a/Wino.Server.NET8/ServerApp.xaml b/Wino.Server.NET8/App.xaml
similarity index 93%
rename from Wino.Server.NET8/ServerApp.xaml
rename to Wino.Server.NET8/App.xaml
index 62f2c276..5058d6b7 100644
--- a/Wino.Server.NET8/ServerApp.xaml
+++ b/Wino.Server.NET8/App.xaml
@@ -1,6 +1,6 @@
(ServerApp)Application.Current;
+ public new static App Current => (App)Application.Current;
private const string WinoServerAppName = "Wino.Server";
public TaskbarIcon TrayIcon { get; private set; }
public bool HandleClosedEvents { get; set; } = true;
public IServiceProvider Services { get; private set; }
- public ServerApp()
+ public App()
{
InitializeComponent();
}
@@ -39,9 +39,9 @@ namespace Wino.Server.NET8
// Below services belongs to UWP.Core package and some APIs are not available for WPF.
// We register them here to avoid compilation errors.
- //services.AddSingleton();
- //services.AddSingleton();
- //services.AddSingleton();
+ services.AddSingleton();
+ services.AddSingleton();
+ services.AddSingleton();
return services.BuildServiceProvider();
}
diff --git a/Wino.Server.NET8/Program.cs b/Wino.Server.NET8/Program.cs
index ae679ef5..f7933cc0 100644
--- a/Wino.Server.NET8/Program.cs
+++ b/Wino.Server.NET8/Program.cs
@@ -24,15 +24,13 @@ namespace Wino.Server
var context = new DispatcherQueueSynchronizationContext(
DispatcherQueue.GetForCurrentThread());
SynchronizationContext.SetSynchronizationContext(context);
- new ServerApp();
+ new App();
});
}
}
private static bool DecideRedirection()
{
- return false;
-
bool isRedirect = false;
AppActivationArguments args = AppInstance.GetCurrent().GetActivatedEventArgs();
diff --git a/Wino.Server.NET8/Properties/launchSettings.json b/Wino.Server.NET8/Properties/launchSettings.json
new file mode 100644
index 00000000..9d3f5df3
--- /dev/null
+++ b/Wino.Server.NET8/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+ "profiles": {
+ "Wino.Server.NET8 (Package)": {
+ "commandName": "MsixPackage"
+ },
+ "Wino.Server.NET8 (Unpackaged)": {
+ "commandName": "Project"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Wino.Server.NET8/ServerContext.cs b/Wino.Server.NET8/ServerContext.cs
index d6c19a3e..5471c501 100644
--- a/Wino.Server.NET8/ServerContext.cs
+++ b/Wino.Server.NET8/ServerContext.cs
@@ -108,13 +108,13 @@ namespace Wino.Server
public async Task TestOutlookSynchronizer()
{
- var accountService = ServerApp.Current.Services.GetService();
+ var accountService = App.Current.Services.GetService();
var accs = await accountService.GetAccountsAsync();
var acc = accs.ElementAt(0);
- var authenticator = ServerApp.Current.Services.GetService();
- var processor = ServerApp.Current.Services.GetService();
+ var authenticator = App.Current.Services.GetService();
+ var processor = App.Current.Services.GetService();
var sync = new OutlookSynchronizer(acc, authenticator, processor);
diff --git a/Wino.Server.NET8/Wino.Server.NET8.csproj b/Wino.Server.NET8/Wino.Server.NET8.csproj
index 9e04728e..7a31aadc 100644
--- a/Wino.Server.NET8/Wino.Server.NET8.csproj
+++ b/Wino.Server.NET8/Wino.Server.NET8.csproj
@@ -1,21 +1,18 @@
WinExe
- net8.0-windows10.0.22621.0
- 10.0.19041.0
+ net8.0-windows10.0.19041.0
+ 10.0.17763.0
Wino.Server
app.manifest
- True
-
x86;x64;ARM64
- win-x86;win-x64;win-arm64
- win10-x86;win10-x64;win10-arm64
- 10.0.22621.35-preview
+ true
+ win-x86;win-x64;win-arm64
+ win10-x86;win10-x64;win10-arm64
win-$(Platform).pubxml
true
- true
true
- 10.0.19041.0
+ false
@@ -39,15 +36,13 @@
-
-
-
+
@@ -63,7 +58,7 @@
-
+
@@ -107,4 +102,4 @@
true
-
+
\ No newline at end of file
diff --git a/Wino.Server/App.xaml.cs b/Wino.Server/App.xaml.cs
index 4613542a..e0b5040d 100644
--- a/Wino.Server/App.xaml.cs
+++ b/Wino.Server/App.xaml.cs
@@ -8,6 +8,7 @@ using Windows.Storage;
using Wino.Core;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Services;
+using Wino.Core.UWP;
//using Wino.Core.UWP;
namespace Wino.Server
@@ -41,7 +42,7 @@ namespace Wino.Server
services.AddTransient();
services.RegisterCoreServices();
- // services.RegisterCoreUWPServices();
+ services.RegisterCoreUWPServices();
// Below services belongs to UWP.Core package and some APIs are not available for WPF.
// We register them here to avoid compilation errors.
diff --git a/Wino.Server/TrayIconResoasdurces.xaml b/Wino.Server/TrayIconResources.xaml
similarity index 100%
rename from Wino.Server/TrayIconResoasdurces.xaml
rename to Wino.Server/TrayIconResources.xaml
diff --git a/Wino.WinUI.sln b/Wino.WinUI.sln
index dac97fdd..2e9d96fa 100644
--- a/Wino.WinUI.sln
+++ b/Wino.WinUI.sln
@@ -13,13 +13,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core.WinUI", "Wino.Cor
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.BackgroundTasks.NET8", "Wino.BackgroundTasks\Wino.BackgroundTasks.NET8.csproj", "{2C86AF48-F7DD-4EA6-A9A6-610E69287F03}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Mail.WinUI", "Wino.Mail.WinUI\Wino.Mail.WinUI.csproj", "{955936B2-112B-4756-8BC7-67FF12BF9759}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Messaging.NET8", "Wino.Messages\Wino.Messaging.NET8.csproj", "{88A9B1A8-BC59-4852-93D0-37A5D357ABC6}"
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Wino.Packaging", "Wino.Packaging\Wino.Packaging.wapproj", "{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server.NET8", "Wino.Server.NET8\Wino.Server.NET8.csproj", "{4D2458CF-67CA-41F0-84FB-97D39FCBD376}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Mail.WinUI", "Wino.Mail.WinUI\Wino.Mail.WinUI.csproj", "{F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server", "Wino.Server\Wino.Server.csproj", "{AF809A28-F49B-4E8C-8363-A882612C41A7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -135,6 +135,36 @@ Global
{2C86AF48-F7DD-4EA6-A9A6-610E69287F03}.Release|x64.Build.0 = Release|Any CPU
{2C86AF48-F7DD-4EA6-A9A6-610E69287F03}.Release|x86.ActiveCfg = Release|Any CPU
{2C86AF48-F7DD-4EA6-A9A6-610E69287F03}.Release|x86.Build.0 = Release|Any CPU
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|Any CPU.Build.0 = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|Any CPU.Deploy.0 = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|ARM.ActiveCfg = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|ARM.Build.0 = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|ARM.Deploy.0 = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|ARM64.Build.0 = Debug|ARM64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|x64.ActiveCfg = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|x64.Build.0 = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|x64.Deploy.0 = Debug|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|x86.ActiveCfg = Debug|x86
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|x86.Build.0 = Debug|x86
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Debug|x86.Deploy.0 = Debug|x86
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|Any CPU.ActiveCfg = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|Any CPU.Build.0 = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|Any CPU.Deploy.0 = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|ARM.ActiveCfg = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|ARM.Build.0 = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|ARM.Deploy.0 = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|ARM64.ActiveCfg = Release|ARM64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|ARM64.Build.0 = Release|ARM64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|ARM64.Deploy.0 = Release|ARM64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|x64.ActiveCfg = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|x64.Build.0 = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|x64.Deploy.0 = Release|x64
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|x86.ActiveCfg = Release|x86
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|x86.Build.0 = Release|x86
+ {955936B2-112B-4756-8BC7-67FF12BF9759}.Release|x86.Deploy.0 = Release|x86
{88A9B1A8-BC59-4852-93D0-37A5D357ABC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88A9B1A8-BC59-4852-93D0-37A5D357ABC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88A9B1A8-BC59-4852-93D0-37A5D357ABC6}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -185,66 +215,26 @@ Global
{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}.Release|x86.ActiveCfg = Release|x86
{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}.Release|x86.Build.0 = Release|x86
{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}.Release|x86.Deploy.0 = Release|x86
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|Any CPU.ActiveCfg = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|Any CPU.Build.0 = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|Any CPU.Deploy.0 = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|ARM.ActiveCfg = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|ARM.Build.0 = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|ARM.Deploy.0 = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|ARM64.Build.0 = Debug|ARM64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|ARM64.Deploy.0 = Debug|ARM64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|x64.ActiveCfg = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|x64.Build.0 = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|x64.Deploy.0 = Debug|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|x86.ActiveCfg = Debug|x86
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|x86.Build.0 = Debug|x86
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Debug|x86.Deploy.0 = Debug|x86
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|Any CPU.ActiveCfg = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|Any CPU.Build.0 = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|Any CPU.Deploy.0 = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|ARM.ActiveCfg = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|ARM.Build.0 = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|ARM.Deploy.0 = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|ARM64.ActiveCfg = Release|ARM64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|ARM64.Build.0 = Release|ARM64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|ARM64.Deploy.0 = Release|ARM64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|x64.ActiveCfg = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|x64.Build.0 = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|x64.Deploy.0 = Release|x64
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|x86.ActiveCfg = Release|x86
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|x86.Build.0 = Release|x86
- {4D2458CF-67CA-41F0-84FB-97D39FCBD376}.Release|x86.Deploy.0 = Release|x86
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|Any CPU.ActiveCfg = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|Any CPU.Build.0 = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|Any CPU.Deploy.0 = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|ARM.ActiveCfg = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|ARM.Build.0 = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|ARM.Deploy.0 = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|ARM64.Build.0 = Debug|ARM64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|ARM64.Deploy.0 = Debug|ARM64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|x64.ActiveCfg = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|x64.Build.0 = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|x64.Deploy.0 = Debug|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|x86.ActiveCfg = Debug|x86
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|x86.Build.0 = Debug|x86
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Debug|x86.Deploy.0 = Debug|x86
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|Any CPU.ActiveCfg = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|Any CPU.Build.0 = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|Any CPU.Deploy.0 = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|ARM.ActiveCfg = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|ARM.Build.0 = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|ARM.Deploy.0 = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|ARM64.ActiveCfg = Release|ARM64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|ARM64.Build.0 = Release|ARM64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|ARM64.Deploy.0 = Release|ARM64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|x64.ActiveCfg = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|x64.Build.0 = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|x64.Deploy.0 = Release|x64
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|x86.ActiveCfg = Release|x86
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|x86.Build.0 = Release|x86
- {F59FCE0A-5AC8-4886-AAAD-AD2C4DD2AF65}.Release|x86.Deploy.0 = Release|x86
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|ARM.Build.0 = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|x64.Build.0 = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Debug|x86.Build.0 = Debug|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|ARM.ActiveCfg = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|ARM.Build.0 = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|ARM64.Build.0 = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|x64.ActiveCfg = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|x64.Build.0 = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|x86.ActiveCfg = Release|Any CPU
+ {AF809A28-F49B-4E8C-8363-A882612C41A7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Wino.sln b/Wino.sln
index 3e783c31..41817d8f 100644
--- a/Wino.sln
+++ b/Wino.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Messaging", "Wino.Mess
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Wino.Packaging", "Wino.Packaging\Wino.Packaging.wapproj", "{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server.NET8", "Wino.Server.NET8\Wino.Server.NET8.csproj", "{8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server", "Wino.Server\Wino.Server.csproj", "{3D1942E5-1A3B-4062-B4BB-156A40DA47FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -215,36 +215,26 @@ Global
{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}.Release|x86.ActiveCfg = Release|x86
{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}.Release|x86.Build.0 = Release|x86
{760F5F31-8EE3-4B83-80F3-0E4FFBCC737C}.Release|x86.Deploy.0 = Release|x86
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|Any CPU.ActiveCfg = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|Any CPU.Build.0 = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|Any CPU.Deploy.0 = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|ARM.ActiveCfg = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|ARM.Build.0 = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|ARM.Deploy.0 = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|ARM64.ActiveCfg = Debug|ARM64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|ARM64.Build.0 = Debug|ARM64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|ARM64.Deploy.0 = Debug|ARM64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|x64.ActiveCfg = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|x64.Build.0 = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|x64.Deploy.0 = Debug|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|x86.ActiveCfg = Debug|x86
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|x86.Build.0 = Debug|x86
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Debug|x86.Deploy.0 = Debug|x86
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|Any CPU.ActiveCfg = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|Any CPU.Build.0 = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|Any CPU.Deploy.0 = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|ARM.ActiveCfg = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|ARM.Build.0 = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|ARM.Deploy.0 = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|ARM64.ActiveCfg = Release|ARM64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|ARM64.Build.0 = Release|ARM64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|ARM64.Deploy.0 = Release|ARM64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|x64.ActiveCfg = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|x64.Build.0 = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|x64.Deploy.0 = Release|x64
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|x86.ActiveCfg = Release|x86
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|x86.Build.0 = Release|x86
- {8CC3CE15-92C9-40FE-8F24-08EAAC2E4027}.Release|x86.Deploy.0 = Release|x86
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|ARM.Build.0 = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|x64.Build.0 = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Debug|x86.Build.0 = Debug|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|ARM.ActiveCfg = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|ARM.Build.0 = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|ARM64.Build.0 = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|x64.ActiveCfg = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|x64.Build.0 = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|x86.ActiveCfg = Release|Any CPU
+ {3D1942E5-1A3B-4062-B4BB-156A40DA47FE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE