code clean

JusterZhu · JusterZhu · commit 35dc2de964db · 2023-03-01T21:39:27.000+08:00
diff --git a/src/c#/.vs/ProjectEvaluation/generalupdate.tool.metadata.v6.1 b/src/c#/.vs/ProjectEvaluation/generalupdate.tool.metadata.v6.1
diff --git a/src/c#/.vs/ProjectEvaluation/generalupdate.tool.projects.v6.1 b/src/c#/.vs/ProjectEvaluation/generalupdate.tool.projects.v6.1
diff --git a/src/c#/GeneralUpdate.Domain/DTO/VersionRespDTO.cs b/src/c#/GeneralUpdate.Domain/DTO/VersionRespDTO.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-
-namespace GeneralUpdate.Core.Domain.DTO
+﻿namespace GeneralUpdate.Core.Domain.DTO
 {
     public class VersionRespDTO : BaseResponseDTO<VersionBodyDTO>
     { }
diff --git a/src/c#/GeneralUpdate.PacketTool/App.xaml b/src/c#/GeneralUpdate.PacketTool/App.xaml
@@ -11,4 +11,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
-</Application>
+</Application>
diff --git a/src/c#/GeneralUpdate.PacketTool/AppShell.xaml b/src/c#/GeneralUpdate.PacketTool/AppShell.xaml
@@ -10,5 +10,4 @@
         Title="Home"
         ContentTemplate="{DataTemplate local:MainPage}"
         Route="MainPage" />
-
-</Shell>
+</Shell>
diff --git a/src/c#/GeneralUpdate.PacketTool/MainPage.xaml b/src/c#/GeneralUpdate.PacketTool/MainPage.xaml
@@ -6,69 +6,69 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition />
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="35"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition/>
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="35" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <StackLayout HorizontalOptions="Center" Orientation="Horizontal">
-                <Image WidthRequest="100" HeightRequest="100"   Source="generalupdate_img.png"/>
+                <Image WidthRequest="100" HeightRequest="100"   Source="generalupdate_img.png" />
             </StackLayout>
-            <StackLayout Grid.Row="1" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center" >
-                <Label VerticalOptions="Center" Text="Source path :"/>
+            <StackLayout Grid.Row="1" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
+                <Label VerticalOptions="Center" Text="Source path :" />
                 <Entry WidthRequest="400" HeightRequest="30" Margin="3,0,3,0" Text="{Binding SourcePath}" />
                 <Button WidthRequest="110" HeightRequest="25" Text="Pick folder" Command="{Binding SelectFolderCommand}"  CommandParameter="Source" />
-                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center"/>
+                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center" />
             </StackLayout>
             <StackLayout Grid.Row="2" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="Target path :"/>
+                <Label VerticalOptions="Center"  Text="Target path :" />
                 <Entry WidthRequest="400" HeightRequest="30" Margin="5,0,3,0" Text="{Binding TargetPath}" />
-                <Button WidthRequest="110" HeightRequest="35" Text="Pick folder" Command="{Binding SelectFolderCommand}"  CommandParameter="Target"/>
-                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center"/>
+                <Button WidthRequest="110" HeightRequest="35" Text="Pick folder" Command="{Binding SelectFolderCommand}"  CommandParameter="Target" />
+                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center" />
             </StackLayout>
             <StackLayout Grid.Row="3" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="Patch path :"/>
-                <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding PatchPath}"/>
+                <Label VerticalOptions="Center"  Text="Patch path :" />
+                <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding PatchPath}" />
                 <Button WidthRequest="110" HeightRequest="35" Text="Pick folder" Command="{Binding SelectFolderCommand}"  CommandParameter="Patch" />
-                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center"/>
+                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center" />
             </StackLayout>
             <StackLayout Margin="0,0,120,0" Grid.Row="4" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="packet name :"/>
+                <Label VerticalOptions="Center"  Text="packet name :" />
                 <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding PacketName , Mode=TwoWay}" />
-                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center"/>
+                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center" />
             </StackLayout>
             <StackLayout Margin="0,0,85,0" Grid.Row="5" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="format :"/>
+                <Label VerticalOptions="Center"  Text="format :" />
                 <Picker WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" ItemsSource="{Binding Formats}" SelectedItem="{Binding CurrentFormat}" />
-                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center"/>
+                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center" />
             </StackLayout>
             <StackLayout Margin="0,0,100,0" Grid.Row="6" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="encoding :"/>
+                <Label VerticalOptions="Center"  Text="encoding :" />
                 <Picker WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" SelectedIndex="0" ItemsSource="{Binding Encodings}" SelectedItem="{Binding CurrentEncoding}" />
