add logic for saving favorite animals

lauramarson · lauramarson · commit 3262ccf399bb · 2022-06-18T15:34:26.000-03:00
diff --git a/AnimalsApp/AnimalsApp.xcodeproj/project.pbxproj.orig b/AnimalsApp/AnimalsApp.xcodeproj/project.pbxproj.orig
@@ -35,7 +35,12 @@
 		A463D071285A373800929A3C /* Animals.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D070285A373700929A3C /* Animals.swift */; };
 		A463D074285A398900929A3C /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D073285A398900929A3C /* HomeViewModel.swift */; };
 		A463D078285A5A8000929A3C /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A463D077285A5A8000929A3C /* OpenSans-Regular.ttf */; };
+<<<<<<< HEAD
+		A463D07C285B9B6300929A3C /* CoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D07B285B9B6300929A3C /* CoreData.swift */; };
+=======
 		A463D07A285B8D8E00929A3C /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D079285B8D8D00929A3C /* Colors.swift */; };
+		A463D07E285CF28200929A3C /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = A463D07D285CF28200929A3C /* String.swift */; };
+>>>>>>> develop
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -94,7 +99,12 @@
 		A463D070285A373700929A3C /* Animals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animals.swift; sourceTree = "<group>"; };
 		A463D073285A398900929A3C /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
 		A463D077285A5A8000929A3C /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = "<group>"; };
+<<<<<<< HEAD
+		A463D07B285B9B6300929A3C /* CoreData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreData.swift; sourceTree = "<group>"; };
+=======
 		A463D079285B8D8D00929A3C /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
+		A463D07D285CF28200929A3C /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
+>>>>>>> develop
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -173,7 +183,6 @@
 				A463D0222858EBBD00929A3C /* Assets.xcassets */,
 				A463D0242858EBBD00929A3C /* LaunchScreen.storyboard */,
 				A463D0272858EBBD00929A3C /* Info.plist */,
-				A463D01F2858EBBB00929A3C /* AnimalsApp.xcdatamodeld */,
 			);
 			path = AnimalsApp;
 			sourceTree = "<group>";
@@ -249,6 +258,7 @@
 			children = (
 				A463D06128590D0300929A3C /* Images.swift */,
 				A463D079285B8D8D00929A3C /* Colors.swift */,
+				A463D07D285CF28200929A3C /* String.swift */,
 			);
 			path = DesignSystem;
 			sourceTree = "<group>";
@@ -257,6 +267,7 @@
 			isa = PBXGroup;
 			children = (
 				A463D068285A1A5A00929A3C /* WebServices.swift */,
+				A463D07B285B9B6300929A3C /* CoreData.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -273,6 +284,7 @@
 		A463D06F285A371F00929A3C /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				A463D01F2858EBBB00929A3C /* AnimalsApp.xcdatamodeld */,
 				A463D070285A373700929A3C /* Animals.swift */,
 			);
 			path = Models;
@@ -560,20 +572,19 @@
 			buildActionMask = 2147483647;
 			files = (
 				A463D06228590D0300929A3C /* Images.swift in Sources */,
+				A463D07C285B9B6300929A3C /* CoreData.swift in Sources */,
 				A463D065285953F900929A3C /* AnimalTableViewCell.swift in Sources */,
 				A463D0212858EBBB00929A3C /* AnimalsApp.xcdatamodeld in Sources */,
 				A463D0572858F62600929A3C /* RegisterViewController.swift in Sources */,
 				A463D0172858EBBB00929A3C /* AppDelegate.swift in Sources */,
 				A463D071285A373800929A3C /* Animals.swift in Sources */,
 				A463D04B2858F39000929A3C /* MainTabBarController.swift in Sources */,
 				A463D074285A398900929A3C /* HomeViewModel.swift in Sources */,
-<<<<<<< HEAD
 				A463D07A285B8D8E00929A3C /* Colors.swift in Sources */,
-=======
 				5CA996F8285A98FB00FF5D79 /* RegisterViewModel.swift in Sources */,
->>>>>>> develop
 				A463D05D2858F64B00929A3C /* FavoritesViewController.swift in Sources */,
 				A463D06D285A22D200929A3C /* DetailViewController.swift in Sources */,
+				A463D07E285CF28200929A3C /* String.swift in Sources */,
 				A463D069285A1A5A00929A3C /* WebServices.swift in Sources */,
 				A463D0532858F60C00929A3C /* HomeViewController.swift in Sources */,
 			);
