fix bugs

futrime · Jan 7, 2024 · c49ce1b · c49ce1b
1 parent 9b041f2
commit c49ce1b
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 80 deletions.
diff --git a/src/LipUI/App.xaml.cs b/src/LipUI/App.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.UI.Xaml;
+using System.IO;
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
@@ -15,7 +16,7 @@ public partial class App : Application
         /// </summary>
         public App()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         /// <summary>
@@ -24,12 +25,15 @@ public App()
         /// <param name="args">Details about the launch request and process.</param>
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            //Main.Initialize();
 
             m_window = new MainWindow();
             m_window.Activate();
 
-            //ExtendAcrylicIntoTitleBar();
+            UnhandledException += App_UnhandledException;
+        }
+
+        private void App_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
         }
 
         internal Window? m_window;

diff --git a/src/LipUI/Language/zh-CN/Resources.resw b/src/LipUI/Language/zh-CN/Resources.resw
@@ -129,6 +129,9 @@
   <data name="home$emptyDesc" xml:space="preserve">
     <value>无描述</value>
   </data>
+  <data name="home$nullServerPath" xml:space="preserve">
+    <value>未选择服务器</value>
+  </data>
   <data name="infoBar$error" xml:space="preserve">
     <value>错误</value>
   </data>
@@ -138,8 +141,8 @@
   <data name="infoBar$warning" xml:space="preserve">
     <value>警告</value>
   </data>
-  <data name="lipExecution$nullServerPath" xml:space="preserve">
-    <value>未知的服务器路径！</value>
+  <data name="lipExecution$nullLipPath" xml:space="preserve">
+    <value>未知的Lip路径！</value>
   </data>
   <data name="lipInstaller$cancel.Content" xml:space="preserve">
     <value>取消</value>

diff --git a/src/LipUI/LipUI.csproj b/src/LipUI/LipUI.csproj
@@ -70,7 +70,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageReference Include="Octokit" Version="9.0.0" />
+    <PackageReference Include="Octokit" Version="9.1.0" />
     <PackageReference Include="PInvoke.User32" Version="0.7.124" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

diff --git a/src/LipUI/MainWindow.xaml.cs b/src/LipUI/MainWindow.xaml.cs
@@ -56,11 +56,14 @@ public MainWindow()
 
         Closed += MainWindow_Closed;
 
-        Helpers.MainWindow = this;
+        Services.MainWindow = this;
     }
 
     private async void MainWindow_Closed(object sender, WindowEventArgs args)
-        => await Main.SaveConfigAsync();
+    {
+        Services.OnWindowClosed();
+        await Main.SaveConfigAsync();
+    }
 
     private NativeMethods.WinProc? newWndProc = null;
     private nint oldWndProc = nint.Zero;
@@ -297,7 +300,7 @@ private bool TryGoBack()
              NavView.DisplayMode is NavigationViewDisplayMode.Minimal))
             return false;
 
-        ContentFrame.GoBack();
+        ContentFrame.TryGoBack();
         return true;
     }
 

diff --git a/src/LipUI/Models/GlobalResources.cs b/src/LipUI/Models/GlobalResources.cs
@@ -1,13 +1,12 @@
 using LipUI.Assets;
-using LipUI.Pages;
 using Microsoft.UI.Xaml.Media.Imaging;
 
 
 namespace LipUI.Models;
 
 internal static class GlobalResources
 {
-    public static readonly BitmapImage GrassBlock = Helpers.CreateImageFromBytes(Images.grass_block);
-    public static readonly BitmapImage Netherrack = Helpers.CreateImageFromBytes(Images.netherrack);
-    public static readonly BitmapImage Glass = Helpers.CreateImageFromBytes(Images.glass);
+    public static readonly BitmapImage GrassBlock = Services.CreateImageFromBytes(Images.grass_block);
+    public static readonly BitmapImage Netherrack = Services.CreateImageFromBytes(Images.netherrack);
+    public static readonly BitmapImage Glass = Services.CreateImageFromBytes(Images.glass);
 }
diff --git a/src/LipUI/Models/ILipUIModules.cs b/src/LipUI/Models/ILipUIModules.cs
@@ -16,11 +16,13 @@ public interface ILipUIModulesNonGeneric
 
     public Type PageType { get; }
 
-    public FrameworkElement? IconContent { get; }
+    public FrameworkElement? IconContent { get => null; }
 
-    public Brush? IconBackground { get; }
+    public Brush? IconBackground { get => null; }
 
     public void OnIconInitialze(ModuleIcon icon) { }
+
+    public void OnExit() { }
 }
 
 public interface ILipUIModules<TSelf> : ILipUIModulesNonGeneric

diff --git a/src/LipUI/Pages/HomePage.xaml b/src/LipUI/Pages/HomePage.xaml
@@ -8,13 +8,12 @@
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Loaded="Page_Loaded">
+    mc:Ignorable="d">
 
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
+                <ResourceDictionary x:Key="Default">
                     <SolidColorBrush x:Key="MyButtonBackgroundDisabledBrush" Color="Transparent"/>
                     <SolidColorBrush x:Key="ButtonDisabledBorderThemeBrush" Color="Transparent"/>
                     <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="MyButtonBackgroundDisabledBrush"/>

