Merge pull request #216 from cuappdev/omar/swift5

Omar/swift5

Author: Omarrasheed

.swiftlint.yml

@@ -18,16 +18,17 @@ excluded: # paths to ignore during linting. Takes precedence over `included`.
 force_cast: warning # implicitly. Give warning only for force casting
 
 force_try:
-severity: warning # explicitly. Give warning only for force try
+  severity: warning # explicitly. Give warning only for force try
 
 type_body_length:
 - 300 # warning
-- 400 # error
 
 # or they can set both explicitly
 file_length:
-warning: 500
-error: 800
+- 500
+
+line_length:
+- 120
 
 large_tuple: # warn user when using 3 values in tuple, give error if there are 4
 - 3

Podfile

@@ -33,9 +33,9 @@ target 'TCAT' do
     pod 'Presentation', :git=> 'https://github.com/cuappdev/Presentation.git'
     pod 'SnapKit'
     pod 'WhatsNewKit', '~> 1.1.2'
-    
+
     # Other
-    pod 'Fuzzywuzzy_swift', :git=> 'https://github.com/cuappdev/Fuzzywuzzy_swift.git'
+    pod 'SwiftLint'
 
     target 'TCATTests' do
         inherit! :search_paths

TCAT.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

TCAT.xcodeproj/xcshareddata/xcschemes/Siri.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

TCAT.xcodeproj/xcshareddata/xcschemes/TCAT Debug.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

TCAT.xcodeproj/xcshareddata/xcschemes/TCAT Release.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

TCAT.xcodeproj/xcshareddata/xcschemes/Today Extension Debug.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

TCAT.xcodeproj/xcshareddata/xcschemes/Today Extension Release.xcscheme

@@ -9,20 +9,20 @@
 import UIKit
 
 class BusStopTableViewCell: UITableViewCell {
-    
+
     let linePosition: CGFloat = DetailIconView.width - 16 // max of DetailIconView (114) - constant (16) = 98
-    
+
     var titleLabel: UILabel!
     let cellHeight: CGFloat = RouteDetailCellSize.smallHeight
     let cellWidth: CGFloat = RouteDetailCellSize.indentedWidth
-    
+
     var connectorTop: UIView!
     var connectorBottom: UIView!
     var statusCircle: Circle!
-    
+
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
-        
+
         titleLabel = UILabel()
         titleLabel.frame = CGRect(x: cellWidth, y: 0, width: UIScreen.main.bounds.width - cellWidth - 20, height: 20)
         titleLabel.font = .getFont(.regular, size: 14)
@@ -33,34 +33,34 @@ class BusStopTableViewCell: UITableViewCell {
         titleLabel.sizeToFit()
         titleLabel.center.y = cellHeight / 2
         contentView.addSubview(titleLabel)
-        
+
         connectorTop = UIView(frame: CGRect(x: linePosition, y: 0, width: 4, height: cellHeight / 2))
         connectorTop.frame.origin.x -= connectorTop.frame.width / 2
         connectorTop.backgroundColor = Colors.tcatBlue
         contentView.addSubview(connectorTop)
-        
+
         connectorBottom = UIView(frame: CGRect(x: linePosition, y: cellHeight / 2, width: 4, height: cellHeight / 2))
         connectorBottom.frame.origin.x -= connectorBottom.frame.width / 2
         connectorBottom.backgroundColor = Colors.tcatBlue
         contentView.addSubview(connectorBottom)
-        
+
         statusCircle = Circle(size: .small, style: .outline, color: Colors.tcatBlue)
         statusCircle.center = self.center
         statusCircle.center.y = cellHeight / 2
         statusCircle.frame.origin.x = linePosition - (statusCircle.frame.width / 2)
         contentView.addSubview(statusCircle)
-        
+
     }
-    
+
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     func setCell(_ name: String) {
         titleLabel.text = name
         titleLabel.sizeToFit()
         titleLabel.frame.size.width = UIScreen.main.bounds.width - cellWidth - 20
         titleLabel.center.y = cellHeight / 2
     }
-    
+
 }

TCAT/Cells/BusStopTableViewCell.swift

@@ -14,7 +14,7 @@ class GeneralTableViewCell: UITableViewCell {
         super.awakeFromNib()
         // Initialization code
     }
-    
+
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
     }
@@ -25,11 +25,11 @@ class GeneralTableViewCell: UITableViewCell {
 
     override func layoutSubviews() {
         super.layoutSubviews()
-        
+
         preservesSuperviewLayoutMargins = false
         separatorInset = .zero
         layoutMargins = .zero
-        
+
         switch reuseIdentifier {
         case Constants.Cells.seeAllStopsIdentifier:
             textLabel?.text = Constants.General.seeAllStops
@@ -43,6 +43,6 @@ class GeneralTableViewCell: UITableViewCell {
         }
 
         textLabel?.font = .getFont(.regular, size: 14)
-        
+
     }
 }