diff --git a/AnimalsApp/AnimalsApp/Models/Animals.swift.orig b/AnimalsApp/AnimalsApp/Models/Animals.swift.orig
@@ -0,0 +1,49 @@
+//
+//  Items.swift
+//  AnimalsApp
+//
+//  Created by Laura Pinheiro Marson on 15/06/22.
+//
+
+import Foundation
+
+struct Animals: Codable {
+    var items: [Animal]
+}
+
+struct Animal: Codable {
+    var id: String?
+    var name: String?
+    var description: String?
+    var age: Int?
+    var species: String?
+    var image: String?
+    var createdAt: String?
+    var updatedAt: String?
+    var isFavorite: Bool? = false
+<<<<<<< HEAD
+    var imageData: Data?
+=======
+    
+    enum CodingKeys: String, CodingKey {
+        case id
+        case name
+        case description
+        case age
+        case species
+        case image
+        case createdAt = "created_at"
+        case updatedAt = "updated_at"
+    }
+>>>>>>> develop
+}
+
+extension Animal {
+    
+    var imageURL: URL {
+        guard let imageURL = URL(string: self.image ?? "") else {
+            return URL(fileURLWithPath: "")
+        }
+        return imageURL
+    }
+}
diff --git a/AnimalsApp/AnimalsApp/Services/CoreData.swift b/AnimalsApp/AnimalsApp/Services/CoreData.swift
@@ -8,7 +8,15 @@
 import UIKit
 import CoreData
 
