MicaApps · Shomnipotence · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024
diff --git a/Wino.Core.Domain/Interfaces/INativeAppService.cs b/Wino.Core.Domain/Interfaces/INativeAppService.cs
@@ -15,7 +15,7 @@ public interface INativeAppService
 
         string GetFullAppVersion();
 
-        Task PinAppToTaskbarAsync();
+        //Task PinAppToTaskbarAsync();
 
         /// <summary>
         /// Some cryptographic shit is needed for requesting Google authentication in UWP.

diff --git a/Wino.Core/Authenticators/OutlookAuthenticator.cs b/Wino.Core/Authenticators/OutlookAuthenticator.cs
@@ -17,7 +17,7 @@ public class OutlookAuthenticator : BaseAuthenticator, IAuthenticator
         // Outlook
         private const string Authority = "https://login.microsoftonline.com/common";
 
-        public string ClientId { get; } = "b19c2035-d740-49ff-b297-de6ec561b208";
+        public string ClientId { get; } = "d26be8d1-9975-4654-aa42-35b398759196";
 
         private readonly string[] MailScope = new string[] { "email", "mail.readwrite", "offline_access", "mail.send" };
 
@@ -27,11 +27,11 @@ public class OutlookAuthenticator : BaseAuthenticator, IAuthenticator
 
         public OutlookAuthenticator(ITokenService tokenService, INativeAppService nativeAppService) : base(tokenService)
         {
-            var authenticationRedirectUri = nativeAppService.GetWebAuthenticationBrokerUri();
+            // var authenticationRedirectUri = nativeAppService.GetWebAuthenticationBrokerUri();
 
             _publicClientApplication = PublicClientApplicationBuilder.Create(ClientId)
                 .WithAuthority(Authority)
-                .WithRedirectUri(authenticationRedirectUri)
+                .WithRedirectUri("https://login.microsoftonline.com/common/oauth2/nativeclient")
                 .Build();
         }
 

diff --git a/Wino.Core/Services/FolderService.cs b/Wino.Core/Services/FolderService.cs
@@ -127,11 +127,13 @@ public async Task<AccountFolderTree> GetFolderStructureForAccountAsync(Guid acco
 
                 if (nonStickyFolders.Any())
                 {
-                    var virtualMoreFolder = new MailItemFolder()
-                    {
-                        FolderName = Translator.More,
-                        SpecialFolderType = SpecialFolderType.More
-                    };
+                    //var virtualMoreFolder = new MailItemFolder()
+                    //{
+                    //    FolderName = Translator.More,
+                    //    SpecialFolderType = SpecialFolderType.More
+                    //};
+
+                    var moreFolders = new List<MailItemFolder>();
 
                     foreach (var unstickyItem in nonStickyFolders)
                     {
@@ -156,12 +158,14 @@ public async Task<AccountFolderTree> GetFolderStructureForAccountAsync(Guid acco
 
                         var structure = await GetChildFolderItemsRecursiveAsync(unstickyItem.Id, accountId);
 
-                        virtualMoreFolder.ChildFolders.Add(structure);
+                        moreFolders.Add(structure);
                     }
 
                     // Only add more if there are any.
-                    if (virtualMoreFolder.ChildFolders.Count > 0)
-                        accountTree.Folders.Add(virtualMoreFolder);
+                    if (moreFolders.Count > 0)
+                    {
+                        accountTree.Folders.AddRange(moreFolders);
+                    }    
                 }
             }
 

diff --git a/Wino.Mail.ViewModels/AppShellViewModel.cs b/Wino.Mail.ViewModels/AppShellViewModel.cs
@@ -873,7 +873,7 @@ protected override async void OnAccountCreated(MailAccount createdAccount)
 
             Messenger.Send(new NewSynchronizationRequested(options));
 
-            await _nativeAppService.PinAppToTaskbarAsync();
+            //await _nativeAppService.PinAppToTaskbarAsync();
         }
 
         /// <summary>

diff --git a/Wino.Mail/AppShell.xaml b/Wino.Mail/AppShell.xaml
@@ -255,7 +255,8 @@
         <!--  Inbox or any other folders.  -->
         <DataTemplate x:Key="FolderMenuTemplate" x:DataType="menu:FolderMenuItem">
             <controls:WinoNavigationViewItem
-                MinHeight="30"
+                MinHeight="32"
+
                 AllowDrop="True"
                 ContextRequested="MenuItemContextRequested"
                 DragEnter="ItemDragEnterOnFolder"
@@ -299,6 +300,7 @@
                                 x:Name="CustomColorTitle"
                                 Margin="4,0,0,0"
                                 VerticalAlignment="Center"
