fix customization layouting

HabitRPG · Jan 19, 2024 · fafb76b · fafb76b
1 parent 1860bce
commit fafb76b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/HabitRPG/UI/General/ArmoireViewController.swift b/HabitRPG/UI/General/ArmoireViewController.swift
@@ -182,11 +182,15 @@ private class ViewModel: ObservableObject {
                 self.text = response?.armoire?.dropText ?? ""
                 self.key = response?.armoire?.dropKey ?? ""
                 self.value = response?.armoire?.value ?? 0
-                if (self.type == "gear") {
+                if self.type == "gear" {
                     self.remainingCount -= 1
                 }
                 onCompleted()
-            }).flatMap(.latest, { _ in
+            })
+            .flatMap(.latest, { _ in
+                return self.userRepository.retrieveInAppRewards()
+            })
+            .flatMap(.latest, { _ in
                 return self.userRepository.retrieveUser(forced: true)
             })
             .observeValues({ _ in

diff --git a/HabitRPG/UI/Inventory/AvatarDetailViewController.swift b/HabitRPG/UI/Inventory/AvatarDetailViewController.swift
@@ -56,7 +56,18 @@ class AvatarDetailViewController: BaseCollectionViewController, UICollectionView
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
         let width = 80
         let viewWidth = Int(collectionView.frame.size.width)
-        var count = viewWidth / width
+        var count = viewWidth / (width + 10)
+        if let dataSource = gearDataSource {
+            let inSection = dataSource.collectionView(collectionView, numberOfItemsInSection: section)
+            if inSection < count {
+                count = inSection
+            }
+        } else if let dataSource = customizationDataSource {
+            let inSection = dataSource.collectionView(collectionView, numberOfItemsInSection: section)
+            if inSection < count {
+                count = inSection
+            }
+        }
         if customizationType == "background" {
             count = 3
         }