Shared core and views part 1

Wino.Mail/Behaviors/BindableCommandBarBehavior.cs

@@ -1,14 +1,22 @@
 using System.Collections;
 using System.Collections.Specialized;
 using System.Windows.Input;
+
 using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
 using Wino.Controls;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+#endif
 namespace Wino.Behaviors
 {
     public class BindableCommandBarBehavior : Behavior<CommandBar>

Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs

@@ -1,9 +1,15 @@
 using System.Collections.ObjectModel;
 using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
+
 using Wino.Controls;
 using Wino.Core.MenuItems;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Behaviors
 {
     public class CreateMailNavigationItemBehavior : Behavior<WinoNavigationViewItem>

Wino.Mail/Controls/AccountNavigationItem.cs

@@ -1,8 +1,16 @@
 using System.Numerics;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+
 using Wino.Core.Domain.Interfaces;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Shapes;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Shapes;
+#endif
 namespace Wino.Controls
 {
     public class AccountNavigationItem : WinoNavigationViewItem
@@ -28,7 +36,7 @@ namespace Wino.Controls
         private const string PART_SelectionIndicator = "CustomSelectionIndicator";
 
         private ItemsRepeater _itemsRepeater;
-        private Windows.UI.Xaml.Shapes.Rectangle _selectionIndicator;
+        private Rectangle _selectionIndicator;
 
         public AccountNavigationItem()
         {
@@ -40,7 +48,7 @@ namespace Wino.Controls
             base.OnApplyTemplate();
 
             _itemsRepeater = GetTemplateChild(PART_NavigationViewItemMenuItemsHost) as ItemsRepeater;
-            _selectionIndicator = GetTemplateChild(PART_SelectionIndicator) as Windows.UI.Xaml.Shapes.Rectangle;
+            _selectionIndicator = GetTemplateChild(PART_SelectionIndicator) as Rectangle;
 
             if (_itemsRepeater == null) return;
 

Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs

@@ -1,7 +1,12 @@
 using Windows.Foundation;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-
+#endif
 namespace Wino.Controls.Advanced
 {
     public sealed partial class WinoAppTitleBar : UserControl

Wino.Mail/Controls/Advanced/WinoListView.cs

@@ -5,14 +5,22 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml.Controls;
 using MoreLinq;
 using Serilog;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Extensions;
 using Wino.Mail.ViewModels.Data;
 using Wino.Mail.ViewModels.Messages;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+#endif
 namespace Wino.Controls.Advanced
 {
     /// <summary>
@@ -114,7 +122,7 @@ namespace Wino.Controls.Advanced
             }
         }
 
-        private void ProcessDelKey(UIElement sender, Windows.UI.Xaml.Input.ProcessKeyboardAcceleratorEventArgs args)
+        private void ProcessDelKey(UIElement sender, ProcessKeyboardAcceleratorEventArgs args)
         {
             if (args.Key == Windows.System.VirtualKey.Delete)
             {

Wino.Mail/Controls/ImagePreviewControl.cs

@@ -2,12 +2,22 @@
 using System.Text.RegularExpressions;
 using Fernandezja.ColorHashSharp;
 using Windows.UI;
+
+using Wino.Core.Services;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Microsoft.UI.Xaml.Shapes;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Shapes;
-using Wino.Core.Services;
+#endif
 
 namespace Wino.Controls
 {

Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs

@@ -3,14 +3,19 @@ using System.ComponentModel;
 using System.Numerics;
 using System.Windows.Input;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Extensions;
 using Wino.Mail.ViewModels.Data;
-
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+#endif
 namespace Wino.Controls
 {
     public sealed partial class MailItemDisplayInformationControl : UserControl, INotifyPropertyChanged
@@ -214,7 +219,7 @@ namespace Wino.Controls
             RootContainerVisualWrapper.SizeChanged += (s, e) => leftBackgroundVisual.Size = e.NewSize.ToVector2();
         }
 
-        private void ControlPointerEntered(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void ControlPointerEntered(object sender, PointerRoutedEventArgs e)
         {
             if (IsHoverActionsEnabled)
             {
@@ -222,7 +227,7 @@ namespace Wino.Controls
             }
         }
 
-        private void ControlPointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void ControlPointerExited(object sender, PointerRoutedEventArgs e)
         {
             if (IsHoverActionsEnabled)
             {

Wino.Mail/Controls/RendererCommandBar.cs

@@ -2,13 +2,18 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Helpers;
 using Wino.MenuFlyouts;
-
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Controls
 {
     public class RendererCommandBar : CommandBar, IDisposable

Wino.Mail/Controls/SettingsMenuItemControl.cs

@@ -1,8 +1,12 @@
-using System;
-using System.Windows.Input;
+using System.Windows.Input;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-
+#endif
 namespace Wino.Controls
 {
     /// <summary>

Wino.Mail/Controls/WinoFontIcon.cs

@@ -1,5 +1,13 @@
-using Windows.UI.Xaml;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+#else
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+#endif
 
 namespace Wino.Controls
 {
@@ -76,7 +84,7 @@ namespace Wino.Controls
 
         public WinoFontIcon()
         {
-            FontFamily = new Windows.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
+            FontFamily = new FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
             FontSize = 32;
         }
 

Wino.Mail/Controls/WinoFontIconSource.cs

@@ -1,5 +1,12 @@
-using Windows.UI.Xaml;
+
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+#endif
 namespace Wino.Controls
 {
     public class WinoFontIconSource : Microsoft.UI.Xaml.Controls.FontIconSource
@@ -14,7 +21,7 @@ namespace Wino.Controls
 
         public WinoFontIconSource()
         {
-            FontFamily = new Windows.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
+            FontFamily = new FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
             FontSize = 32;
         }
 

Wino.Mail/Controls/WinoInfoBar.cs

@@ -1,10 +1,16 @@
 using System;
 using System.Numerics;
-using CommunityToolkit.WinUI.Animations;
-using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Wino.Core.Domain.Enums;
 
+using Microsoft.UI.Xaml.Controls;
+
+using Wino.Core.Domain.Enums;
+using CommunityToolkit.WinUI.Animations;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
 namespace Wino.Controls
 {
     public class WinoInfoBar : InfoBar

Wino.Mail/Controls/WinoNavigationViewItem.cs

@@ -1,8 +1,13 @@
 using System.Numerics;
 using Microsoft.UI.Xaml.Controls;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Hosting;
-
+#endif
 namespace Wino.Controls
 {
     public class WinoNavigationViewItem : NavigationViewItem

Wino.Mail/Controls/WinoPivotControl.xaml.cs

@@ -1,13 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Numerics;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.Foundation;
-using Windows.Foundation.Collections;
+
+using Wino.Extensions;
+#if NET8_0
+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+#else
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -17,8 +21,7 @@ using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
-using Wino.Extensions;
-
+#endif
 namespace Wino.Controls
 {
     // TODO: Memory leak with FolderPivot bindings.
@@ -131,7 +134,7 @@ namespace Wino.Controls
             {
                 // Get selected item container position
                 // TODO: It's bad...
-                while(PivotHeaders.ContainerFromItem(PivotHeaders.SelectedItem) == null)
+                while (PivotHeaders.ContainerFromItem(PivotHeaders.SelectedItem) == null)
                 {
                     await Task.Delay(100);
                 }

Wino.Mail/Controls/WinoSwipeControlItems.cs

@@ -1,11 +1,16 @@
 using System.Linq;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Helpers;
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
 namespace Wino.Controls
 {
     public class WinoSwipeControlItems : SwipeItems

Wino.Mail/Converters/ReverseBooleanConverter.cs

@@ -1,9 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml.Data;
+#else
 using Windows.UI.Xaml.Data;
+#endif
 
 namespace Wino.Converters
 {

Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs

@@ -1,10 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Xaml;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml;
+#else
 using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml;
+#endif
 
 namespace Wino.Converters
 {

Wino.Mail/Dialogs/AccountEditDialog.xaml.cs

@@ -1,6 +1,11 @@
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Entities;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class AccountEditDialog : ContentDialog

Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs

@@ -1,7 +1,12 @@
 using System.Collections.Generic;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class AccountPickerDialog : ContentDialog

Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs

@@ -1,9 +1,13 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class AccountReorderDialog : ContentDialog

Wino.Mail/Dialogs/BaseAccountCreationDialog.cs

@@ -1,8 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public abstract class BaseAccountCreationDialog : ContentDialog, IAccountCreationDialog

Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs

@@ -1,8 +1,14 @@
 using System.Threading.Tasks;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class ConfirmationDialog : ContentDialog, IConfirmationDialog

Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs

@@ -1,10 +1,17 @@
 using System;
 using CommunityToolkit.WinUI.Helpers;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
 using Wino.Core.Domain.Interfaces;
-using Wino.Services;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+#endif
 
 namespace Wino.Dialogs
 {
@@ -43,7 +50,7 @@ namespace Wino.Dialogs
             }
         }
 
-        private async void BrowseWallpaperClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private async void BrowseWallpaperClicked(object sender, RoutedEventArgs e)
         {
             var dialogService = App.Current.Services.GetService<IDialogService>();
 

Wino.Mail/Dialogs/MoveMailDialog.xaml.cs

@@ -1,9 +1,15 @@
 using System.Collections.Generic;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Models.Folders;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class MoveMailDialog : ContentDialog

Wino.Mail/Dialogs/NewAccountDialog.xaml.cs

@@ -1,9 +1,15 @@
 using System.Collections.Generic;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class NewAccountDialog : ContentDialog

Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs

@@ -1,14 +1,22 @@
 using System;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
+
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Messages.Mails;
 using Wino.Views.ImapSetup;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media.Animation;
+#endif
+
 namespace Wino.Dialogs
 {
     public enum ImapSetupState

Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs

@@ -5,14 +5,22 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2.Core;
 using Newtonsoft.Json;
 using Windows.UI.ViewManagement.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Requests;
 using Wino.Views.Settings;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class SignatureEditorDialog : ContentDialog

Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs

@@ -1,6 +1,10 @@
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class StoreRatingDialog : ContentDialog, IStoreRatingDialog

Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class SystemFolderConfigurationDialog : ContentDialog

Wino.Mail/Dialogs/TextInputDialog.xaml.cs

@@ -1,5 +1,11 @@
-using Windows.UI.Xaml;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+#endif
 
 namespace Wino.Dialogs
 {

Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs

@@ -1,7 +1,12 @@
 using System.Threading.Tasks;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class WinoMessageDialog : ContentDialog

Wino.Mail/Extensions/AnimationExtensions.cs

@@ -1,13 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Composition;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Composition;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Animation;
-
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static class AnimationExtensions

Wino.Mail/Extensions/CompositionEnums.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Wino.Extensions
 {

Wino.Mail/Extensions/CompositionExtensions.Implicit.cs

@@ -1,13 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Composition;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Composition;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Hosting;
-
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static partial class CompositionExtensions

Wino.Mail/Extensions/CompositionExtensions.Size.cs

@@ -1,9 +1,15 @@
 using System;
 using System.Numerics;
 using System.Threading.Tasks;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Composition;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static partial class CompositionExtensions
@@ -51,7 +57,6 @@ namespace Wino.Extensions
             {
                 to = Vector2.One;
             }
-
             visual.StartAnimation("Size",
                 compositor.CreateVector2KeyFrameAnimation(from, to.Value, duration, delay, easing, iterationBehavior));
 

Wino.Mail/Extensions/MimeKitExtensions.cs

@@ -1,7 +1,6 @@
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.Helpers;
+using System.Threading.Tasks;
 using Windows.Storage;
+using Wino.Helpers;
 using Wino.Mail.ViewModels.Data;
 
 namespace Wino.Extensions

Wino.Mail/Extensions/UtilExtensions.cs

@@ -2,12 +2,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Foundation;
-using Windows.UI.Composition;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Composition;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Hosting;
 using Windows.UI.Xaml.Media;
-
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static class UtilExtensions

Wino.Mail/Helpers/WinoVisualTreeHelper.cs

@@ -1,10 +1,18 @@
-using System;
+
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+#else
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
+#endif
 
 namespace Wino.Helpers
 {

Wino.Mail/Helpers/XamlHelpers.cs

@@ -1,19 +1,33 @@
 using System;
 using System.Linq;
-using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI;
-using Windows.UI.Text;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
+
 using Wino.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Reader;
+using Windows.UI.Text;
 
+
+
+#if NET8_0
+using Microsoft.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
+using CommunityToolkit.WinUI.Helpers;
+using Microsoft.UI.Xaml.Shapes;
+#else
+using Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+using Windows.UI.Xaml.Media;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Windows.UI.Xaml.Shapes;
+#endif
 namespace Wino.Helpers
 {
     public static class XamlHelpers
@@ -276,7 +290,7 @@ namespace Wino.Helpers
             "<Path " +
             "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'>" +
             "<Path.Data>" + pathMarkup + "</Path.Data></Path>";
-            var path = XamlReader.Load(xaml) as Windows.UI.Xaml.Shapes.Path;
+            var path = XamlReader.Load(xaml) as Path;
 
             Geometry geometry = path.Data;
             path.Data = null;

Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs

@@ -2,11 +2,19 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Controls;
 using Wino.Core.Domain.Entities;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.MenuFlyouts
 {
     public class AccountSelectorFlyout : MenuFlyout, IDisposable
@@ -40,7 +48,7 @@ namespace Wino.MenuFlyouts
             }
         }
 
-        private async void AccountClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private async void AccountClicked(object sender, RoutedEventArgs e)
         {
             if (sender is MenuFlyoutItem menuItem && menuItem.Tag is string accountAddress)
             {

Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs

@@ -1,12 +1,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using CommunityToolkit.Mvvm.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Controls;
 using Wino.Core.Domain.Models.Reader;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
 namespace Wino.MenuFlyouts
 {
     public class FilterMenuFlyout : MenuFlyout

Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs

@@ -1,9 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Folders;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.MenuFlyouts.Context
 {
     public class FolderOperationFlyout : WinoOperationFlyout<FolderOperationMenuItem>

Wino.Mail/MenuFlyouts/MailOperationFlyout.cs

@@ -1,9 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Menus;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.MenuFlyouts.Context
 {
     public class MailOperationFlyout : WinoOperationFlyout<MailOperationMenuItem>

Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs

@@ -2,9 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Foundation;
+using Wino.Core.Domain.Entities;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Entities;
+#endif
 
 namespace Wino.MenuFlyouts
 {

Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs

@@ -1,10 +1,16 @@
 using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.MenuFlyouts
 {
     public class RendererCommandBarItem : AppBarButton, IDisposable
@@ -26,7 +32,7 @@ namespace Wino.MenuFlyouts
             Click += MenuClicked;
         }
 
-        private void MenuClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void MenuClicked(object sender, RoutedEventArgs e)
         {
             Clicked(Operation);
         }

Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs

@@ -1,8 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+#endif
 namespace Wino.MenuFlyouts
 {
     public class WinoOperationFlyout<TActionType> : MenuFlyout, IDisposable where TActionType : class
@@ -22,7 +28,7 @@ namespace Wino.MenuFlyouts
             Closing += FlyoutClosing;
         }
 
-        private void FlyoutClosing(Windows.UI.Xaml.Controls.Primitives.FlyoutBase sender, Windows.UI.Xaml.Controls.Primitives.FlyoutBaseClosingEventArgs args)
+        private void FlyoutClosing(FlyoutBase sender, FlyoutBaseClosingEventArgs args)
         {
             Closing -= FlyoutClosing;
 

Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs

@@ -1,12 +1,19 @@
 using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Controls;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.MenuFlyouts
 {
     public class WinoOperationFlyoutItem<TOperationMenuItem> : MenuFlyoutItem, IDisposable where TOperationMenuItem : IMenuOperation
@@ -45,7 +52,7 @@ namespace Wino.MenuFlyouts
             Click += MenuClicked;
         }
 
-        private void MenuClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void MenuClicked(object sender, RoutedEventArgs e)
         {
             Clicked(Operation);
         }

Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs

@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class AccountProviderViewModelTemplateSelector : DataTemplateSelector

Wino.Mail/Selectors/AccountReorderTemplateSelector.cs

@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class AccountReorderTemplateSelector : DataTemplateSelector

Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs

@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.UWP.Models.Personalization;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class AppThemePreviewTemplateSelector : DataTemplateSelector

Wino.Mail/Selectors/FileAttachmentTypeSelector.cs

@@ -1,11 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Wino.Core.Domain.Enums;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
+#endif
 
 namespace Wino.Selectors
 {

Wino.Mail/Selectors/MailItemContainerStyleSelector.cs

@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class MailItemContainerStyleSelector : StyleSelector

Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs

@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     /// <summary>

Wino.Mail/Selectors/MailItemDisplaySelector.cs

@@ -1,6 +1,12 @@
-using Windows.UI.Xaml;
+using Wino.Mail.ViewModels.Data;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Mail.ViewModels.Data;
+#endif
 
 namespace Wino.Selectors
 {

Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs

@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.MenuItems;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class NavigationMenuTemplateSelector : DataTemplateSelector

Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs

@@ -1,8 +1,13 @@
-using Windows.Graphics.Printing.OptionDetails;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Menus;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Menus;
+#endif
 
 namespace Wino.Selectors
 {

Wino.Mail/Services/ApplicationResourceManager.cs

@@ -1,7 +1,11 @@
 using System.Linq;
-using Windows.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
 namespace Wino.Services
 {
     public class ApplicationResourceManager : IApplicationResourceManager<ResourceDictionary>

Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs

@@ -1,15 +1,22 @@
 using System;
 using System.Collections.Generic;
 using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
+
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Core.Messages.Mails;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
 
 namespace Wino.Views.ImapSetup
 {

Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs

@@ -1,13 +1,20 @@
 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.Domain;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Messages.Mails;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
+
 namespace Wino.Views.ImapSetup
 {
     public sealed partial class ImapConnectionFailedPage : Page

Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs

@@ -1,25 +1,13 @@
-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;
+
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
 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=234238
+#endif
 
 namespace Wino.Views.ImapSetup
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
+
     public sealed partial class PreparingImapFoldersPage : Page
     {
         public PreparingImapFoldersPage()

Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs

@@ -2,15 +2,19 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Core.Messages.Mails;
 
-
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
 namespace Wino.Views.ImapSetup
 {
     public sealed partial class TestingImapConnectionPage : Page

Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs

@@ -2,16 +2,21 @@
 using System.Threading.Tasks;
 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.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Core.Messages.Mails;
-
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
 
 namespace Wino.Views.ImapSetup
 {