Merge branch 'master' into fix/issue-178-networking-layer

Author: glm4

Podfile.lock

@@ -171,4 +171,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ad8b2fa0cef07782327d22c0570f1659eddad970
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.2

ios-base.xcodeproj/project.pbxproj

@@ -13,7 +13,7 @@ extension UILabel {
 
   static func titleLabel (
     text: String = "",
-    font: UIFont = .h1Regular,
+    font: UIFont = .h2Regular,
     textColor: UIColor = .mainTitle,
     backgroundColor: UIColor = .clear,
     numberOfLines: Int = 0,

ios-base/Base.lproj/Main.storyboard

@@ -9,6 +9,27 @@
 import UIKit
 
 extension UITextField {
+  
+  convenience init(
+    target: Any,
+    selector: Selector,
+    placeholder: String,
+    backgroundColor: UIColor = .white,
+    height: CGFloat = UI.TextField.height,
+    borderStyle: BorderStyle = .line,
+    isPassword: Bool = false
+  ) {
+    self.init()
+    
+    translatesAutoresizingMaskIntoConstraints = false
+    addTarget(target, action: selector, for: .editingChanged)
+    self.placeholder = placeholder
+    self.backgroundColor = backgroundColor
+    self.borderStyle = borderStyle
+    heightAnchor.constraint(equalToConstant: height).isActive = true
+    isSecureTextEntry = isPassword
+  }
+  
   func setPlaceholder(color: UIColor = .lightGray) {
     attributedPlaceholder = NSAttributedString(
       string: placeholder ?? "",

ios-base/Extensions/LabelExtension.swift

@@ -12,10 +12,13 @@ import UIKit
 struct UI {
   enum Defaults {
     static let margin: CGFloat = 32
+    static let spacing: CGFloat = 20
   }
 
   enum ViewController {
     static let topMargin: CGFloat = 72
+    static let smallTopMargin: CGFloat = 40
+    static let bottomMargin: CGFloat = 60
   }
 
   enum Button {
@@ -24,4 +27,8 @@ struct UI {
     static let width: CGFloat = 200.0
     static let spacing: CGFloat = 20.0
   }
+  
+  enum TextField {
+    static let height: CGFloat = 40.0
+  }
 }

ios-base/Extensions/TextFieldExtension.swift

@@ -15,10 +15,7 @@ enum HomeRoutes: Route {
   var screen: UIViewController {
     switch self {
     case .home:
-      guard let home = R.storyboard.main.homeViewController() else {
-        return UIViewController()
-      }
-      home.viewModel = HomeViewModel()
+      let home = HomeViewController(viewModel: HomeViewModel())
       return home
     }
   }

ios-base/Helpers/UIConstants.swift

@@ -12,37 +12,112 @@ class HomeViewController: UIViewController, ActivityIndicatorPresenter {
 
   // MARK: - Outlets
 
-  @IBOutlet weak var welcomeLabel: UILabel!
-  @IBOutlet weak var logOut: UIButton!
-  @IBOutlet weak var deleteAccountButton: UIButton!
+  private lazy var welcomeLabel = UILabel.titleLabel(
+    text: "homescreen_title".localized
+  )
+  
+  private lazy var logOutButton = UIButton.primaryButton(
+    color: .black,
+    title: "homescreen_logout_button_title".localized,
+    target: self,
+    action: #selector(tapOnLogOutButton)
+  )
+  
+  private lazy var deleteAccountButton = UIButton.primaryButton(
+    color: .deleteButton,
+    title: "homescreen_delete_button_title".localized,
+    target: self,
+    action: #selector(tapOnDeleteAccount)
+  )
+  
+  private lazy var getProfileButton: UIButton = {
+    let button = UIButton()
+    button.translatesAutoresizingMaskIntoConstraints = false
+    button.setTitle("homescreen_get_profile_button_title".localized, for: .normal)
+    button.setTitleColor(.blue, for: .normal)
+    button.addTarget(
+      self,
+      action: #selector(tapOnGetMyProfile),
+      for: .touchUpInside
+    )
+    
+    return button
+  }()
 
   let activityIndicator = UIActivityIndicatorView()
 
-  var viewModel: HomeViewModel!
+  private var viewModel: HomeViewModel
+  
+  init(viewModel: HomeViewModel) {
+    self.viewModel = viewModel
+    super.init(nibName: nil, bundle: nil)
+  }
+  
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
 
   // MARK: - Lifecycle Events
   override func viewDidLoad() {
     super.viewDidLoad()
+    
     viewModel.delegate = self
-    logOut.setRoundBorders(22)
-    deleteAccountButton.setRoundBorders(22)
+    configureViews()
   }
 
   // MARK: - Actions
 
-  @IBAction func tapOnGetMyProfile(_ sender: Any) {
+  @objc
+  func tapOnGetMyProfile(_ sender: Any) {
     viewModel.loadUserProfile()
   }
 
-  @IBAction func tapOnLogOutButton(_ sender: Any) {
+  @objc
+  func tapOnLogOutButton(_ sender: Any) {
     viewModel.logoutUser()
   }
 
-  @IBAction func tapOnDeleteAccount(_ sender: Any) {
+  @objc
+  func tapOnDeleteAccount(_ sender: Any) {
     viewModel.deleteAccount()
   }
 }
 
+private extension HomeViewController {
+  
+  private func configureViews() {
+    applyDefaultUIConfigs()
+    view.addSubviews(
+      subviews: [welcomeLabel, logOutButton, deleteAccountButton, getProfileButton]
+    )
+    activateConstraints()
+  }
+  
+  private func activateConstraints() {
+    welcomeLabel.centerHorizontally(with: view)
+    getProfileButton.center(view)
+    logOutButton.attachHorizontally(to: view)
+    deleteAccountButton.attachHorizontally(to: view)
+    
+    NSLayoutConstraint.activate([
+      welcomeLabel.topAnchor.constraint(
+        equalTo: view.topAnchor,
+        constant: UI.ViewController.topMargin
+      ),
+      deleteAccountButton.bottomAnchor.constraint(
+        equalTo: view.bottomAnchor,
+        constant: -UI.Defaults.margin
+      ),
+      logOutButton.bottomAnchor.constraint(
+        equalTo: deleteAccountButton.topAnchor,
+        constant: -UI.Button.spacing
+      )
+    ])
+  }
+
+}
+
 extension HomeViewController: HomeViewModelDelegate {
   func didUpdateState(to state: HomeViewModelState) {
     switch state {

ios-base/Home/Routes/HomeRoutes.swift

@@ -71,8 +71,10 @@ internal final class BaseAPIClient: APIClient {
     completion: CompletionCallback<T>
   ) {
     switch result {
-    case .success(let response): handle(response, with: endpoint.decodingConfiguration, completion: completion)
-    case .failure(let error): completion(.failure(error), [:])
+    case .success(let response):
+      handle(response, with: endpoint.decodingConfiguration, completion: completion)
+    case .failure(let error):
+      completion(.failure(error), [:])
     }
   }
 
@@ -94,7 +96,9 @@ internal final class BaseAPIClient: APIClient {
   ) {
     do {
       guard let data = response.data, !data.isEmpty else {
-        guard emptyDataStatusCodes.contains(response.statusCode) else { throw unexpectedResponseError }
+        guard emptyDataStatusCodes.contains(response.statusCode) else {
+          throw unexpectedResponseError
+        }
 
         return completion(.success(.none), response.headers)
       }
@@ -108,7 +112,10 @@ internal final class BaseAPIClient: APIClient {
     }
   }
 
-  private func decode<M: Decodable>(_ data: Data, with configuration: DecodingConfiguration?) throws -> M {
+  private func decode<M: Decodable>(
+    _ data: Data,
+    with configuration: DecodingConfiguration?
+  ) throws -> M {
     let decoder = JSONDecoder(decodingConfig: configuration ?? decodingConfiguration)
 
     return try decoder.decode(M.self, from: data)

ios-base/Home/Views/HomeViewController.swift

@@ -26,24 +26,17 @@ enum OnboardingRoutes: Route {
   }
 
   private func buildSignInViewController() -> UIViewController {
-    guard let signIn = R.storyboard.main.signInViewController() else {
-      return UIViewController()
-    }
-    signIn.viewModel = SignInViewModelWithCredentials()
+    let signIn = SignInViewController(viewModel: SignInViewModelWithCredentials())
     return signIn
   }
 
   private func buildSignUpViewController() -> UIViewController {
-    guard let signUp = R.storyboard.main.signUpViewController() else {
-      return UIViewController()
-    }
-    signUp.viewModel = SignUpViewModelWithEmail()
+    let signUp = SignUpViewController(viewModel: SignUpViewModelWithEmail())
     return signUp
   }
 
   private func buildFirstViewController() -> UIViewController {
-    let firstViewController = FirstViewController()
-    firstViewController.viewModel = FirstViewModel()
+    let firstViewController = FirstViewController(viewModel: FirstViewModel())
     return firstViewController
   }
 }