mvcgen 0.1.20 → 0.1.21

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

@@ -16,6 +16,7 @@ class TutorialVC: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
         skipButton.isHidden = true
         
         // Uncomment next line to setup `PaperOnboarding` from code
@@ -24,6 +25,7 @@ class TutorialVC: UIViewController {
     }
     
     private func setupPaperOnboardingView() {
+
         let onboarding = PaperOnboarding()
         onboarding.dataSource = self
         onboarding.delegate = self
@@ -80,32 +82,33 @@ extension TutorialVC: PaperOnboardingDelegate {
 extension TutorialVC: PaperOnboardingDataSource {
     
     func onboardingItem(at index: Int) -> OnboardingItemInfo {
+        
         let titleFont = UIFont(name: "Quicksand-Bold", size: 30.0) ?? UIFont.boldSystemFont(ofSize: 30.0)
         let descriptionFont = UIFont(name: "Quicksand-Medium", size: 22.0) ?? UIFont.systemFont(ofSize: 22.0)
-        let welcomeLabel = NSLocalizedString("WELCOME", comment: "")
+        let welcomeLabel = "WELCOME"
         
         let list = [
-            OnboardingItemInfo(informationImage: UIImage(named: "Welcome_001")!,
+            OnboardingItemInfo(informationImage: Asset.welcome_01.image,
                                title: welcomeLabel,
-                               description: NSLocalizedString("If you like to travel comfortably ...", comment: ""),
+                               description: "First tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
                                color: Colors.firstGradientColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
-            OnboardingItemInfo(informationImage: UIImage(named: "Welcome_002")!,
+            OnboardingItemInfo(informationImage: Asset.welcome_02.image,
                                title: "",
-                               description: NSLocalizedString("... with everything arranged ...", comment: ""),
+                               description: "Second tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
                                color: Colors.secondGradientColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
-            OnboardingItemInfo(informationImage: UIImage(named: "Welcome_003")!,
+            OnboardingItemInfo(informationImage: Asset.welcome_03.image,
                                title: "",
-                               description: NSLocalizedString("... with everything planned ...", comment: ""),
+                               description: "Third tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
                                color: Colors.thirdGradientColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),
-            OnboardingItemInfo(informationImage: UIImage(named: "Welcome_004")!,
+            OnboardingItemInfo(informationImage: Asset.welcome_04.image,
                                title: "",
-                               description: NSLocalizedString("... then don't travel with us!", comment: ""),
+                               description: "Final tutorial message!",
                                pageIcon: UIImage(named: "Tick")!,
                                color: Colors.textColor,
                                titleColor: UIColor.white, descriptionColor: UIColor.white, titleFont: titleFont, descriptionFont: descriptionFont),

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

@@ -96,15 +96,3 @@ class GradientButton: UIButton {
     }
 }
 
-extension UIButton {
-    
-    func addShadow(){
-        // Shadow and Radius
-        self.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.15).cgColor
-        self.layer.shadowOffset = CGSize(width: 0.0, height: 2.0)
-        self.layer.shadowOpacity = 1.0
-        self.layer.shadowRadius = 0.0
-        self.layer.masksToBounds = false
-    }
-}
-

data/lib/templates/default/swift/Extensions/{ArrayDuplicates.swift → Utils+Array.swift}

@@ -1,5 +1,5 @@
 //
-//  ArrayDuplicates.swift
+//  Utils+Array.swift
 //  MVCGEN
 //
 //  Created by Daniel Martinez on 23/7/18.

data/lib/templates/default/swift/Extensions/{Images.swift → Utils+Images.swift}

@@ -1,5 +1,5 @@
 //
-//  Images.swift
+//  Utils+Images.swift
 //  MVCGEN
 //
 //  Created by Daniel Martinez on 23/7/18.
@@ -16,14 +16,15 @@
 
 enum Asset: String {
     case logo = "logo"
-    case banks = "Banks"
-    case hotels = "Hotels"
-    case key = "Key"
-    case shoppingCart = "Shopping-cart"
-    case stores = "Stores"
-    case wallet = "Wallet"
     case tick = "Tick"
     case userTestPhoto = "photo"
+    case notifications = "notificaciones"
+    case notification = "notification"
+    case back = "Back"
+    case welcome_01 = "Welcome_001"
+    case welcome_02 = "Welcome_002"
+    case welcome_03 = "Welcome_003"
+    case welcome_04 = "Welcome_004"
     
     var image: Image {
         let bundle = Bundle(for: BundleToken.self)

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

@@ -0,0 +1,34 @@
+//
+//  Utils+String.swift
+//  MVCGEN
+//
+//  Created by Daniel Martinez on 23/7/18.
+//  Copyright © 2018 Houlak. All rights reserved.
+//
+
+extension String {
+
+    func isEmail() -> Bool {
+
+        let __firstpart = "[A-Z0-9a-z]([A-Z0-9a-z._%+-]{0,30}[A-Z0-9a-z])?"
+        let __serverpart = "([A-Z0-9a-z]([A-Z0-9a-z-]{0,30}[A-Z0-9a-z])?\\.){1,5}"
+        let __emailRegex = __firstpart + "@" + __serverpart + "[A-Za-z]{2,8}"
+        let __emailPredicate = NSPredicate(format: "SELF MATCHES %@", __emailRegex)
+
+        return __emailPredicate.evaluate(with: self)
+    }
+
+    func isName() -> Bool {
+
+        let nameRegEx = "[A-Za-z\\s]+"
+        let nameTest = NSPredicate(format:"SELF MATCHES %@", nameRegEx)
+        return nameTest.evaluate(with: self)
+    }
+
+    func isPhone() -> Bool {
+
+        let phoneRegEx = "[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\\s\\./0-9]*"
+        let phoneTest = NSPredicate(format:"SELF MATCHES %@", phoneRegEx)
+        return phoneTest.evaluate(with: self)
+    }
+}

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

@@ -0,0 +1,21 @@
+//
+//  Utils+UIButton.swift
+//  MVCGEN
+//
+//  Created by Daniel Martinez on 23/7/18.
+//  Copyright © 2018 Houlak. All rights reserved.
+//
+
+import UIKit
+
+extension UIButton {
+    
+    func addShadow(){
+        // Shadow and Radius
+        self.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.15).cgColor
+        self.layer.shadowOffset = CGSize(width: 0.0, height: 2.0)
+        self.layer.shadowOpacity = 1.0
+        self.layer.shadowRadius = 0.0
+        self.layer.masksToBounds = false
+    }
+}

data/lib/templates/default/swift/Extensions/{UIColorExtensions.swift → Utils+UIColor.swift}

@@ -1,5 +1,5 @@
 //
-//  UIColorExtensions.swift
+//  Utils+UIColor.swift
 //  MVCGEN
 //
 //  Created by Daniel Martinez on 23/7/18.

data/lib/templates/default/swift/Extensions/{TableViewEmptyView.swift → Utils+UITableView.swift}

@@ -1,5 +1,5 @@
 //
-//  TableViewEmptyView.swift
+//  Utils+UITableView.swift
 //  MVCGEN
 //
 //  Created by Daniel Martinez on 23/7/18.
@@ -8,7 +8,6 @@
 
 import UIKit
 
-
 extension UITableView {
     
     func setEmptyTableLabelView(message: String, emptyIcon: String) {

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

@@ -0,0 +1,22 @@
+//
+//  Utils+UITextField.swift
+//  MVCGEN
+//
+//  Created by Daniel Martinez on 23/7/18.
+//  Copyright © 2018 Houlak. All rights reserved.
+//
+
+extension UITextField {
+    
+    func isEmail() -> Bool {
+        return self.text.isEmail()
+    }
+
+    func isName() -> Bool {
+        return self.text.isName()
+    }
+
+    func isPhone() -> Bool {
+        return self.text.isPhone()
+    }
+}

data/lib/templates/default/swift/Extensions/{GradientView.swift → Utils+UIView.swift}

@@ -1,13 +1,91 @@
 //
-//  GradientView.swift
+//  Utils+UIView.swift
 //  MVCGEN
 //
 //  Created by Daniel Martinez on 23/7/18.
 //  Copyright © 2018 Houlak. All rights reserved.
 //
 
-import Foundation
 import UIKit
+import Foundation
+
+// MARK: - Ineer Shadow View
+
+extension UIView {
+
+    // different inner shadow styles
+    public enum innerShadowSide
+    {
+        case all, left, right, top, bottom, topAndLeft, topAndRight, bottomAndLeft, bottomAndRight, exceptLeft, exceptRight, exceptTop, exceptBottom
+    }
+    
+    // define function to add inner shadow
+    public func addInnerShadow(onSide: innerShadowSide, shadowColor: UIColor, shadowSize: CGFloat, cornerRadius: CGFloat = 0.0, shadowOpacity: Float)
+    {
+        // define and set a shaow layer
+        let shadowLayer = CAShapeLayer()
+        shadowLayer.frame = bounds
+        shadowLayer.shadowColor = shadowColor.cgColor
+        shadowLayer.shadowOffset = CGSize(width: 0.0, height: 0.0)
+        shadowLayer.shadowOpacity = shadowOpacity
+        shadowLayer.shadowRadius = shadowSize
+        shadowLayer.fillRule = kCAFillRuleEvenOdd
+        
+        // define shadow path
+        let shadowPath = CGMutablePath()
+        
+        // define outer rectangle to restrict drawing area
+        let insetRect = bounds.insetBy(dx: -shadowSize * 2.0, dy: -shadowSize * 2.0)
+        
+        // define inner rectangle for mask
+        let innerFrame: CGRect = { () -> CGRect in
+            switch onSide
+            {
+            case .all:
+                return CGRect(x: 0.0, y: 0.0, width: frame.size.width, height: frame.size.height)
+            case .left:
+                return CGRect(x: 0.0, y: -shadowSize * 2.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height + shadowSize * 4.0)
+            case .right:
+                return CGRect(x: -shadowSize * 2.0, y: -shadowSize * 2.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height + shadowSize * 4.0)
+            case .top:
+                return CGRect(x: -shadowSize * 2.0, y: 0.0, width: frame.size.width + shadowSize * 4.0, height: frame.size.height + shadowSize * 2.0)
+            case.bottom:
+                return CGRect(x: -shadowSize * 2.0, y: -shadowSize * 2.0, width: frame.size.width + shadowSize * 4.0, height: frame.size.height + shadowSize * 2.0)
+            case .topAndLeft:
+                return CGRect(x: 0.0, y: 0.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height + shadowSize * 2.0)
+            case .topAndRight:
+                return CGRect(x: -shadowSize * 2.0, y: 0.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height + shadowSize * 2.0)
+            case .bottomAndLeft:
+                return CGRect(x: 0.0, y: -shadowSize * 2.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height + shadowSize * 2.0)
+            case .bottomAndRight:
+                return CGRect(x: -shadowSize * 2.0, y: -shadowSize * 2.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height + shadowSize * 2.0)
+            case .exceptLeft:
+                return CGRect(x: -shadowSize * 2.0, y: 0.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height)
+            case .exceptRight:
+                return CGRect(x: 0.0, y: 0.0, width: frame.size.width + shadowSize * 2.0, height: frame.size.height)
+            case .exceptTop:
+                return CGRect(x: 0.0, y: -shadowSize * 2.0, width: frame.size.width, height: frame.size.height + shadowSize * 2.0)
+            case .exceptBottom:
+                return CGRect(x: 0.0, y: 0.0, width: frame.size.width, height: frame.size.height + shadowSize * 2.0)
+            }
+        }()
+        
+        // add outer and inner rectangle to shadow path
+        shadowPath.addRect(insetRect)
+        shadowPath.addRect(innerFrame)
+        
+        // set shadow path as show layer's
+        shadowLayer.path = shadowPath
+        
+        // add shadow layer as a sublayer
+        layer.addSublayer(shadowLayer)
+        
+        // hide outside drawing area
+        clipsToBounds = true
+    }
+}
+
+// MARK: - GrdientView
 
 typealias GradientPoints = (startPoint: CGPoint, endPoint: CGPoint)
 
@@ -119,3 +197,5 @@ extension UIView {
     }
     
 }
+
+

data/lib/templates/default/swift/Extensions/{TapEffectExtension.swift → Utils+UIViewController.swift}

@@ -1,5 +1,5 @@
 //
-//  TapEffectExtension.swift
+//  Utils+UIViewController.swift
 //  MVCGEN
 //
 //  Created by Daniel Martinez on 23/7/18.
@@ -8,6 +8,8 @@
 
 import UIKit
 
+// MARK: - Animations
+
 extension UIViewController {
     
     func setUnselectedColors(backgroundView: UIView, label: UILabel) {
@@ -46,3 +48,18 @@ extension UIViewController {
         viewToTransform.transform = CGAffineTransform.identity
     }
 }
+
+// MARK: - Keyboard
+
+extension UIViewController {
+    
+    func hideKeyboardWhenTappedAround() {
+        let tap: UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(UIViewController.dismissKeyboard))
+        view.addGestureRecognizer(tap)
+        
+    }
+    
+    @objc func dismissKeyboard() {
+        view.endEditing(true)
+    }
+}

data/lib/templates/default/swift/Helper/Utils.swift

@@ -34,7 +34,7 @@ struct Endpoints {
     static let readNotifications = "read_notifications"
 }
 
-struct Colors {
+struct ColorConstants {
     static let firstGradientColor = UIColor(hex: "71F0DF")
     static let secondGradientColor = UIColor(hex: "397EB7")
     static let thirdGradientColor = UIColor(hex: "425893")

data/lib/templates/default/swift/UI/Storyboards/Home.storyboard

@@ -87,7 +87,7 @@
         <scene sceneID="fZ6-KG-qSG">
             <objects>
                 <navigationController id="zLo-6j-Dkc" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="plane" largeContentSizeImage="plane" selectedImage="plane" id="ZtI-te-uZc" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="" image="calendar" largeContentSizeImage="calendar" selectedImage="calendar" id="ZtI-te-uZc" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="0.066666666669999999" green="0.1215686275" blue="0.43921568630000002" alpha="1" colorSpace="calibratedRGB"/>
@@ -1121,7 +1121,7 @@
         <scene sceneID="wOq-72-WnN">
             <objects>
                 <navigationController id="504-EG-qbw" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="group-2" largeContentSizeImage="group-2" selectedImage="group-2" id="w5N-vp-LZS" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="" image="calendar" largeContentSizeImage="calendar" selectedImage="calendar" id="w5N-vp-LZS" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <inset key="largeContentSizeImageInsets" minX="0.0" minY="1" maxX="0.0" maxY="1"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
@@ -1440,7 +1440,7 @@
         <image name="Back" width="50" height="50"/>
         <image name="baggage" width="29" height="23"/>
         <image name="edit" width="35" height="35"/>
-        <image name="group-2" width="30" height="25"/>
+        <image name="calendar" width="30" height="25"/>
         <image name="icons8-delete" width="100" height="100"/>
         <image name="imageView:CwA-pU-e9P:image" width="20" height="20">
             <mutableData key="keyedArchiveRepresentation">
@@ -1848,7 +1848,7 @@ AAAAAAAAAAAAAAAAAD3RA
         </image>
         <image name="no-fav" width="44" height="41"/>
         <image name="notificaciones" width="130" height="88"/>
-        <image name="plane" width="34" height="27"/>
+        <image name="calendar" width="34" height="27"/>
         <image name="tabBarItem:gX4-gq-oKY:image" width="48" height="48">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGVVZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QEgcI

data/lib/templates/default/swift/UI/Views/EmptyTableView/Xibs/EmptyTableLabelView.xib

@@ -41,7 +41,7 @@
                         <constraint firstAttribute="width" constant="45" id="zQZ-CB-Snb"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Are you sure this destination exist?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="n45-cG-wqU">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please try searching by other words" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="n45-cG-wqU">
                     <rect key="frame" x="50" y="225" width="275" height="45"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <fontDescription key="fontDescription" name="Quicksand-Medium" family="Quicksand" pointSize="18"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mvcgen
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Daniel Martinez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,14 +131,6 @@ files:
 - lib/templates/default/swift/Assets.xcassets/Welcome_003.imageset/Icons_NotATour_Welcome_003.pdf
 - lib/templates/default/swift/Assets.xcassets/Welcome_004.imageset/Contents.json
 - lib/templates/default/swift/Assets.xcassets/Welcome_004.imageset/Icons_NotATour_Welcome_004.pdf
-- lib/templates/default/swift/Assets.xcassets/alert_beach.imageset/Contents.json
-- lib/templates/default/swift/Assets.xcassets/alert_beach.imageset/icons8-beach-64.png
-- lib/templates/default/swift/Assets.xcassets/alert_nobaggage.imageset/Contents.json
-- lib/templates/default/swift/Assets.xcassets/alert_nobaggage.imageset/icons8-no-baggage-100.png
-- lib/templates/default/swift/Assets.xcassets/alert_signpost.imageset/Contents.json
-- lib/templates/default/swift/Assets.xcassets/alert_signpost.imageset/icons8-signpost-64.png
-- lib/templates/default/swift/Assets.xcassets/alert_sunbed.imageset/Contents.json
-- lib/templates/default/swift/Assets.xcassets/alert_sunbed.imageset/sunbed.png
 - lib/templates/default/swift/Assets.xcassets/arrow.imageset/Contents.json
 - lib/templates/default/swift/Assets.xcassets/arrow.imageset/arrow.pdf
 - lib/templates/default/swift/Assets.xcassets/baggage.imageset/Contents.json
@@ -253,18 +245,19 @@ files:
 - lib/templates/default/swift/Controllers/Profile/ProfileContainerVC.swift
 - lib/templates/default/swift/Controllers/Profile/ProfileTVC.swift
 - lib/templates/default/swift/Controllers/Tutorial/TutorialVC.swift
-- lib/templates/default/swift/Extensions/ArrayDuplicates.swift
 - lib/templates/default/swift/Extensions/Buttons.swift
 - lib/templates/default/swift/Extensions/CustomCamera.swift
-- lib/templates/default/swift/Extensions/GradientView.swift
-- lib/templates/default/swift/Extensions/HideKeyboard.swift
-- lib/templates/default/swift/Extensions/Images.swift
-- lib/templates/default/swift/Extensions/InnerShadowExtension.swift
-- lib/templates/default/swift/Extensions/TableViewEmptyView.swift
-- lib/templates/default/swift/Extensions/TapEffectExtension.swift
-- lib/templates/default/swift/Extensions/UIColorExtensions.swift
 - lib/templates/default/swift/Extensions/UnderlinedTextView.swift
 - lib/templates/default/swift/Extensions/UnderlinedWithIconTextField.swift
+- lib/templates/default/swift/Extensions/Utils+Array.swift
+- lib/templates/default/swift/Extensions/Utils+Images.swift
+- lib/templates/default/swift/Extensions/Utils+String.swift
+- lib/templates/default/swift/Extensions/Utils+UIButton.swift
+- lib/templates/default/swift/Extensions/Utils+UIColor.swift
+- lib/templates/default/swift/Extensions/Utils+UITableView.swift
+- lib/templates/default/swift/Extensions/Utils+UITextField.swift
+- lib/templates/default/swift/Extensions/Utils+UIView.swift
+- lib/templates/default/swift/Extensions/Utils+UIViewController.swift
 - lib/templates/default/swift/Helper/APIHelper.swift
 - lib/templates/default/swift/Helper/APIManager.swift
 - lib/templates/default/swift/Helper/APIRequestBody.swift