chore: use TabItem instead buttons in RecognizerView

src/MaaWpfGui/Res/Themes/Dark.xaml

@@ -4,6 +4,7 @@
 
     <SolidColorBrush x:Key="PallasBrush" Color="#CDD1FF" />
     <SolidColorBrush x:Key="ErrorViewBackgroundBrush" Color="#2d2d30" />
+    <SolidColorBrush x:Key="VersionUpdateViewBackgroundBrush" Color="#2d2d30" />
 
     <!-- See https://github.com/ghost1372/HandyControls/blob/v3.4.5/src/Shared/HandyControl_Shared/Themes/Basic/Colors/Dark.xaml -->
     <!-- Latest Doc https://ghost1372.github.io/handycontrol/basic_xaml/brushes/ -->

src/MaaWpfGui/Res/Themes/Light.xaml

@@ -4,7 +4,7 @@
 
     <SolidColorBrush x:Key="PallasBrush" Color="#6A6AAB" />
     <SolidColorBrush x:Key="ErrorViewBackgroundBrush" Color="#E6E6E6" />
-    <SolidColorBrush x:Key="SecondaryRegionBrush" Color="#ffffff" />
+    <SolidColorBrush x:Key="VersionUpdateViewBackgroundBrush" Color="#ffffff" />
 
     <!-- UiLogColor -->
     <SolidColorBrush x:Key="ErrorLogBrush" Color="DarkRed" />

src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs

@@ -53,24 +53,6 @@ namespace MaaWpfGui.ViewModels.UI
             _asstProxy = _container.Get<AsstProxy>();
         }
 
-        private int _displayId = 0;
-
-        public int DisplayId
-        {
-            get => _displayId;
-            set => SetAndNotify(ref _displayId, value);
-        }
-
-        public void ChangeButtenRecruit()
-        {
-            DisplayId = 0;
-        }
-
-        public void ChangeButtenDepot()
-        {
-            DisplayId = 1;
-        }
-
         #region Recruit
         private string _recruitInfo = LocalizationHelper.GetString("RecruitmentRecognitionTip");
 

src/MaaWpfGui/Views/UI/RecognizerView.xaml

@@ -16,178 +16,165 @@
     d:DesignHeight="1200"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <StackPanel>
-        <StackPanel
-            HorizontalAlignment="Center"
-            VerticalAlignment="Top"
-            Orientation="Horizontal">
-            <Button
-                Width="150"
-                Height="30"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Command="{s:Action ChangeButtenRecruit}"
-                Content="{DynamicResource RecruitmentRecognition}" />
-            <Button
-                Width="150"
-                Height="30"
-                Command="{s:Action ChangeButtenDepot}"
-                Content="{DynamicResource DepotRecognition}" />
-        </StackPanel>
-        <Grid
-            Height="500"
-            Margin="20,0,20,20"
-            Visibility="{c:Binding 'DisplayId==0'}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="150" />
-            </Grid.RowDefinitions>
-            <hc:ScrollViewer
-                Grid.Row="0"
-                Margin="10,0"
-                IsInertiaEnabled="True"
-                VerticalAlignment="Top">
-                <StackPanel>
-                    <controls:TextBlock
-                        Height="36"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        FontSize="14"
-                        Style="{StaticResource TextBlockDefaultBold}"
-                        Text="{Binding RecruitInfo}"
-                        TextWrapping="Wrap" />
-                    <controls:TextBlock
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        FontSize="14"
-                        Text="{Binding RecruitResult}"
-                        TextWrapping="Wrap" />
-                </StackPanel>
-            </hc:ScrollViewer>
-            <StackPanel
-                Grid.Row="1"
-                Margin="27,0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
-                <StackPanel Margin="40,0,40,0" VerticalAlignment="Center">
-                    <CheckBox
-                        Margin="5"
-                        Content="{DynamicResource AutoSettingTime}"
-                        IsChecked="{Binding AutoSetTime}" />
-                    <CheckBox
-                        MaxWidth="170"
-                        Margin="5"
-                        HorizontalAlignment="Left"
-                        IsChecked="{Binding IsLevel3UseShortTime}"
-                        ToolTip="{DynamicResource Level3UseShortTimeTip}">
-                        <controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
-                    </CheckBox>
-                </StackPanel>
+    <TabControl
+        SelectedIndex="3"
+        Margin="0,10"
+        BorderThickness="0"
+        Style="{StaticResource TabControlSliding}">
+        <TabItem Header="{DynamicResource RecruitmentRecognition}">
+            <Grid
+                Margin="20,0,20,20">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="150" />
+                </Grid.RowDefinitions>
+                <hc:ScrollViewer
+                    Grid.Row="0"
+                    Margin="10,0"
+                    IsInertiaEnabled="True"
+                    VerticalAlignment="Top">
+                    <StackPanel>
+                        <controls:TextBlock
+                            Height="36"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            FontSize="14"
+                            Style="{StaticResource TextBlockDefaultBold}"
+                            Text="{Binding RecruitInfo}"
+                            TextWrapping="Wrap" />
+                        <controls:TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            FontSize="14"
+                            Text="{Binding RecruitResult}"
+                            TextWrapping="Wrap" />
+                    </StackPanel>
+                </hc:ScrollViewer>
+                <StackPanel
+                    Grid.Row="1"
+                    Margin="27,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <StackPanel Margin="40,0,40,0" VerticalAlignment="Center">
+                        <CheckBox
+                            Margin="5"
+                            Content="{DynamicResource AutoSettingTime}"
+                            IsChecked="{Binding AutoSetTime}" />
+                        <CheckBox
+                            MaxWidth="170"
+                            Margin="5"
+                            HorizontalAlignment="Left"
+                            IsChecked="{Binding IsLevel3UseShortTime}"
+                            ToolTip="{DynamicResource Level3UseShortTimeTip}">
+                            <controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
+                        </CheckBox>
+                    </StackPanel>
 
