feat:Dialog更改至MainWindow

Author: HRxiaohu

MainPage.xaml

@@ -39,12 +39,6 @@
                 </DockPanel>
             </Border>
         </Grid>
-        <Grid x:Name="FrontGrid" x:FieldModifier="public" Grid.Row="0" Grid.RowSpan="4" Visibility="Hidden">
-            <Rectangle x:Name="DialogRect" Opacity="0" Fill="Black" ></Rectangle>
-            <Border x:Name="DialogBorder" Width="0" Height="0" Background="White" CornerRadius="12">
-                <StackPanel x:Name="DialogStackPan" VerticalAlignment="Top" HorizontalAlignment="Left" Width="400" Height="250"></StackPanel>
-            </Border>
-            <Border x:Name="FrontBorder" Width="400" Height="250" Background="White" CornerRadius="12" Visibility="Hidden"></Border>
-        </Grid>
+        
     </Grid>
 </Page>

MainPage.xaml.cs

@@ -12,6 +12,7 @@
 using static SodaCL.Core.Auth.MSAuth;
 using static SodaCL.Launcher.LauncherLogging;
 using static SodaCL.Toolkits.GetResources;
+using static SodaCL.Toolkits.Dialog;
 
 namespace SodaCL.Pages
 {
@@ -112,6 +113,7 @@ private async void GetYiyanAsync()
             }
             catch (HttpRequestException ex)
             {
+                YiYanTxb.Text = "一言获取失败";
                 Log(ModuleList.Network, LogInfo.Error, ex.Message, ex.StackTrace);
             }
         }
@@ -186,8 +188,8 @@ private async void MSOAuth_OpenWindows(object sender, (MSAuth.WindowsTypes, stri
                         await Dispatcher.InvokeAsync(() =>
                         {
                             OpenDialog();
-                            DialogStackPan.Children.Add(new TextBlock() { Text = "正在初始化微软登录服务", FontSize = 18, TextAlignment = TextAlignment.Center });
-                            DialogStackPan.Children.Add(new ProgressBar() { IsIndeterminate = true, Height = 10, Width = 300, Margin = new Thickness(0, 30, 0, 0) });
+                            MainWindow.mainWindow.DialogStackPan.Children.Add(new TextBlock() { Text = "正在初始化微软登录服务", FontSize = 18, TextAlignment = TextAlignment.Center });
+                            MainWindow.mainWindow.DialogStackPan.Children.Add(new ProgressBar() { IsIndeterminate = true, Height = 10, Width = 300, Margin = new Thickness(0, 30, 0, 0) });
                         });
                         break;
                     }
@@ -256,131 +258,28 @@ await Dispatcher.InvokeAsync(() =>
                     Text = GetI18NText("Login_Microsoft_MessageBox_OpenInBrowser_Title")
                 });
                 StackPan.Children.Add(exitButton);
-                DialogStackPan.Children.Add(StackPan);
-                DialogStackPan.Children.Add(new TextBlock
+                MainWindow.mainWindow.DialogStackPan.Children.Add(StackPan);
+                MainWindow.mainWindow.DialogStackPan.Children.Add(new TextBlock
                 {
                     Margin = new Thickness(52, 10, 20, 0),
                     Text = GetI18NText("Login_Microsoft_MessageBox_OpenInBrowser_Text_Tip")
                 });
-                DialogStackPan.Children.Add(new TextBlock
+                MainWindow.mainWindow.DialogStackPan.Children.Add(new TextBlock
                 {
                     Margin = new Thickness(50, 10, 20, 0),
                     Style = GetStyle("Text_Bold"),
                     Text = GetI18NText("Login_Microsoft_MessageBox_OpenInBrowser_Text_YourLoginCode")
                 });
-                DialogStackPan.Children.Add(new TextBlock
+                MainWindow.mainWindow.DialogStackPan.Children.Add(new TextBlock
                 {
                     Margin = new Thickness(50, 5, 20, 0),
                     Text = deviceCode,
                     FontSize = 24,
                 });
-                DialogStackPan.Children.Add(okButton);
+                MainWindow.mainWindow.DialogStackPan.Children.Add(okButton);
             });
         }
 
