From 3d2fa60d982b878d06640e3483f4c612a86c4d5a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 7 Apr 2021 16:21:21 +0200
Subject: [PATCH] Correctly sort seasonal shop

---
 .../fragments/inventory/shops/ShopFragment.kt  | 18 +++++++++++-------
 Habitica/staff/release/output-metadata.json    | 18 ------------------
 2 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 Habitica/staff/release/output-metadata.json

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 1ed986100..6c169b551 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -162,13 +162,17 @@ open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
                         specialCategory.items.add(ShopItem.makeFortifyItem(context?.resources))
                         shop1.categories.add(specialCategory)
                     }
-                    if (shop1.identifier == Shop.TIME_TRAVELERS_SHOP) {
-                        formatTimeTravelersShop(shop1)
-                    } else if (shop1.identifier == Shop.SEASONAL_SHOP) {
-                        shop1.categories.reverse()
-                        shop1
-                    } else {
-                        shop1
+                    when (shop1.identifier) {
+                        Shop.TIME_TRAVELERS_SHOP -> {
+                            formatTimeTravelersShop(shop1)
+                        }
+                        Shop.SEASONAL_SHOP -> {
+                            shop1.categories.sortWith(compareBy<ShopCategory> { it.items.size != 1 }.thenByDescending { it.items.firstOrNull()?.event?.end })
+                            shop1
+                        }
+                        else -> {
+                            shop1
+                        }
                     }
                 }
                 .subscribe({
diff --git a/Habitica/staff/release/output-metadata.json b/Habitica/staff/release/output-metadata.json
deleted file mode 100644
index cc2823e6a..000000000
--- a/Habitica/staff/release/output-metadata.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 2,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.habitrpg.android.habitica",
-  "variantName": "processStaffReleaseResources",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "versionCode": 2841,
-      "versionName": "3.2.1",
-      "outputFile": "Habitica-staff-release.apk"
-    }
-  ]
-}
\ No newline at end of file