Merge pull request #14 from lauramarson/keyboardChanges

lauramarson · web-flow · commit ebf8fff09c73 · 2022-06-18T12:24:34.000-03:00
adapts scrollView size to keyboard
diff --git a/AnimalsApp/AnimalsApp/Assets.xcassets/Colors/grayTextColor.colorset/Contents.json b/AnimalsApp/AnimalsApp/Assets.xcassets/Colors/grayTextColor.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.400",
-          "green" : "0.400",
-          "red" : "0.400"
+          "blue" : "0x66",
+          "green" : "0x66",
+          "red" : "0x66"
         }
       },
       "idiom" : "universal"
diff --git a/AnimalsApp/AnimalsApp/DesignSystem/Colors.swift b/AnimalsApp/AnimalsApp/DesignSystem/Colors.swift
@@ -11,6 +11,8 @@ extension UIColor {
     static let blueTabBarColor: UIColor? = UIColor(named: "blueTabBarColor")
     static let blueTextColor: UIColor? = UIColor(named: "blueTextColor")
     
+    static let grayCellFrame: UIColor? = UIColor(named: "grayCellFrame")
+    static let grayTextColor: UIColor? = UIColor(named: "grayTextColor")  
     static let lightGray: UIColor? = UIColor(named: "lightGray")
    
 }
diff --git a/AnimalsApp/AnimalsApp/DesignSystem/Colors.swift.orig b/AnimalsApp/AnimalsApp/DesignSystem/Colors.swift.orig
@@ -0,0 +1,21 @@
+//
+//  Colors.swift
+//  AnimalsApp
+//
+//  Created by Laura Pinheiro Marson on 16/06/22.
+//
+
+import UIKit
+
+extension UIColor {
+    static let blueTabBarColor: UIColor? = UIColor(named: "blueTabBarColor")
+    static let blueTextColor: UIColor? = UIColor(named: "blueTextColor")
+    
+<<<<<<< HEAD
+    static let grayCellFrame: UIColor? = UIColor(named: "grayCellFrame")
+    static let grayTextColor: UIColor? = UIColor(named: "grayTextColor")  
+=======
+    static let lightGray: UIColor? = UIColor(named: "lightGray")
+   
+>>>>>>> develop
+}
diff --git a/AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.xib b/AnimalsApp/AnimalsApp/Views/Components/AnimalTableViewCell.xib
@@ -31,12 +31,11 @@
                         </constraints>
                     </imageView>
                     <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="687-rn-Ydp">
-                        <rect key="frame" x="247" y="33" width="40" height="30"/>
+                        <rect key="frame" x="247" y="28" width="40" height="40"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="30" id="7rZ-bg-lFP"/>
+                            <constraint firstAttribute="height" constant="40" id="7rZ-bg-lFP"/>
                             <constraint firstAttribute="width" constant="40" id="i65-df-ED5"/>
                         </constraints>
-                        <inset key="imageEdgeInsets" minX="35" minY="0.0" maxX="35" maxY="0.0"/>
                         <state key="normal" image="addFavorite"/>
                         <connections>
                             <action selector="favoritePressed:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="X9N-Mv-iRU"/>
diff --git a/AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.swift b/AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.swift
@@ -10,39 +10,43 @@ import Alamofire
 
 class RegisterViewController: UIViewController {
     // MARK: Properties
-    var registerVM = RegisterViewModel()
+    private var registerVM = RegisterViewModel()
     
     // MARK: Outlets
+    @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var textFieldName: UITextField!
     @IBOutlet weak var textFieldImageLink: UITextField!
     @IBOutlet weak var textFieldDescription: UITextField!
     @IBOutlet weak var textFieldSpecie: UITextField!
     @IBOutlet weak var textFieldAge: UITextField!
     @IBOutlet weak var buttonRegister: UIButton!
-    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
+//    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
     
     // MARK: Overrides
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
         setNavigationItems()
         delegateTextField()
-        activityIndicator.hidesWhenStopped = true
+        notificationCenter()
+//        activityIndicator.hidesWhenStopped = true
     }
     
     // MARK: Actions
     @IBAction func handlerButtonRegister(_ sender: Any) {
+        
         guard let name = textFieldName.text?.testIfIsEmpty(),
               let description = textFieldDescription.text?.testIfIsEmpty(),
               let age = Int(textFieldAge.text ?? ""),
               let species = textFieldSpecie.text?.testIfIsEmpty(),
               let image = textFieldImageLink.text?.testIfIsEmpty() else {
-            showAlerts(alertTitle: "Erro", alertMessage: "Preencha todos os dados")
+            showAlerts(alertTitle: "Erro", alertMessage: "Preencha todos os campos")
             return }
               
-        activityIndicator.startAnimating()
+//        activityIndicator.startAnimating()
         registerVM.registerAnimal(name: name, description: description, age: age, species: species, image: image) {
-            self.activityIndicator.stopAnimating()
+//            self.activityIndicator.stopAnimating()
+            print("oi")
         }
     }
     
