mvcgen 0.1.20 → 0.1.21

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

@@ -7,9 +7,12 @@
 //
 
 import UIKit
+import SwiftDate
 
 class NotificationCell: UITableViewCell {
     
+    // MARK: - Outlets
+
     @IBOutlet weak var notificationImage: UIImageView!{
         didSet{
             self.notificationImage.layoutIfNeeded()
@@ -32,6 +35,8 @@ class NotificationCell: UITableViewCell {
         }
     }
     
+    // MARK: - Life cycle
+
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
@@ -43,9 +48,31 @@ class NotificationCell: UITableViewCell {
     override func prepareForReuse() {
         super.prepareForReuse()
         
-        self.notificationImage.image = UIImage(named: "notificaciones")
+        self.notificationImage.image =  Asset.tick.notifications
         
         self.newNotificationView.isHidden = true
     }
+
+    func configure(with notification: Notif) {
+
+        self.notificationText.text = notification.body
+        
+        self.newNotificationView.isHidden = notification.read
+
+        let region = Region.Local()
+        let dateB = DateInRegion(absoluteDate: notification.createdDate as Date, in: region)
+        let (colloquial, _) = try! dateB.colloquialSinceNow()
+        self.notificationDate.text = colloquial
+
+        // In case you need to config something by notif type:
+        // switch notification.notifType{
+        //     case .broadcast:
+        //         break
+        //     case .generic:
+        //         break
+        // default:
+        //     break
+        // }
+    }
     
 }

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

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import SwiftDate
 import Kingfisher
 import PMAlertController
 
@@ -23,7 +22,7 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
     
     // MARK: - Properties
     
-    let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
+    private static let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
     
     var notifications = [Notif]()
     
@@ -31,17 +30,20 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
     
     var delegate: NotificationReadProtocol?
     
+    // MARK: - Life cycle
+
     override func viewDidLoad() {
         super.viewDidLoad()
         
         setup()
-
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(true)
         
         self.navigationController?.navigationBar.isHidden = true
+
+        // To avoid multi tap on cell
         self.tableView.isUserInteractionEnabled = true
         
         self.tableView.reloadData()
@@ -57,20 +59,20 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
         
         self.tableView.rowHeight = UITableViewAutomaticDimension
         
-        let origImage = UIImage(named: "Back")
-        let tintedImage = origImage?.withRenderingMode(.alwaysTemplate)
+        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)
     }
     
-    
-    
     @IBAction func backTapped(_ sender: UIButton) {
+
         self.navigationController?.popViewController(animated: true)
     }
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
+        // Mark all notifications as read
         if self.isMovingFromParentViewController{
             delegate?.setAsRead(value: true)
         }
@@ -79,10 +81,12 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
     // MARK: - Table view
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+
         return notifications.count
     }
     
     func numberOfSections(in tableView: UITableView) -> Int {
+
         if notifications.count > 0 {
             self.hideNoNotificationsView()
             return 1
@@ -93,6 +97,7 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
     }
     
     func setNoNotificationsView(){
+        
         let emptyTableLabelViewNib = UINib(nibName: "NoNotificationsView", bundle: nil)
         let emptyTableLabelView = emptyTableLabelViewNib.instantiate(withOwner: nil, options: nil)[0] as! NoNotificationView
         emptyTableLabelView.tag = 100
@@ -101,6 +106,7 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
     }
     
     func hideNoNotificationsView(){
+
         self.tableView.separatorStyle = .singleLine
         if let viewWithTag = self.tableView.viewWithTag(100) {
             viewWithTag.isHidden = true
@@ -113,33 +119,17 @@ class NotificationsVC: UIViewController, UITableViewDelegate, UITableViewDataSou
         
         let notification = self.notifications[indexPath.row]
 
-        cell.notificationText.text = notification.body
-        
-        if !notification.read{
-            cell.newNotificationView.isHidden = false
-        }
+        cell.configure(with: notification)
 
-        let region = Region.Local()
-        let dateB = DateInRegion(absoluteDate: notification.createdDate as Date, in: region)
-        let (colloquial, _) = try! dateB.colloquialSinceNow()
-        cell.notificationDate.text = colloquial
-        switch notification.notifType{
-            case .broadcast:
-                break
-            case .generic:
-                break
-        default:
-            break
-        }
         return cell
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+
+        // To avoid multi tap on cell
         self.tableView.isUserInteractionEnabled = false
         
-        let selectedNotif = self.notifications[indexPath.row]
-        
-        self.selectedNotification = selectedNotif
+        self.selectedNotification = self.notifications[indexPath.row]
         
         switch selectedNotif.notifType {
         case .broadcast:

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

@@ -34,9 +34,7 @@ class ForgetPasswordTVC: UITableViewController, UITextFieldDelegate {
         
         self.emailTextField.underlined(color: UIColor.white, width: 1.0)
         self.emailTextField.addLeftIcon("envelope")
-        
-        self.instructionsLabel.addCharacterSpacing(space: 0.9)
-        self.instructionsLabel.addLineSpacing(lineHeightMultiple: 1.4)
+
         self.instructionsLabel.textAlignment = NSTextAlignment.center
         
         self.emailTextField.delegate = self
@@ -44,7 +42,7 @@ class ForgetPasswordTVC: UITableViewController, UITextFieldDelegate {
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
-        self.backgroundGradientView.applyGradient(withColours: [ColorConstants.fromGradient, ColorConstants.fromGradient, ColorConstants.toGradient], locations: [0, 0.2, 0.98])
+        self.backgroundGradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
     }
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@@ -81,12 +79,13 @@ class ForgetPasswordTVC: UITableViewController, UITextFieldDelegate {
     private func forgetPasswordTapped(){
         if let email = self.emailTextField.text, isValidEmail(email){
             self.sendLinkButton.showLoading()
-            RemoteUserRepository.sharedInstance.forgetPassword(email: email) { result in
-                self.sendLinkButton.hideLoading()
-                if result == .success{
-                    APIHelper.sharedInstance.showSuccesMessage(with: NSLocalizedString("Email sent!", comment: ""), and: "")
-                }
-            }
+            // TODO:
+//            RemoteUserRepository.sharedInstance.forgetPassword(email: email) { result in
+//                self.sendLinkButton.hideLoading()
+//                if result == .success{
+//                    APIHelper.sharedInstance.showSuccesMessage(with: NSLocalizedString("Email sent!", comment: ""), and: "")
+//                }
+//            }
         } else {
             APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("Invalid email", comment: ""), and: "")
         }

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

@@ -10,7 +10,7 @@ import UIKit
 import Pastel
 import FacebookLogin
 
-class LoginVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDelegate {
+class LoginTVC: UITableViewController, UITextFieldDelegate, ForgetPasswordVCDelegate {
     
     // MARK: - Outlets
     

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 = ColorConstants.fromGradient
+        self.registerButton.activityIndicatorColor = Colors.firstGradientColor
         
         emailTextField.underlined(color: UIColor.white, width: 1.0)
         nameTextField.underlined(color: UIColor.white, width: 1.0)
@@ -85,17 +85,18 @@ class OtherRegisterVC: UITableViewController, UITextFieldDelegate {
     }
     
     func fetchCountries(){
-        RemoteUserRepository.sharedInstance.getCountries() {
-            result, countries in
-            if result == .success {
-                self.countries = countries
-            }
-        }
+        // TODO
+//        RemoteUserRepository.sharedInstance.getCountries() {
+//            result, countries in
+//            if result == .success {
+//                self.countries = countries
+//            }
+//        }
     }
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
-        self.gradientView.applyGradient(withColours: [ColorConstants.fromGradient, ColorConstants.fromGradient, ColorConstants.toGradient], locations: [0, 0.2, 0.98])
+        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
     }
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@@ -286,10 +287,10 @@ class OtherRegisterVC: UITableViewController, UITextFieldDelegate {
             return
         }, origin: sender)
         
-        acp?.setTextColor(ColorConstants.fromGradient)
+        acp?.setTextColor(Colors.firstGradientColor)
         acp?.pickerBackgroundColor = UIColor.white
         acp?.toolbarBackgroundColor = UIColor.white
-        acp?.toolbarButtonsColor = ColorConstants.fromGradient
+        acp?.toolbarButtonsColor = Colors.firstGradientColor
         acp?.show()
     }
     

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

@@ -41,32 +41,33 @@ class SelectLanguageVC: UITableViewController {
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         
-        self.gradientView.applyGradient(withColours: [ColorConstants.fromGradient, ColorConstants.fromGradient, ColorConstants.toGradient], locations: [0, 0.2, 0.98])
+        self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
     }
     
     @IBAction func registerTapped(_ sender: UIButton) {
         if selectedLanguages.count > 0 {
             if let email = self.signupInfo["email"], let firstname = self.signupInfo["firstname"], let lastname = self.signupInfo["lastname"], let phoneCountry = self.signupInfo["phoneCountry"], let phone = self.signupInfo["phone"], let password = self.signupInfo["password"]{
-                UserRepository.sharedInstance.signup(
-                    email: email,
-                    password: password,
-                    name: firstname,
-                    lastname: lastname,
-                    phoneCountry: phoneCountry,
-                    phone: phone,
-                    languages: selectedLanguages
-                ) { result, message in
-                    
-                    if result == .success {
-                        self.performSegue(withIdentifier: "ShowHome", sender: self)
-                    } else {
-                        if let msg = message {
-                            APIHelper.sharedInstance.showErrorMessage(with: msg, and: "")
-                        } else {
-                            APIHelper.sharedInstance.showErrorMessage(with:  NSLocalizedString("Connection error with services.", comment: ""), and: "")
-                        }
-                    }
-                }
+                // TODO:
+//                UserRepository.sharedInstance.signup(
+//                    email: email,
+//                    password: password,
+//                    name: firstname,
+//                    lastname: lastname,
+//                    phoneCountry: phoneCountry,
+//                    phone: phone,
+//                    languages: selectedLanguages
+//                ) { result, message in
+//
+//                    if result == .success {
+//                        self.performSegue(withIdentifier: "ShowHome", sender: self)
+//                    } else {
+//                        if let msg = message {
+//                            APIHelper.sharedInstance.showErrorMessage(with: msg, and: "")
+//                        } else {
+//                            APIHelper.sharedInstance.showErrorMessage(with:  NSLocalizedString("Connection error with services.", comment: ""), and: "")
+//                        }
+//                    }
+//                }
             }
         }
         else{

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 = ColorConstants.fromGradient
+            self.registerButtonOutlet.activityIndicatorColor = Colors.firstGradientColor
         }
     }
     @IBOutlet weak var termsAndConditions: UIButton!{
@@ -28,7 +28,7 @@ class TermsAndConditionsVC: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.applyGradient(withColours: [ColorConstants.fromGradient, ColorConstants.fromGradient, ColorConstants.toGradient], locations: [0, 0.2, 0.98])
+        self.view.applyGradient(withColours: [Colors.firstGradientColor, Colors.secondGradientColor, Colors.thirdGradientColor], locations: [0, 0.2, 0.98])
         // Do any additional setup after loading the view.
     }
 
@@ -59,11 +59,11 @@ class TermsAndConditionsVC: UIViewController {
     
     @IBAction func registerTapped(_ sender: Any) {
         if self.acceptTermsAndConditions{
-            UserRepository.sharedInstance.acceptTermsAndConditions(){ result in
-                if result == .success{
-                    self.performSegue(withIdentifier: "registerToHome", sender: self)
-                }
-            }
+//            UserRepository.sharedInstance.acceptTermsAndConditions(){ result in
+//                if result == .success{
+//                    self.performSegue(withIdentifier: "registerToHome", sender: self)
+//                }
+//            }
         } else {
             APIHelper.sharedInstance.showErrorMessage(with: NSLocalizedString("You have to accept terms & conditions", comment: ""), and: "")
         }
@@ -74,3 +74,4 @@ class TermsAndConditionsVC: UIViewController {
     }
 
 }
+

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

@@ -9,6 +9,7 @@
 import UIKit
 
 // TODO: Temp picture struct
+
 struct Pic{
     
     var url = ""
@@ -32,7 +33,8 @@ class AboutUsVC: UIViewController, UITableViewDelegate, UITableViewDataSource{
     // MARK: - Properties
     
     var pictures = [Pic]()
-    
+
+    // MARK: - Life cycle
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -40,7 +42,7 @@ class AboutUsVC: UIViewController, UITableViewDelegate, UITableViewDataSource{
         setup()
 
         // TODO: Add some pictures
-        self.pictures.append(Pic(url: "http://detoqueytoque.com/Fotos_Web_new/Home/grupo%20en%20TLG.jpg"))
+        self.pictures.append(Pic(url: ""))
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -49,33 +51,43 @@ class AboutUsVC: UIViewController, UITableViewDelegate, UITableViewDataSource{
         self.navigationController?.navigationItem.hidesBackButton = true
         
     }
-    private func setup() {
+
+    override func viewDidLayoutSubviews() {
+        view.backgroundColor = UIColor.clear
         
         self.gradientView.applyGradient(withColours: [Colors.firstGradientColor, Colors.thirdGradientColor], locations: [0, 0.5])
-        
-        self.tableView.rowHeight = UITableViewAutomaticDimension
-        
-        let origImage = UIImage(named: "Back")
-        let tintedImage = origImage?.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)
     }
     
+    // MARK: - Actions
+
     @IBAction func backTapped(_ sender: UIButton) {
         self.navigationController?.popViewController(animated: true)
     }
-    
+
+    // MARK: - Private
+
+    private func setup() {
+        
+        self.tableView.rowHeight = UITableViewAutomaticDimension
+        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)
+    }
+
     // MARK: - Table view
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+
         return 1
     }
     
     func numberOfSections(in tableView: UITableView) -> Int {
+
         return 2
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
         switch indexPath.section{
         case 0:
             let cell = tableView.dequeueReusableCell(withIdentifier: "aboutUsImageCell", for: indexPath) as! AboutUsImageCell