From aef35d748e18a79e7f84deaa96f5b9050fb86e38 Mon Sep 17 00:00:00 2001
From: ema <mccoy39082@163.com>
Date: Fri, 27 Jun 2025 02:12:49 +0800
Subject: [PATCH] Fix apk icon can not be found from resource id

---
 .../PackageParsers/Apk/ApkParser.cs                           | 4 +++-
 .../QuickLook.Plugin.AppViewer.csproj                         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/QuickLook.Plugin/QuickLook.Plugin.AppViewer/PackageParsers/Apk/ApkParser.cs b/QuickLook.Plugin/QuickLook.Plugin.AppViewer/PackageParsers/Apk/ApkParser.cs
index d2a1fbf..d270600 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.AppViewer/PackageParsers/Apk/ApkParser.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.AppViewer/PackageParsers/Apk/ApkParser.cs
@@ -53,7 +53,9 @@ public static class ApkParser
 
             if (baseInfo.HasIcon)
             {
-                ZipEntry entry = zip.GetEntry(baseInfo.Icons.Values.LastOrDefault());
+                ZipEntry entry = zip.GetEntry(baseInfo.Icons.Values
+                    .Where(icon => icon.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
+                    .LastOrDefault());
                 using var s = new BinaryReader(zip.GetInputStream(entry));
                 info.Logo = s.ReadBytes((int)entry.Size);
             }
diff --git a/QuickLook.Plugin/QuickLook.Plugin.AppViewer/QuickLook.Plugin.AppViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.AppViewer/QuickLook.Plugin.AppViewer.csproj
index f00fc68..a891470 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.AppViewer/QuickLook.Plugin.AppViewer.csproj
+++ b/QuickLook.Plugin/QuickLook.Plugin.AppViewer/QuickLook.Plugin.AppViewer.csproj
@@ -75,8 +75,8 @@
         <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="6.0.0" />
         <PackageReference Include="SharpZipLib" Version="1.4.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="ApkReader" Version="2.0.1.1" />
         <PackageReference Include="PureSharpCompress" Version="0.39.0" />
+        <PackageReference Include="QuickLook.ApkReader" Version="2.0.2" />
         <PackageReference Include="QuickLook.DiscUtils" Version="1.0.0" />
         <PackageReference Include="QuickLook.RpmReader" Version="1.0.0" />
     </ItemGroup>