Merge pull request #10 from lauramarson/resgisterUpgrades

alert tf is empty, loading register, check textfield is empty

Author: lauramarson

AnimalsApp/AnimalsApp/Services/WebServices.swift

@@ -11,7 +11,7 @@ import Alamofire
 protocol WebServicesContract: AnyObject {
     var endpoint: String { get }
     func fetchAnimals(completion: @escaping (Result<[Animal], Error>) -> ())
-    func registerAnimal(with parameters: [String: Any])
+    func registerAnimal(with parameters: [String: Any], handler: @escaping (() -> Void))
 }
 
 class WebServices: WebServicesContract {
@@ -31,10 +31,11 @@ class WebServices: WebServicesContract {
             }
     }
 
-    func registerAnimal(with parameters: [String: Any]) {
+    func registerAnimal(with parameters: [String: Any], handler: @escaping (() -> Void)) {
         AF.request(endpoint, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: nil).validate(statusCode: 200 ..< 299).responseData { response in
                 switch response.result {
                     case .success(let data):
+                    handler()
                         do {
                             guard let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
                                 print("Error: Cannot convert data to JSON object")
@@ -55,6 +56,7 @@ class WebServices: WebServicesContract {
                             return
                         }
                     case .failure(let error):
+                    handler()
                         print(error)
                 }
             }

AnimalsApp/AnimalsApp/View Models/RegisterViewModel.swift

@@ -14,7 +14,9 @@ struct RegisterViewModel {
         self.webServices = webServices
     }
 
-    func registerAnimal(with parameters: [String: Any]) {
-        webServices.registerAnimal(with: parameters)
+    func registerAnimal(with parameters: [String: Any], handler: @escaping (() -> Void)) {
+        webServices.registerAnimal(with: parameters) {
+            handler()
+        }
     }
 }

AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.swift

@@ -26,19 +26,28 @@ class RegisterViewController: UIViewController {
     @IBOutlet weak var textFieldSpecie: UITextField!
     @IBOutlet weak var textFieldAge: UITextField!
     @IBOutlet weak var buttonRegister: UIButton!
+    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
 
     // MARK: Overrides
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
         setNavigationItems()
         delegateTextField()
+        activityIndicator.hidesWhenStopped = true
     }
 
     // MARK: Actions
     @IBAction func handlerButtonRegister(_ sender: Any) {
+        if textFieldName.text == "" || textFieldImageLink.text == "" || textFieldDescription.text == "" || textFieldSpecie.text == "" || textFieldAge.text == "" {
+            showAlerts(alertTitle: "Erro", alertMessage: "Preencha todos os dados")
+            return
+        }
+        activityIndicator.startAnimating()
         setParameters()
-        registerVM.registerAnimal(with: parameters)
+        registerVM.registerAnimal(with: parameters) {
+            self.activityIndicator.stopAnimating()
+        }
     }
 
     // MARK: Methods
@@ -87,6 +96,12 @@ class RegisterViewController: UIViewController {
         textFieldImageLink.delegate = self
         self.view.addGestureRecognizer(UITapGestureRecognizer(target: self.view, action: #selector(UIView.endEditing(_:))))
     }
+    
+    private func showAlerts(alertTitle: String?, alertMessage: String?) {
+        let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+        present(alert, animated: true)
+    }
 }
 
 extension RegisterViewController: UIGestureRecognizerDelegate, UITextFieldDelegate {

AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.xib

@@ -11,6 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RegisterViewController" customModule="AnimalsApp" customModuleProvider="target">
             <connections>
+                <outlet property="activityIndicator" destination="hKh-ih-WLW" id="udD-CU-nbq"/>
                 <outlet property="buttonRegister" destination="IgQ-5e-alS" id="L9L-mM-03l"/>
                 <outlet property="textFieldAge" destination="8vc-1n-XQI" id="ttV-kf-O7h"/>
                 <outlet property="textFieldDescription" destination="Jyn-Gz-FpY" id="34R-ts-wvz"/>
@@ -136,13 +137,20 @@
                                                 <constraint firstAttribute="trailing" secondItem="rPO-OE-UhZ" secondAttribute="trailing" id="yPe-15-Y6Q"/>
                                             </constraints>
                                         </view>
+                                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="hKh-ih-WLW">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="800"/>
+                                        </activityIndicatorView>
                                     </subviews>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <constraints>
                                         <constraint firstAttribute="trailing" secondItem="bId-Di-cZ3" secondAttribute="trailing" constant="13" id="9kb-aZ-MA4"/>
                                         <constraint firstAttribute="height" constant="800" id="CVi-Hk-f0s"/>
+                                        <constraint firstAttribute="trailing" secondItem="hKh-ih-WLW" secondAttribute="trailing" id="DQ4-gJ-4jp"/>
                                         <constraint firstItem="bId-Di-cZ3" firstAttribute="top" secondItem="uTn-FQ-xzf" secondAttribute="top" constant="25" id="M0E-Yg-F60"/>
+                                        <constraint firstItem="hKh-ih-WLW" firstAttribute="leading" secondItem="uTn-FQ-xzf" secondAttribute="leading" id="SDo-4A-TMh"/>
+                                        <constraint firstItem="hKh-ih-WLW" firstAttribute="top" secondItem="uTn-FQ-xzf" secondAttribute="top" id="Xrg-G9-Y1B"/>
                                         <constraint firstItem="bId-Di-cZ3" firstAttribute="leading" secondItem="uTn-FQ-xzf" secondAttribute="leading" constant="13" id="cIf-rj-wPi"/>
+                                        <constraint firstAttribute="bottom" secondItem="hKh-ih-WLW" secondAttribute="bottom" id="tBu-Rc-bEL"/>
                                     </constraints>
                                 </view>
                             </subviews>