cleaned auto scrolling feature for forms

Author: leloupnicolas

iOSFormUtils.podspec

@@ -30,7 +30,6 @@ iOSFormUtils helps you developping validated forms in iOS apps. You could use it
   s.ios.deployment_target = '8.0'
 
   s.source_files = 'iOSFormUtils'
-  s.resources = 'iOSFormUtils/*.xib'
 
   s.dependency 'SBPickerSelector', '~> 1.1.0' 
   s.dependency 'UIKitExtensions', '~> 0.2.4'

iOSFormUtils/DateDropDown.swift

@@ -9,32 +9,32 @@
 import Foundation
 import UIKit
 
-protocol DateDropDownDelegate {
+public protocol DateDropDownDelegate {
   func dropDown(_ dropDown: DateDropDown!, selectedDate value: Date!)
 }
 
-public class DateDropDown: DropDown {
-  var selectedDate: Date! {
+open class DateDropDown: DropDown {
+  public var selectedDate: Date! {
     didSet {
       if selectedDate != oldValue {
         self.refreshDateView()
       }
     }
   }
-  var dateDropDownDelegate: DateDropDownDelegate!
+  public var dateDropDownDelegate: DateDropDownDelegate!
 
   func refreshDateView() {
     let dateFormatter = DateFormatter()
     dateFormatter.dateFormat = self.dateFormat
 
     titleTextField.text = dateFormatter.string(from: selectedDate)
     if let _ = self.dataSource {
-      titleTextField.textColor = self.dataSource.getTextColor()
-      titleTextField.font = UIFont(name: self.dataSource.getFontName(), size: self.dataSource.getFontSize())
+      titleTextField.textColor = self.uiDataSource.getTextColor()
+      titleTextField.font = UIFont(name: self.uiDataSource.getFontName(), size: self.uiDataSource.getFontSize())
     }
   }
 
-  override public func loadView() {
+  override open func loadView() {
     super.loadView()
 
     picker.pickerType = .date

iOSFormUtils/DropDown.swift

@@ -10,42 +10,41 @@ import Foundation
 import SBPickerSelector
 import UIKit
 import UIKitExtensions
+import SnapKit
 
-protocol DropDownDataSource {
+public protocol DropDownDataSource {
   func controllerForDropDownDisplaying(_ dropDown: DropDown) -> UIViewController
-
   func valuesForDropDown(_ dropDown: DropDown) -> [String]
-
   func selectedIndexForDropDown(_ dropDown: DropDown) -> Int?
-
   func placeholderKeyForDropDown(_ dropDown: DropDown) -> String?
-
   func isRequired(_ dropDown: DropDown) -> Bool
+}
 
+public protocol DropDownUIDataSource {
   func getTextColor() -> UIColor
-
+  func getPlaceholderColor() -> UIColor
   func getFontName() -> String
-
   func getFontSize() -> CGFloat
-
-  func getRightIcon() -> UIImage
+  func getRightIcon() -> UIImage?
+  func getButtonsColor() -> UIColor
 }
 
-protocol DropDownDelegate {
+public protocol DropDownDelegate {
   func dropDown(_ dropDown: DropDown!, selectedValue value: String!, index: Int)
 
   func dropDownDeselectedValue(_ dropDown: DropDown!)
 }
 
-public class DropDown: OwnView {
+open class DropDown: OwnView {
   var dateFormat = "dd/MM/y"
 
-  var delegate: DropDownDelegate!
-  var dataSource: DropDownDataSource! {
+  public var delegate: DropDownDelegate!
+  public var uiDataSource: DropDownUIDataSource! {
     didSet {
-      updatePlaceholder()
+      updateUI()
     }
   }
+  public var dataSource: DropDownDataSource!
 
   var picker: SBPickerSelector = SBPickerSelector.picker()
   var values: [String]!
@@ -54,11 +53,38 @@ public class DropDown: OwnView {
 
   var mainColor: UIColor = UIColor.blue
 
-  @IBOutlet weak var rightIcon: UIImageView!
-  @IBOutlet weak var titleTextField: FormInput!
-
-  override public func loadView() {
-    super.loadView()
+  var rightIcon: UIImageView!
+  open var titleTextField: FormInput!
+  var mainButton: UIButton!
+
+  override open func loadView() {
+    self.titleTextField = FormInput(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+    self.titleTextField.borderStyle = .none
+    self.addSubview(self.titleTextField)
+    
+    rightIcon = UIImageView(frame: CGRect())
+    self.addSubview(rightIcon)
+
+    mainButton = UIButton(type: .custom)
+    mainButton.addTarget(self, action: #selector(DropDown.mainButtonTouched(_:)), for: .touchUpInside)
+    self.addSubview(mainButton)
+
+    titleTextField.snp.makeConstraints { make in
+      make.leading.equalTo(self.snp.leading)
+      make.height.equalTo(self)
+      make.centerY.equalTo(self)
+      make.trailing.equalTo(rightIcon.snp.leading)
+    }
+    rightIcon.snp.makeConstraints { make in
+      make.trailing.equalTo(self)
+      make.height.equalTo(self)
+      make.width.equalTo(self.snp.height)
+    }
+    mainButton.snp.makeConstraints { maker in
+      maker.edges.equalTo(self)
+    }
+    self.layoutIfNeeded()
+    self.layoutSubviews()
 
     picker.delegate = self
     picker.pickerType = SBPickerSelectorType.text
@@ -67,7 +93,7 @@ public class DropDown: OwnView {
     picker.cancelButtonTitle = "Annuler"
     picker.cancelButton?.tintColor = mainColor
 
-    updatePlaceholder()
+    updateUI()
 
     reloadData()
 
@@ -79,20 +105,27 @@ public class DropDown: OwnView {
     )
   }
 
-  func updatePlaceholder() {
-    if let _ = dataSource {
+  func updateUI() {
+    if let _ = dataSource, let _ = uiDataSource {
+      picker.doneButton?.tintColor = uiDataSource.getButtonsColor()
+      picker.cancelButton?.tintColor = uiDataSource.getButtonsColor()
+      
       if let existingPlaceholder = dataSource.placeholderKeyForDropDown(self) {
         updatePlaceholderWithValue(existingPlaceholder)
       }
+      
+      if let _ = uiDataSource.getRightIcon() {
+        rightIcon.image = uiDataSource.getRightIcon()
+      }
     }
   }
 
   func updatePlaceholderWithValue(_ value: String) {
     titleTextField.attributedPlaceholder = NSAttributedString(
         string: value,
         attributes: [
-            NSForegroundColorAttributeName: self.dataSource.getTextColor(),
-            NSFontAttributeName: UIFont(name: self.dataSource.getFontName(), size: self.dataSource.getFontSize())!
+            NSForegroundColorAttributeName: self.uiDataSource.getPlaceholderColor(),
+            NSFontAttributeName: UIFont(name: self.uiDataSource.getFontName(), size: self.uiDataSource.getFontSize())!
         ]
     )
   }
@@ -110,8 +143,8 @@ public class DropDown: OwnView {
     titleTextField.text! = ""
   }
 
-  func reloadData() {
-    updatePlaceholder()
+  public func reloadData() {
+    updateUI()
     if let itsDataSource = dataSource {
       var values: [String] = itsDataSource.valuesForDropDown(self)
       var offset = 0
@@ -136,7 +169,7 @@ public class DropDown: OwnView {
     }
   }
 
-  @IBAction func mainButtonTouched(_ sender: AnyObject) {
+  func mainButtonTouched(_ sender: AnyObject) {
     presentDropDown()
   }
 
@@ -151,20 +184,14 @@ public class DropDown: OwnView {
   }
 }
 
-extension DropDown: OwnViewProtocol {
-  public var viewName: String {
-    return "DropDown"
-  }
-}
-
 extension DropDown: SBPickerSelectorDelegate {
   public func pickerSelector(_ selector: SBPickerSelector!, selectedValue value: String!, index idx: Int) {
     let required = (nil != dataSource && !dataSource.isRequired(self))
     var offset = 0
     if (required && 0 != idx) || !required {
       titleTextField.text = value
-      titleTextField.textColor = self.dataSource.getTextColor()
-      titleTextField.font = UIFont(name: self.dataSource.getFontName(), size: self.dataSource.getFontSize())
+      titleTextField.textColor = self.uiDataSource.getTextColor()
+      titleTextField.font = UIFont(name: self.uiDataSource.getFontName(), size: self.uiDataSource.getFontSize())
       if required {
         offset = 1
       }
@@ -190,8 +217,8 @@ extension DropDown: SBPickerSelectorDelegate {
         dateFormatter.dateFormat = self.dateFormat
 
         titleTextField.text = dateFormatter.string(from: date)
-        titleTextField.textColor = self.dataSource.getTextColor()
-        titleTextField.font = UIFont(name: self.dataSource.getFontName(), size: self.dataSource.getFontSize())
+        titleTextField.textColor = self.uiDataSource.getTextColor()
+        titleTextField.font = UIFont(name: self.uiDataSource.getFontName(), size: self.uiDataSource.getFontSize())
 
         if let dateSelf: DateDropDown = self as? DateDropDown {
           if let dateDropDownDelegate: DateDropDownDelegate = dateSelf.dateDropDownDelegate {