v0.1.11更新

Paving-Base · Mar 6, 2022 · 62e5cbd · 62e5cbd
1 parent b108f6a
commit 62e5cbd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 35 deletions.
diff --git a/APKInstaller/AAPTForNet/AAPTForNet.csproj b/APKInstaller/AAPTForNet/AAPTForNet.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<LangVersion>preview</LangVersion>
+    <LangVersion>preview</LangVersion>
     <TargetFrameworks>net4.8;netcoreapp3.1;net6.0-windows10.0.22000.0;net7.0-windows10.0.22000.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net4.8'">
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
   </ItemGroup>
-	
+    
   <ItemGroup Condition="'$(TargetFramework)' != 'net4.8'">
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>

diff --git a/APKInstaller/APKInstaller/APKInstaller.csproj b/APKInstaller/APKInstaller/APKInstaller.csproj
@@ -3,29 +3,29 @@
     <UseWinUI>true</UseWinUI>
     <AppxBundle>Never</AppxBundle>
     <OutputType>WinExe</OutputType>
-	<LangVersion>preview</LangVersion>
+    <LangVersion>preview</LangVersion>
     <Platforms>x86;x64;arm64</Platforms>
-	<VersionPrefix>0.1.10</VersionPrefix>
+    <VersionPrefix>0.1.11</VersionPrefix>
     <RootNamespace>APKInstaller</RootNamespace>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <GenerateTestArtifacts>False</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-	<Copyright>Copyright © 2017 - 2022 PavingBase. All Rights Reserved.</Copyright>
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
-	<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
-	<TargetPlatformMaxVersion>10.0.22000.0</TargetPlatformMaxVersion>
+    <TargetPlatformMaxVersion>10.0.22000.0</TargetPlatformMaxVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-	<Description>An Android Application Installer for Windows</Description>
+    <Description>An Android Application Installer for Windows</Description>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-	<RepositoryUrl>https://github.com/Paving-Base/APK-Installer</RepositoryUrl>
-	<PackageProjectUrl>https://github.com/Paving-Base/APK-Installer</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Paving-Base/APK-Installer</RepositoryUrl>
+    <Copyright>Copyright © 2017 - 2022 PavingBase. All Rights Reserved.</Copyright>
+    <PackageProjectUrl>https://github.com/Paving-Base/APK-Installer</PackageProjectUrl>
     <AppxPackageDir>C:\Users\qq251\Downloads\Github\APK-Installer\APKInstaller\APKInstaller\AppPackages\</AppxPackageDir>
   </PropertyGroup>
   <ItemGroup>
@@ -60,11 +60,11 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="CommunityToolkit.WinUI.Connectivity" Version="7.1.2" />
-	<PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
-	<PackageReference Include="Downloader" Version="2.3.2" />
-	<PackageReference Include="SharpCompress" Version="0.30.1" />
-	<PackageReference Include="PInvoke.User32" Version="0.7.104" />
+    <PackageReference Include="CommunityToolkit.WinUI.Connectivity" Version="7.1.2" />
+    <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
+    <PackageReference Include="Downloader" Version="2.3.2" />
+    <PackageReference Include="SharpCompress" Version="0.30.1" />
+    <PackageReference Include="PInvoke.User32" Version="0.7.104" />
     <PackageReference Include="AdvancedSharpAdbClient" Version="2.5.2" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.2" />

diff --git a/APKInstaller/APKInstaller/Controls/WebXAML.xaml.cs b/APKInstaller/APKInstaller/Controls/WebXAML.xaml.cs
@@ -2,20 +2,9 @@
 using CommunityToolkit.WinUI.Connectivity;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Markup;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net.Http;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

diff --git a/APKInstaller/APKInstaller/Package.appxmanifest b/APKInstaller/APKInstaller/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="18184wherewhere.AndroidAppInstaller"
     Publisher="CN=2C3A37C0-35FC-4839-B08C-751C1C1AFBF5"
-    Version="0.1.10.0" />
+    Version="0.1.11.0" />
 
   <Properties>
     <DisplayName>APK 安装程序</DisplayName>

diff --git a/APKInstaller/APKInstaller/Pages/MainPage.xaml.cs b/APKInstaller/APKInstaller/Pages/MainPage.xaml.cs
@@ -27,7 +27,7 @@ public MainPage()
                 SizeChanged += Page_SizeChanged;
                 UIHelper.MainWindow.ExtendsContentIntoTitleBar = true;
                 CustomTitleBarRoot.HorizontalAlignment = HorizontalAlignment.Left;
-                Root.RowDefinitions.Add(new RowDefinition { Height= new GridLength(1, GridUnitType.Auto) });
+                Root.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Auto) });
                 Root.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
             }
             else

diff --git a/APKInstaller/APKInstaller/Pages/SettingsPages/SettingsPage.xaml b/APKInstaller/APKInstaller/Pages/SettingsPages/SettingsPage.xaml
@@ -80,7 +80,7 @@
                             <ToggleSwitch IsOn="{Binding ShowDialogs, Mode=TwoWay}" Style="{StaticResource ToggleSwitchSettingStyle}" />
                         </controls:Setting.ActionContent>
                     </controls:Setting>
-                    <controls:Setting x:Uid="/SettingsPage/ShowMessagesSettings" Icon="&#xE82F;">
+                    <controls:Setting x:Uid="/SettingsPage/ShowMessagesSettings" Icon="&#xE789;">
                         <controls:Setting.ActionContent>
                             <ToggleSwitch IsOn="{Binding ShowMessages, Mode=TwoWay}" Style="{StaticResource ToggleSwitchSettingStyle}" />
                         </controls:Setting.ActionContent>

diff --git a/APKInstaller/APKInstaller/Pages/SettingsPages/SettingsPage.xaml.cs b/APKInstaller/APKInstaller/Pages/SettingsPages/SettingsPage.xaml.cs
@@ -3,16 +3,11 @@
 using APKInstaller.Helpers;
 using APKInstaller.Models;
 using APKInstaller.ViewModels.SettingsPages;
-using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.IO;
-using System.Text;
-using Windows.Services.Store;
 using Windows.Storage;
 using Windows.System;
 

diff --git a/APKInstaller/APKInstaller/ViewModels/SettingsPages/SettingsViewModel.cs b/APKInstaller/APKInstaller/ViewModels/SettingsPages/SettingsViewModel.cs
@@ -10,7 +10,6 @@
 using System.ComponentModel;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Resources;
-using Windows.Services.Store;
 
 namespace APKInstaller.ViewModels.SettingsPages
 {