-                <StackPanel Margin="40,0,40,0" VerticalAlignment="Center">
-                    <CheckBox
-                        Margin="0,2"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Bottom"
-                        Content="{DynamicResource AutoSelectLevel3Tags}"
-                        IsChecked="{Binding ChooseLevel3}" />
-                    <CheckBox
-                        Margin="0,2"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Bottom"
-                        Content="{DynamicResource AutoSelectLevel4Tags}"
-                        IsChecked="{Binding ChooseLevel4}" />
-                    <CheckBox
-                        Margin="0,2"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Bottom"
-                        Content="{DynamicResource AutoSelectLevel5Tags}"
-                        IsChecked="{Binding ChooseLevel5}" />
-                    <CheckBox
-                        Margin="0,2"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Bottom"
-                        Content="{DynamicResource AutoSelectLevel6Tags}"
-                        IsChecked="{Binding ChooseLevel6}" />
+                    <StackPanel Margin="40,0,40,0" VerticalAlignment="Center">
+                        <CheckBox
+                            Margin="0,2"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Bottom"
+                            Content="{DynamicResource AutoSelectLevel3Tags}"
+                            IsChecked="{Binding ChooseLevel3}" />
+                        <CheckBox
+                            Margin="0,2"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Bottom"
+                            Content="{DynamicResource AutoSelectLevel4Tags}"
+                            IsChecked="{Binding ChooseLevel4}" />
+                        <CheckBox
+                            Margin="0,2"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Bottom"
+                            Content="{DynamicResource AutoSelectLevel5Tags}"
+                            IsChecked="{Binding ChooseLevel5}" />
+                        <CheckBox
+                            Margin="0,2"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Bottom"
+                            Content="{DynamicResource AutoSelectLevel6Tags}"
+                            IsChecked="{Binding ChooseLevel6}" />
+                    </StackPanel>
+                    <!--  <Label x:Name="prompt" Content="提示：本辅助仅会帮你选择最优Tags，&#xA;但是不会帮你点击确定按钮！！！&#xA;请自行检查辅助选择的是否正确，&#xA;若辅助出现识别错误，遗漏了高星干员，&#xA;作者概不负责哦__(:з」∠)_"  -->
+                    <!--  HorizontalAlignment="Center" VerticalAlignment="Center" Height="121" Width="292" FontSize="16" />  -->
+                    <Button
+                        Width="180"
+                        Height="70"
+                        Margin="30"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{s:Action RecruitStartCalc}"
+                        Content="{DynamicResource BeganToRecruit}" />
                 </StackPanel>
