update caption after deleting item

pull/1/head
Michael Kirk 7 years ago
parent ca30a96451
commit d805246cb7

@ -477,7 +477,7 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel
return return
} }
pageViewController.currentItem = mediaGalleryItem pageViewController.setCurrentItem(mediaGalleryItem, direction: .forward, animated: false)
pageViewController.willBePresentedAgain() pageViewController.willBePresentedAgain()
// TODO fancy zoom animation // TODO fancy zoom animation

@ -44,21 +44,17 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
} }
public var currentItem: MediaGalleryItem! { public var currentItem: MediaGalleryItem! {
get {
return currentViewController.galleryItemBox.value return currentViewController.galleryItemBox.value
} }
set {
setCurrentItem(newValue, direction: .forward, animated: false)
}
}
private func setCurrentItem(_ item: MediaGalleryItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) { public func setCurrentItem(_ item: MediaGalleryItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) {
guard let galleryPage = self.buildGalleryPage(galleryItem: item) else { guard let galleryPage = self.buildGalleryPage(galleryItem: item) else {
owsFailDebug("unexpetedly unable to build new gallery page") owsFailDebug("unexpetedly unable to build new gallery page")
return return
} }
self.updateTitle(item: item) self.updateTitle(item: item)
self.updateCaption(item: item)
self.setViewControllers([galleryPage], direction: direction, animated: isAnimated) self.setViewControllers([galleryPage], direction: direction, animated: isAnimated)
self.updateFooterBarButtonItems(isPlayingVideo: false) self.updateFooterBarButtonItems(isPlayingVideo: false)
} }
@ -717,6 +713,10 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
updateTitle(item: currentItem) updateTitle(item: currentItem)
} }
private func updateCaption(item: MediaGalleryItem) {
self.currentCaptionView.text = item.captionForDisplay
}
private func updateTitle(item: MediaGalleryItem) { private func updateTitle(item: MediaGalleryItem) {
let name = senderName(message: item.message) let name = senderName(message: item.message)
portraitHeaderNameLabel.text = name portraitHeaderNameLabel.text = name

Loading…
Cancel
Save