diff --git a/src/LipUI/Pages/HomePage.xaml.cs b/src/LipUI/Pages/HomePage.xaml.cs
@@ -33,36 +33,17 @@ private async void RefreshIcon()
     {
         ServerInstance? instance = Main.Config.SelectedServer;
         ServerIconImage.Source = await ServerIcon.GetIcon(instance);
-        ServerDesc.Text = instance is null || string.IsNullOrWhiteSpace(instance.Description) ?
-            "home$emptyDesc".GetLocalized() : instance.Description;
+        ServerDesc.Text = 
+            instance is null ?
+                "home$nullServerPath".GetLocalized() :
+                string.IsNullOrWhiteSpace(instance.Description) ?
+                    "home$emptyDesc".GetLocalized() : 
+                    instance.Description;
     }
 
     private void SelectServerButton_Click(object sender, RoutedEventArgs e)
         => Frame.Navigate(typeof(ServerSelectionPage), () => { DispatcherQueue.TryEnqueue(() => { RefreshIcon(); }); });
 
-    private void Page_Loaded(object sender, RoutedEventArgs e)
-        => ShowLipInstallerPageIfNotExist();
-
-    private void ShowLipInstallerPageIfNotExist()
-    {
-        if (File.Exists(Main.Config.Settings.LipPath))
-        {
-            return;
-        }
-
-        var dialog = new ContentDialog()
-        {
-            XamlRoot = XamlRoot,
-            Content = new LipInstallerView()
-        };
-
-        Task.Run(() =>
-        {
-            Task.Delay(100);
-            DispatcherQueue.TryEnqueue(async () => await dialog.ShowAsync());
-        });
-    }
-
     private void StartServerButton_Click(object sender, RoutedEventArgs e)
     {
         if (Main.Config.SelectedServer is null)
@@ -97,7 +78,10 @@ private void BackButton_PointerExited(object sender, PointerRoutedEventArgs e)
         => AnimatedIcon.SetState(BackAnimatedIcon, "Normal");
 
     private void BackButton_Click(object sender, RoutedEventArgs e)
-    => ContentFrame.GoBack();
+    {
+        ModuleIcon.OnExit(ContentFrame.Content.GetType());
+        ContentFrame.TryGoBack();
+    }
 
     private void ContentFrame_Navigated(object sender, NavigationEventArgs e)
     {
@@ -113,7 +97,7 @@ private void ContentFrame_Navigated(object sender, NavigationEventArgs e)
             }
             catch (Exception ex)
             {
-                await Helpers.ShowInfoBarAsync(ex);
+                await Services.ShowInfoBarAsync(ex);
             }
         });
     }

diff --git a/src/LipUI/Pages/HomePageModules/BdsPropertiesEditorPage.xaml.cs b/src/LipUI/Pages/HomePageModules/BdsPropertiesEditorPage.xaml.cs
@@ -12,7 +12,7 @@
 using System.Threading.Tasks;
 using Windows.System;
 using Windows.UI;
-using static LipUI.Pages.Helpers;
+using static LipUI.Services;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -64,7 +64,7 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
         {
             await Task.Delay(500);
             await ShowInfoBarAsync("propertiesEditor$nullServerPath".GetLocalized(), null, InfoBarSeverity.Error);
-            Frame.GoBack();
+            Frame.TryGoBack();
             return;
         };
 
@@ -126,7 +126,7 @@ private async void LoadPropertiesAndCreateUI()
         catch (Exception ex)
         {
             await ShowInfoBarAsync(ex, default, null);
-            Frame.GoBack();
+            Frame.TryGoBack();
             return;
         }
 

diff --git a/src/LipUI/Pages/IndexPage.xaml.cs b/src/LipUI/Pages/IndexPage.xaml.cs
@@ -111,7 +111,7 @@ where tooth.Name.ToLower().Contains(str)
             }
             catch (Exception ex)
             {
-                await Helpers.ShowInfoBarAsync(ex);
+                await Services.ShowInfoBarAsync(ex);
             }
         });
     }
@@ -143,7 +143,7 @@ where tooth.Name.ToLower().Contains(query)
             }
             catch (Exception ex)
             {
-                await Helpers.ShowInfoBarAsync(ex);
+                await Services.ShowInfoBarAsync(ex);
             }
         });
 