@@ -63,16 +67,16 @@ class RegisterViewController: UIViewController {
         [textFieldName, textFieldImageLink, textFieldDescription, textFieldSpecie, textFieldAge].forEach { textField in
             textField?.layer.cornerRadius = 8
             textField?.layer.borderWidth = 1
-            textField?.layer.borderColor = UIColor.systemGray.cgColor
+            textField?.layer.borderColor = UIColor.grayCellFrame?.cgColor
             textField?.layer.masksToBounds = true
         }
         
-        let attributes = [NSAttributedString.Key.foregroundColor: UIColor.systemGray]
-        textFieldName.attributedPlaceholder = NSAttributedString(string: "Nome", attributes:attributes)
-        textFieldImageLink.attributedPlaceholder = NSAttributedString(string: "Link da imagem", attributes:attributes)
-        textFieldDescription.attributedPlaceholder = NSAttributedString(string: "Descrição", attributes:attributes)
-        textFieldSpecie.attributedPlaceholder = NSAttributedString(string: "Espécie", attributes:attributes)
-        textFieldAge.attributedPlaceholder = NSAttributedString(string: "Idade", attributes:attributes)
+        let attributes = [NSAttributedString.Key.foregroundColor: UIColor.grayTextColor ?? UIColor.systemGray, NSAttributedString.Key.font: UIFont(name: "OpenSans", size: 16) ?? UIFont.systemFont(ofSize: 16)]
+        textFieldName.attributedPlaceholder = NSAttributedString(string: "  Nome", attributes: attributes)
+        textFieldImageLink.attributedPlaceholder = NSAttributedString(string: "  Link da imagem", attributes: attributes)
+        textFieldDescription.attributedPlaceholder = NSAttributedString(string: "  Descrição", attributes: attributes)
+        textFieldSpecie.attributedPlaceholder = NSAttributedString(string: "  Espécie", attributes: attributes)
+        textFieldAge.attributedPlaceholder = NSAttributedString(string: "  Idade", attributes: attributes)
         buttonRegister.layer.cornerRadius = 10
     }
     
@@ -90,6 +94,27 @@ class RegisterViewController: UIViewController {
         alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
         present(alert, animated: true)
     }
+    
+    private func notificationCenter() {
+        let notificationCenter = NotificationCenter.default
+        notificationCenter.addObserver(self, selector: #selector(adjustForKeyboard), name: UIResponder.keyboardWillHideNotification, object: nil)
+        notificationCenter.addObserver(self, selector: #selector(adjustForKeyboard), name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
+    }
+    
+    @objc func adjustForKeyboard(notification: Notification) {
+        guard let keyboardValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue else { return }
+
+        let keyboardScreenEndFrame = keyboardValue.cgRectValue
+        let keyboardViewEndFrame = view.convert(keyboardScreenEndFrame, from: view.window)
+
+        if notification.name == UIResponder.keyboardWillHideNotification {
+            scrollView.contentInset = .zero
+        } else {
+            scrollView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: keyboardViewEndFrame.height - view.safeAreaInsets.bottom, right: 0)
+        }
+
+        scrollView.scrollIndicatorInsets = scrollView.contentInset
+    }
 }
 
 extension RegisterViewController: UIGestureRecognizerDelegate, UITextFieldDelegate {
diff --git a/AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.xib b/AnimalsApp/AnimalsApp/Views/RegisterViewController/RegisterViewController.xib

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ extension UIColor {`
`11`	`11`	`static let blueTabBarColor: UIColor? = UIColor(named: "blueTabBarColor")`
`12`	`12`	`static let blueTextColor: UIColor? = UIColor(named: "blueTextColor")`
`13`	`13`
	`14`	`+ static let grayCellFrame: UIColor? = UIColor(named: "grayCellFrame")`
	`15`	`+ static let grayTextColor: UIColor? = UIColor(named: "grayTextColor")`
`14`	`16`	`static let lightGray: UIColor? = UIColor(named: "lightGray")`
`15`	`17`
`16`	`18`	`}`