mvcgen 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6d2b0188f0092f35c61de28a1f6c3dba6612432
-  data.tar.gz: 68adf84e24be94e067c4a70112540293e9b02858
+  metadata.gz: fd00291f4c2e3b1d3b3da10080f0df0a4cd0df4d
+  data.tar.gz: 36b8b66d0fc2a889b29d18dae82ccffa2ec97a9d
 SHA512:
-  metadata.gz: 34d5ac13e410067e630c9193478685d411f6fcb0fd2bfcc51b61494b36c7321cb105122c6d8c1049a4424b561947c8c6f04a35e76449948bffa4b97e01893407
-  data.tar.gz: 3b2a068d12d78cd888f7f69d23dce9ac9e49aacc8fcb4b1b944255558ea39bc5e9a3df0bc30d126983f3c4c30bcb0b4ce620ebcd37f4012035150fec29edd721
+  metadata.gz: '089345d9299dc54561c612152eef2aae89768ed5af101f124ba2a1673b877003be6825b3213fe3d8e35a56a3e337a40c22f0718c2e833de99a2b8c80f4f47605'
+  data.tar.gz: 79090f4ae74d29cc0cb075b7becd65fc6454543637cab070a7449bdffa93111e1d905aafee10b9b133b92fe9edf52b45a7a02eb5b93bedc545784db3c5d2e3c6

data/README.md

