Merge pull request MicaApps#94 from MicaApps/ruofan

Code cleanup

Author: kengwang

Diff for: Mail/Models/LoadMailMessageOption.cs

@@ -6,21 +6,13 @@
 /// 创建者: GaN<br/>
 /// 创建时间: 2023/06/20
 /// </summary>
-public class LoadMailMessageOption
+public sealed class LoadMailMessageOption
 {
-    public LoadMailMessageOption(string FolderId)
-    {
-        this.FolderId = FolderId;
-    }
-
-    public LoadMailMessageOption(string FolderId, bool IsFocusedTab)
-    {
-        this.FolderId = FolderId;
-        this.IsFocusedTab = IsFocusedTab;
-    }
-
     public string FolderId { get; set; }
-    public bool IsFocusedTab { get; set; } = true;
+
     public int StartIndex { get; set; }
+
     public int LoadCount { get; set; } = 30;
+
+    public bool IsFocusedTab { get; set; } = true;
 }

Diff for: Mail/Pages/HomePage.xaml.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Identity.Client;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Diagnostics;
@@ -80,34 +81,25 @@ private void HomePage_Loaded(object sender, RoutedEventArgs e)
 
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
-            base.OnNavigatedTo(e);
-            if (e.NavigationMode != NavigationMode.New) return;
-            // 这是分割线
-            MailFolderSource.Add(0);
-            var isFirstOther = true;
+            MailFolderSource.Add(new NavigationViewItemSeparator());
+
             try
             {
-                // the specified folder could not be found in the store
-                var orderedAsyncEnumerable = Service.GetMailSuperFoldersAsync()
-                    .OrderBy(item => item.Type);
-                await foreach (var item in orderedAsyncEnumerable)
+                IReadOnlyList<MailFolderData> MailFolders = await Service.GetMailSuperFoldersAsync().OrderBy((Data) => Data.Type).ToArrayAsync();
+
+                if (MailFolders.Count > 0)
                 {
-                    if (item.Type == MailFolderType.Other && isFirstOther)
-                    {
-                        // 这是分割线
-                        MailFolderSource.Add(1);
-                        isFirstOther = false;
-                    }
-
-                    MailFolderSource.Add(item);
+                    MailFolderSource.AddRange(MailFolders.TakeWhile((Data) => Data.Type != MailFolderType.Other));
+                    MailFolderSource.Add(new NavigationViewItemSeparator());
+                    MailFolderSource.AddRange(MailFolders.Skip(MailFolderSource.Count));
                 }
             }
             catch (Exception exception)
             {
                 Trace.WriteLine(exception);
             }
 
-            NavView.SelectedItem = MailFolderSource.FirstOrDefault(item => item is MailFolderData);
+            NavView.SelectedItem = MailFolderSource.OfType<MailFolderData>().FirstOrDefault();
 
             Service.MailFoldersTree.CollectionChanged += (Sender, Args) =>
             {

Diff for: Mail/Pages/MailFolderDetailsPage.xaml

@@ -276,7 +276,7 @@
                             <WebView HorizontalAlignment="Stretch"
                                      NavigationCompleted="Browser_NavigationCompleted"
                                      DefaultBackgroundColor="Transparent"
-                                     NavigationStarting="WebView_OnNavigationStarting"
+                                     NavigationStarting="Browser_OnNavigationStarting"
                                      VerticalAlignment="Stretch" />
                         </StackPanel>
                     </ScrollViewer>
@@ -304,21 +304,33 @@
                                   BackButtonBehavior="Manual"
                                   Background="Transparent"
                                   DetailsPaneBackground="Transparent"
-                                  IsTapEnabled="True"
                                   ListPaneBackground="Transparent"
                                   Loaded="ListDetailsView_Loaded"
                                   NoSelectionContent="Select an item to view"
                                   SelectionChanged="DetailsView_SelectionChanged"
-                                  Tapped="ListDetailsView_Tapped"
                                   ViewStateChanged="DetailsView_ViewStateChanged"
                                   DetailsContentTemplateSelector="{StaticResource MailFolderDetailsContentDataTemplateSelector}">
             <controls:ListDetailsView.ListHeader>
                 <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <TextBlock x:Name="FolderName"
+                               Margin="0,10,0,0"
+                               Grid.ColumnSpan="2"
+                               FontSize="15"
+                               FontWeight="Bold"
+                               VerticalAlignment="Center" />
                     <muxc:NavigationView x:Name="NavigationTab"
+                                         Grid.Row="1"
                                          IsBackButtonVisible="Collapsed"
                                          IsSettingsVisible="False"
                                          SelectionChanged="NavigationView_SelectionChanged"
-                                         Visibility="Collapsed"
                                          PaneDisplayMode="Top">
                         <muxc:NavigationView.MenuItems>
                             <muxc:NavigationViewItem x:Uid="FocusedTab"
@@ -327,11 +339,9 @@
                                                      x:Name="OtherTab" />
                         </muxc:NavigationView.MenuItems>
                     </muxc:NavigationView>
-                    <TextBlock x:Name="FolderName"
-                               FontWeight="Bold"
-                               Visibility="Collapsed"
-                               VerticalAlignment="Center" />
                     <Button Margin="5"
+                            Grid.Row="1"
+                            Grid.Column="1"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
                             Style="{ThemeResource AlternateCloseButtonStyle}"