Merge branch 'devpass-tech:main' into feature/ContactListView

Author: gabrieldcc

solutions/devsprint-caio-santos-7/FinanceApp/Extensions/UIColor+Extensions.swift

@@ -0,0 +1,58 @@
+import UIKit
+
+extension UIColor {
+    static func fromRGB(_ rgbValue: Int) -> UIColor! {
+        return UIColor(
+            red: CGFloat((Float((rgbValue & 0xff0000) >> 16)) / 255.0),
+            green: CGFloat((Float((rgbValue & 0x00ff00) >> 8)) / 255.0),
+            blue: CGFloat((Float((rgbValue & 0x0000ff) >> 0)) / 255.0),
+            alpha: 1.0)
+    }
+
+    convenience init?(hexString: String?) {
+        let input: String! = (hexString ?? "")
+            .replacingOccurrences(of: "#", with: "")
+            .uppercased()
+        var alpha: CGFloat = 1.0
+        var red: CGFloat = 0
+        var blue: CGFloat = 0
+        var green: CGFloat = 0
+        switch (input.count) {
+        case 3 /* #RGB */:
+            red = Self.colorComponent(from: input, start: 0, length: 1)
+            green = Self.colorComponent(from: input, start: 1, length: 1)
+            blue = Self.colorComponent(from: input, start: 2, length: 1)
+            break
+        case 4 /* #ARGB */:
+            alpha = Self.colorComponent(from: input, start: 0, length: 1)
+            red = Self.colorComponent(from: input, start: 1, length: 1)
+            green = Self.colorComponent(from: input, start: 2, length: 1)
+            blue = Self.colorComponent(from: input, start: 3, length: 1)
+            break
+        case 6 /* #RRGGBB */:
+            red = Self.colorComponent(from: input, start: 0, length: 2)
+            green = Self.colorComponent(from: input, start: 2, length: 2)
+            blue = Self.colorComponent(from: input, start: 4, length: 2)
+            break
+        case 8 /* #AARRGGBB */:
+            alpha = Self.colorComponent(from: input, start: 0, length: 2)
+            red = Self.colorComponent(from: input, start: 2, length: 2)
+            green = Self.colorComponent(from: input, start: 4, length: 2)
+            blue = Self.colorComponent(from: input, start: 6, length: 2)
+            break
+        default:
+            NSException.raise(NSExceptionName("Invalid color value"), format: "Color value \"%@\" is invalid.  It should be a hex value of the form #RBG, #ARGB, #RRGGBB, or #AARRGGBB", arguments:getVaList([hexString ?? ""]))
+        }
+        self.init(red: red, green: green, blue: blue, alpha: alpha)
+    }
+    
+    static func colorComponent(from string: String!, start: Int, length: Int) -> CGFloat {
+        let substring = (string as NSString)
+            .substring(with: NSRange(location: start, length: length))
+        let fullHex = length == 2 ? substring : "\(substring)\(substring)"
+        var hexComponent: UInt64 = 0
+        Scanner(string: fullHex)
+            .scanHexInt64(&hexComponent)
+        return CGFloat(Double(hexComponent) / 255.0)
+    }
+}

solutions/devsprint-caio-santos-7/FinanceApp/Screens/ActivityDetails/ActivityCellView.swift

@@ -10,13 +10,27 @@ import UIKit
 enum ActivityTypes: String {
     case mall = "Mall"
     case foodCourt = "Food Court"
+    case oceanicAirlines = "Oceanic Airlines"
 
     func getColor() -> UIColor {
         switch self {
         case .mall:
-            return .red
+            return UIColor(red: 190/255, green: 81/255, blue: 255/255, alpha: 1)
         case .foodCourt:
             return .blue
+        case .oceanicAirlines:
+            return .orange
+        }
+    }
+    
+    func getIcon() -> UIImage? {
+        switch self {
+        case .mall:
+            return UIImage(named: "bag.circle.fill")
+        case .foodCourt:
+            return UIImage(named: "fork.knife.circle.fill")
+        case .oceanicAirlines:
+            return UIImage(named: "airplane.circle.fill")
         }
     }
 }
