final changes

Author: lauramarson

AnimalsApp/AnimalsApp/View Models/FavoritesViewModel.swift

@@ -8,16 +8,28 @@
 import Foundation
 
 class FavoritesViewModel {
+    //MARK: Properties
     let coreData: CoreDataContract
 
     var favoriteAnimals = [Animal]()
     private var newCoreDataChanges = true
 
+    //MARK: Initialization
     init(coreData: CoreDataContract = CoreData.shared) {
         self.coreData = coreData
         coreData.delegate.append(self)
     }
 
+    //MARK: Methods
+    func numberOfRows() -> Int {
+        return favoriteAnimals.count
+    }
+    
+    func modelAt(_ index: Int) -> Animal {
+        return favoriteAnimals[index]
+    }
+    
+    //MARK: Core Data Methods
     func getFavoriteAnimals(completion: @escaping () -> Void) {
         guard newCoreDataChanges else { return }
 
@@ -29,14 +41,6 @@ class FavoritesViewModel {
         completion()
     }
 
-    func numberOfRows() -> Int {
-        return favoriteAnimals.count
-    }
-    
-    func modelAt(_ index: Int) -> Animal {
-        return favoriteAnimals[index]
-    }
-    
     func removeFavorite(at index: Int, completion: @escaping () -> Void) {
         guard let id = favoriteAnimals[index].id else { return }
         favoriteAnimals.remove(at: index)
@@ -45,6 +49,7 @@ class FavoritesViewModel {
     }
 }
 
+//MARK: Update Delegate Protocol
 extension FavoritesViewModel: UpdateDelegateProtocol {
     func updateFavoriteAnimals() {
         newCoreDataChanges = true

AnimalsApp/AnimalsApp/View Models/HomeViewModel.swift

@@ -8,16 +8,19 @@
 import Foundation
 
 class HomeViewModel {
+    //MARK: Properties
     private var webServices: WebServicesContract
     private var coreData: CoreDataContract
     var animals = [Animal]()
 
+    //MARK: Initialization
     init(webServices: WebServicesContract = WebServices(), coreData: CoreDataContract = CoreData.shared) {
         self.webServices = webServices
         self.coreData = coreData
         coreData.delegate.append(self)
     }
 
+    //MARK: Methods
     func numberOfRows() -> Int {
         return animals.count
     }
@@ -80,6 +83,7 @@ class HomeViewModel {
     }
 }
 
+//MARK: Update Delegate Protocol
 extension HomeViewModel: UpdateDelegateProtocol {
     func updateFavoriteAnimals() {
         setFavorite()

AnimalsApp/AnimalsApp/View Models/RegisterViewModel.swift

@@ -8,12 +8,15 @@
 import Foundation
 
 struct RegisterViewModel {
+    //MARK: Properties
     private var webServices: WebServicesContract
 
+    //MARK: Initialization
     init(webServices: WebServicesContract = WebServices()) {
         self.webServices = webServices
     }
 
+    //MARK: Methods
     func registerAnimal(name: String, description: String, age: Int, species: String, image: String, completion: @escaping ((Result<Void, Error>) -> Void)) {
 
         let newAnimal = Animal(name: name, description: description, age: age, species: species, image: image)

AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.swift

@@ -14,26 +14,19 @@ protocol ActionDelegateProtocol: AnyObject {
 }
 
 class AnimalTableViewCell: UITableViewCell {
+    
+    // MARK: Properties
     weak var delegate: ActionDelegateProtocol?
     var animal: Animal?
     var index: Int?
 
+    // MARK: Outlets
     @IBOutlet weak var animalImage: UIImageView!
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var descriptionLabel: UILabel!
     @IBOutlet weak var favoriteButton: UIButton!
 
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        // Initialization code
-    }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
-    }
-    
+    // MARK: Methods
     func configure() {
         guard let animal = animal else { return }
 
@@ -57,6 +50,7 @@ class AnimalTableViewCell: UITableViewCell {
         animal.isFavorite ?? false ? favoriteButton.setImage(.favorite, for: .normal) : favoriteButton.setImage(.notFavorite, for: .normal)
     }
 
+    // MARK: Actions
     @IBAction func favoritePressed(_ sender: UIButton) {
         guard let animal = animal, let index = index else { return }
 

AnimalsApp/AnimalsApp/Views/DetailViewController/DetailViewController.swift

@@ -25,6 +25,7 @@ class DetailViewController: UIViewController {
         setupDetails()
     }
 
+    // MARK: Methods
     private func setupDetails() {
         guard let animal = animal else { return }
 

AnimalsApp/AnimalsApp/Views/HomeViewController/HomeViewController.swift

@@ -116,7 +116,7 @@ class HomeViewController: UIViewController {
     }
 }
 
-// MARK: TableView Data Source
+// MARK: - TableView Data Source
 extension HomeViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return homeVM.numberOfRows()
@@ -138,7 +138,7 @@ extension HomeViewController: UITableViewDataSource {
 
 }
 
-// MARK: TableView Delegate
+// MARK: - TableView Delegate
 extension HomeViewController: UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -154,7 +154,7 @@ extension HomeViewController: UITableViewDelegate {
 
 }
 
-// MARK: Action Delegate Protocol
+// MARK: - Action Delegate Protocol
 extension HomeViewController: ActionDelegateProtocol {
     func addFavoriteTapped(at index: Int, with image: Data) {
         homeVM.addFavorite(at: index, with: image)

AnimalsApp/AnimalsApp/Views/TabBarController/MainTabBarController.swift

@@ -9,13 +9,15 @@ import UIKit
 
 class MainTabBarController: UITabBarController {
 
+    // MARK: Overrides
     override func viewDidLoad() {
         super.viewDidLoad()
 
         setupViewControllers()
         setupTabBar()
     }
 
+    // MARK: Methods
     func setupViewControllers() {
 
         let homeVC = UINavigationController(rootViewController: HomeViewController())