-                <!--  <Label x:Name="prompt" Content="提示：本辅助仅会帮你选择最优Tags，&#xA;但是不会帮你点击确定按钮！！！&#xA;请自行检查辅助选择的是否正确，&#xA;若辅助出现识别错误，遗漏了高星干员，&#xA;作者概不负责哦__(:з」∠)_"  -->
-                <!--  HorizontalAlignment="Center" VerticalAlignment="Center" Height="121" Width="292" FontSize="16" />  -->
-                <Button
-                    Width="180"
-                    Height="70"
-                    Margin="30"
+            </Grid>
+        </TabItem>
+        <TabItem Header="{DynamicResource DepotRecognition}">
+            <Grid
+                Margin="20,0,20,20">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="150" />
+                </Grid.RowDefinitions>
+                <hc:ScrollViewer
+                    Grid.Row="0"
+                    Margin="10,0"
+                    IsInertiaEnabled="True"
+                    VerticalAlignment="Top">
+                    <StackPanel>
+                        <controls:TextBlock
+                            Height="36"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            FontSize="14"
+                            Style="{StaticResource TextBlockDefaultBold}"
+                            Text="{Binding DepotInfo}"
+                            TextWrapping="Wrap" />
+                        <controls:TextBlock
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            FontSize="14"
+                            Text="{Binding DepotResult}"
+                            TextWrapping="Wrap" />
+                    </StackPanel>
+                </hc:ScrollViewer>
+                <StackPanel
+                    Grid.Row="1"
+                    Margin="27,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Command="{s:Action RecruitStartCalc}"
-                    Content="{DynamicResource BeganToRecruit}" />
-            </StackPanel>
-        </Grid>
-        <Grid
-            Height="500"
-            Margin="20,0,20,20"
-            Visibility="{c:Binding 'DisplayId==1'}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="150" />
-            </Grid.RowDefinitions>
-            <hc:ScrollViewer
-                Grid.Row="0"
-                Margin="10,0"
-                IsInertiaEnabled="True"
-                VerticalAlignment="Top">
-                <StackPanel>
-                    <controls:TextBlock
-                        Height="36"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        FontSize="14"
-                        Style="{StaticResource TextBlockDefaultBold}"
-                        Text="{Binding DepotInfo}"
-                        TextWrapping="Wrap" />
-                    <controls:TextBlock
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        FontSize="14"
-                        Text="{Binding DepotResult}"
-                        TextWrapping="Wrap" />
+                    Orientation="Horizontal">
+                    <Button
+                        Width="180"
+                        Height="70"
+                        Margin="30"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{s:Action ExportToArkplanner}"
+                        Content="{DynamicResource ExportToArkplanner}"
+                        IsEnabled="{Binding DepotDone}" />
+                    <Button
+                        Width="180"
+                        Height="70"
+                        Margin="30"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{s:Action ExportToLolicon}"
+                        Content="{DynamicResource ExportToLolicon}"
+                        IsEnabled="{Binding DepotDone}" />
+                    <Button
+                        Width="180"
+                        Height="70"
+                        Margin="30"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Command="{s:Action Start}"
+                        Content="{DynamicResource BeganToDepotRecognition}" />
                 </StackPanel>
-            </hc:ScrollViewer>
-            <StackPanel
-                Grid.Row="1"
-                Margin="27,0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
-                <Button
-                    Width="180"
-                    Height="70"
-                    Margin="30"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Command="{s:Action ExportToArkplanner}"
-                    Content="{DynamicResource ExportToArkplanner}"
-                    IsEnabled="{Binding DepotDone}" />
-                <Button
-                    Width="180"
-                    Height="70"
-                    Margin="30"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Command="{s:Action ExportToLolicon}"
-                    Content="{DynamicResource ExportToLolicon}"
-                    IsEnabled="{Binding DepotDone}" />
-                <Button
-                    Width="180"
-                    Height="70"
-                    Margin="30"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Command="{s:Action Start}"
-                    Content="{DynamicResource BeganToDepotRecognition}" />
-            </StackPanel>
-        </Grid>
-    </StackPanel>
+            </Grid>
+        </TabItem>
+    </TabControl>
 </UserControl>

src/MaaWpfGui/Views/UI/VersionUpdateView.xaml

@@ -17,7 +17,7 @@
     Height="500"
     d:DataContext="{d:DesignInstance {x:Type ui:VersionUpdateViewModel}}"
     mc:Ignorable="d">
-    <Grid>
+    <Grid Background="{DynamicResource VersionUpdateViewBackgroundBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
             <RowDefinition Height="*" />