mvcgen 0.1.30 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1defbd5440c2691e08dac9aa88b4aa90dbc96d
-  data.tar.gz: ae4b13241fff1e868c38d847b8c5578d6f0595c1
+  metadata.gz: e84dfa06db18c8f66e8a3a141a2f1113e39a210c
+  data.tar.gz: d42eeea17daebd4b1bce5054b4d3826cb91fbca7
 SHA512:
-  metadata.gz: 9bce821f676efbd9b3fad0e5e9e6a135c8b84f76ede75834c2ec3c731f02a5f6ed58b316c1e5ae7791e5db8de88e7eafa5421ffb872f44a5a8fe818ede1fe3c5
-  data.tar.gz: f2ab620744e0783d42f08361a9e2e30f4e05a4064863d6e2c265a63c653e767e4c9e6d8404dcfd5565139c714d985423e35c8b7e6d0e0b4bb085bb3a25ab258e
+  metadata.gz: 40c4e90948754c239cc18971c99a05c49393f403f9598182c4bcc59d152fbcf516dd010407c7641aa6d4bd86fe3b8db3bb6bea7258143466e697ba814d731c96
+  data.tar.gz: e744dab0f208fa848c44ba2c96a1ff5e8beaadab51a34c33030a6a40f6ba35944b1eea6fabf19a2c18ea7dc5db13077efe4854f1cceee8f301af997e3b90d221

data/README.md