-                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center"/>
+                <Label Text="*" TextColor="Red" VerticalTextAlignment="Center" />
             </StackLayout>
             <StackLayout Margin="0,0,135,0" Grid.Row="7" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="client app key :"/>
+                <Label VerticalOptions="Center"  Text="client app key :" />
                 <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding CurrentClientAppKey}" />
             </StackLayout>
             <StackLayout Margin="0,0,115,0" Grid.Row="8" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="client type :"/>
+                <Label VerticalOptions="Center"  Text="client type :" />
                 <Picker WidthRequest="400" HeightRequest="32" Margin="9,0,3,0" ItemsSource="{Binding AppTypes}" SelectedItem="{Binding CurrnetAppType}" />
             </StackLayout>
             <StackLayout Margin="0,0,110,0" Grid.Row="9" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="server url :"/>
-                <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding Url}"/>
+                <Label VerticalOptions="Center"  Text="server url :" />
+                <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding Url}" />
             </StackLayout>
             <StackLayout Margin="0,0,145,0" Grid.Row="10" Orientation="Horizontal" HeightRequest="35" HorizontalOptions="Center">
-                <Label VerticalOptions="Center"  Text="currnet version :"/>
+                <Label VerticalOptions="Center"  Text="currnet version :" />
                 <Entry WidthRequest="400" HeightRequest="30" Margin="9,0,3,0" Text="{Binding CurrentVersion}" />
             </StackLayout>
             <StackLayout HorizontalOptions="Center" Grid.Row="11"  HeightRequest="35" Orientation="Horizontal">
@@ -79,4 +79,4 @@
             </StackLayout>
         </Grid>
     </ScrollView>
-</ContentPage>
+</ContentPage>
diff --git a/src/c#/GeneralUpdate.PacketTool/MauiProgram.cs b/src/c#/GeneralUpdate.PacketTool/MauiProgram.cs
@@ -45,7 +45,7 @@ public static MauiAppBuilder RegisterAppServices(this MauiAppBuilder mauiAppBuil
 #if WINDOWS
 		mauiAppBuilder.Services.AddTransient<IFolderPickerService, Platforms.Windows.FolderPicker>();
 #elif MACCATALYST
-		mauiAppBuilder.Services.AddTransient<IFolderPickerService, Platforms.MacCatalyst.FolderPicker>();
+            mauiAppBuilder.Services.AddTransient<IFolderPickerService, Platforms.MacCatalyst.FolderPicker>();
 #endif
             return mauiAppBuilder;
         }
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/Android/MainActivity.cs b/src/c#/GeneralUpdate.PacketTool/Platforms/Android/MainActivity.cs
@@ -1,6 +1,5 @@
 ﻿using Android.App;
 using Android.Content.PM;
-using Android.OS;
 
 namespace GeneralUpdate.PacketTool
 {
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/MacCatalyst/FolderPicker.cs b/src/c#/GeneralUpdate.PacketTool/Platforms/MacCatalyst/FolderPicker.cs
@@ -80,4 +80,4 @@ protected override void Dispose(bool disposing)
             }
         }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/MacCatalyst/Program.cs b/src/c#/GeneralUpdate.PacketTool/Platforms/MacCatalyst/Program.cs
@@ -1,5 +1,4 @@
-﻿using ObjCRuntime;
-using UIKit;
+﻿using UIKit;
 
 namespace GeneralUpdate.PacketTool
 {
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/Tizen/tizen-manifest.xml b/src/c#/GeneralUpdate.PacketTool/Platforms/Tizen/tizen-manifest.xml
@@ -9,7 +9,7 @@
   <shortcut-list />
   <privileges>
     <privilege>http://tizen.org/privilege/internet</privilege>
-  </privileges> 
+  </privileges>
   <dependencies />
   <provides-appdefined-privileges />
 </manifest>
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/Windows/App.xaml b/src/c#/GeneralUpdate.PacketTool/Platforms/Windows/App.xaml
@@ -2,7 +2,6 @@
     x:Class="GeneralUpdate.PacketTool.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:GeneralUpdate.PacketTool.WinUI">
-
-</maui:MauiWinUIApplication>
+    xmlns:local="using:GeneralUpdate.PacketTool.WinUI"
+    xmlns:maui="using:Microsoft.Maui">
+</maui:MauiWinUIApplication>
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/Windows/App.xaml.cs b/src/c#/GeneralUpdate.PacketTool/Platforms/Windows/App.xaml.cs
@@ -1,6 +1,4 @@
-﻿using Microsoft.UI.Xaml;
-
-// To learn more about WinUI, the WinUI project structure,
+﻿// To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
 namespace GeneralUpdate.PacketTool.WinUI
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/Windows/FolderPicker.cs b/src/c#/GeneralUpdate.PacketTool/Platforms/Windows/FolderPicker.cs
@@ -22,4 +22,4 @@ public async Task<string> PickFolderTaskAsync()
             return result?.Path;
         }
     }
