From f7db9b18515f6561acc66645ecae985023f21bc5 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:16:57 +0200
Subject: [PATCH] Use both versionName and versionCode to identify icon pack
 versions

---
 .../main/java/de/mm20/launcher2/icons/IconPack.kt   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt
index 8a5095dd..d5b40a8a 100644
--- a/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt
+++ b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt
@@ -24,10 +24,13 @@ data class IconPack(
         context: Context,
         resolveInfo: ResolveInfo,
         themed: Boolean = false
-    ): this(
+    ) : this(
         name = resolveInfo.loadLabel(context.packageManager).toString(),
         packageName = resolveInfo.activityInfo.packageName,
-        version = context.packageManager.getPackageInfo(resolveInfo.activityInfo.packageName, 0).versionName,
+        version = context.packageManager.getPackageInfo(resolveInfo.activityInfo.packageName, 0)
+            .let {
+                "${it.versionName} (${it.versionCode})"
+            },
         themed = themed,
     )
 
@@ -35,10 +38,12 @@ data class IconPack(
         context: Context,
         packageInfo: PackageInfo,
         themed: Boolean = false
-    ): this(
+    ) : this(
         name = packageInfo.applicationInfo.loadLabel(context.packageManager).toString(),
         packageName = packageInfo.packageName,
-        version = context.packageManager.getPackageInfo(packageInfo.packageName, 0).versionName,
+        version = context.packageManager.getPackageInfo(packageInfo.packageName, 0).let {
+            "${it.versionName} (${it.versionCode})"
+        },
         themed = themed,
     )