@@ -131,6 +131,10 @@ gem push mvcgen-0.1.gem
 ```
 Then you'll be asked for your credentials in order to make the update in the repo (http://guides.rubygems.org/publishing/)
 
+To remove previous gem versions:
+```
+gem cleanup mvcgen
+```
 ### Add a new template
 Are you interested in this project and you would like to contribute by adding new templates? Feel free to do it. It's pretty easy. You've just to:
 - Create a folder inside `templates` with the name of your template

data/lib/mvcgen/version.rb

@@ -1,4 +1,4 @@
 module MVCgen
   NAME = "mvcgen"
-  VERSION = "0.1.30"
+  VERSION = "0.2.0"
 end

data/lib/templates/default/podfile/Podfile

@@ -11,15 +11,15 @@ def commom_pods
   pod 'TextFieldEffects'
   pod 'NotificationBannerSwift'
   pod 'RAMAnimatedTabBarController'
-  pod 'ObjectMapper', '~> 3.1'
+  pod 'ObjectMapper'
   pod 'DKImagePickerController'
-  pod 'SwiftDate', '~> 4.5.1'
+  pod 'SwiftDate'
   pod 'NVActivityIndicatorView'
-  pod 'Kingfisher', '~> 4.0'
+  pod 'Kingfisher'
   pod 'PMAlertController'
   pod 'ActionSheetPicker-3.0', '~> 2.3.0'
-  pod 'Kingfisher', '~> 4.0'
-  pod 'paper-onboarding', '~> 4.0.2'
+  pod 'Kingfisher'
+  pod 'paper-onboarding'
   pod 'Pastel'
   
   # Alamofire

data/lib/templates/default/swift/AppDelegate.swift

@@ -27,7 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
     private let loginStoryboard = UIStoryboard(name: "Login", bundle: Bundle.main)
     
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         
         UIApplication.shared.statusBarStyle = .lightContent
@@ -52,7 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         Fabric.with([Crashlytics.self])
     }
     
-    func setupOneSignal(_ launchOptions: [UIApplicationLaunchOptionsKey: Any]?){
+    func setupOneSignal(_ launchOptions: [UIApplication.LaunchOptionsKey: Any]?){
         let onesignalInitSettings = [kOSSettingsKeyAutoPrompt: false]
         // Replace 'YOUR_APP_ID' with your OneSignal App ID.
         OneSignal.initWithLaunchOptions(launchOptions,

data/lib/templates/default/swift/Controllers/Login/ForgetPasswordVC.swift

@@ -44,8 +44,8 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
         
         self.backgroundView.addGestureRecognizer(tap)
         
-        NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWasShown), name: .UIKeyboardWillShow, object: nil);
-        NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWasHidden), name: .UIKeyboardWillHide, object: nil);
+        NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWasShown), name: UIResponder.keyboardWillShowNotification, object: nil);
+        NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWasHidden), name: UIResponder.keyboardWillHideNotification, object: nil);
 
     }
 
@@ -110,8 +110,9 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
                     APIHelper.sharedInstance.showSuccesMessage(with: "Email sent!", and: "")
                 }
             })
-        } else {
-            APIHelper.sharedInstance.showErrorMessage(with: "Invalid email", and: "")
+            } else {
+                APIHelper.sharedInstance.showErrorMessage(with: "Invalid email", and: "")
+            }
         }
     }
     

data/lib/templates/default/swift/Controllers/Login/LoginVC.swift

@@ -37,7 +37,7 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
     
     // MARK: - Properties
 
-    private static let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
+    private let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
 
     private var pastelView: PastelView!
     
@@ -150,16 +150,16 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
     private func configureText(){
         
         self.emailTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Email", comment: ""),
-                                                                       attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
+                                                                       attributes: [NSAttributedString.Key.foregroundColor: UIColor.lightGray, NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)])
         self.passwordTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Password", comment: ""),
-                                                                          attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
+                                                                          attributes: [NSAttributedString.Key.foregroundColor: UIColor.lightGray, NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)])
         
         let normalText = NSLocalizedString("Forget your password?", comment: "")
-        let normalAttrs = [NSAttributedStringKey.font : Fonts.roboto(type: 0, fontSize: 15)]
+        let normalAttrs = [NSAttributedString.Key.font : Fonts.roboto(type: 0, fontSize: 15)]
         let normalString = NSMutableAttributedString(string:normalText,attributes: normalAttrs)
         
         let boldText  = NSLocalizedString(" Restore", comment: "")
-        let attrs = [NSAttributedStringKey.font : Fonts.roboto(type: 4, fontSize: 15)]
+        let attrs = [NSAttributedString.Key.font : Fonts.roboto(type: 4, fontSize: 15)]
         let attributedString = NSMutableAttributedString(string:boldText, attributes:attrs)
         
         normalString.append(attributedString)
@@ -179,7 +179,7 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
         pastelView.animationDuration = 3.0
         
         // Custom Color
-        pastelView.setColors([Colors.firstGradientColor, Colors.textColor, Colors.secondGradientColor, Colors.thirdGradientColor])
+        pastelView.setColors([ColorConstants.firstGradientColor, ColorConstants.textColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor])
         
         self.tableView.backgroundView = pastelView
         

data/lib/templates/default/swift/Controllers/Login/RegisterVC.swift

@@ -102,7 +102,7 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
             sender.setImage(tintedImage, for: .normal)
             sender.tintColor = UIColor.init(red: 51/255, green: 125/255, blue: 173/255, alpha: 1.0)
             if let image = sender.imageView {
-                sender.bringSubview(toFront: image)
+                sender.bringSubviewToFront(image)
             }
             termsAndConditionsAccepted = true
         } else {
@@ -139,38 +139,38 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
         
         self.emailTextField.attributedPlaceholder = NSAttributedString(string: "Email",
                                                                        attributes: [
-                                                                           NSAttributedStringKey.foregroundColor: UIColor.lightGray,
-                                                                           NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)
+                                                                           NSAttributedString.Key.foregroundColor: UIColor.lightGray,
+                                                                           NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)
                                                                            ])
         
         self.nameTextField.attributedPlaceholder = NSAttributedString(string: "Name",
                                                                           attributes: [
-                                                                              NSAttributedStringKey.foregroundColor: UIColor.lightGray, 
-                                                                              NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)
+                                                                              NSAttributedString.Key.foregroundColor: UIColor.lightGray, 
+                                                                              NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)
                                                                               ])
         
         self.lastnameTextField.attributedPlaceholder = NSAttributedString(string: "Lastname",
                                                                           attributes: [
-                                                                              NSAttributedStringKey.foregroundColor: UIColor.lightGray, 
-                                                                              NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)
+                                                                              NSAttributedString.Key.foregroundColor: UIColor.lightGray, 
+                                                                              NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)
                                                                               ])
         
         self.cellphoneTextField.attributedPlaceholder = NSAttributedString(string: "Cellphone (optional)",
                                                                           attributes: [
-                                                                              NSAttributedStringKey.foregroundColor: UIColor.lightGray,
-                                                                              NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)
+                                                                              NSAttributedString.Key.foregroundColor: UIColor.lightGray,
+                                                                              NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)
                                                                             ])
         
         self.passwordTextField.attributedPlaceholder = NSAttributedString(string: "Password",
                                                                           attributes: [
-                                                                              NSAttributedStringKey.foregroundColor: UIColor.lightGray, 
-                                                                              NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)
+                                                                              NSAttributedString.Key.foregroundColor: UIColor.lightGray, 
+                                                                              NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)
                                                                               ])
         
         self.confirmPasswordTextField.attributedPlaceholder = NSAttributedString(string: "Confirm password",
                                                                             attributes: [
-                                                                                NSAttributedStringKey.foregroundColor: UIColor.lightGray, 
-                                                                                NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)
+                                                                                NSAttributedString.Key.foregroundColor: UIColor.lightGray, 
+                                                                                NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)
                                                                                 ])
     }
     
@@ -186,7 +186,7 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
         pastelView.animationDuration = 3.0
         
         // Custom Color
-        pastelView.setColors([Colors.firstGradientColor, Colors.textColor, Colors.secondGradientColor, Colors.thirdGradientColor])
+        pastelView.setColors([ColorConstants.firstGradientColor, ColorConstants.textColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor])
         
         self.tableView.backgroundView = pastelView
         

data/lib/templates/default/swift/Controllers/Notifications/Cells/NotificationCell.swift

@@ -48,7 +48,7 @@ class NotificationCell: UITableViewCell {
     override func prepareForReuse() {
         super.prepareForReuse()
         
-        self.notificationImage.image =  Asset.tick.notifications
+        self.notificationImage.image = Asset.notifications.image
         
         self.newNotificationView.isHidden = true
     }

data/lib/templates/default/swift/Controllers/Notifications/NotificationsVC.swift

@@ -52,12 +52,12 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
-        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.thirdGradientColor], locations: [0, 0.5])
+        self.gradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.5])
     }
     
     private func setup() {
         
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.rowHeight = UITableView.automaticDimension
         
         let tintedImage = Asset.back.image.withRenderingMode(.alwaysTemplate)
         self.backButton.setImage(tintedImage, for: .normal)
@@ -73,7 +73,7 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
         super.viewWillDisappear(animated)
         
         // Mark all notifications as read
-        if self.isMovingFromParentViewController{
+        if self.isMovingFromParent{
             delegate?.setAsRead(value: true)
         }
     }
@@ -131,17 +131,19 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
         
         self.selectedNotification = self.notifications[indexPath.row]
         
-        switch selectedNotif.notifType {
-        case .broadcast:
-            self.tableView.isUserInteractionEnabled = true
-            break
-        case .generic:
-            self.tableView.isUserInteractionEnabled = true
-            //Perform segue to detail
-            break
-        default:
-            self.tableView.isUserInteractionEnabled = true
-            break
+        if let notifType = selectedNotification?.notifType {
+            switch notifType {
+            case .broadcast:
+                self.tableView.isUserInteractionEnabled = true
+                break
+            case .generic:
+                self.tableView.isUserInteractionEnabled = true
+                //Perform segue to detail
+                break
+            default:
+                self.tableView.isUserInteractionEnabled = true
+                break
+            }
         }
     }
 

data/lib/templates/default/swift/Controllers/OtherLogin/ForgetPasswordTVC.swift

@@ -42,7 +42,7 @@ class ForgetPasswordTVC: UITableViewController, UITextFieldDelegate {
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
-        self.backgroundGradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
+        self.backgroundGradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.2, 0.98])
     }
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {

data/lib/templates/default/swift/Controllers/OtherLogin/LoginTVC.swift

@@ -139,16 +139,16 @@ class LoginTVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDele
     private func configureText(){
         
         self.emailTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Email", comment: ""),
-                                                                       attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
+                                                                       attributes: [NSAttributedString.Key.foregroundColor: UIColor.lightGray, NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)])
         self.passwordTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Password", comment: ""),
-                                                                          attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
+                                                                          attributes: [NSAttributedString.Key.foregroundColor: UIColor.lightGray, NSAttributedString.Key.font: Fonts.roboto(type: 1, fontSize: 17)])
         
         let normalText = NSLocalizedString("Forget your password?", comment: "")
-        let normalAttrs = [NSAttributedStringKey.font : Fonts.roboto(type: 0, fontSize: 15)]
+        let normalAttrs = [NSAttributedString.Key.font : Fonts.roboto(type: 0, fontSize: 15)]
         let normalString = NSMutableAttributedString(string:normalText,attributes: normalAttrs)
         
         let boldText  = NSLocalizedString(" Restore", comment: "")
-        let attrs = [NSAttributedStringKey.font : Fonts.roboto(type: 4, fontSize: 15)]
+        let attrs = [NSAttributedString.Key.font : Fonts.roboto(type: 4, fontSize: 15)]
         let attributedString = NSMutableAttributedString(string:boldText, attributes:attrs)
         
         normalString.append(attributedString)
@@ -168,7 +168,7 @@ class LoginTVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDele
         pastelView.animationDuration = 3.0
         
         // Custom Color
-        pastelView.setColors([Colors.firstGradientColor, Colors.textColor, Colors.secondGradientColor, Colors.thirdGradientColor])
+        pastelView.setColors([ColorConstants.firstGradientColor, ColorConstants.textColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor])
         
         self.tableView.backgroundView = pastelView
         

data/lib/templates/default/swift/Controllers/OtherLogin/OtherRegisterVC.swift

@@ -59,7 +59,7 @@ class OtherRegisterVC: UITableViewController, UITextFieldDelegate {
         self.registerButton.layoutIfNeeded()
         self.registerButton.layer.cornerRadius = self.registerButton.frame.height/7
         self.registerButton.layer.masksToBounds = true
-        self.registerButton.activityIndicatorColor = Colors.firstGradientColor
+        self.registerButton.activityIndicatorColor = ColorConstants.firstGradientColor
         
         emailTextField.underlined(color: UIColor.white, width: 1.0)
         nameTextField.underlined(color: UIColor.white, width: 1.0)
@@ -96,7 +96,7 @@ class OtherRegisterVC: UITableViewController, UITextFieldDelegate {
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
-        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
+        self.gradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.2, 0.98])
     }
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@@ -138,8 +138,8 @@ class OtherRegisterVC: UITableViewController, UITextFieldDelegate {
     
     @IBAction func acceptTermsTapped(_ sender: UIButton) {
         if !termsAndConditionsAccepted {
-            sender.setImage(UIImage(named: "Tick"), for: .normal)
-            sender.bringSubview(toFront: sender.imageView!)
+            sender.setImage(Asset.tick.image, for: .normal)
+            sender.bringSubviewToFront(sender.imageView!)
             termsAndConditionsAccepted = true
             //registerButton.isEnabled = true
         } else {
@@ -287,10 +287,10 @@ class OtherRegisterVC: UITableViewController, UITextFieldDelegate {
             return
         }, origin: sender)
         
-        acp?.setTextColor(Colors.firstGradientColor)
+        acp?.setTextColor(ColorConstants.firstGradientColor)
         acp?.pickerBackgroundColor = UIColor.white
         acp?.toolbarBackgroundColor = UIColor.white
-        acp?.toolbarButtonsColor = Colors.firstGradientColor
+        acp?.toolbarButtonsColor = ColorConstants.firstGradientColor
         acp?.show()
     }
     

data/lib/templates/default/swift/Controllers/OtherLogin/SelectLanguageVC.swift

@@ -41,7 +41,7 @@ class SelectLanguageVC: UITableViewController {
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
-        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
+        self.gradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.2, 0.98])
     }
     
     @IBAction func registerTapped(_ sender: UIButton) {

data/lib/templates/default/swift/Controllers/OtherLogin/TermsAndConditionsVC.swift

@@ -14,7 +14,7 @@ class TermsAndConditionsVC: UIViewController {
         didSet{
             self.registerButtonOutlet.layer.cornerRadius = self.registerButtonOutlet.frame.height/7
             self.registerButtonOutlet.layer.masksToBounds = true
-            self.registerButtonOutlet.activityIndicatorColor = Colors.firstGradientColor
+            self.registerButtonOutlet.activityIndicatorColor = ColorConstants.firstGradientColor
         }
     }
     @IBOutlet weak var termsAndConditions: UIButton!{
@@ -28,7 +28,7 @@ class TermsAndConditionsVC: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
+        self.view.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.secondGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.2, 0.98])
         // Do any additional setup after loading the view.
     }
 
@@ -39,8 +39,8 @@ class TermsAndConditionsVC: UIViewController {
     
     @IBAction func acceptTermsTapped(_ sender: UIButton) {
         if !acceptTermsAndConditions {
-            sender.setImage(UIImage(named: "Tick"), for: .normal)
-            sender.bringSubview(toFront: sender.imageView!)
+            sender.setImage(Asset.tick.image, for: .normal)
+            sender.bringSubviewToFront(sender.imageView!)
             self.acceptTermsAndConditions = true
             //registerButton.isEnabled = true
         } else {

data/lib/templates/default/swift/Controllers/Profile/AboutUsVC.swift

@@ -55,7 +55,7 @@ class AboutUsVC: UIViewController, UITableViewDelegate, UITableViewDataSource{
     override func viewDidLayoutSubviews() {
         view.backgroundColor = UIColor.clear
         
-        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.thirdGradientColor], locations: [0, 0.5])
+        self.gradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.5])
     }
     
     // MARK: - Actions
@@ -68,7 +68,7 @@ class AboutUsVC: UIViewController, UITableViewDelegate, UITableViewDataSource{
 
     private func setup() {
         
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.rowHeight = UITableView.automaticDimension
         let tintedImage = Asset.back.image.withRenderingMode(.alwaysTemplate)
         self.backButton.setImage(tintedImage, for: .normal)
         self.backButton.tintColor = UIColor(red: 107.0/255.0, green: 255.0/255.0, blue: 192.0/255.0, alpha: 1)

data/lib/templates/default/swift/Controllers/Profile/Cells/DestinationCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class DestinationCell: UICollectionViewCell {
     
@@ -26,15 +27,22 @@ class DestinationCell: UICollectionViewCell {
         super.awakeFromNib()
         
         // Initialization code
-        self.blueGradientView.applyGradient(withColours: [Colors.firstGradientColor, UIColor.clear], alpha: 0.8, angle: 90)
+        self.blueGradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, UIColor.clear], alpha: 0.8, angle: 90)
     }
     
     override var isSelected: Bool {
         didSet {
             self.layer.borderWidth = 1.0
-            self.layer.borderColor = isSelected ? Colors.firstGradientColor.cgColor : UIColor.clear.cgColor
-            self.blueGradientView.backgroundColor = isSelected ? Colors.thirdGradientColor : UIColor.clear
+            self.layer.borderColor = isSelected ? ColorConstants.firstGradientColor.cgColor : UIColor.clear.cgColor
+            self.blueGradientView.backgroundColor = isSelected ? ColorConstants.thirdGradientColor : UIColor.clear
             self.tickImage.image = isSelected ? UIImage(named: "Tick") : nil
         }
     }
+
+    func configure(with userHistory: UserHistory) {
+        
+        self.destinationLabel.text = userHistory.name.capitalized
+        self.destinationBackgroundImage.kf.indicatorType = .activity
+        self.destinationBackgroundImage.kf.setImage(with: URL(string: userHistory.thumbnailUrl), options: [.transition(.fade(0.2))])
+    }
 }

data/lib/templates/default/swift/Controllers/Profile/ProfileContainerVC.swift

@@ -18,7 +18,7 @@ class ProfileContainerVC: UIViewController {
 
     // MARK: - Properties
     
-    private static let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
+    private let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
 
     private lazy var profileTVC: ProfileTVC = { 
         return self.homeStoryboard.instantiateViewController(withIdentifier: "ProfileTVC") as! ProfileTVC 
@@ -37,7 +37,7 @@ class ProfileContainerVC: UIViewController {
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
                 
-        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.thirdGradientColor], locations: [0, 0.5])
+        self.gradientView.applyGradient(withColours: [ColorConstants.firstGradientColor, ColorConstants.thirdGradientColor], locations: [0, 0.5])
     }
 
     // MARK: - Private
@@ -59,18 +59,18 @@ class ProfileContainerVC: UIViewController {
         viewController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         
         // Notify Child View Controller
-        viewController.didMove(toParentViewController: self)
+        viewController.didMove(toParent: self)
     }
     
     private func remove(asChildViewController viewController: UIViewController) {
 
         // Notify Child View Controller
-        viewController.willMove(toParentViewController: nil)
+        viewController.willMove(toParent: nil)
         
         viewController.view.removeFromSuperview()
         
         // Notify Child View Controller
-        viewController.removeFromParentViewController()
+        viewController.removeFromParent()
     }
     
 }

data/lib/templates/default/swift/Controllers/Profile/ProfileTVC.swift

@@ -116,7 +116,7 @@ class ProfileTVC: UITableViewController, UITextFieldDelegate, NotificationReadPr
     
     // MARK: - Properties
     
-    private static let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
+    private let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
     
     var profileImageChanged: Bool = false
 
@@ -348,13 +348,15 @@ class ProfileTVC: UITableViewController, UITextFieldDelegate, NotificationReadPr
     @IBAction func handleEditProfileImageButton(_ sender: Any) {
         
         let pickerController = DKImagePickerController()
-        pickerController.UIDelegate = CustomUIDelegate()
+        
+        DKImageExtensionController.registerExtension(extensionClass: CustomCamera.self, for: .camera)
+        
         pickerController.assetType = .allPhotos
         pickerController.singleSelect = true
         pickerController.didSelectAssets = { (assets: [DKAsset]) in
             for asset in assets {
                 //Gets a fullscreen image for the asset to show in the CollectionView
-                asset.fetchFullScreenImageWithCompleteBlock({ (image, info) in
+                asset.fetchFullScreenImage(completeBlock: { (image, info) in
                     
                     self.profileImageChanged = true
                     self.editProfileImageView.image = image
@@ -459,10 +461,10 @@ class ProfileTVC: UITableViewController, UITextFieldDelegate, NotificationReadPr
             self.phoneCountry = prevPhoneCountryValue
             return }, origin: sender)
         
-        acp?.setTextColor(Colors.firstGradientColor)
+        acp?.setTextColor(ColorConstants.firstGradientColor)
         acp?.pickerBackgroundColor = UIColor.white
         acp?.toolbarBackgroundColor = UIColor.white
-        acp?.toolbarButtonsColor = Colors.firstGradientColor
+        acp?.toolbarButtonsColor = ColorConstants.firstGradientColor
         acp?.show()
     }
     
@@ -486,18 +488,6 @@ class ProfileTVC: UITableViewController, UITextFieldDelegate, NotificationReadPr
     
 }
 
-open class CustomUIDelegate: DKImagePickerControllerDefaultUIDelegate {
-    
-    open override func imagePickerControllerCreateCamera(_ imagePickerController: DKImagePickerController) -> UIViewController {
-        
-        let picker = CustomCamera()
-        picker.sourceType = .camera
-        picker.mediaTypes = [kUTTypeImage as String]
-        return picker
-    }
-    
-}
-
 extension ProfileTVC: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
@@ -530,7 +520,7 @@ extension ProfileTVC: UICollectionViewDelegate, UICollectionViewDataSource, UICo
             
             let history = userHistory[indexPath.row]
 
-            cell.configure(with: userHistory)
+            cell.configure(with: history)
 
             return cell
         }
@@ -550,7 +540,7 @@ extension ProfileTVC: UICollectionViewDelegate, UICollectionViewDataSource, UICo
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         
         if collectionView == favoritesCollectionView {
-            let size = (favorites[indexPath.row].name as NSString).size(withAttributes: [NSAttributedStringKey.font : UIFont.systemFont(ofSize: 16.0)])
+            let size = (favorites[indexPath.row].name as NSString).size(withAttributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16.0)])
             return CGSize(width: size.width + 65, height: 40)
         } else {
             return CGSize(width: 200, height: 100)

data/lib/templates/default/swift/Controllers/Tutorial/TutorialVC.swift

@@ -33,7 +33,7 @@ class TutorialVC: UIViewController {
         view.addSubview(onboarding)
         
         // Add constraints
-        for attribute: NSLayoutAttribute in [.left, .right, .top, .bottom] {
+        for attribute: NSLayoutConstraint.Attribute in [.left, .right, .top, .bottom] {
             let constraint = NSLayoutConstraint(item: onboarding,
                                                 attribute: attribute,
                                                 relatedBy: .equal,
@@ -43,7 +43,7 @@ class TutorialVC: UIViewController {
                                                 constant: 0)
             view.addConstraint(constraint)
         }
-        self.view.bringSubview(toFront: skipButton);
+        self.view.bringSubviewToFront(skipButton);
     }
 
 }
@@ -92,25 +92,25 @@ extension TutorialVC: PaperOnboardingDataSource {
                                title: welcomeLabel,
                                description: "First tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
-                               color: Colors.firstGradientColor,
+                               color: ColorConstants.firstGradientColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
             OnboardingItemInfo(informationImage: Asset.welcome_02.image,
                                title: "",
                                description: "Second tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
-                               color: Colors.secondGradientColor,
+                               color: ColorConstants.secondGradientColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
             OnboardingItemInfo(informationImage: Asset.welcome_03.image,
                                title: "",
                                description: "Third tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
-                               color: Colors.thirdGradientColor,
+                               color: ColorConstants.thirdGradientColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
             OnboardingItemInfo(informationImage: Asset.welcome_04.image,
                                title: "",
                                description: "Final tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
-                               color: Colors.textColor,
+                               color: ColorConstants.textColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
         ]
         return list[index]

data/lib/templates/default/swift/Extensions/CustomCamera.swift

@@ -5,54 +5,49 @@
 //  Created by Daniel Martinez on 23/7/18.
 //  Copyright © 2018 Houlak. All rights reserved.
 //
-
 import UIKit
 import MobileCoreServices
 import DKImagePickerController
 
-open class CustomCamera: UIImagePickerController, DKImagePickerControllerCameraProtocol, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+open class CustomCamera: DKImageBaseExtension, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
     
     var didCancel: (() -> Void)?
     var didFinishCapturingImage: ((_ image: UIImage, _ metadata: [AnyHashable : Any]?) -> Void)?
     var didFinishCapturingVideo: ((_ videoURL: URL) -> Void)?
     
-    open override func viewDidLoad() {
-        super.viewDidLoad()
+    open override func perform(with extraInfo: [AnyHashable : Any]) {
+        guard let didFinishCapturingImage = extraInfo["didFinishCapturingImage"] as? ((UIImage, [AnyHashable : Any]?) -> Void)
+            , let didFinishCapturingVideo = extraInfo["didFinishCapturingVideo"] as? ((URL) -> Void)
+            , let didCancel = extraInfo["didCancel"] as? (() -> Void) else { return }
         
-        self.delegate = self
-        self.sourceType = .camera
-        self.mediaTypes = [kUTTypeImage as String, kUTTypeMovie as String]
-    }
-    
-    // MARK: - DKImagePickerControllerCameraProtocol
-    
-    public func setDidCancel(block: @escaping () -> Void) {
-        self.didCancel = block
-    }
-    
-    public func setDidFinishCapturingImage(block: @escaping (UIImage, [AnyHashable : Any]?) -> Void) {
-        self.didFinishCapturingImage = block
+        self.didFinishCapturingImage = didFinishCapturingImage
+        self.didFinishCapturingVideo = didFinishCapturingVideo
+        self.didCancel = didCancel
+        
+        let camera = UIImagePickerController()
+        camera.delegate = self
+        camera.sourceType = .camera
+        camera.mediaTypes = [kUTTypeImage as String, kUTTypeMovie as String]
+        
+        self.context.imagePickerController.present(camera)
     }
     
-    public func setDidFinishCapturingVideo(block: @escaping (URL) -> Void) {
-        self.didFinishCapturingVideo = block
+    open override func finish() {
+        self.context.imagePickerController.dismiss(animated: true)
     }
     
     // MARK: - UIImagePickerControllerDelegate methods
     
-    open func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
-        
-        let mediaType = info[UIImagePickerControllerMediaType] as! String
-        let metadata = info[UIImagePickerControllerMediaMetadata] as! [AnyHashable : Any]
+    open func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
+        let mediaType = info[.mediaType] as! String
         
         if mediaType == kUTTypeImage as String {
+            let metadata = info[.mediaMetadata] as! [AnyHashable : Any]
             
-            let image = info[UIImagePickerControllerOriginalImage] as! UIImage
+            let image = info[.originalImage] as! UIImage
             self.didFinishCapturingImage?(image, metadata)
-            
         } else if mediaType == kUTTypeMovie as String {
-            
-            let videoURL = info[UIImagePickerControllerMediaURL] as! URL
+            let videoURL = info[.mediaURL] as! URL
             self.didFinishCapturingVideo?(videoURL)
         }
     }
@@ -60,6 +55,4 @@ open class CustomCamera: UIImagePickerController, DKImagePickerControllerCameraP
     open func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
         self.didCancel?()
     }
-    
 }
-

data/lib/templates/default/swift/Extensions/UnderlinedWithIconTextField.swift

@@ -49,7 +49,7 @@ class UnderlinedWithIconTextField: UITextField {
         imageView.bounds = imageView.frame.insetBy(dx: 15.0, dy: 0.0);
         
         self.leftView = leftView
-        self.leftViewMode = UITextFieldViewMode.always
+        self.leftViewMode = UITextField.ViewMode.always
         
     }
 }

data/lib/templates/default/swift/Extensions/Utils+String.swift

@@ -5,6 +5,7 @@
 //  Created by Daniel Martinez on 23/7/18.
 //  Copyright © 2018 Houlak. All rights reserved.
 //
+import Foundation
 
 extension String {
 

data/lib/templates/default/swift/Extensions/Utils+UITextField.swift

@@ -5,18 +5,19 @@
 //  Created by Daniel Martinez on 23/7/18.
 //  Copyright © 2018 Houlak. All rights reserved.
 //
+import UIKit
 
 extension UITextField {
     
     func isEmail() -> Bool {
-        return self.text.isEmail()
+        return self.text?.isEmail() ?? false
     }
 
     func isName() -> Bool {
-        return self.text.isName()
+        return self.text?.isName() ?? false
     }
 
     func isPhone() -> Bool {
-        return self.text.isPhone()
+        return self.text?.isPhone() ?? false
     }
 }

data/lib/templates/default/swift/Extensions/Utils+UIView.swift

@@ -29,7 +29,7 @@ extension UIView {
         shadowLayer.shadowOffset = CGSize(width: 0.0, height: 0.0)
         shadowLayer.shadowOpacity = shadowOpacity
         shadowLayer.shadowRadius = shadowSize
-        shadowLayer.fillRule = kCAFillRuleEvenOdd
+        shadowLayer.fillRule = CAShapeLayerFillRule.evenOdd
         
         // define shadow path
         let shadowPath = CGMutablePath()

data/lib/templates/default/swift/Extensions/Utils+UIViewController.swift

@@ -18,7 +18,7 @@ extension UIViewController {
     }
     
     func setSelectedColors(backgroundView: UIView, label: UILabel) {
-        backgroundView.backgroundColor = Colors.firstGradientColor
+        backgroundView.backgroundColor = ColorConstants.firstGradientColor
         label.textColor = UIColor.white
     }
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcgen
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Martinez