signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'mkirk/fix-missing-captionview' into release/2.34.0

Browse Source
This commit is contained in:
Michael Kirk 2019-01-17 09:54:20 -07:00
commit 70f4d69fb7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
View File

@ -224,6 +224,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
self.setCurrentItem(firstItem, direction: .forward, animated: false)
// layout immediately to avoid animating the layout process during the transition
self.currentPageViewController.view.layoutIfNeeded()
// As a refresher, the _Information Architecture_ here is:
//
// You are approving an "Album", which has multiple "Attachments"
@ -533,6 +536,10 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
return
}
page.loadViewIfNeeded()
let keyboardScenario: KeyboardScenario = bottomToolView.isEditingMediaMessage ? .editingMessage : .hidden
page.updateCaptionViewBottomInset(keyboardScenario: keyboardScenario)
self.setViewControllers([page], direction: direction, animated: isAnimated, completion: nil)
updateMediaRail()
}