v0.1.18更新

Paving-Base · Aug 16, 2022 · fe559b9 · fe559b9
1 parent 7947c1a
commit fe559b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -33,6 +33,7 @@ body:
       label: App version
       description: Specify the version of APK Installer you're using.
       options:
+        - "0.1.18"
         - "0.1.17"
         - "0.1.16"
         - "0.1.15"

diff --git a/APKInstaller/AAPTForNet/AAPTForNet.csproj b/APKInstaller/AAPTForNet/AAPTForNet.csproj
@@ -5,11 +5,11 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net4.8'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net4.8'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/APKInstaller/APKInstaller/APKInstaller.csproj b/APKInstaller/APKInstaller/APKInstaller.csproj
@@ -9,7 +9,7 @@
     <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
     <Copyright>Copyright © 2017 - 2022 PavingBase. All Rights Reserved.</Copyright>
     <Description>An Android Application Installer for Windows</Description>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnablePreviewMsixTooling>True</EnablePreviewMsixTooling>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
     <GenerateTestArtifacts>False</GenerateTestArtifacts>
@@ -22,11 +22,11 @@
     <RepositoryUrl>https://github.com/Paving-Base/APK-Installer</RepositoryUrl>
     <RootNamespace>APKInstaller</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMaxVersion>10.0.22621.0</TargetPlatformMaxVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-    <UseWinUI>true</UseWinUI>
-    <VersionPrefix>0.1.17</VersionPrefix>
+    <UseWinUI>True</UseWinUI>
+    <VersionPrefix>0.1.18</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">

diff --git a/APKInstaller/APKInstaller/Helpers/ThemeHelper.cs b/APKInstaller/APKInstaller/Helpers/ThemeHelper.cs
@@ -73,7 +73,6 @@ public static void Initialize()
         {
             // Save reference as this might be null when the user is in another app
             CurrentApplicationWindow = UIHelper.MainWindow;
-            UIHelper.MainWindow.Backdrop.BackdropTypeChanged += UpdateTitleBarColor;
             RootTheme = SettingsHelper.Get<ElementTheme>(SettingsHelper.SelectedAppTheme);
         }
 
@@ -95,13 +94,12 @@ public static void UpdateSystemCaptionButtonColors()
 
                 TitleBar.ForegroundColor = TitleBar.ButtonForegroundColor = ForegroundColor;
                 TitleBar.BackgroundColor = TitleBar.InactiveBackgroundColor = BackgroundColor;
-                TitleBar.ButtonBackgroundColor = TitleBar.ButtonInactiveBackgroundColor = UIHelper.TitleBarExtended ? BackgroundColor : Colors.Transparent;
+                TitleBar.ButtonBackgroundColor = TitleBar.ButtonInactiveBackgroundColor = UIHelper.TitleBarExtended ? Colors.Transparent : BackgroundColor;
             }
 
-            if (UIHelper.MainWindow.Backdrop != null && UIHelper.MainWindow.Backdrop.Backdrop.HasValue)
-            {
-                UpdateTitleBarColor(UIHelper.MainWindow.Backdrop, UIHelper.MainWindow.Backdrop.Backdrop);
-            }
+            ResourceDictionary resources = Application.Current.Resources;
+            resources["WindowCaptionForeground"] = IsDarkTheme() ? Colors.White : Colors.Black;
+            TitleBarHelper.TriggerTitleBarRepaint();
 
             if (IsDarkTheme())
             {
@@ -118,14 +116,5 @@ public static void UpdateSystemCaptionButtonColors()
                 }
             }
         }
-
-        private static void UpdateTitleBarColor(BackdropHelper sender, object args)
-        {
-            ResourceDictionary resources = Application.Current.Resources;
-
-            resources["WindowCaptionForeground"] = IsDarkTheme() ? Colors.White : Colors.Black;
-
-            TitleBarHelper.TriggerTitleBarRepaint();
-        }
     }
 }
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.17.0" />
+    Version="0.1.18.0" />
 
   <Properties>
     <DisplayName>APK 安装程序</DisplayName>
@@ -19,8 +19,8 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>