Merge pull request #43 from marcospojr/feature/api-repos-integration

[Feature] Integration of API call with repos list

Author: rdgborges

solutions/devsprint-6/OnboardingChallenge/Models/RepositoriesModel.swift

@@ -13,7 +13,7 @@ struct RepositoriesModel: Codable {
     let name: String
     let owner: Owner
     let stargazersCount: Int
-    let language: String
+    let language: String?
     let forksCount: Int
 }
 

solutions/devsprint-6/OnboardingChallenge/Screens/List/ListView.swift

@@ -10,8 +10,8 @@ import UIKit
 final class ListView: UIView {
 
     private let listViewCellIdentifier = RepositoryCellView.classIdentifier()
-    
-    private var listItems: [String] = []
+
+    private var listItems: [RepositoriesModel] = []
 
     private lazy var tableView: UITableView = {
 
@@ -23,7 +23,7 @@ final class ListView: UIView {
         return tableView
     }()
 
-    var didSelectedRow: ((String) -> Void)?
+    var didSelectedRow: ((RepositoriesModel) -> Void)?
 
     init() {
         super.init(frame: .zero)
@@ -39,7 +39,7 @@ extension ListView {
 
     func updateView(with configuration: ListViewConfiguration) {
 
-        self.listItems = configuration.listItems
+        self.listItems = configuration.repositories
         self.tableView.reloadData()
     }
 }
@@ -85,8 +85,8 @@ extension ListView: UITableViewDataSource, UITableViewDelegate {
         }
 
         // TODO: removing mock repositoryOwnerName when have defined models
-        cell.updateView(with: RepositoryCellViewConfiguration(repositoryName: self.listItems[indexPath.row],
-                                                              repositoryOwnerName: "rdgborges"))
+        cell.updateView(with: RepositoryCellViewConfiguration(repositoryName: self.listItems[indexPath.row].name,
+                                                              repositoryOwnerName: self.listItems[indexPath.row].owner.login))
 
         return cell
     }

solutions/devsprint-6/OnboardingChallenge/Screens/List/ListViewConfiguration.swift

@@ -9,5 +9,5 @@ import Foundation
 
 struct ListViewConfiguration {
 
-    let listItems: [String]
+    let repositories: [RepositoriesModel]
 }

solutions/devsprint-6/OnboardingChallenge/Screens/List/ListViewController.swift

@@ -16,6 +16,7 @@ final class ListViewController: UIViewController {
     private lazy var searchController: UISearchController = {
         let searchController = UISearchController(searchResultsController: nil)
         searchController.delegate = self
+        searchController.searchBar.delegate = self
         searchController.searchResultsUpdater = self
         searchController.searchBar.placeholder = "Type a GitHub user name"
         searchController.hidesNavigationBarDuringPresentation = false
@@ -36,27 +37,15 @@ final class ListViewController: UIViewController {
         super.viewDidLoad()
         setupUI()
         bindEvents()
-        fetchList()
     }
 
     override func loadView() {
         view = listView
     }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        navigationController?.navigationBar.prefersLargeTitles = true
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        navigationController?.navigationBar.prefersLargeTitles = false
-    }
-    
+
     // MARK: Actions
     @objc
     func pressedSettings() {
-        debugPrint("Open Settings")
         let settingsViewController = SettingsViewController()
         let navBarController = UINavigationController(rootViewController: settingsViewController)
         navBarController.navigationBar.backgroundColor = .systemGray5
@@ -76,34 +65,38 @@ final class ListViewController: UIViewController {
     }
 
     private func setupNavigationBar() {
+        navigationController?.navigationBar.prefersLargeTitles = true
+
         let settingsButton = UIBarButtonItem(title: "Settings", style: .plain, target: self, action: #selector(pressedSettings))
         navigationItem.rightBarButtonItem = settingsButton
         navigationItem.searchController = searchController
         navigationItem.hidesSearchBarWhenScrolling = false
     }
-    
-    private func fetchList() {
-
-        self.service.fetchList(for: "devpass-tech") { items in
-            
-            let names = items.map { $0.name }
+        
+    private func fetchList(for user: String) {
 
-            let configuration = ListViewConfiguration(listItems: names)
+        self.service.fetchList(for: user) { items in
 
+            let configuration = ListViewConfiguration(repositories: items)
+            
             DispatchQueue.main.async {
                 self.listView.updateView(with: configuration)
             }
         }
     }
 
-    private func instanceDetailsOf(_ item: String) {
+    private func instanceDetailsOf(_ item: RepositoriesModel) {
         let viewController = DetailViewController()
-        viewController.title = item
-        navigationController?.pushViewController(viewController, animated: false)
+        viewController.title = item.name
+        navigationController?.pushViewController(viewController, animated: true)
     }
 }
 
 // MARK: Extensions
-extension ListViewController: UISearchResultsUpdating, UISearchControllerDelegate {
+extension ListViewController: UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate {
     func updateSearchResults(for searchController: UISearchController) { }
+    
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        fetchList(for: searchController.searchBar.text ?? "")
+    }
 }