-        private void OpenDialog()
-        {
-            FrontGrid.Visibility = Visibility.Visible;
-            var easingFunc = new CubicEase
-            {
-                EasingMode = EasingMode.EaseInOut
-            };
-            var diaSbBig = new Storyboard();
-            var rectBigOpacAni = new DoubleAnimation(0.6, TimeSpan.FromSeconds(1));
-            Storyboard.SetTarget(rectBigOpacAni, DialogRect);
-            Storyboard.SetTargetProperty(rectBigOpacAni, new PropertyPath("Opacity"));
-            var borderBigWidthAni = new DoubleAnimation(400, TimeSpan.FromSeconds(1));
-            borderBigWidthAni.EasingFunction = easingFunc;
-            Storyboard.SetTarget(borderBigWidthAni, DialogBorder);
-            Storyboard.SetTargetProperty(borderBigWidthAni, new PropertyPath("Width"));
-            var borderBigHeightAni = new DoubleAnimation(250, TimeSpan.FromSeconds(1));
-            borderBigHeightAni.EasingFunction = easingFunc;
-            Storyboard.SetTarget(borderBigHeightAni, DialogBorder);
-            Storyboard.SetTargetProperty(borderBigHeightAni, new PropertyPath("Height"));
-            diaSbBig.Children.Add(rectBigOpacAni);
-            diaSbBig.Children.Add(borderBigWidthAni);
-            diaSbBig.Children.Add(borderBigHeightAni);
-            diaSbBig.Begin();
-        }
-
-        private void ChangeDialog()
-        {
-            DialogStackPan.Children.Clear();
-            FrontBorder.Visibility = Visibility.Visible;
-            DialogBorder.Visibility = Visibility.Hidden;
-            var easingFunc = new CubicEase
-            {
-                EasingMode = EasingMode.EaseInOut
-            };
-            var froSbSmall = new Storyboard();
-
-            var borderSmallWidthAni = new DoubleAnimation(400, 0, TimeSpan.FromSeconds(0.5));
-            borderSmallWidthAni.EasingFunction = easingFunc;
-
-            Storyboard.SetTarget(borderSmallWidthAni, FrontBorder);
-            Storyboard.SetTargetProperty(borderSmallWidthAni, new PropertyPath("Width"));
-
-            var borderSmallHeightAni = new DoubleAnimation(250, 0, TimeSpan.FromSeconds(0.5));
-            borderSmallHeightAni.EasingFunction = easingFunc;
-
-            Storyboard.SetTarget(borderSmallHeightAni, FrontBorder);
-            Storyboard.SetTargetProperty(borderSmallHeightAni, new PropertyPath("Height"));
-
-            froSbSmall.Children.Add(borderSmallWidthAni);
-            froSbSmall.Children.Add(borderSmallHeightAni);
 
-            var diaSbBig = new Storyboard();
-
-            var forBorderBigWidthAni = new DoubleAnimation(0, 400, TimeSpan.FromSeconds(1));
-            forBorderBigWidthAni.EasingFunction = easingFunc;
-            Storyboard.SetTarget(forBorderBigWidthAni, DialogBorder);
-            Storyboard.SetTargetProperty(forBorderBigWidthAni, new PropertyPath("Width"));
-
-            var forBorderBigHeightAni = new DoubleAnimation(0, 250, TimeSpan.FromSeconds(1));
-            forBorderBigHeightAni.EasingFunction = easingFunc;
-            Storyboard.SetTarget(forBorderBigHeightAni, DialogBorder);
-            Storyboard.SetTargetProperty(forBorderBigHeightAni, new PropertyPath("Height"));
-            diaSbBig.Children.Add(forBorderBigWidthAni);
-            diaSbBig.Children.Add(forBorderBigHeightAni);
-
-            froSbSmall.Completed += (object sender, EventArgs e) =>
-            {
-                FrontBorder.Visibility = Visibility.Hidden;
-                DialogBorder.Visibility = Visibility.Visible;
-
-                diaSbBig.Begin();
-                Trace.WriteLine(FrontBorder.Width + FrontBorder.Width);
-            };
-            froSbSmall.Begin();
-        }
-
-        private void CloseDialog()
-        {
-            var easingFunc = new CubicEase
-            {
-                EasingMode = EasingMode.EaseInOut
-            };
-            var diaSbSmall = new Storyboard();
-            var rectSmallOpacAni = new DoubleAnimation(0, TimeSpan.FromSeconds(0.6));
-            Storyboard.SetTarget(rectSmallOpacAni, DialogRect);
-            Storyboard.SetTargetProperty(rectSmallOpacAni, new PropertyPath("Opacity"));
-            var borderSmallWidthAni = new DoubleAnimation(0, TimeSpan.FromSeconds(1));
-            borderSmallWidthAni.EasingFunction = easingFunc;
-            Storyboard.SetTarget(borderSmallWidthAni, DialogBorder);
-            Storyboard.SetTargetProperty(borderSmallWidthAni, new PropertyPath("Width"));
-            var borderSmallHeightAni = new DoubleAnimation(0, TimeSpan.FromSeconds(1));
-            borderSmallHeightAni.EasingFunction = easingFunc;
-            Storyboard.SetTarget(borderSmallHeightAni, DialogBorder);
-            Storyboard.SetTargetProperty(borderSmallHeightAni, new PropertyPath("Height"));
-            diaSbSmall.Children.Add(rectSmallOpacAni);
-            diaSbSmall.Children.Add(borderSmallWidthAni);
-            diaSbSmall.Children.Add(borderSmallHeightAni);
-            diaSbSmall.Completed += (object sender, EventArgs e) =>
-            {
-                FrontGrid.Visibility = Visibility.Hidden;
-                DialogStackPan.Children.Clear();
-            };
-            diaSbSmall.Begin();
-        }
     }
 }

