14.07

Dmitriy Tymofyeyev
1 parent 6db08737
Showing 8 changed files with 108 additions and 62 deletions
InterQR-Internship/Modules/AddResidentsScreen/ViewController/AddResidentsViewController.swift
InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift
InterQR-Internship/Modules/ResidentsScreen/View/ResidentTableViewCell/ResidentTableViewCell.swift
InterQR-Internship/Modules/ResidentsScreen/ViewController/ResidentsViewController.swift
InterQR-Internship/Modules/SettingsScreen/ViewController/SettingsViewController.swift
InterQR-Internship/Modules/VerificationSceen/View/VerificationView.swift
InterQR-Internship/Modules/VerificationSceen/ViewController/VerificationViewController.swift
InterQR-Internship/NetworkManager/AuthService.swift
--- a/InterQR-Internship/Modules/AddResidentsScreen/ViewController/AddResidentsViewController.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/AddResidentsScreen/ViewController/AddResidentsViewController.swift
View file @e93d193
@@ -58,9 +58,20 @@ class AddResidentsViewController: UIViewController {
     }
     @objc private func didTapResidentButton() {
-        print("✅")
-        didReceiveData()
-        dismiss(animated: true, completion: nil)
+        if mainView.nameTextField.text == "" {
+            let alert = UIAlertController(title: "Enter name field", message: "", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+            present(alert, animated: true, completion: nil)
+        } else {
+            if mainView.mobileNumberTextField.text == "" {
+                let alert = UIAlertController(title: "Enter phone number field", message: "", preferredStyle: .alert)
+                alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
+                present(alert, animated: true, completion: nil)
+            } else {
+                didReceiveData()
+                dismiss(animated: true, completion: nil)
+            }
+        }
     }
     func didReceiveData() {
--- a/InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift
View file @e93d193
@@ -37,9 +37,8 @@ class CodeVerificationViewController: UIViewController {
     }
     func networkingVerify() {
-        guard let verifyUrl = URL(string: APIRoutes.verifyURL.urlString) else { return }
-        let verifyModel = verifyModelFilling()
-        AuthService.share.verifyRequest(verifyUrl, model: verifyModel!) { response in
+        guard let verifyModel = verifyModelFilling() else { return }
+        AuthService.share.verifyRequest(model: verifyModel) { response in
             print("3️⃣✅\(response.data)")
             print("\(response.message)✅")
             self.networkingLogin()
@@ -50,12 +49,9 @@ class CodeVerificationViewController: UIViewController {
     }
     func networkingLogin() {
-        guard let loginUrl = URL(string: APIRoutes.loginURL.urlString) else { return }
         guard let loginModel = loginModelFilling() else { return }
-        
-        self.networkManager.loginRequest(loginUrl, model: loginModel) { response in
-            guard let message = response.message else { return }
-            print("4️⃣✅\(message)✅")
+        AuthService.share.loginRequest(model: loginModel) { response in
+            print("4️⃣\(response.message)4️⃣")
             self.errorProcessing()
         } fail: { error in
             print("4️⃣⛔️\(error)⛔️")
--- a/InterQR-Internship/Modules/ResidentsScreen/View/ResidentTableViewCell/ResidentTableViewCell.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/ResidentsScreen/View/ResidentTableViewCell/ResidentTableViewCell.swift
View file @e93d193
@@ -183,9 +183,9 @@ class ResidentTableViewCell: UITableViewCell {
         }
         removeCellButton.addTarget(self, action: #selector(didRemoveButtonTapped(_:)), for: .touchUpInside)
-        managerButton.addTarget(self, action: #selector(didButtonsTapped(_:)), for: .touchUpInside)
-        hiddenButton.addTarget(self, action: #selector(didButtonsTapped(_:)), for: .touchUpInside)
-        heartButton.addTarget(self, action: #selector(didButtonsTapped(_:)), for: .touchUpInside)
+        managerButton.addTarget(self, action: #selector(didManagerButtonTapped(_:)), for: .touchUpInside)
+        hiddenButton.addTarget(self, action: #selector(didHiddenButtonTapped(_:)), for: .touchUpInside)
+        heartButton.addTarget(self, action: #selector(didHeartButtonTapped(_:)), for: .touchUpInside)
     }
     override func layoutSubviews() {
@@ -201,9 +201,16 @@ extension ResidentTableViewCell {
         delegate?.didRemoveButtonTapped(cell: self)
     }
-    @objc private func didButtonsTapped(_ sender: UIButton) {
+    @objc private func didManagerButtonTapped(_ sender: UIButton) {
         delegate?.didManagerButtonTapped(cell: self)
+    }
+    
+    @objc private func didHiddenButtonTapped(_ sender: UIButton) {
         delegate?.didHiddenButtonTapped(cell: self)
+    }
+    
+    @objc private func didHeartButtonTapped(_ sender: UIButton) {
         delegate?.didHeardButtonTapped(cell: self)
     }
+    
 }
--- a/InterQR-Internship/Modules/ResidentsScreen/ViewController/ResidentsViewController.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/ResidentsScreen/ViewController/ResidentsViewController.swift
View file @e93d193
@@ -50,7 +50,7 @@ class ResidentsViewController: UIViewController {
         guard let model = modelFilling() else {
             return
         }
-        AuthService.share.initRequest(model) { result in
+        AuthService.share.initRequest(model: model) { result in
             print("1️⃣✅\(result.message)✅")
         } fail: { error in
             print("1️⃣\(error)")
@@ -84,20 +84,6 @@ extension ResidentsViewController: UITableViewDelegate, UITableViewDataSource {
         cell.delegate = self
         return cell
     }
-    
-//    @objc private func removeCell(_ sender: UIButton) {
-//        myData.remove(at: sender.tag)
-//        mainView.tableView.deleteRows(at: [IndexPath(row: sender.tag, section: 0)], with: .fade)
-//        mainView.tableView.reloadData()
-//    }
-    
-//    @objc private func didTapManagerButton(_ sender: UIButton) {
-//        if !sender.isSelected {
-//            sender.isSelected = true
-//        } else {
-//            sender.isSelected = false
-//        }
-//    }
 }
 //MARK: - ResidentSavable delegate
 extension ResidentsViewController: ResidentSavable {
@@ -109,6 +95,14 @@ extension ResidentsViewController: ResidentSavable {
 //MARK: residentcell delegate
 extension ResidentsViewController: ResidentTableViewCellDelegate {
+    func didButtonsTapped(cell: ResidentTableViewCell) {
+        if !cell.managerButton.isSelected {
+                    cell.managerButton.isSelected = true
+                } else {
+                    cell.managerButton.isSelected = false
+                }
+    }
+    
     func didRemoveButtonTapped(cell: ResidentTableViewCell) {
         guard let model = cell.model else {
             return
@@ -117,9 +111,13 @@ extension ResidentsViewController: ResidentTableViewCellDelegate {
         mainView.tableView.reloadData()
     }
-    func didButtonsTapped(_ sender: UIButton) {
-        
-    }
+//    func didButtonsTapped(_ button: UIButton) {
+//        if !button.isSelected {
+//            button.isSelected = true
+//        } else {
+//            button.isSelected = false
+//        }
+//    }
     func didManagerButtonTapped(cell: ResidentTableViewCell) {
         if !cell.managerButton.isSelected {
@@ -136,7 +134,7 @@ extension ResidentsViewController: ResidentTableViewCellDelegate {
             cell.hiddenButton.isSelected = false
         }
     }
-    
+
     func didHeardButtonTapped(cell: ResidentTableViewCell) {
         if !cell.heartButton.isSelected {
             cell.heartButton.isSelected = true
--- a/InterQR-Internship/Modules/SettingsScreen/ViewController/SettingsViewController.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/SettingsScreen/ViewController/SettingsViewController.swift
View file @e93d193
@@ -40,15 +40,15 @@ extension SettingsViewController {
     }
     @objc private func didLogoutAndShowVerificationVC() {
+        networking()
         let vc = VerificationViewController()
         navigationController?.pushViewController(vc, animated: true)
-        networking()
+        
     }
     func networking() {
-        guard let logoutUrl = URL(string: APIRoutes.logoutURL.urlString) else { return }
         guard let logoutModel = logoutModelFilling() else { return }
-        networkManager.logoutRequest(logoutUrl, model: logoutModel) { response in
+        AuthService.share.logoutRequest(model: logoutModel) { response in
             print("5️⃣❇️\(response.message ?? "Data not received!")❇️")
         } fail: { error in
             print("5️⃣❗️\(error)❗️")
--- a/InterQR-Internship/Modules/VerificationSceen/View/VerificationView.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/VerificationSceen/View/VerificationView.swift
View file @e93d193
@@ -95,7 +95,7 @@ class VerificationView: UIView {
         textField.backgroundColor = .TextFieldColor.general
         textField.textAlignment = .left
         textField.layer.cornerRadius = 15
-        textField.keyboardType = .numberPad
+        textField.keyboardType = .phonePad
         textField.text = .Text.plusOne
         textField.font = .skModernist(type: .regular, ofSize: 15)
         textField.layer.masksToBounds = true
--- a/InterQR-Internship/Modules/VerificationSceen/ViewController/VerificationViewController.swift
View file @e93d193
+++ b/InterQR-Internship/Modules/VerificationSceen/ViewController/VerificationViewController.swift
View file @e93d193
@@ -11,6 +11,7 @@ class VerificationViewController: UIViewController {
     var networkManager = AuthService()
     var isKeyboardAppear = false
     private let mainView = VerificationView()
+    var closeTap: UITapGestureRecognizer?
     lazy var phonePickerModels: [PhonePickerModel] = {
         var models: [PhonePickerModel] = []
@@ -37,6 +38,11 @@ class VerificationViewController: UIViewController {
     }
     private func initViewController() {
+        addDoneButtonOnKeyboard()
+        
+        mainView.emailTextField.delegate = self
+        mainView.phoneTextField.delegate = self
+        
         mainView.phonePickerView.phoneNumberPicker.delegate = self
         mainView.phonePickerView.phoneNumberPicker.dataSource = self
@@ -45,16 +51,15 @@ class VerificationViewController: UIViewController {
         mainView.showPickerButton.addTarget(self, action: #selector(didshowPickerButtonTapped(_:)), for: .touchUpInside)
         mainView.phonePickerView.selectButton.addTarget(self, action: #selector(didshowPickerButtonTapped(_:)), for: .touchUpInside)
         mainView.phonePickerView.titleButton.addTarget(self, action: #selector(didshowPickerButtonTapped(_:)), for: .touchDragInside)
-        
         mainView.continueButton.addTarget(self, action: #selector(didTapContinueButton), for: .touchUpInside)
+        
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil)
     }
     func networking() {
-        guard let startUrl = URL(string: APIRoutes.startURL.urlString) else { return }
         guard let startModel = startModelFilling() else { return }
-        networkManager.startRequest(startUrl, model: startModel) { response in
+        AuthService.share.startRequest(model: startModel) { response in
             print("2️⃣✅\(response.message)✅")
         } fail: { error in
             print("2️⃣❌\(error)❌")
@@ -70,6 +75,25 @@ class VerificationViewController: UIViewController {
             return StartRequestModel(emailOrNumber: (String(describing: number)))
         }
     }
+    
+    func addDoneButtonOnKeyboard() {
+            let doneToolbar: UIToolbar = UIToolbar(frame: CGRect.init(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 50))
+            doneToolbar.barStyle = .default
+
+            let flexSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+            let done: UIBarButtonItem = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(self.doneButtonAction))
+
+            let items = [flexSpace, done]
+            doneToolbar.items = items
+            doneToolbar.sizeToFit()
+
+        mainView.phoneTextField.inputAccessoryView = doneToolbar
+        }
+
+        @objc func doneButtonAction(){
+            mainView.phoneTextField.resignFirstResponder()
+            didShowCodeVerificationVC()
+        }
 }
 //MARK: helpers and handlers
@@ -92,7 +116,6 @@ extension VerificationViewController {
         default:
             return
         }
-//        mainView.handleUI(mainView.emailButton.isSelected)
     }
     @objc private func didshowPickerButtonTapped(_ sender: UIButton) {
@@ -166,7 +189,7 @@ extension VerificationViewController {
         }
     }
 }
-
+//MARK: - PickerView Delegate
 extension VerificationViewController: UIPickerViewDataSource, UIPickerViewDelegate {
     func numberOfComponents(in pickerView: UIPickerView) -> Int {
         return 1
@@ -193,4 +216,12 @@ extension VerificationViewController: UIPickerViewDataSource, UIPickerViewDelega
         mainView.flagPickerView.image = model.icon
     }
 }
+//MARK: - TextField delegate
+extension VerificationViewController: UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        mainView.emailTextField.resignFirstResponder()
+        return true
+    }
+}
+
--- a/InterQR-Internship/NetworkManager/AuthService.swift
View file @e93d193
+++ b/InterQR-Internship/NetworkManager/AuthService.swift
View file @e93d193
@@ -9,7 +9,6 @@ import Foundation
 import Alamofire
 class AuthService {
-    
     static let share = AuthService()
     var networkToken: String? {
@@ -28,9 +27,10 @@ class AuthService {
     typealias VerifyWebServiceResponse = (VerifyResponseModel) -> Void
     typealias LoginWebServiceResponse = (LoginResponseModel) -> Void
     typealias LogoutWebServiceResponse = (LogoutResponseModel) -> Void
+    
     typealias FailedHandler = (Error) -> Void
-    func initRequest(_ model: InitRequestModel, success: @escaping InitWebServiceResponse, fail: @escaping FailedHandler) {
+    func initRequest(model: InitRequestModel, completion: @escaping InitWebServiceResponse, fail: @escaping FailedHandler) {
         let params = ["device_uuid": model.deviceUUID,
                       "manufacturer": model.manufacturer,
@@ -40,20 +40,22 @@ class AuthService {
                       "app_version": model.appVersion] as [String: Any]
         AF.request(Constants.baseURL + APIRoutes.initURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: InitResponseModel.self ) { response in
-            switch response.result {
-            case .failure(let error) :
+            
+            if let error = response.error {
                 fail(error)
-            case .success(let res) :
-                success(res)
+            } else {
+                if let res = response.value {
+                    completion(res)
+                }
             }
         }
     }
-    func startRequest(_ url: URL, model: StartRequestModel, completion: @escaping StartWebServiceResponse, fail: @escaping FailedHandler) {
+    func startRequest(model: StartRequestModel, completion: @escaping StartWebServiceResponse, fail: @escaping FailedHandler) {
         let params = ["email_or_number": model.emailOrNumber] as [String: Any]
-        AF.request(url, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: StartResponseModel.self ) { response in
+        AF.request(Constants.baseURL + APIRoutes.startURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: StartResponseModel.self ) { response in
             if let error = response.error {
                 fail(error)
@@ -65,13 +67,13 @@ class AuthService {
         }
     }
-    func verifyRequest(_ url: URL, model: VerifyRequestModel, completion: @escaping VerifyWebServiceResponse, fail: @escaping FailedHandler) {
+    func verifyRequest(model: VerifyRequestModel, completion: @escaping VerifyWebServiceResponse, fail: @escaping FailedHandler) {
         let params = ["email_or_number": model.emailOrNumber,
                       "code": model.code,
                       "second_auth_token": model.secondAuthToken] as [String: Any]
-        AF.request(url, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: VerifyResponseModel.self ) { response in
+        AF.request(Constants.baseURL + APIRoutes.verifyURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: VerifyResponseModel.self ) { response in
             if let error = response.error {
                 fail(error)
@@ -84,25 +86,26 @@ class AuthService {
         }
     }
-    func loginRequest(_ url: URL, model: LoginRequestModel, completion: @escaping LoginWebServiceResponse, fail: @escaping FailedHandler) {
+    func loginRequest(model: LoginRequestModel, success: @escaping LoginWebServiceResponse, fail: @escaping FailedHandler) {
         let headers = ["Authorization": "Bearer \(self.networkToken ?? "")"]
         let params = ["device_uuid": model.deviceUUID] as [String: Any]
-        AF.request(url, method: .post, parameters: params, encoding: JSONEncoding.default, headers: HTTPHeaders(headers), interceptor: nil).responseDecodable(of: LoginResponseModel.self ) { response in
-            if let error = response.error {
+        
+        AF.request(Constants.baseURL + APIRoutes.loginURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default, headers: HTTPHeaders(headers), interceptor: nil).responseDecodable(of: LoginResponseModel.self ) { response in
+            
+            switch response.result {
+            case .failure(let error) :
                 fail(error)
-            } else {
-                if let res = response.value {
-                    completion(res)
-                }
+            case .success(let res) :
+                success(res)
             }
         }
     }
-    func logoutRequest(_ url: URL, model: LogoutRequestModel, completion: @escaping LogoutWebServiceResponse, fail: @escaping FailedHandler) {
+    func logoutRequest(model: LogoutRequestModel, completion: @escaping LogoutWebServiceResponse, fail: @escaping FailedHandler) {
         let headers = ["Authorization": "Bearer \(self.networkToken ?? "")"]
         let params = ["device_uuid": model.deviceUUID] as [String: Any]
-        AF.request(url, method: .post, parameters: params, encoding: JSONEncoding.default, headers: HTTPHeaders(headers), interceptor: nil).responseDecodable(of: LogoutResponseModel.self ) { response in
+        AF.request(Constants.baseURL + APIRoutes.logoutURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default, headers: HTTPHeaders(headers), interceptor: nil).responseDecodable(of: LogoutResponseModel.self ) { response in
             if let error = response.error {
                 fail(error)