-class CoreData {
+protocol CoreDataContract: AnyObject {
+    func loadFavoriteAnimals(completion: @escaping () -> ())
+    func isFavorite(id: String) -> Bool
+    func addFavorite(_ animal: Animal)
+    func removeFavorite(id: String)
+    func saveChanges()
+}
+
+class CoreData: CoreDataContract {
     var managedContext: NSManagedObjectContext?
     var favoriteAnimals = [FavoriteAnimal]()
     
@@ -58,17 +66,18 @@ class CoreData {
     func removeFavorite(id: String) {
 
         guard let managedContext = managedContext else { return }
-        
-        var removeAnimal = FavoriteAnimal()
-        
-        for (index, animal) in favoriteAnimals.enumerated() {
+
+        var count = 0
+
+        for animal in favoriteAnimals {
             if animal.id == id {
-                removeAnimal = animal
-                favoriteAnimals.remove(at: index)
+                let removeAnimal = animal
+                favoriteAnimals.remove(at: count)
+                managedContext.delete(removeAnimal)
             }
+            count += 1
         }
-        
-        managedContext.delete(removeAnimal)
+
     }
 
     func saveChanges() {
diff --git a/AnimalsApp/AnimalsApp/View Models/HomeViewModel.swift b/AnimalsApp/AnimalsApp/View Models/HomeViewModel.swift
@@ -9,10 +9,12 @@ import Foundation
 
 class HomeViewModel {
     private var webServices: WebServicesContract
+    private var coreData: CoreDataContract
     var animals = [Animal]()
     
-    init(webServices: WebServicesContract = WebServices()) {
+    init(webServices: WebServicesContract = WebServices(), coreData: CoreDataContract = CoreData()) {
         self.webServices = webServices
+        self.coreData = coreData
     }
     
     func numberOfRows() -> Int {
@@ -28,6 +30,7 @@ class HomeViewModel {
             switch result {
             case .success(let animals):
                 self?.handleAnimalResponse(with: animals)
+                self?.setFavorite()
             case .failure(let error):
                 //obs criar alerta
                 print(error.localizedDescription)
@@ -45,4 +48,33 @@ class HomeViewModel {
             return false
         }
     }
+    
+    //MARK: Core Data Methods
+    
+    private func setFavorite() {
+        for (index, animal) in animals.enumerated() {
+            guard let id = animal.id else { return }
+            animals[index].isFavorite = coreData.isFavorite(id: id)
+        }
+    }
+    
+    func addOrRemoveFavorite(at index: Int, with image: Data) {
+        animals[index].imageData = image
+        
+        guard let isFavorite = animals[index].isFavorite,
+              let id = animals[index].id else { return }
+        isFavorite ? coreData.removeFavorite(id: id) : coreData.addFavorite(animals[index])
+        
+        animals[index].isFavorite = !isFavorite
+    }
+    
+    func loadFavorites(completion: @escaping () -> ()) {
+        coreData.loadFavoriteAnimals {
+            completion()
+        }
+    }
+    
+    func saveChangesInCoreData() {
+        coreData.saveChanges()
+    }
 }
diff --git a/AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.swift b/AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.swift
@@ -8,26 +8,20 @@
 import UIKit
 import SDWebImage
 
+protocol ActionDelegateProtocol: AnyObject {
+    func favoriteButtonTapped(at index: Int, with image: Data)
+}
+
 class AnimalTableViewCell: UITableViewCell {
+    weak var delegate: ActionDelegateProtocol?
+    var animal: Animal?
+    var index: Int?
 
     @IBOutlet weak var animalImage: UIImageView!
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var descriptionLabel: UILabel!
     @IBOutlet weak var favoriteButton: UIButton!
     
-    var animal: Animal?
-    
-//    var isFavorite: Bool? {
-//        didSet {
-//            guard let isFavorite = isFavorite else { return }
-//            if isFavorite {
-//                favoriteButton.imageView?.image = .favorite
-//            } else {
-//                favoriteButton.imageView?.image = .notFavorite
-//            }
-//        }
-//    }
-    
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
@@ -55,21 +49,23 @@ class AnimalTableViewCell: UITableViewCell {
 
         animalImage.sd_setImage(with: imageURL, placeholderImage: placeholderImage)
         
-        if animal.isFavorite ?? false {
-            favoriteButton.setImage(.favorite, for: .normal)
-        } else {
-            favoriteButton.setImage(.notFavorite, for: .normal)
-        }
+        animal.isFavorite ?? false ? favoriteButton.setImage(.favorite, for: .normal) : favoriteButton.setImage(.notFavorite, for: .normal)
     }
     
     @IBAction func favoritePressed(_ sender: UIButton) {
         guard let animal = animal else { return }
         
         if animal.isFavorite ?? false {
             sender.setImage(.notFavorite, for: .normal)
+            self.animal?.isFavorite = false
         } else {
             sender.setImage(.favorite, for: .normal)
+            self.animal?.isFavorite = true
+        }
+        
+        if let index = index, let image = SDImageCache.shared.imageFromDiskCache(forKey: animal.imageURL.absoluteString) {
+            let imageData = image.jpegData(compressionQuality: 0.9)
+            delegate?.favoriteButtonTapped(at: index, with: imageData ?? Data())
         }
     }
-    
 }
diff --git a/AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.xib b/AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.xib
@@ -36,7 +36,6 @@
                             <constraint firstAttribute="height" constant="40" id="7rZ-bg-lFP"/>
                             <constraint firstAttribute="width" constant="40" id="i65-df-ED5"/>
                         </constraints>
-                        <state key="normal" image="addFavorite"/>
                         <connections>
                             <action selector="favoritePressed:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="X9N-Mv-iRU"/>
                         </connections>
@@ -81,13 +80,12 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="addFavorite" width="22.5" height="21.5"/>
         <image name="imagePlaceholder" width="300" height="300"/>
         <namedColor name="blueTextColor">
             <color red="0.082000002264976501" green="0.54500001668930054" blue="0.74900001287460327" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="grayTextColor">
-            <color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>
diff --git a/AnimalsApp/AnimalsApp/Views/HomeViewController/HomeViewController.swift b/AnimalsApp/AnimalsApp/Views/HomeViewController/HomeViewController.swift
@@ -27,16 +27,28 @@ class HomeViewController: UIViewController {
         tableView.register(UINib(nibName: "AnimalTableViewCell", bundle: nil), forCellReuseIdentifier: "Animal")
         
         setNavigationItems()
+        homeVM.loadFavorites { [weak self] in
+            self?.populateTableView()
+        }
 
         let refreshControl = UIRefreshControl()
         refreshControl.addTarget(self, action: #selector(reloadAnimals), for: .valueChanged)
         tableView.refreshControl = refreshControl
+        
+        let notificationCenter = NotificationCenter.default
+        notificationCenter.addObserver(self, selector: #selector(saveChanges), name: UIApplication.willResignActiveNotification, object: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         populateTableView()
     }
     
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        homeVM.saveChangesInCoreData()
+    }
+    
     // MARK: Methods
     private func setNavigationItems() {
         title = "Home"
@@ -66,6 +78,11 @@ class HomeViewController: UIViewController {
         populateTableView()
         refreshControl.endRefreshing()
     }
+    
+    @objc
+    private func saveChanges() {
+        homeVM.saveChangesInCoreData()
+    }
 }
 
 // MARK: TableView Data Source
@@ -81,6 +98,8 @@ extension HomeViewController: UITableViewDataSource {
         }
         
         cell.animal = homeVM.modelAt(indexPath.row)
+        cell.index = indexPath.row
+        cell.delegate = self
         cell.configure()
         
         return cell
@@ -102,3 +121,10 @@ extension HomeViewController: UITableViewDelegate {
     }
     
 }
+
+// MARK: Action Delegate Protocol
+extension HomeViewController: ActionDelegateProtocol {
+    func favoriteButtonTapped(at index: Int, with image: Data) {
+        homeVM.addOrRemoveFavorite(at: index, with: image)
+    }    
+}
diff --git a/AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.xib b/AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.xib
