Reorder the displayed history after the video player is presented

Author: bcylin

iCookTV/HistoryViewController.swift

@@ -79,21 +79,26 @@ class HistoryViewController: VideosViewController {
     return nil
   }
 
-  override func saveToHistory(video: Video, atIndex index: Int) {
-    super.saveToHistory(video, atIndex: index)
-    // Reorder current displayed contents
-    var reordered = self.videos
-    reordered.removeAtIndex(index)
-    reordered.insert(video, atIndex: 0)
-    self.videos = reordered
-  }
-
   // MARK: - UICollectionViewDelegate
 
   override func collectionView(collectionView: UICollectionView, willDisplayCell cell: UICollectionViewCell, forItemAtIndexPath indexPath: NSIndexPath) {
     // History doesn't need pagination.
   }
 
+  override func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
+    super.collectionView(collectionView, didSelectItemAtIndexPath: indexPath)
+
+    let video = videos[indexPath.row]
+    var reordered = videos
+    reordered.removeAtIndex(indexPath.row)
+    reordered.insert(video, atIndex: 0)
+
+    // Reorder current displayed contents after the video player is presented.
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(0.5 * Double(NSEC_PER_SEC))), dispatch_get_main_queue()) {
+      self.videos = reordered
+    }
+  }
+
   // MARK: - OverlayEnabled
 
   private lazy var emptyStateOverlay: UIView = {

iCookTV/VideosViewController.swift

@@ -191,7 +191,7 @@ class VideosViewController: BlurBackgroundViewController,
 
     let controller = VideoPlayerController(video: video, coverImage: cell?.imageView.image)
     navigationController?.pushViewController(controller, animated: true)
-    saveToHistory(video, atIndex: indexPath.row)
+    HistoryManager.save(video: video)
   }
 
   func collectionView(collectionView: UICollectionView, didUpdateFocusInContext context: UICollectionViewFocusUpdateContext, withAnimationCoordinator coordinator: UIFocusAnimationCoordinator) {
@@ -280,12 +280,6 @@ class VideosViewController: BlurBackgroundViewController,
     }
   }
 
-  // MARK: - Public Methods
-
-  func saveToHistory(video: Video, atIndex index: Int) {
-    HistoryManager.save(video: video)
-  }
-
 }