Rename Corner to Grid

Author: bcylin

iCookTV/Extensions/CGRect+Grid.swift

@@ -26,25 +26,26 @@
 
 import UIKit
 
-enum Grid: Int {
+enum Grid: Int, Equatable {
   case topLeft, topRight, bottomLeft, bottomRight
 
   static let numberOfGrids: Int = {
     var count = 0
     while let _ = Grid(rawValue: count) { count += 1 }
     return count
   }()
-}
 
-func == (lhs: Grid, rhs: Grid) -> Bool {
-  return lhs.rawValue == rhs.rawValue
+  static func == (lhs: Grid, rhs: Grid) -> Bool {
+    return lhs.rawValue == rhs.rawValue
+  }
+
 }
 
 extension CGRect {
 
-  func rect(bySize size: CGSize, atCorner corner: Grid) -> CGRect {
+  func rect(with size: CGSize, in grid: Grid) -> CGRect {
     let target = CGSize(width: min(width, size.width), height: min(height, size.height))
-    switch corner {
+    switch grid {
     case .topLeft:
       return divided(atDistance: target.height, from: .maxYEdge).remainder.divided(atDistance: target.width, from: .maxXEdge).remainder
     case .topRight:

iCookTV/Extensions/UIImage+Grid.swift

@@ -28,13 +28,13 @@ import UIKit
 
 extension UIImage {
 
-  func image(byReplacingImage image: UIImage, atCorner corner: Grid) -> UIImage? {
+  func image(byReplacingImage image: UIImage, in grid: Grid) -> UIImage? {
     UIGraphicsBeginImageContextWithOptions(size, true, 0)
 
     let canvas = CGRect(origin: CGPoint.zero, size: size)
     self.draw(in: canvas)
 
-    let rect = canvas.rect(bySize: image.size, atCorner: corner)
+    let rect = canvas.rect(with: image.size, in: grid)
     image.draw(in: rect)
 
     let newImage = UIGraphicsGetImageFromCurrentImageContext()

iCookTV/Helpers/CoverBuilder.swift

@@ -57,7 +57,7 @@ class CoverBuilder {
 
   // MARK: - Public Methods
 
-  func addImage(_ image: UIImage, atCorner corner: Grid, categoryID id: String? = nil, completion: @escaping (_ newCover: UIImage?) -> Void) {
+  func add(image: UIImage, to grid: Grid, categoryID id: String? = nil, completion: @escaping (_ newCover: UIImage?) -> Void) {
     operationQueue.addOperation(BlockOperation { [weak self] in
       let imageSize = CGSize(width: image.size.width * 2, height: image.size.height * 2)
       var canvas: UIImage?
@@ -68,9 +68,9 @@ class CoverBuilder {
         canvas = UIImage.placeholderImage(withSize: imageSize)
       }
 
-      let cover = canvas?.image(byReplacingImage: image, atCorner: corner)
+      let cover = canvas?.image(byReplacingImage: image, in: grid)
       self?.cover = cover
-      self?.filledGrids.insert(corner)
+      self?.filledGrids.insert(grid)
 
       if let key = id, let image = cover, self?.filledGrids.count == Grid.numberOfGrids {
         self?.cacheImage(image, forKey: key)

iCookTV/Views/CategoryCell.swift

@@ -118,21 +118,21 @@ class CategoryCell: UICollectionViewCell {
 
   func setUpCover(_ urls: [Grid: URL], forCategory category: Category) {
     // Cancel previous tasks
-    for (corner, task) in tasks {
+    for (grid, task) in tasks {
       task.cancel()
-      tasks[corner] = nil
+      tasks[grid] = nil
     }
 
-    for (corner, url) in urls {
+    for (grid, url) in urls {
       let downloading = ImageDownloader.default.downloadImage(with: url, progressBlock: nil) {
         [weak self] image, error, imageURL, originalData in
 
-        self?.tasks[corner] = nil
+        self?.tasks[grid] = nil
         guard let image = image, imageURL == url else {
           return
         }
 
-        self?.coverBuilder.addImage(image, atCorner: corner, categoryID: category.id) { newCover in
+        self?.coverBuilder.add(image: image, to: grid, categoryID: category.id) { newCover in
           if let current = self {
             UIView.transition(
               with: current.imageView,
@@ -146,7 +146,7 @@ class CategoryCell: UICollectionViewCell {
         }
       }
       if let task = downloading {
-        tasks[corner] = task
+        tasks[grid] = task
       }
     }
   }
@@ -163,8 +163,8 @@ class CategoryCell: UICollectionViewCell {
 
     var urls = [Grid: URL]()
     for (index, value) in category.coverURLs.enumerated() {
-      guard let corner = Grid(rawValue: index), let url = URL(string: value) else { continue }
-      urls[corner] = url
+      guard let grid = Grid(rawValue: index), let url = URL(string: value) else { continue }
+      urls[grid] = url
     }
 
     setUpCover(urls, forCategory: category)