diff --git a/src/LipUI/Pages/LipExecutionPanelPage.xaml.cs b/src/LipUI/Pages/LipExecutionPanelPage.xaml.cs
@@ -84,6 +84,14 @@ public LipConsoleHandler(LipExecutionPanelPage page)
 
         public void Run()
         {
+            Action closed = null!;
+            closed = () =>
+            {
+                process?.Kill();
+                Services.WindowClosed -= closed;
+            };
+            Services.WindowClosed += closed;
+
             dispatcherQueue.TryEnqueue(async () =>
             {
                 lip = await Main.CreateLipConsole(page.XamlRoot);
@@ -96,9 +104,9 @@ public void Run()
                     page.LipWorkingInfoText.Text = string.Empty;
                     page.ProgressRateText.Text = string.Empty;
 
-                    await Helpers.ShowInfoBarAsync(
+                    await Services.ShowInfoBarAsync(
                         "infobar$error".GetLocalized(),
-                        "lipExecution$nullServerPath".GetLocalized(),
+                        "lipExecution$nullLipPath".GetLocalized(),
                          InfoBarSeverity.Error);
 
                     return;
@@ -127,6 +135,7 @@ await Helpers.ShowInfoBarAsync(
 
                         break;
                 }
+                Services.WindowClosed -= closed;
 
             });
         }

diff --git a/src/LipUI/Pages/LocalPackagePage.xaml.cs b/src/LipUI/Pages/LocalPackagePage.xaml.cs
@@ -59,7 +59,7 @@ private void ReloadPackage(IEnumerable<ToothPackage>? items = null)
                 }
                 catch (Exception ex)
                 {
-                    await Helpers.ShowInfoBarAsync(ex);
+                    await Services.ShowInfoBarAsync(ex);
                 }
 
             if (arr is not null)
@@ -91,7 +91,7 @@ private void RefreshUpgradableTeeth()
             }
             catch (Exception ex)
             {
-                await Helpers.ShowInfoBarAsync(ex);
+                await Services.ShowInfoBarAsync(ex);
                 return;
             }
 
@@ -137,7 +137,7 @@ where tooth.Info.Name.ToLower().Contains(str)
             }
             catch (Exception ex)
             {
-                await Helpers.ShowInfoBarAsync(ex);
+                await Services.ShowInfoBarAsync(ex);
             }
         });
     }
@@ -166,7 +166,7 @@ where tooth.Info.Name.ToLower().Contains(query)
             }
             catch (Exception ex)
             {
-                await Helpers.ShowInfoBarAsync(ex);
+                await Services.ShowInfoBarAsync(ex);
             }
         });
     }

diff --git a/src/LipUI/Pages/ServerSelectionPage.xaml b/src/LipUI/Pages/ServerSelectionPage.xaml
@@ -11,7 +11,7 @@
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
+                <ResourceDictionary x:Key="Default">
                     <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="{ThemeResource LayerOnAcrylicFillColorDefault}"/>
                     <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="{ThemeResource LayerOnAcrylicFillColorDefault}"/>
                     <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="{ThemeResource LayerOnAcrylicFillColorDefault}"/>

diff --git a/src/LipUI/Pages/ServerSelectionPage.xaml.cs b/src/LipUI/Pages/ServerSelectionPage.xaml.cs
@@ -191,7 +191,7 @@ private async ValueTask ItemClick_AddServerViewClicked(object sender, ItemClickE
             {
                 if (instance == server)
                 {
-                    await Helpers.ShowInfoBarAsync(
+                    await Services.ShowInfoBarAsync(
                         "infoBar$error".GetLocalized(),
                         "serverSelection$existed".GetLocalized(),
                         InfoBarSeverity.Error);
@@ -219,7 +219,7 @@ private async void ItemClick_SelectMode(object sender, ItemClickEventArgs e)
         Main.Config.SelectedServer = (e.ClickedItem as ServerInstanceView)!.ServerInstance;
         refreshIcon!();
         await Main.SaveConfigAsync();
-        Frame.GoBack();
+        Frame.TryGoBack();
     }
 
     private void ItemClick_EditMode(object sender, ItemClickEventArgs e)

diff --git a/src/LipUI/Pages/Helpers.cs → src/LipUI/Services.cs b/src/LipUI/Pages/Helpers.cs → src/LipUI/Services.cs
@@ -6,16 +6,29 @@
 using Microsoft.Windows.ApplicationModel.Resources;
 using System.Threading.Tasks;
 
-namespace LipUI.Pages;
+namespace LipUI;
 
-public static class ResourceExtensions
+internal static class ResourceExtensions
 {
     private static readonly ResourceLoader _resourceLoader = new();
 
     public static string GetLocalized(this string resourceKey) => _resourceLoader.GetString(resourceKey);
 }
 
-internal static class Helpers
+internal static class FrameExtensions
+{
+    public static bool TryGoBack(this Frame frame)
+    {
+        if (frame.CanGoBack)
+        {
+            frame.GoBack();
+            return true;
+        }
+        return false;
+    }
+}
+
+internal static class Services
 {
     public static BitmapImage CreateImageFromBytes(byte[] bytes)
     {
@@ -70,4 +83,8 @@ public static async ValueTask ShowInfoBarAsync(
             interval = TimeSpan.FromSeconds(5);
         await ShowInfoBarAsync(ex.GetType().Name, ex.Message, InfoBarSeverity.Error, interval, barContent);
     }
+
+    public static event Action? WindowClosed;
+
+    internal static void OnWindowClosed() => WindowClosed?.Invoke();
 }