+
                                 FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
                                 Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(Parameter.TextColorHex), Mode=OneWay}"
                                 Style="{StaticResource BodyTextBlockStyle}"
@@ -490,7 +492,8 @@
         x:Name="RootGrid"
         Padding="0"
         ColumnSpacing="0"
-        RowSpacing="0">
+        RowSpacing="0"
+        >
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="48" />
             <ColumnDefinition Width="*" />
@@ -528,7 +531,16 @@
             PaneOpening="NavigationPaneOpening"
             ScrollViewer.VerticalScrollBarVisibility="Hidden"
             SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay}"
-            SelectionChanged="MenuSelectionChanged">
+            SelectionChanged="MenuSelectionChanged"
+            Background="#08FFFFFF"
+            >
+            <muxc:NavigationView.Resources>
+                <!--<Thickness x:Key="NavigationViewContentMargin">0,50,0,0</Thickness>-->
+                <SolidColorBrush x:Key="NavigationViewContentBackground"
+         Color="Transparent" />
+                <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush"
+         Color="Transparent" />
+            </muxc:NavigationView.Resources>
             <muxc:NavigationView.ContentTransitions>
                 <TransitionCollection>
                     <AddDeleteThemeTransition />
@@ -542,7 +554,7 @@
             <!--<muxc:NavigationView.PaneFooter>
 
             </muxc:NavigationView.PaneFooter>-->
-            <Grid ColumnSpacing="0">
+            <Grid ColumnSpacing="0" Margin="-30 0 0 0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
@@ -608,5 +620,6 @@
             OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=OneWay}"
             ReadingPaneLength="{x:Bind ViewModel.StatePersistenceService.MailListPaneLength, Mode=OneWay}"
             SystemReserved="180" />
+
     </Grid>
 </abstract:AppShellAbstract>
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-100.png b/Wino.Mail/Assets/BadgeLogo.scale-100.png
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-125.png b/Wino.Mail/Assets/BadgeLogo.scale-125.png
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-150.png b/Wino.Mail/Assets/BadgeLogo.scale-150.png
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-200.png b/Wino.Mail/Assets/BadgeLogo.scale-200.png
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-400.png b/Wino.Mail/Assets/BadgeLogo.scale-400.png
diff --git a/Wino.Mail/Assets/LargeTile.scale-100.png b/Wino.Mail/Assets/LargeTile.scale-100.png
diff --git a/Wino.Mail/Assets/LargeTile.scale-125.png b/Wino.Mail/Assets/LargeTile.scale-125.png
diff --git a/Wino.Mail/Assets/LargeTile.scale-150.png b/Wino.Mail/Assets/LargeTile.scale-150.png
diff --git a/Wino.Mail/Assets/LargeTile.scale-200.png b/Wino.Mail/Assets/LargeTile.scale-200.png
diff --git a/Wino.Mail/Assets/LargeTile.scale-400.png b/Wino.Mail/Assets/LargeTile.scale-400.png
diff --git a/Wino.Mail/Assets/Rectangle17.png b/Wino.Mail/Assets/Rectangle17.png
diff --git a/Wino.Mail/Assets/SmallTile.scale-100.png b/Wino.Mail/Assets/SmallTile.scale-100.png
diff --git a/Wino.Mail/Assets/SmallTile.scale-125.png b/Wino.Mail/Assets/SmallTile.scale-125.png
diff --git a/Wino.Mail/Assets/SmallTile.scale-150.png b/Wino.Mail/Assets/SmallTile.scale-150.png
diff --git a/Wino.Mail/Assets/SmallTile.scale-200.png b/Wino.Mail/Assets/SmallTile.scale-200.png
diff --git a/Wino.Mail/Assets/SmallTile.scale-400.png b/Wino.Mail/Assets/SmallTile.scale-400.png
diff --git a/Wino.Mail/Assets/SplashScreen.scale-100.png b/Wino.Mail/Assets/SplashScreen.scale-100.png
diff --git a/Wino.Mail/Assets/SplashScreen.scale-125.png b/Wino.Mail/Assets/SplashScreen.scale-125.png
diff --git a/Wino.Mail/Assets/SplashScreen.scale-150.png b/Wino.Mail/Assets/SplashScreen.scale-150.png
diff --git a/Wino.Mail/Assets/SplashScreen.scale-200.png b/Wino.Mail/Assets/SplashScreen.scale-200.png
diff --git a/Wino.Mail/Assets/SplashScreen.scale-400.png b/Wino.Mail/Assets/SplashScreen.scale-400.png
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-100.png b/Wino.Mail/Assets/Square150x150Logo.scale-100.png
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-125.png b/Wino.Mail/Assets/Square150x150Logo.scale-125.png
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-150.png b/Wino.Mail/Assets/Square150x150Logo.scale-150.png
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-200.png b/Wino.Mail/Assets/Square150x150Logo.scale-200.png
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-400.png b/Wino.Mail/Assets/Square150x150Logo.scale-400.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-100.png b/Wino.Mail/Assets/Square44x44Logo.scale-100.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-125.png b/Wino.Mail/Assets/Square44x44Logo.scale-125.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-150.png b/Wino.Mail/Assets/Square44x44Logo.scale-150.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-200.png b/Wino.Mail/Assets/Square44x44Logo.scale-200.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-400.png b/Wino.Mail/Assets/Square44x44Logo.scale-400.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png
diff --git a/Wino.Mail/Assets/StoreLogo.scale-100.png b/Wino.Mail/Assets/StoreLogo.scale-100.png
diff --git a/Wino.Mail/Assets/StoreLogo.scale-125.png b/Wino.Mail/Assets/StoreLogo.scale-125.png
diff --git a/Wino.Mail/Assets/StoreLogo.scale-150.png b/Wino.Mail/Assets/StoreLogo.scale-150.png
diff --git a/Wino.Mail/Assets/StoreLogo.scale-200.png b/Wino.Mail/Assets/StoreLogo.scale-200.png
diff --git a/Wino.Mail/Assets/StoreLogo.scale-400.png b/Wino.Mail/Assets/StoreLogo.scale-400.png
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-100.png b/Wino.Mail/Assets/Wide310x150Logo.scale-100.png
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-125.png b/Wino.Mail/Assets/Wide310x150Logo.scale-125.png
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-150.png b/Wino.Mail/Assets/Wide310x150Logo.scale-150.png
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-200.png b/Wino.Mail/Assets/Wide310x150Logo.scale-200.png
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-400.png b/Wino.Mail/Assets/Wide310x150Logo.scale-400.png
diff --git a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
@@ -96,8 +96,10 @@
             <ContentPresenter
                 x:Name="ShellContentContainer"
                 Grid.Column="1"