@@ -7,11 +7,9 @@ Gem to generate MVC starting modules to use them in your Swift projects
 The implementation scheme returned by this generator is hardly inspired in the example and post of vipergen, https://rubygems.org/gems/vipergen/versions/0.2.6 .
 
 - [Features](#features)
-  - [Changelog](#changelog-0.1)
-  - [Expected in version 0.2](#expected-in-version-0.2)
 - [MVC files structure](#mvc-files-structure)
-- [How to install mvcgen](#how-to-install-vipergen)
-- [How to generate a MVC module with a given name?](#how-to-generate-viper-module-with-a-given-name?)
+- [How to install mvcgen](#how-to-install-mvcgen)
+- [How to generate a MVC module with a given name?](#how-to-generate-a-MVC-module-with-a-given-name?)
 - [Developer tips](#developer-tips)
   - [Update the gem](#update-the-gem)
   - [Add a new template](#add-a-new-template)
@@ -117,7 +115,7 @@ sudo gem install mvcgen
 If everything were right, you should have now the mvcgen command available in your system console
 
 ## How to generate a MVC module with a given name?
-You have just to execute the following command standing on your project main folder
+You have just to execute the following command standing on your project root folder
 ```bash
 mvcgen generate YourProjectName --path=./
 ```
@@ -127,28 +125,28 @@ And then the files structure will be automatically created and added to the proj
 ### Update the gem 
 When the gem is updated it has to be reported to the gem repository. I followed this tutorial http://amaras-tech.co.uk/article/43/Creating_executable_gems that basically says that once you have your gem ready execute:
 ```bash
-gem build vipergen.gemspec
-gem install vipergen-0.1.gem
-gem push vipergen-0.1.gem
+gem build mvcgen.gemspec
+gem install mvcgen-0.1.gem
+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/)
 
-<!-- ### Add a new template
-Are you interested in MVC and you would like to contribute with this gem adding new templates? Feel free to do it. It's pretty easy. You've just to:
+### 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
 - You'll have to create inside the templates a swift folder with your files (get inspired from existing templates)
 - Use the word MVCGEN where you want the name to be replaced in.
 - Remember to add the file mvcspec.yml with the description of your template as below:
 ```yaml
-author: pepi
-author_email: daniel.martinezcg@gmail.com
-template_description: Default template with the simplest structure using MVC
+author: pepito
+author_email: pepito@test.com
+template_description: Default template with..
 updated_at: 2018-08-01
 ```
-- Report it as a PR in this repo updating the gem version in Gemspec. -->
+- Report it as a PR in this repo updating the gem version in Gemspec.
 
 ## Resources
 - Rspec documentation: http://rubydoc.info/gems/rspec-expectations/frames
 - XCode Plugins: http://nshipster.com/xcode-plugins/
 - XCodeProj gem (to modify project groups structure): https://github.com/CocoaPods/Xcodeproj
-- Thor, powerful Ruby library for command line: http://whatisthor.com/ -->
+- Thor, powerful Ruby library for command line: http://whatisthor.com/

data/lib/mvcgen/generator.rb

@@ -18,12 +18,72 @@ module MVCgen
 			proj = Xcodeproj::Project.open(project_file)
 
 			# TODO: view this to improve path files: allowable_project_paths
-			self.addxcodefiles(filespath,proj.main_group,proj.targets.first)
+			self.add_files_togroup(proj, proj.main_group, proj.targets.first)
+			# self.addxcodefiles(filespath,proj.main_group,proj.targets.first)
 			
 			proj.save
 			puts "Finish adding files"
 		end
 
+		def is_resource_group(file)
+			extname= file[/\.[^\.]+$/]
+			if extname == '.bundle' || extname == '.xcassets' then
+				return true
+			end
+			return false
+		end
+		
+		def self.add_files_togroup(project, group, target)
+		
+			if File.exist?(group.real_path) 
+		
+				Dir.foreach(group.real_path) do |entry|
+					filePath = File.join(group.real_path, entry)
+		
+					# puts filePath
+		
+					if filePath.to_s.end_with?(".DS_Store", ".xcconfig") then
+						# ignore
+		
+					elsif filePath.to_s.end_with?(".lproj") then
+						if @variant_group.nil?
+							@variant_group = group.new_variant_group("Localizable.strings");
+						end
+						string_file = File.join(filePath, "Localizable.strings")
+						fileReference = @variant_group.new_reference(string_file)
+						target.add_resources([fileReference])
+		
+					elsif is_resource_group(entry) then
+						fileReference = group.new_reference(filePath)
+						target.add_resources([fileReference])
+					elsif !File.directory?(filePath) then
+		
+						fileReference = group.new_reference(filePath)
+						if filePath.to_s.end_with?(".swift", ".mm", ".m", ".cpp") then
+							target.add_file_references([fileReference])		
+						elsif filePath.to_s.end_with?(".pch") then
+		
+						elsif filePath.to_s.end_with?("Info.plist") && entry == "Info.plist" then
+		
+						elsif filePath.to_s.end_with?(".h") then
+							# target.headers_build_phase.add_file_reference(fileReference)
+						elsif filePath.to_s.end_with?(".framework") || filePath.to_s.end_with?(".a") then
+							target.frameworks_build_phases.add_file_reference(fileReference)
+						elsif 
+							target.add_resources([fileReference])
+						end
+					elsif File.directory?(filePath) && entry != '.' && entry != '..' then
+		
+						subGroup = group.find_subpath(entry, true)
+						subGroup.set_source_tree(group.source_tree)
+						subGroup.set_path(File.join(group.real_path, entry))
+						add_files_togroup(project, target, subGroup)
+		
+					end
+				end
+			end
+		end
+		
 		def self.addxcodefiles(direc, current_group, main_target)
 			Dir.glob(direc) do |item|
 				next if item == '.' or item == '.DS_Store'

data/lib/mvcgen/version.rb

@@ -1,4 +1,4 @@
 module MVCgen
   NAME = "mvcgen"
-  VERSION = "0.1.20"
+  VERSION = "0.1.21"
 end

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

@@ -13,11 +13,11 @@ import UIKit
 protocol ForgetPasswordVCDelegate: class {
     func removeBlurredBackgroundView()
 }
+
 class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
     
-    weak var delegate: ForgetPasswordVCDelegate?
-    private var keybaordIsShowing: Bool = false
-    
+    // MARK: - Outlets
+
     @IBOutlet weak var cancelButton: UIButton!
     @IBOutlet weak var bottomConstraint: NSLayoutConstraint!
     @IBOutlet weak var topConstraint: NSLayoutConstraint!
@@ -25,7 +25,14 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
     @IBOutlet weak var recoverView: UIView!
     @IBOutlet weak var emailTextField: UITextField!
     @IBOutlet weak var sendButton: LoadingButton!
+
+    // MARK: - Properties
+
+    weak var delegate: ForgetPasswordVCDelegate?
+    private var keyboardIsShowing: Bool = false
     
+    // MARK: - Life cycle
+
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -39,21 +46,26 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
         
         NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWasShown), name: .UIKeyboardWillShow, object: nil);
         NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWasHidden), name: .UIKeyboardWillHide, object: nil);
+
+    }
+
+    override func viewDidLayoutSubviews() {
+        view.backgroundColor = UIColor.clear
         
-        
+        //ensure that the icon embeded in the cancel button fits in nicely
+        cancelButton.imageView?.contentMode = .scaleAspectFit
     }
     
+    // MARK: - UIGestureRecognizerDelegate
+
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
-        if keybaordIsShowing {
-            return false
-        }
-        if touch.view?.restorationIdentifier == "backViewID" {
-            return true
-        }
-        return false
+       
+       let result = (keyboardIsShowing || touch.view?.restorationIdentifier != "backViewID") ? false : true
+       return result
     }
     
     @objc func dismissView(){
+
         dismiss(animated: true, completion: nil)
         delegate?.removeBlurredBackgroundView()
     }
@@ -61,7 +73,7 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
     
     @objc func keyboardWasShown(notification: NSNotification) {
         
-        self.keybaordIsShowing = true
+        self.keyboardIsShowing = true
         
         UIView.animate(withDuration: 0.5, animations: { () -> Void in
             self.bottomConstraint.constant = 287
@@ -71,7 +83,7 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
     
     @objc func keyboardWasHidden(notification: NSNotification) {
         
-        self.keybaordIsShowing = false
+        self.keyboardIsShowing = false
         
         UIView.animate(withDuration: 0.5, animations: { () -> Void in
             self.topConstraint.constant = 148.5
@@ -79,47 +91,28 @@ class ForgetPasswordVC: UIViewController, UIGestureRecognizerDelegate {
         })
     }
     
-    override func viewDidLayoutSubviews() {
-        view.backgroundColor = UIColor.clear
-        
-        //ensure that the icon embeded in the cancel button fits in nicely
-        cancelButton.imageView?.contentMode = .scaleAspectFit
-        
-        //add a white tint color for the Cancel button image
-//        let cancelImage = UIImage(named: "Cancel")
-        
-//        let tintedCancelImage = cancelImage?.withRenderingMode(.alwaysTemplate)
-//        cancelButton.setImage(tintedCancelImage, for: .normal)
-//        cancelButton.tintColor = .white
-    }
-    
     // MARK: - Actions
+
     @IBAction func cancelTapped(_ sender: UIButton) {
+
         self.dismissView()
     }
     
     @IBAction func sendTapped(_ sender: UIButton) {
-        if let email = self.emailTextField.text, isValidEmail(email) {
+        
+        if self.emailTextField.isEmail() {
+            if let email = self.emailTextField.text {
             self.sendButton.showLoading()
             APIManager.sharedInstance.forgotPwd(withParameters: APIRequestBody.forgotPwd(withEmail: email), completion: {
                 result in
                 self.sendButton.hideLoading()
                 if result == .success {
-                    APIHelper.sharedInstance.showSuccesMessage(with: NSLocalizedString("Email sent!", comment: ""), and: "")
+                    APIHelper.sharedInstance.showSuccesMessage(with: "Email sent!", and: "")
                 }
             })
         } else {
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Invalid email", comment: ""), and: "")
+            APIHelper.sharedInstance.showErrorMessage(with: "Invalid email", and: "")
         }
     }
     
-    // MARK: - Private
-    
-    private func isValidEmail(_ testStr:String) -> Bool {
-        let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
-        let emailTest = NSPredicate(format:"SELF MATCHES %@", emailRegEx)
-        return emailTest.evaluate(with: testStr)
-    }
-    
-    
 }

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

@@ -23,8 +23,6 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
         }
     }
     
-    private let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
-    
     @IBOutlet weak var registerButton: UIButton!{
         didSet{
             registerButton.addShadow()
@@ -37,14 +35,18 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
         }
     }
     
+    // MARK: - Properties
+
+    private static let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
+
     private var pastelView: PastelView!
     
+    // MARK: - Life cycle
+
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        
-        self.emailTextField.delegate = self
-        self.passwordTextField.delegate = self
+        setupTextFieldsDelegate()
         
         configureText()
         
@@ -95,12 +97,14 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
     }
     
     @IBAction func forgetPasswordTapped(_ sender: UIButton) {
+
         self.definesPresentationContext = true
         self.providesPresentationContextTransitionStyle = true
-        
         self.overlayBlurredBackgroundView()
     }
     
+    // MARK: - Navigation
+
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if let identifier = segue.identifier {
             if identifier == "ShowForgetPassword" {
@@ -113,6 +117,7 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
     }
     
     // MARK: - UITextFieldDelegate
+    
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         
         if textField.tag == 1 {
@@ -136,6 +141,12 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
     
     // MARK: - Private
     
+    private func setupTextFieldsDelegate(){
+
+        self.emailTextField.delegate = self
+        self.passwordTextField.delegate = self
+    }
+
     private func configureText(){
         
         self.emailTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Email", comment: ""),
@@ -193,7 +204,7 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
     
     private func validateForm() -> Bool {
         
-        if self.emailTextField.text == "" {
+        if !self.emailTextField.isEmail() {
             errorOnLogin(causeOfFailure: "email")
             return false
         }
@@ -210,13 +221,13 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
         
         switch error {
         case "email":
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("You must enter an email", comment: ""), and: "")
+            APIHelper.sharedInstance.showErrorMessage(with: "You must enter an email", and: "")
             break
         case "password":
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("You must enter a password", comment: ""), and: "")
+            APIHelper.sharedInstance.showErrorMessage(with: "You must enter a password", and: "")
             break
         default:
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Check the entered data", comment: ""), and: "")
+            APIHelper.sharedInstance.showErrorMessage(with: "Check the entered data", and: "")
             break
         }
         
@@ -230,7 +241,6 @@ class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDeleg
         blurredBackgroundView.effect = UIBlurEffect(style: .dark)
         
         self.tableView.addSubview(blurredBackgroundView)
-        
     }
     
     @objc func removeBlurredBackgroundView() {

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

@@ -11,6 +11,8 @@ import Pastel
 
 class RegisterVC: UITableViewController, UITextFieldDelegate {
     
+    // MARK: - Outlets
+
     @IBOutlet weak var nameTextField: UITextField!
     @IBOutlet weak var lastnameTextField: UITextField!
     @IBOutlet weak var cellphoneTextField: UITextField!
@@ -24,19 +26,18 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
     }
     @IBOutlet weak var acceptTermsButton: UIButton!
     
+    // MARK: - Properties
+
     private var pastelView: PastelView!
     
     private var termsAndConditionsAccepted: Bool = false
     
+    // MARK: - Life cycle
+
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.nameTextField.delegate = self
-        self.lastnameTextField.delegate = self
-        self.cellphoneTextField.delegate = self
-        self.emailTextField.delegate = self
-        self.passwordTextField.delegate = self
-        self.confirmPasswordTextField.delegate = self
+        setupTextFieldsDelegate()
         
         configureText()
         
@@ -52,8 +53,8 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
         self.pastelView.startAnimation()
     }
     
-    
     // MARK: - UITextFieldDelegate
+
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         
         let nextTage = textField.tag+1
@@ -72,6 +73,7 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
     // MARK: - Actions
     
     @IBAction func createTapped(_ sender: UIButton) {
+
         if self.validateForm(){
             if let email = self.emailTextField.text, let password = self.passwordTextField.text, let name = self.nameTextField.text, let lastname = self.lastnameTextField.text, let cellphone = self.cellphoneTextField.text {
                 self.createAccountButton.showLoading()
@@ -94,6 +96,7 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
     }
     
     @IBAction func termsTapped(_ sender: UIButton) {
+
         if !termsAndConditionsAccepted {
             let tintedImage = Asset.tick.image.withRenderingMode(.alwaysTemplate)
             sender.setImage(tintedImage, for: .normal)
@@ -109,44 +112,70 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
     }
     
     @IBAction func termsAndConditionsTapped(_ sender: UIButton) {
-        // TODO: View url
-        if let url = URL(string: "http://dils.com/terms-and-conditions") {
+        // TODO: URL
+        if let url = URL(string: "/terms-and-conditions") {
             UIApplication.shared.open(url, options: [:], completionHandler: nil)
         }
     }
     
     @IBAction func alreadyHaveAccountTapped(_ sender: UIButton) {
+
         self.dismiss(animated: true, completion: nil)
     }
     
-    
-    
     // MARK: - Private
+
+    private func setupTextFieldsDelegate(){
+        
+        self.nameTextField.delegate = self
+        self.lastnameTextField.delegate = self
+        self.cellphoneTextField.delegate = self
+        self.emailTextField.delegate = self
+        self.passwordTextField.delegate = self
+        self.confirmPasswordTextField.delegate = self
+    }
     
     private func configureText(){
         
-        self.emailTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Email", comment: ""),
-                                                                       attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
-        
-        self.nameTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Name", comment: ""),
-                                                                          attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
-        
-        self.lastnameTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Lastname", comment: ""),
-                                                                          attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
-        
-        self.cellphoneTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Cellphone (optional)", comment: ""),
-                                                                          attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.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)])
-        
-        self.confirmPasswordTextField.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("Confirm password", comment: ""),
-                                                                          attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray, NSAttributedStringKey.font: Fonts.roboto(type: 1, fontSize: 17)])
-        
-        
+        self.emailTextField.attributedPlaceholder = NSAttributedString(string: "Email",
+                                                                       attributes: [
+                                                                           NSAttributedStringKey.foregroundColor: UIColor.lightGray,
+                                                                           NSAttributedStringKey.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)
+                                                                              ])
+        
+        self.lastnameTextField.attributedPlaceholder = NSAttributedString(string: "Lastname",
+                                                                          attributes: [
+                                                                              NSAttributedStringKey.foregroundColor: UIColor.lightGray, 
+                                                                              NSAttributedStringKey.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)
+                                                                            ])
+        
+        self.passwordTextField.attributedPlaceholder = NSAttributedString(string: "Password",
+                                                                          attributes: [
+                                                                              NSAttributedStringKey.foregroundColor: UIColor.lightGray, 
+                                                                              NSAttributedStringKey.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)
+                                                                                ])
     }
     
     private func configureViews(){
+
         self.pastelView = PastelView(frame: self.tableView.bounds)
         
         // Custom Direction
@@ -167,47 +196,28 @@ class RegisterVC: UITableViewController, UITextFieldDelegate {
         
         if let password = self.passwordTextField.text, let confirmPassword = self.confirmPasswordTextField.text {
             if password != confirmPassword {
-                APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Passwords don't match", comment: ""), and: "")
+                APIHelper.sharedInstance.showErrorMessage(with: "Passwords don't match", and: "")
                 return false
             }
         }
-        if let name = self.nameTextField.text, name.isEmpty {
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Check the entered data", comment: ""), and: "")
+        if !self.nameTextField.isName() {
+            APIHelper.sharedInstance.showErrorMessage(with: "Check the entered data", and: "")
             return false
         }
-        if let lastname = self.lastnameTextField.text, lastname.isEmpty {
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Check the entered data", comment: ""), and: "")
+        if !self.lastnameTextField.isName() {
+            APIHelper.sharedInstance.showErrorMessage(with: "Check the entered data", and: "")
             return false
         }
-        if let email = self.emailTextField.text{
-            if !isValidEmail(email.trimmingCharacters(in: .whitespacesAndNewlines)) {
-                APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Invalid email", comment: ""), and: "")
-                return false
-            }
+        
+        if !self.emailTextField.isEmail(){
+            APIHelper.sharedInstance.showErrorMessage(with: "Invalid email", and: "")
+            return false
         }
         if !termsAndConditionsAccepted{
-            APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Check the entered data", comment: ""), and: NSLocalizedString("You have to accept terms & conditions", comment: ""))
+            APIHelper.sharedInstance.showErrorMessage(with: "Check the entered data", and: "You have to accept terms & conditions")
             return false
         }
         return true
     }
     
-    private func isValidEmail(_ testStr:String) -> Bool {
-        let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
-        let emailTest = NSPredicate(format:"SELF MATCHES %@", emailRegEx)
-        return emailTest.evaluate(with: testStr)
-    }
-    
-    private func isValidName(_ testStr:String) -> Bool {
-        let nameRegEx = "[A-Za-z\\s]+"
-        let nameTest = NSPredicate(format:"SELF MATCHES %@", nameRegEx)
-        return nameTest.evaluate(with: testStr)
-    }
-    
-    private func isValidPhone(_ testStr:String) -> Bool {
-        let phoneRegEx = "[0-9]*"
-        let phoneTest = NSPredicate(format:"SELF MATCHES %@", phoneRegEx)
-        return phoneTest.evaluate(with: testStr)
-    }
-    
 }