@@ -72,6 +86,7 @@ class ActivityCellView: UITableViewCell {
 
         if let type = ActivityTypes(rawValue: activity.name) {
             icon.tintColor = type.getColor()
+            icon.image = type.getIcon()
         }
 
         titleDescription.text = String.activityDetails(with: activity.price, and: activity.time)
@@ -96,22 +111,17 @@ extension ActivityCellView: ViewCodable {
 
 
     func setupConstraints() {
-        
         NSLayoutConstraint.activate([
-            icon.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 8),
+            icon.centerYAnchor.constraint(equalTo: contentView.centerYAnchor),
             icon.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: 8),
             icon.heightAnchor.constraint(equalToConstant: 48),
             icon.widthAnchor.constraint(equalToConstant: 48),
 
-            stackView.centerYAnchor.constraint(equalTo: contentView.centerYAnchor),
+            stackView.heightAnchor.constraint(greaterThanOrEqualToConstant: 48),
+            stackView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 8),
+            stackView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -8),
             stackView.leadingAnchor.constraint(equalTo: icon.trailingAnchor, constant: 8),
-            stackView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -8),
-            
-            titleLabel.leadingAnchor.constraint(equalTo: stackView.trailingAnchor),
-            titleLabel.trailingAnchor.constraint(equalTo: stackView.trailingAnchor),
-            
-            titleDescription.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor),
-            titleDescription.trailingAnchor.constraint(equalTo: titleLabel.trailingAnchor),
+            stackView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -8)
         ])
     }
 }

solutions/devsprint-caio-santos-7/FinanceApp/Screens/Home/HomeView.swift

@@ -12,8 +12,6 @@ struct HomeViewConfiguration {
 }
 
 final class HomeView: UIView {
-    private let listViewCellIdentifier = "ListViewCellIdentifier"
-
     private var activities: [Activity] = []
 
     private lazy var accountSummaryView: AccountSummaryView = {
@@ -25,7 +23,8 @@ final class HomeView: UIView {
     private lazy var tableView: UITableView = {
         let tableView = UITableView(frame: .zero)
         tableView.translatesAutoresizingMaskIntoConstraints = false
-        tableView.register(UITableViewCell.self, forCellReuseIdentifier: self.listViewCellIdentifier)
+        tableView.register(ActivityCellView.self, forCellReuseIdentifier: ActivityCellView.reuseIdentifier)
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: UITableViewCell.reuseIdentifier)
         tableView.dataSource = self
         return tableView
     }()
@@ -81,8 +80,13 @@ extension HomeView: UITableViewDataSource {
     }
 
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: self.listViewCellIdentifier)!
-        cell.textLabel?.text = activities[indexPath.row].name
+        guard let cell: ActivityCellView = .createCell(for: tableView, at: indexPath),
+              indexPath.row < activities.count else {
+            return .init()
+        }
+        
+        
+        cell.updateValues(activity: activities[indexPath.row])
         return cell
     }
 }

solutions/devsprint-caio-santos-7/FinanceAppTests/Screens/ActivityDetails/ActivityCellViewTests.swift

@@ -32,7 +32,7 @@ final class ActivityCellViewTests: XCTestCase {
         unwrappedSut.updateValues(activity: Activity(name: "TESTE TESTE TESTE TESTE TESTE TESTE TESTE",
                                                      price: 0,
                                                      time: "TESTE"))
-        assertSnapshot(matching: unwrappedSut, as: .image)
+        assertSnapshot(matching: unwrappedSut, as: .image(size: .init(width: UIScreen.main.bounds.width, height: 78)))
     }
 
     func test_WhenInitActivityCellViewWithMall_ThenView_ShouldHaveValidSnapshot() throws {