CR: method args shouldn't shadow properties

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent d94f355c2c
commit 1e59fbafd3

@ -174,7 +174,7 @@ protocol MediaGalleryDataSource: class {
func galleryItem(after currentItem: MediaGalleryItem) -> MediaGalleryItem? func galleryItem(after currentItem: MediaGalleryItem) -> MediaGalleryItem?
func showAllMedia(focusedItem: MediaGalleryItem) func showAllMedia(focusedItem: MediaGalleryItem)
func dismissDetailView(_ pageViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?) func dismissMediaDetailViewController(_ mediaDetailViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?)
} }
class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource, MediaTileViewControllerDelegate { class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource, MediaTileViewControllerDelegate {
@ -423,11 +423,11 @@ class MediaGalleryViewController: UINavigationController, MediaGalleryDataSource
} }
} }
public func dismissDetailView(_ pageViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?) { public func dismissMediaDetailViewController(_ mediaDetailViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?) {
self.view.isUserInteractionEnabled = false self.view.isUserInteractionEnabled = false
UIApplication.shared.isStatusBarHidden = false UIApplication.shared.isStatusBarHidden = false
guard let detailView = pageViewController.view else { guard let detailView = mediaDetailViewController.view else {
owsFail("\(logTag) in \(#function) detailView was unexpectedly nil") owsFail("\(logTag) in \(#function) detailView was unexpectedly nil")
self.presentingViewController?.dismiss(animated: false, completion: completion) self.presentingViewController?.dismiss(animated: false, completion: completion)
return return

@ -454,7 +454,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
return return
} }
mediaGalleryDataSource.dismissDetailView(self, animated: isAnimated, completion: completion) mediaGalleryDataSource.dismissMediaDetailViewController(self, animated: isAnimated, completion: completion)
} }
public func mediaDetailViewController(_ mediaDetailViewController: MediaDetailViewController, isPlayingVideo: Bool) { public func mediaDetailViewController(_ mediaDetailViewController: MediaDetailViewController, isPlayingVideo: Bool) {

Loading…
Cancel
Save