+                Grid.ColumnSpan="1"
                 Canvas.ZIndex="2"
-                Content="{x:Bind ShellFrameContent, Mode=OneWay}">
+                HorizontalAlignment="Stretch"
+                Content="{x:Bind ShellFrameContent, Mode=OneWay}" RenderTransformOrigin="0.5,0.5">
                 <ContentPresenter.ContentTransitions>
                     <TransitionCollection>
                         <PaneThemeTransition Edge="Top" />

diff --git a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
@@ -101,9 +101,9 @@ private void DrawTitleBar()
             UpdateLayout();
 
             CoreWindowTitleTextBlock.Visibility = Visibility.Collapsed;
-            ShellContentContainer.Width = double.NaN;
-            ShellContentContainer.Margin = new Thickness(0, 0, 0, 0);
-            ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Stretch;
+            //ShellContentContainer.Width = double.NaN;
+            //ShellContentContainer.Margin = new Thickness(0, 0, 0, 0);
+            //ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Stretch;
 
             EmptySpaceWidth.Width = new GridLength(1, GridUnitType.Star);
 
@@ -118,8 +118,9 @@ private void DrawTitleBar()
 
                 if (!IsReaderNarrowed)
                 {
-                    ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
-                    ShellContentContainer.Width = ReadingPaneLength;
+                    //ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
+                    //ShellContentContainer.Width = ReadingPaneLength;
+                    ShellContentContainer.Margin = new Thickness(10, 0, 0, 0);
                 }
             }
             else if (NavigationViewDisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Expanded)
@@ -129,19 +130,30 @@ private void DrawTitleBar()
                     CoreWindowTitleTextBlock.Visibility = Visibility.Visible;
 
                     // LMargin = OpenPaneLength - LeftMenuStackPanel
-                    ShellContentContainer.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
+                    // ShellContentContainer.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
 
                     if (!IsReaderNarrowed)
                     {
-                        ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
-                        ShellContentContainer.Width = ReadingPaneLength;
+                        //ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
+                        //ShellContentContainer.Width = ReadingPaneLength;
                     }
                 }
                 else
                 {
-                    EmptySpaceWidth.Width = new GridLength(ReadingPaneLength, GridUnitType.Pixel);
+                    //EmptySpaceWidth.Width = new GridLength(ReadingPaneLength, GridUnitType.Pixel);
                 }
             }
+
+            if(this.ActualWidth >= 720)
+            {
+                ShellContentContainer.Margin = new Thickness(125, 0, 0, 0);
+                ShellContentContainer.MaxWidth = 400;
+            }
+            else
+            {
+                ShellContentContainer.Margin = new Thickness(60, 0, -40, 0);
+                ShellContentContainer.MaxWidth = double.PositiveInfinity;
+            }
         }
 
         public WinoAppTitleBar()