resolved conflicts

Author: lauramarson

AnimalsApp/AnimalsApp/Assets.xcassets/Colors/lightGray.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xD9",
+          "green" : "0xD9",
+          "red" : "0xD9"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AnimalsApp/AnimalsApp/DesignSystem/Colors.swift

@@ -13,4 +13,6 @@ extension UIColor {
 
     static let grayCellFrame: UIColor? = UIColor(named: "grayCellFrame")
     static let grayTextColor: UIColor? = UIColor(named: "grayTextColor")  
+    static let lightGray: UIColor? = UIColor(named: "lightGray")
+   
 }

AnimalsApp/AnimalsApp/DesignSystem/Colors.swift.orig

@@ -0,0 +1,21 @@
+//
+//  Colors.swift
+//  AnimalsApp
+//
+//  Created by Laura Pinheiro Marson on 16/06/22.
+//
+
+import UIKit
+
+extension UIColor {
+    static let blueTabBarColor: UIColor? = UIColor(named: "blueTabBarColor")
+    static let blueTextColor: UIColor? = UIColor(named: "blueTextColor")
+    
+<<<<<<< HEAD
+    static let grayCellFrame: UIColor? = UIColor(named: "grayCellFrame")
+    static let grayTextColor: UIColor? = UIColor(named: "grayTextColor")  
+=======
+    static let lightGray: UIColor? = UIColor(named: "lightGray")
+   
+>>>>>>> develop
+}

AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.swift

@@ -47,6 +47,8 @@ class AnimalTableViewCell: UITableViewCell {
         self.descriptionLabel.text = animal.description
 
         self.animalImage.layer.cornerRadius = 10
+        self.animalImage.layer.borderWidth = 0.5
+        self.animalImage.layer.borderColor = UIColor.lightGray?.cgColor
 
         let imageURL = animal.imageURL
         let placeholderImage = UIImage.imagePlaceHolder

AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.xib

@@ -16,17 +16,17 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Animal" rowHeight="98" id="KGk-i7-Jjw" customClass="AnimalTableViewCell" customModule="AnimalsApp" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="302" height="98"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Animal" rowHeight="96" id="KGk-i7-Jjw" customClass="AnimalTableViewCell" customModule="AnimalsApp" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="302" height="96"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="302" height="98"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="302" height="96"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imagePlaceholder" translatesAutoresizingMaskIntoConstraints="NO" id="lNA-6P-Vee">
                         <rect key="frame" x="20" y="8" width="80" height="80"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="80" id="WD3-HZ-qNY"/>
+                            <constraint firstAttribute="height" constant="80" id="ZEC-PQ-WcJ"/>
                             <constraint firstAttribute="width" constant="80" id="kcM-BZ-81T"/>
                         </constraints>
                     </imageView>
@@ -63,7 +63,7 @@
                     <constraint firstItem="687-rn-Ydp" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="fsl-xq-9yj" secondAttribute="trailing" constant="5" id="Fot-hl-ITO"/>
                     <constraint firstItem="lNA-6P-Vee" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="IB3-A5-MoG"/>
                     <constraint firstItem="fsl-xq-9yj" firstAttribute="centerY" secondItem="lNA-6P-Vee" secondAttribute="centerY" id="W6t-ob-L4I"/>
-                    <constraint firstItem="lNA-6P-Vee" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="8" id="jhP-MT-FBj"/>
+                    <constraint firstItem="lNA-6P-Vee" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" priority="999" constant="9" id="jhP-MT-FBj"/>
                     <constraint firstAttribute="bottom" secondItem="lNA-6P-Vee" secondAttribute="bottom" constant="8" id="mNv-vS-OgZ"/>
                     <constraint firstAttribute="trailing" secondItem="687-rn-Ydp" secondAttribute="trailing" constant="15" id="oaJ-Ve-0pr"/>
                     <constraint firstItem="fsl-xq-9yj" firstAttribute="leading" secondItem="lNA-6P-Vee" secondAttribute="trailing" constant="15" id="sdK-OL-XPW"/>
@@ -77,7 +77,7 @@
                 <outlet property="favoriteButton" destination="687-rn-Ydp" id="wgR-Fp-8k1"/>
                 <outlet property="nameLabel" destination="cyH-cm-d20" id="Gts-qf-dcs"/>
             </connections>
-            <point key="canvasLocation" x="118.84057971014494" y="68.303571428571431"/>
+            <point key="canvasLocation" x="120.28985507246378" y="66.294642857142861"/>
         </tableViewCell>
     </objects>
     <resources>

AnimalsApp/AnimalsApp/Views/HomeViewController/HomeViewController.swift

@@ -75,6 +75,7 @@ extension HomeViewController: UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "Animal", for: indexPath) as? AnimalTableViewCell else {
             return UITableViewCell()
         }