Save item variants

Dimillian · Dimillian · commit 7d58c7719f7f · 2020-05-25T21:20:28.000+02:00
diff --git a/ACHNBrowserUI/ACHNBrowserUI.xcodeproj/project.pbxproj b/ACHNBrowserUI/ACHNBrowserUI.xcodeproj/project.pbxproj
@@ -1161,7 +1161,7 @@
 				CODE_SIGN_ENTITLEMENTS = ACHNBrowserUI/ACHNBrowserUI.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development: Thomas Ricouard (7MB55D6BJ5)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 052572020;
+				CURRENT_PROJECT_VERSION = 052582020;
 				DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
 				DEVELOPMENT_TEAM = Z6P74P6T99;
 				ENABLE_PREVIEWS = YES;
@@ -1192,7 +1192,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 052572020;
+				CURRENT_PROJECT_VERSION = 052582020;
 				DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
 				DEVELOPMENT_TEAM = Z6P74P6T99;
 				ENABLE_PREVIEWS = YES;
diff --git a/ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/environments/UserCollection.swift b/ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/environments/UserCollection.swift
@@ -15,16 +15,19 @@ public class UserCollection: ObservableObject {
     
     // MARK: - Published properties
     @Published public var items: [Item] = []
+    @Published public var variants: [String: [Variant]] = [:]
     @Published public var villagers: [Villager] = []
     @Published public var critters: [Item] = []
     @Published public var lists: [UserList] = []
     @Published public var dailyTasks = DailyTasks()
+    
     @Published public var isCloudEnabled = true
     @Published public var isSynched = false
     
     // MARK: - Private properties
     private struct SavedData: Codable {
         let items: [Item]
+        let variants: [String: [Variant]]?
         let villagers: [Villager]
         let critters: [Item]
         let lists: [UserList]?
@@ -80,6 +83,31 @@ public class UserCollection: ObservableObject {
         return added
     }
     
+    public func containVariant(item: Item, variant: Variant) -> Bool {
+        guard let filename = item.filename else {
+            return false
+        }
+        return variants[filename]?.contains(variant) == true
+    }
+    
+    public func toggleVariant(item: Item, variant: Variant) -> Bool {
+        guard let filename = item.filename else {
+            return false
+        }
+        if variants[filename]?.contains(variant) == true {
+            variants[filename]?.removeAll(where: { $0 == variant })
+            save()
+            return false
+        } else {
+            if variants[filename] == nil {
+                variants[filename] = []
+            }
+            variants[filename]?.append(variant)
+            save()
+            return true
+        }
+    }
+    
     public func toggleCritters(critter: Item) -> Bool {
         let added = critters.toggle(item: critter)
         save()
@@ -230,7 +258,12 @@ public class UserCollection: ObservableObject {
     // MARK: - Import / Export
     private func save() {
         do {
-            let savedData = SavedData(items: items, villagers: villagers, critters: critters, lists: lists, dailyTasks: dailyTasks)
+            let savedData = SavedData(items: items,
+                                      variants: variants,
+                                      villagers: villagers,
+                                      critters: critters,
+                                      lists: lists,
+                                      dailyTasks: dailyTasks)
             let data = try encoder.encode(savedData)
             try data.write(to: filePath, options: .atomicWrite)
         
@@ -250,6 +283,7 @@ public class UserCollection: ObservableObject {
             do {
                 let savedData = try decoder.decode(SavedData.self, from: data)
                 self.items = savedData.items
+                self.variants = savedData.variants ?? [:]
                 self.villagers = savedData.villagers
                 self.critters = savedData.critters
                 self.lists = savedData.lists ?? []
diff --git a/ACHNBrowserUI/ACHNBrowserUI/views/items/ItemRowView.swift b/ACHNBrowserUI/ACHNBrowserUI/views/items/ItemRowView.swift
@@ -110,7 +110,8 @@ struct ItemRowView: View {
     var body: some View {
         HStack(spacing: 8) {
             if displayMode != .largeNoButton {
-                LikeButtonView(item: item).environmentObject(collection)
+                LikeButtonView(item: item,
+                               variant: displayedVariant).environmentObject(collection)
             }
             if item.finalImage == nil && displayedVariant == nil {
                 Image(item.appCategory.iconName())
diff --git a/ACHNBrowserUI/ACHNBrowserUI/views/items/detail/ItemDetailView.swift b/ACHNBrowserUI/ACHNBrowserUI/views/items/detail/ItemDetailView.swift
@@ -119,7 +119,8 @@ extension ItemDetailView {
     
     private var navButtons: some View {
         HStack {
-            LikeButtonView(item: self.itemViewModel.item).imageScale(.large)
+            LikeButtonView(item: itemViewModel.item,
+                           variant: displayedVariant).imageScale(.large)
                 .environmentObject(collection)
                 .safeHoverEffectBarItem(position: .trailing)
             Spacer(minLength: 12)
@@ -132,23 +133,33 @@ extension ItemDetailView {
             ScrollView(.horizontal, showsIndicators: false) {
                 HStack {
                     itemViewModel.item.variations.map { variants in
-                        ForEach(variants) { variant in
-                            ItemImage(path: variant.content.image,
-                                      size: 75)
-                                .onTapGesture {
-                                    withAnimation {
-                                        FeedbackGenerator.shared.triggerSelection()
-                                        self.displayedVariant = variant
-                                    }
-                            }
-                        }
+                        ForEach(variants, content: makeVariantRow(variant:))
                     }
                 }.padding()
             }
             .listRowInsets(EdgeInsets())
         }
     }
     
+    private func makeVariantRow(variant: Variant) -> some View {
+        ZStack(alignment: .topLeading) {
+            ItemImage(path: variant.content.image,
+                      size: 75)
+                .onTapGesture {
+                    withAnimation {
+                        if self.itemViewModel.item.variations?.firstIndex(of: variant) == 0 {
+                            self.displayedVariant = nil
+                        } else {
+                            self.displayedVariant = variant
+                        }
+                        FeedbackGenerator.shared.triggerSelection()
+                    }
+            }
+            LikeButtonView(item: item,
+                           variant: self.itemViewModel.item.variations?.firstIndex(of: variant) == 0 ? nil : variant)
+        }
+    }
+    
     private var materialsSection: some View {
         Section(header: SectionHeaderView(text: "Materials", icon: "leaf.arrow.circlepath")) {
             ScrollView(.horizontal, showsIndicators: false) {
diff --git a/ACHNBrowserUI/ACHNBrowserUI/views/shared/LikeButtonView.swift b/ACHNBrowserUI/ACHNBrowserUI/views/shared/LikeButtonView.swift
@@ -11,21 +11,27 @@ import Backend
 
 struct LikeButtonView: View {
     let item: Item?
+    let variant: Variant?
     let villager: Villager?
     @EnvironmentObject private var collection: UserCollection
     
-    init(item: Item) {
+    init(item: Item, variant: Variant?) {
         self.item = item
+        self.variant = variant
         self.villager = nil
     }
     
     init(villager: Villager) {
         self.villager = villager
+        self.variant = nil
         self.item = nil
     }
     
     private var isInCollection: Bool {
         if let item = item {
+            if let variant = variant {
+                return collection.containVariant(item: item, variant: variant)
+            }
             return collection.items.contains(item) || collection.critters.contains(item)
         } else if let villager = villager {
             return collection.villagers.contains(villager)
@@ -63,6 +69,11 @@ struct LikeButtonView: View {
                     let added = self.collection.toggleCritters(critter: item)
                     FeedbackGenerator.shared.triggerNotification(type: added ? .success : .warning)
                 default:
+                    if let variant = self.variant {
+                        let added = self.collection.toggleVariant(item: item, variant: variant)
+                        FeedbackGenerator.shared.triggerNotification(type: added ? .success : .warning)
+                        return
+                    }
                     let added = self.collection.toggleItem(item: item)
                     FeedbackGenerator.shared.triggerNotification(type: added ? .success : .warning)
                 }
@@ -81,7 +92,7 @@ struct LikeButtonView: View {
 
 struct StarButtonView_Previews: PreviewProvider {
     static var previews: some View {
-        LikeButtonView(item: static_item)
+        LikeButtonView(item: static_item, variant: nil)
             .environmentObject(UserCollection.shared)
     }
 }
diff --git a/ACHNBrowserUI/ACHNBrowserUI/views/villagers/VillagerRowView.swift b/ACHNBrowserUI/ACHNBrowserUI/views/villagers/VillagerRowView.swift
@@ -17,7 +17,8 @@ struct VillagerRowView: View {
     
     var body: some View {
         HStack {
-            LikeButtonView(villager: villager).environmentObject(collection)
+            LikeButtonView(villager: villager)
+                .environmentObject(collection)
             ItemImage(path: ACNHApiService.BASE_URL.absoluteString +
                 ACNHApiService.Endpoint.villagerIcon(id: villager.id).path(),
                       size: 50)