MainWindow.xaml

@@ -55,6 +55,13 @@
                         </Grid>
                     </Border>
                     <Frame x:Name="MainFram" Grid.Row="1" Source="./MainPage.xaml" NavigationUIVisibility="Hidden" Style="{x:Null}"></Frame>
+                    <Grid x:Name="FrontGrid" x:FieldModifier="public" Grid.Row="3" Grid.RowSpan="4" Visibility="Hidden">
+                        <Rectangle x:Name="DialogRect" Opacity="0" Fill="Black" ></Rectangle>
+                        <Border x:Name="DialogBorder" Width="0" Height="0" Background="White" CornerRadius="12">
+                            <StackPanel x:Name="DialogStackPan" VerticalAlignment="Top" HorizontalAlignment="Left" Width="400" Height="250"></StackPanel>
+                        </Border>
+                        <Border x:Name="FrontBorder" Width="400" Height="250" Background="White" CornerRadius="12" Visibility="Hidden"></Border>
+                    </Grid>
                 </Grid>
             </Border>
         </Border>

MainWindow.xaml.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
@@ -17,11 +18,15 @@ namespace SodaCL
     /// </summary>
     public partial class MainWindow : Window
     {
+        public static MainWindow mainWindow;
         public static LauncherInfo launcherInfo;
         public static List<MCClient> clients = new();
 
         public MainWindow()
         {
+            mainWindow = Application.Current.Windows
+            .Cast<Window>()
+            .FirstOrDefault(window => window is MainWindow) as MainWindow;
             InitializeComponent();
         }
 

Soda_Craft_Launcher.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SodaCL", ".\SodaCL.csproj", "{DCA68EDB-AF33-4F64-BD6E-DD2D852DF9B4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SodaCL", "SodaCL.csproj", "{DCA68EDB-AF33-4F64-BD6E-DD2D852DF9B4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Toolkits/Dialog.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Animation;
+using System.Windows;
+
+namespace SodaCL.Toolkits
+{
+    public class Dialog
+    {
+        public static void OpenDialog()
+        {
+            MainWindow.mainWindow.FrontGrid.Visibility = Visibility.Visible;
+            var easingFunc = new CubicEase
+            {
+                EasingMode = EasingMode.EaseInOut
+            };
+            var diaSbBig = new Storyboard();
+            var rectBigOpacAni = new DoubleAnimation(0.6, TimeSpan.FromSeconds(1));
+            Storyboard.SetTarget(rectBigOpacAni, MainWindow.mainWindow.DialogRect);
+            Storyboard.SetTargetProperty(rectBigOpacAni, new PropertyPath("Opacity"));
+            var borderBigWidthAni = new DoubleAnimation(400, TimeSpan.FromSeconds(1));
+            borderBigWidthAni.EasingFunction = easingFunc;
+            Storyboard.SetTarget(borderBigWidthAni, MainWindow.mainWindow.DialogBorder);
+            Storyboard.SetTargetProperty(borderBigWidthAni, new PropertyPath("Width"));
+            var borderBigHeightAni = new DoubleAnimation(250, TimeSpan.FromSeconds(1));
+            borderBigHeightAni.EasingFunction = easingFunc;
+            Storyboard.SetTarget(borderBigHeightAni, MainWindow.mainWindow.DialogBorder);
+            Storyboard.SetTargetProperty(borderBigHeightAni, new PropertyPath("Height"));
+            diaSbBig.Children.Add(rectBigOpacAni);
+            diaSbBig.Children.Add(borderBigWidthAni);
+            diaSbBig.Children.Add(borderBigHeightAni);
+            diaSbBig.Begin();
+        }
+
+        public static void ChangeDialog()
+        {
+            MainWindow.mainWindow.DialogStackPan.Children.Clear();
+            MainWindow.mainWindow.FrontBorder.Visibility = Visibility.Visible;
+            MainWindow.mainWindow.DialogBorder.Visibility = Visibility.Hidden;
+            var easingFunc = new CubicEase
+            {
+                EasingMode = EasingMode.EaseInOut
+            };
+            var froSbSmall = new Storyboard();
+
+            var borderSmallWidthAni = new DoubleAnimation(400, 0, TimeSpan.FromSeconds(0.5));
+            borderSmallWidthAni.EasingFunction = easingFunc;
+
+            Storyboard.SetTarget(borderSmallWidthAni, MainWindow.mainWindow.FrontBorder);
+            Storyboard.SetTargetProperty(borderSmallWidthAni, new PropertyPath("Width"));
+
+            var borderSmallHeightAni = new DoubleAnimation(250, 0, TimeSpan.FromSeconds(0.5));
+            borderSmallHeightAni.EasingFunction = easingFunc;
+
+            Storyboard.SetTarget(borderSmallHeightAni, MainWindow.mainWindow.FrontBorder);
+            Storyboard.SetTargetProperty(borderSmallHeightAni, new PropertyPath("Height"));
+
+            froSbSmall.Children.Add(borderSmallWidthAni);
+            froSbSmall.Children.Add(borderSmallHeightAni);
+
+            var diaSbBig = new Storyboard();
+
+            var forBorderBigWidthAni = new DoubleAnimation(0, 400, TimeSpan.FromSeconds(1));
+            forBorderBigWidthAni.EasingFunction = easingFunc;
+            Storyboard.SetTarget(forBorderBigWidthAni, MainWindow.mainWindow.DialogBorder);
+            Storyboard.SetTargetProperty(forBorderBigWidthAni, new PropertyPath("Width"));
+
+            var forBorderBigHeightAni = new DoubleAnimation(0, 250, TimeSpan.FromSeconds(1));
+            forBorderBigHeightAni.EasingFunction = easingFunc;
+            Storyboard.SetTarget(forBorderBigHeightAni, MainWindow.mainWindow.DialogBorder);
+            Storyboard.SetTargetProperty(forBorderBigHeightAni, new PropertyPath("Height"));
+            diaSbBig.Children.Add(forBorderBigWidthAni);
+            diaSbBig.Children.Add(forBorderBigHeightAni);
+
+            froSbSmall.Completed += (object sender, EventArgs e) =>
+            {
+                MainWindow.mainWindow.FrontBorder.Visibility = Visibility.Hidden;
+                MainWindow.mainWindow.DialogBorder.Visibility = Visibility.Visible;
+
+                diaSbBig.Begin();
+                Trace.WriteLine(MainWindow.mainWindow.FrontBorder.Width + MainWindow.mainWindow.FrontBorder.Width);
+            };
+            froSbSmall.Begin();
+        }
+
+        public static void CloseDialog()
+        {
+            var easingFunc = new CubicEase
+            {
+                EasingMode = EasingMode.EaseInOut
+            };
+            var diaSbSmall = new Storyboard();
+            var rectSmallOpacAni = new DoubleAnimation(0, TimeSpan.FromSeconds(0.6));
+            Storyboard.SetTarget(rectSmallOpacAni, MainWindow.mainWindow.DialogRect);
+            Storyboard.SetTargetProperty(rectSmallOpacAni, new PropertyPath("Opacity"));
+            var borderSmallWidthAni = new DoubleAnimation(0, TimeSpan.FromSeconds(1));
+            borderSmallWidthAni.EasingFunction = easingFunc;
+            Storyboard.SetTarget(borderSmallWidthAni, MainWindow.mainWindow.DialogBorder);
+            Storyboard.SetTargetProperty(borderSmallWidthAni, new PropertyPath("Width"));
+            var borderSmallHeightAni = new DoubleAnimation(0, TimeSpan.FromSeconds(1));
+            borderSmallHeightAni.EasingFunction = easingFunc;
+            Storyboard.SetTarget(borderSmallHeightAni, MainWindow.mainWindow.DialogBorder);
+            Storyboard.SetTargetProperty(borderSmallHeightAni, new PropertyPath("Height"));
+            diaSbSmall.Children.Add(rectSmallOpacAni);
+            diaSbSmall.Children.Add(borderSmallWidthAni);
+            diaSbSmall.Children.Add(borderSmallHeightAni);
+            diaSbSmall.Completed += (object sender, EventArgs e) =>
+            {
+                MainWindow.mainWindow.FrontGrid.Visibility = Visibility.Hidden;
+                MainWindow.mainWindow.DialogStackPan.Children.Clear();
+            };
+            diaSbSmall.Begin();
+        }
+    }
+}