Update method naming to follow Swift 3 guidelines

Author: bcylin

iCookTV/Extensions/UIFont+TV.swift

@@ -35,50 +35,50 @@ extension UIFont {
 
   // MARK: - Private Methods
 
-  private class func tvFontOfSize(_ fontSize: CGFloat) -> UIFont {
+  private class func tvFont(ofSize fontSize: CGFloat) -> UIFont {
     return UIFont(name: FontFamily.PingFangTCRegular, size: fontSize) ?? UIFont.systemFont(ofSize: fontSize)
   }
 
-  private class func tvBoldFontOfSize(_ fontSize: CGFloat) -> UIFont {
+  private class func tvBoldFont(ofSize fontSize: CGFloat) -> UIFont {
     return UIFont(name: FontFamily.PingFangTCMedium, size: fontSize) ?? UIFont.boldSystemFont(ofSize: fontSize)
   }
 
   // MARK: - Public Methods
 
   class func tvFontForTagline() -> UIFont {
-    return UIFont.tvFontOfSize(44)
+    return UIFont.tvFont(ofSize: 44)
   }
 
   class func tvFontForCategoryCell() -> UIFont {
-    return UIFont.tvFontOfSize(35)
+    return UIFont.tvFont(ofSize: 35)
   }
 
   class func tvFontForFocusedCategoryCell() -> UIFont {
-    return UIFont.tvFontOfSize(40)
+    return UIFont.tvFont(ofSize: 40)
   }
 
   class func tvFontForVideoCell() -> UIFont {
-    return UIFont.tvFontOfSize(29)
+    return UIFont.tvFont(ofSize: 29)
   }
 
   class func tvFontForFocusedVideoCell() -> UIFont {
-    return UIFont.tvBoldFontOfSize(29)
+    return UIFont.tvBoldFont(ofSize: 29)
   }
 
   class func tvFontForVideoLength() -> UIFont {
     return UIFont.systemFont(ofSize: 20)
   }
 
   class func tvFontForLogo() -> UIFont {
-    return UIFont.tvFontOfSize(65)
+    return UIFont.tvFont(ofSize: 65)
   }
 
   class func tvFontForMenuButton() -> UIFont {
-    return UIFont.tvFontOfSize(30)
+    return UIFont.tvFont(ofSize: 30)
   }
 
   class func tvFontForHeaderTitle() -> UIFont {
-    return UIFont.tvFontOfSize(35)
+    return UIFont.tvFont(ofSize: 35)
   }
 
 }

iCookTV/Extensions/UIImage+Grid.swift

@@ -43,7 +43,7 @@ extension UIImage {
     return newImage
   }
 
-  class func placeholderImage(withSize size: CGSize) -> UIImage? {
+  class func placeholderImage(with size: CGSize) -> UIImage? {
     let layer = CAGradientLayer()
     layer.frame = CGRect(origin: CGPoint.zero, size: size)
     layer.colors = [UIColor.white.cgColor, UIColor.Palette.LightGray.cgColor]
@@ -63,7 +63,7 @@ extension UIImage {
     return image
   }
 
-  class func resizableImage(withFillColor color: UIColor) -> UIImage? {
+  class func resizableImage(filledWith color: UIColor) -> UIImage? {
     UIGraphicsBeginImageContextWithOptions(CGSize(width: 1, height: 1), true, 0)
 
     color.setFill()

iCookTV/Helpers/CoverBuilder.swift

@@ -65,7 +65,7 @@ class CoverBuilder {
       if let currentImage = self?.cover, currentImage.size == imageSize {
         canvas = currentImage
       } else {
-        canvas = UIImage.placeholderImage(withSize: imageSize)
+        canvas = UIImage.placeholderImage(with: imageSize)
       }
 
       let cover = canvas?.image(byReplacingImage: image, in: grid)

iCookTV/Models/CategoriesDataSource.swift

@@ -38,7 +38,7 @@ class CategoriesDataSource: DataSource<CategoriesCollection> {
 
   override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
     let cell = collectionView.dequeueReusableCell(for: indexPath) as CategoryCell
-    cell.configure(withCategory: dataCollection[indexPath.row])
+    cell.configure(with: dataCollection[indexPath.row])
     return cell
   }
 

iCookTV/Models/VideosDataSource.swift

@@ -50,7 +50,7 @@ class VideosDataSource: DataSource<VideosCollection> {
 
   override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
     let cell = collectionView.dequeueReusableCell(for: indexPath) as VideoCell
-    cell.configure(withVideo: dataCollection[indexPath.row])
+    cell.configure(with: dataCollection[indexPath.row])
     return cell
   }
 

iCookTV/Views/CategoryCell.swift

@@ -37,7 +37,7 @@ class CategoryCell: UICollectionViewCell {
 
   private(set) lazy var imageView: UIImageView = {
     let _imageView = UIImageView()
-    _imageView.image = UIImage.placeholderImage(withSize: self.bounds.size)
+    _imageView.image = UIImage.placeholderImage(with: self.bounds.size)
     _imageView.contentMode = .scaleAspectFill
     return _imageView
   }()
@@ -75,7 +75,7 @@ class CategoryCell: UICollectionViewCell {
       tasks[index] = nil
     }
     coverBuilder.resetCover()
-    imageView.image = UIImage.placeholderImage(withSize: bounds.size)
+    imageView.image = UIImage.placeholderImage(with: bounds.size)
     textLabel.text = nil
   }
 
@@ -153,7 +153,7 @@ class CategoryCell: UICollectionViewCell {
 
   // MARK: - Public Methods
 
-  func configure(withCategory category: Category) {
+  func configure(with category: Category) {
     textLabel.text = category.name
 
     if let cached = coverBuilder.coverForCategory(withID: category.id) {

iCookTV/Views/EmptyStateView.swift

@@ -67,10 +67,10 @@ class EmptyStateView: UIView {
 
     imageView.centerXAnchor.constraint(equalTo: centerXAnchor).isActive = true
 
-    let views = [
+    let views: [String: Any] = [
       "image": imageView,
       "text": textLabel
-    ] as [String : Any]
+    ]
     addConstraints(NSLayoutConstraint.constraints(
       withVisualFormat: "H:|-(>=0)-[image(280)]-(>=0)-|",
       options: [],

iCookTV/Views/MenuButton.swift

@@ -44,8 +44,8 @@ class MenuButton: UIButton {
     contentEdgeInsets = UIEdgeInsets(top: 15, left: 40, bottom: 15, right: 40)
     setTitleColor(UIColor.Palette.Button.TitleColor, for: UIControlState())
     setTitleColor(UIColor.Palette.FocusedButton.TitleColor, for: .focused)
-    setImage(UIImage.resizableImage(withFillColor: UIColor.Palette.Button.BackgroundColor), for: .normal)
-    setImage(UIImage.resizableImage(withFillColor: UIColor.Palette.FocusedButton.BackgroundColor), for: .focused)
+    setImage(UIImage.resizableImage(filledWith: UIColor.Palette.Button.BackgroundColor), for: .normal)
+    setImage(UIImage.resizableImage(filledWith: UIColor.Palette.FocusedButton.BackgroundColor), for: .focused)
   }
 
 }

iCookTV/Views/VideoCell.swift

@@ -31,7 +31,7 @@ class VideoCell: UICollectionViewCell {
 
   private(set) lazy var imageView: UIImageView = {
     let _imageView = UIImageView()
-    _imageView.image = UIImage.placeholderImage(withSize: self.bounds.size)
+    _imageView.image = UIImage.placeholderImage(with: self.bounds.size)
     _imageView.contentMode = .scaleAspectFill
     return _imageView
   }()
@@ -79,7 +79,7 @@ class VideoCell: UICollectionViewCell {
   override func prepareForReuse() {
     super.prepareForReuse()
     imageView.kf.cancelDownloadTask()
-    imageView.image = UIImage.placeholderImage(withSize: bounds.size)
+    imageView.image = UIImage.placeholderImage(with: bounds.size)
     titleLabel.text = nil
   }
 
@@ -138,9 +138,9 @@ class VideoCell: UICollectionViewCell {
 
   // MARK: - Public Methods
 
-  func configure(withVideo video: Video) {
+  func configure(with video: Video) {
     if let url = video.coverURL {
-      imageView.kf.setImage(with: url, placeholder: UIImage.placeholderImage(withSize: bounds.size))
+      imageView.kf.setImage(with: url, placeholder: UIImage.placeholderImage(with: bounds.size))
     }
     titleLabel.text = video.title
     timeLabel.text = video.timestamp