change detailVC logic

Author: lauramarson

AnimalsApp/AnimalsApp/Views/DetailViewController/DetailViewController.swift

@@ -9,11 +9,9 @@ import UIKit
 import SDWebImage
 
 class DetailViewController: UIViewController {
+    
     // MARK: Properties
-    public var labelNameText: String?
-    public var labelSpecieText: String?
-    public var textViewText: String?
-    public var imageViewURL: URL?
+    var animal: Animal?
 
     // MARK: Outlets
     @IBOutlet weak var imageViewDetail: UIImageView!
@@ -24,7 +22,7 @@ class DetailViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setNavigationItems()
-        setupCell()
+        setupDetails()
     }
 
     private func setNavigationItems() {
@@ -41,11 +39,24 @@ class DetailViewController: UIViewController {
         navigationController?.navigationBar.tintColor = UIColor.blueTextColor
     }
 
-    private func setupCell() {
-        labelName.text = labelNameText
-        labelSpecie.text = labelSpecieText
-        textViewDescription.text = textViewText
-        imageViewDetail.sd_setImage(with: imageViewURL)
+    private func setupDetails() {
+        guard let animal = animal else { return }
+
+        if animal.age == 1 {
+            labelName.text = "\(animal.name?.capitalized ?? "") - \(animal.age ?? 1) ano"
+        } else {
+            labelName.text = "\(animal.name?.capitalized ?? "") - \(animal.age ?? 0) anos"
+        }
+        
+        labelSpecie.text = animal.species?.capitalized
+        textViewDescription.text = animal.description
+        
+        if let imageData = animal.imageData {
+            imageViewDetail.image = UIImage(data: imageData)
+        } else {
+            imageViewDetail.sd_setImage(with: animal.imageURL)
+        }
+        
         imageViewDetail.layer.cornerRadius = 10
         imageViewDetail.layer.borderWidth = 0.5
         imageViewDetail.layer.borderColor = UIColor.lightGray?.cgColor

AnimalsApp/AnimalsApp/Views/FavoritesViewController/FavoritesViewController.swift

@@ -43,6 +43,8 @@ class FavoritesViewController: UIViewController {
             NSAttributedString.Key.font: UIFont(name: "OpenSans", size: 20) ?? UIFont.systemFont(ofSize: 20)]
         navigationController?.navigationBar.standardAppearance = appearance
         navigationController?.navigationBar.scrollEdgeAppearance = navigationController?.navigationBar.standardAppearance
+        
+        navigationItem.backButtonTitle = ""
     }
 
 }
@@ -75,7 +77,8 @@ extension FavoritesViewController: UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let detailVC = DetailViewController(nibName: "DetailViewController", bundle: nil)
 
-        //continuar
+        let animal = favoritesVM?.modelAt(indexPath.row)
+        detailVC.animal = animal
 
         navigationController?.pushViewController(detailVC, animated: true)
 

AnimalsApp/AnimalsApp/Views/HomeViewController/HomeViewController.swift

@@ -112,11 +112,10 @@ extension HomeViewController: UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let detailVC = DetailViewController(nibName: "DetailViewController", bundle: nil)
-        let data = homeVM.modelAt(indexPath.row)
-        detailVC.imageViewURL = data.imageURL
-        detailVC.labelNameText = "\(data.name ?? "") - \(data.age ?? 0)"
-        detailVC.labelSpecieText = data.species
-        detailVC.textViewText = data.description
+        
+        let animal = homeVM.modelAt(indexPath.row)
+        detailVC.animal = animal
+
         navigationController?.pushViewController(detailVC, animated: true)
 
         tableView.deselectRow(at: indexPath, animated: true)