-}
+}
diff --git a/src/c#/GeneralUpdate.PacketTool/Platforms/iOS/Program.cs b/src/c#/GeneralUpdate.PacketTool/Platforms/iOS/Program.cs
@@ -1,5 +1,4 @@
-﻿using ObjCRuntime;
-using UIKit;
+﻿using UIKit;
 
 namespace GeneralUpdate.PacketTool
 {
diff --git a/src/c#/GeneralUpdate.PacketTool/Resources/Styles/Colors.xaml b/src/c#/GeneralUpdate.PacketTool/Resources/Styles/Colors.xaml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="UTF-8" ?>
 <?xaml-comp compile="true" ?>
-<ResourceDictionary 
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
@@ -17,19 +17,19 @@
     <Color x:Key="Gray600">#404040</Color>
     <Color x:Key="Gray900">#212121</Color>
     <Color x:Key="Gray950">#141414</Color>
-    <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
-    <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
-    <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
-    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/>
-    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/>
-    <SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}"/>
-    <SolidColorBrush x:Key="Gray200Brush" Color="{StaticResource Gray200}"/>
-    <SolidColorBrush x:Key="Gray300Brush" Color="{StaticResource Gray300}"/>
-    <SolidColorBrush x:Key="Gray400Brush" Color="{StaticResource Gray400}"/>
-    <SolidColorBrush x:Key="Gray500Brush" Color="{StaticResource Gray500}"/>
-    <SolidColorBrush x:Key="Gray600Brush" Color="{StaticResource Gray600}"/>
-    <SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}"/>
-    <SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}"/>
+    <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}" />
+    <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}" />
+    <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}" />
+    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}" />
+    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}" />
+    <SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}" />
+    <SolidColorBrush x:Key="Gray200Brush" Color="{StaticResource Gray200}" />
+    <SolidColorBrush x:Key="Gray300Brush" Color="{StaticResource Gray300}" />
+    <SolidColorBrush x:Key="Gray400Brush" Color="{StaticResource Gray400}" />
+    <SolidColorBrush x:Key="Gray500Brush" Color="{StaticResource Gray500}" />
+    <SolidColorBrush x:Key="Gray600Brush" Color="{StaticResource Gray600}" />
+    <SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}" />
+    <SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}" />
 
     <Color x:Key="Yellow100Accent">#F7B548</Color>
     <Color x:Key="Yellow200Accent">#FFD590</Color>
@@ -40,5 +40,4 @@
     <Color x:Key="Blue100Accent">#3E8EED</Color>
     <Color x:Key="Blue200Accent">#72ACF1</Color>
     <Color x:Key="Blue300Accent">#A7CBF6</Color>
-
 </ResourceDictionary>
diff --git a/src/c#/GeneralUpdate.PacketTool/Resources/Styles/Styles.xaml b/src/c#/GeneralUpdate.PacketTool/Resources/Styles/Styles.xaml
diff --git a/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs b/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Collections.Generic;`
`2`		`-`
`3`		`-namespace GeneralUpdate.Core.Domain.DTO`
	`1`	`+namespace GeneralUpdate.Core.Domain.DTO`
`4`	`2`	`{`
`5`	`3`	`public class VersionRespDTO : BaseResponseDTO<VersionBodyDTO>`
`6`	`4`	`{ }`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static MauiAppBuilder RegisterAppServices(this MauiAppBuilder mauiAppBuil`
`45`	`45`	`#if WINDOWS`
`46`	`46`	`mauiAppBuilder.Services.AddTransient<IFolderPickerService, Platforms.Windows.FolderPicker>();`
`47`	`47`	`#elif MACCATALYST`
`48`		`- mauiAppBuilder.Services.AddTransient<IFolderPickerService, Platforms.MacCatalyst.FolderPicker>();`
	`48`	`+ mauiAppBuilder.Services.AddTransient<IFolderPickerService, Platforms.MacCatalyst.FolderPicker>();`
`49`	`49`	`#endif`
`50`	`50`	`return mauiAppBuilder;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using Android.App;`
`2`	`2`	`using Android.Content.PM;`
`3`		`-using Android.OS;`
`4`	`3`
`5`	`4`	`namespace GeneralUpdate.PacketTool`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,4 @@ protected override void Dispose(bool disposing)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
`83`		`-}`
	`83`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using ObjCRuntime;`
`2`		`-using UIKit;`
	`1`	`+using UIKit;`
`3`	`2`
`4`	`3`	`namespace GeneralUpdate.PacketTool`
`5`	`4`	`{`