Skip to content
This repository was archived by the owner on Nov 24, 2021. It is now read-only.

Commit 29f36df

Browse files
authored
Improve delegate (#94)
1 parent 9492736 commit 29f36df

2 files changed

Lines changed: 7 additions & 22 deletions

File tree

Source/ViewableController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import AVKit
88

99
protocol ViewableControllerDelegate: class {
1010
func viewableControllerDidTapItem(_ viewableController: ViewableController)
11-
func viewableController(_ viewableController: ViewableController, didFailPlayingVideoWith error: NSError)
11+
func viewableController(_ viewableController: ViewableController, didFailDisplayingVieweableWith error: NSError)
1212
}
1313

1414
protocol ViewableControllerDataSource: class {
@@ -369,7 +369,7 @@ extension ViewableController: VideoViewDelegate {
369369

370370
func videoViewDidFinishPlaying(_ videoView: VideoView, error: NSError?) {
371371
if let error = error {
372-
self.delegate?.viewableController(self, didFailPlayingVideoWith: error)
372+
self.delegate?.viewableController(self, didFailDisplayingVieweableWith: error)
373373
} else {
374374
self.repeatButton.alpha = 1
375375
self.pauseButton.alpha = 0

Source/ViewerController.swift

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,19 @@
11
import UIKit
22
import CoreData
33

4-
/**
5-
The ViewerController takes care of displaying the user's photos/videos in full-screen.
6-
7-
You can swipe right or left to navigate between photos.
8-
*/
9-
104
public protocol ViewerControllerDataSource: class {
115
func numberOfItemsInViewerController(_ viewerController: ViewerController) -> Int
126
func viewerController(_ viewerController: ViewerController, viewableAt indexPath: IndexPath) -> Viewable
137
}
148

159
public protocol ViewerControllerDelegate: class {
16-
/**
17-
Called when the ViewerController changes focus.
18-
*/
1910
func viewerController(_ viewerController: ViewerController, didChangeFocusTo indexPath: IndexPath)
20-
21-
/**
22-
Called when the ViewerController is dismissed.
23-
*/
2411
func viewerControllerDidDismiss(_ viewerController: ViewerController)
25-
26-
/**
27-
Called when the video playback fails.
28-
*/
29-
func viewerController(_ viewerController: ViewerController, didFailPlayingVideoAt indexPath: IndexPath, error: NSError)
12+
func viewerController(_ viewerController: ViewerController, didFailDisplayingViewableAt indexPath: IndexPath, error: NSError)
3013
}
3114

15+
16+
/// The ViewerController takes care of displaying the user's photos and videos in full-screen. You can swipe right or left to navigate between them.
3217
public class ViewerController: UIViewController {
3318
static let domain = "com.bakkenbaeck.Viewer"
3419
fileprivate static let HeaderHeight = CGFloat(64)
@@ -444,8 +429,8 @@ extension ViewerController: ViewableControllerDelegate {
444429
self.toggleButtons(self.buttonsAreVisible)
445430
}
446431

447-
func viewableController(_ viewableController: ViewableController, didFailPlayingVideoWith error: NSError) {
448-
self.delegate?.viewerController(self, didFailPlayingVideoAt: self.currentIndexPath, error: error)
432+
func viewableController(_ viewableController: ViewableController, didFailDisplayingVieweableWith error: NSError) {
433+
self.delegate?.viewerController(self, didFailDisplayingViewableAt: self.currentIndexPath, error: error)
449434
}
450435
}
451436

0 commit comments

Comments
 (0)