代码优化

Author: wtcpython

App.xaml.cs

@@ -16,7 +16,6 @@ namespace Edge
     public partial class App : Application
     {
         public static List<MainWindow> mainWindows = [];
-        public static string LatestVersion = null;
         public static Settings settings;
         public static WebView2 webView2 = new();
         public static ObservableCollection<WebViewHistory> Histories = [];

Controls/WebSearch.xaml.cs

@@ -39,7 +39,7 @@ public static void StartSearch(string text, MainWindow mainWindow)
                 }
                 else if (Info.ImageDict.TryGetValue(ext, out var _))
                 {
-                    mainWindow.AddNewTab(new ImageViewer(text), fileInfo.Name);
+                    mainWindow.AddNewTab(new ImageViewer(fileInfo), fileInfo.Name);
                 }
                 else
                 {

MainWindow.xaml.cs

@@ -184,7 +184,7 @@ private LRESULT MainWindowSubClassProc(HWND hWnd, uint Msg, WPARAM wParam, LPARA
 
                             TitlebarMenuFlyout.ShowAt(Content, options);
                         }
-                        return (LRESULT)0;
+                        return new(0);
                     }
             }
             return PInvoke.DefSubclassProc(hWnd, Msg, wParam, lParam);

Pages/HomePage.xaml

@@ -15,19 +15,13 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-
-        <local:BrowserMenuItems Grid.Column="2" HorizontalAlignment="Right"/>
+        <local:BrowserMenuItems Grid.Column="1" HorizontalAlignment="Right"/>
 
         <local:WebSearch
-            Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
+            Grid.Row="1" VerticalAlignment="Center" Margin="200"
             CornerRadius="15" FontSize="18"/>
 
-        <GridView Name="View" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"
+        <GridView Name="View" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center"
                   IsItemClickEnabled="True" ItemClick="OpenSuggestWebsite" SelectionMode="Single">
 
             <GridView.ItemContainerStyle>

Pages/ImageViewer.xaml.cs

@@ -19,18 +19,18 @@ namespace Edge
 {
     public sealed partial class ImageViewer : Page
     {
-        public FileInfo fileInfo;
+        public FileInfo info;
         public BitmapImage source;
 
         private PrintManager printManager;
         private PrintDocument printDocument;
         private IPrintDocumentSource printDocumentSource;
 
-        public ImageViewer(string filepath)
+        public ImageViewer(FileInfo fileInfo)
         {
             this.InitializeComponent();
-            fileInfo = new(filepath);
-            source = new(new Uri(filepath));
+            info = fileInfo;
+            source = new(new Uri(info.FullName));
             image.Source = source;
             source.ImageOpened += ImageOpened;
         }
@@ -66,7 +66,7 @@ private void PrintDocument_Paginate(object sender, PaginateEventArgs e)
 
         private void PrintManager_PrintTaskRequested(PrintManager sender, PrintTaskRequestedEventArgs args)
         {
-            PrintTask task = args.Request.CreatePrintTask(fileInfo.Name, PrintTaskSourceRequested);
+            PrintTask task = args.Request.CreatePrintTask(info.Name, PrintTaskSourceRequested);
         }
 
         private void PrintTaskSourceRequested(PrintTaskSourceRequestedArgs args)
@@ -86,17 +86,17 @@ private async void PrintImageRequest(object sender, RoutedEventArgs e)
 
         private void ImageOpened(object sender, RoutedEventArgs e)
         {
-            imageNameBlock.Text = fileInfo.Name;
+            imageNameBlock.Text = info.Name;
             imagePixel.Text = $"{source.PixelWidth} x {source.PixelHeight}";
-            imageSize.Text = Converters.ToFileSizeString(fileInfo.Length);
+            imageSize.Text = Converters.ToFileSizeString(info.Length);
         }
 
         private async void ImageDeleteRequest(object sender, RoutedEventArgs e)
         {
             ContentDialogResult result = await deleteDialog.ShowAsync();
             if (result == ContentDialogResult.Primary)
             {
-                fileInfo.Delete();
+                info.Delete();
             }
         }
 
@@ -109,7 +109,7 @@ private void ImageRotateRequest(object sender, RoutedEventArgs e)
 
         private void OpenFileLocation(object sender, RoutedEventArgs e)
         {
-            System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{fileInfo.FullName}\"");
+            System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{info.FullName}\"");
         }
 
         private void Image_PointerWheelChanged(object sender, PointerRoutedEventArgs e)
@@ -141,17 +141,17 @@ private void ImageFullScreen(object sender, RoutedEventArgs e)
 
         private void SaveImageAs(object sender, RoutedEventArgs e)
         {
-            string path = Utilities.Win32SaveFile(fileInfo.FullName, this.GetWindowHandle());
+            string path = Utilities.Win32SaveFile(info.FullName, this.GetWindowHandle());
             if (path != string.Empty)
             {
-                fileInfo.CopyTo(path, true);
+                info.CopyTo(path, true);
             }
         }
 
         private void CopyFilePath(object sender, RoutedEventArgs e)
         {
             DataPackage package = new();
-            package.SetText(fileInfo.FullName);
+            package.SetText(info.FullName);
             Clipboard.SetContent(package);
         }
 
@@ -160,7 +160,7 @@ private async void SetImageAsLockScreen(object sender, RoutedEventArgs e)
             if (UserProfilePersonalizationSettings.IsSupported())
             {
                 UserProfilePersonalizationSettings settings = UserProfilePersonalizationSettings.Current;
-                StorageFile imageFile = await StorageFile.GetFileFromPathAsync(fileInfo.FullName);
+                StorageFile imageFile = await StorageFile.GetFileFromPathAsync(info.FullName);
                 await settings.TrySetLockScreenImageAsync(imageFile);
             }
         }
@@ -170,7 +170,7 @@ private async void SetImageAsWallpaper(object sender, RoutedEventArgs e)
             if (UserProfilePersonalizationSettings.IsSupported())
             {
                 UserProfilePersonalizationSettings settings = UserProfilePersonalizationSettings.Current;
-                StorageFile imageFile = await StorageFile.GetFileFromPathAsync(fileInfo.FullName);
+                StorageFile imageFile = await StorageFile.GetFileFromPathAsync(info.FullName);
                 await settings.TrySetWallpaperImageAsync(imageFile);
             }
         }

Settings/AboutItem.xaml.cs

@@ -26,12 +26,12 @@ private async void CheckUpdate(object sender, RoutedEventArgs e)
             {
                 string fileUri = "https://raw.githubusercontent.com/wtcpython/WinUIEdge/main/Assets/version.txt";
                 using HttpClient client = new();
-                App.LatestVersion = await client.GetStringAsync(fileUri);
+                string version = await client.GetStringAsync(fileUri);
 
-                if (App.LatestVersion.CompareTo(appVersion) > 0)
+                if (version.CompareTo(appVersion) > 0)
                 {
                     var builder = new AppNotificationBuilder()
-                        .AddText($"发现新版本：{App.LatestVersion}，是否要更新？\n当前版本：{appVersion}")
+                        .AddText($"发现新版本：{version}，是否要更新？\n当前版本：{appVersion}")
                         .AddArgument("Notification", "LaunchReleaseWebsite")
                         .AddButton(new AppNotificationButton("确定")
                             .AddArgument("Notification", "LaunchReleaseWebsite"))