Cleanup

artigee · May 26, 2020 · 6691135 · 6691135
1 parent 9465e1b
commit 6691135
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...rowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/environments/UserCollection.swift b/...rowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/environments/UserCollection.swift
@@ -83,7 +83,7 @@ public class UserCollection: ObservableObject {
         return added
     }
 
-    public func containVariant(item: Item, variant: Variant) -> Bool {
+    public func variantIn(item: Item, variant: Variant) -> Bool {
         guard let filename = item.filename else {
             return false
         }

diff --git a/ACHNBrowserUI/ACHNBrowserUI/views/collection/CollectionListView.swift b/ACHNBrowserUI/ACHNBrowserUI/views/collection/CollectionListView.swift
@@ -21,7 +21,7 @@ struct CollectionListView: View {
     @State private var sheet: Sheet.SheetType?
 
     private var categories: [String] {
-        Array(Set(collection.items.map({ $0.category })))
+        Array(Set(collection.items.map(\.category))).sorted()
     }
 
     var body: some View {

diff --git a/ACHNBrowserUI/ACHNBrowserUI/views/shared/LikeButtonView.swift b/ACHNBrowserUI/ACHNBrowserUI/views/shared/LikeButtonView.swift
@@ -10,10 +10,11 @@ import SwiftUI
 import Backend
 
 struct LikeButtonView: View {
+    @EnvironmentObject private var collection: UserCollection
+
     let item: Item?
     let variant: Variant?
     let villager: Villager?
-    @EnvironmentObject private var collection: UserCollection
 
     init(item: Item, variant: Variant?) {
         self.item = item
@@ -30,7 +31,7 @@ struct LikeButtonView: View {
     private var isInCollection: Bool {
         if let item = item {
             if let variant = variant {
-                return collection.containVariant(item: item, variant: variant)
+                return collection.variantIn(item: item, variant: variant)
             }
             return collection.items.contains(item) || collection.critters.contains(item)
         } else if let villager = villager {