Respond to CR.

pull/1/head
Matthew Chen 7 years ago
parent 2919e8d780
commit 86d006ba14

@ -56,6 +56,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
target: self,
action: #selector(didPressCancel))
if #available(iOS 11, *) {
titleLabel.text = photoCollection.localizedTitle()
titleLabel.textColor = Theme.primaryColor
titleLabel.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight()
@ -71,6 +72,9 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
titleView.isUserInteractionEnabled = true
titleView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(titleTapped)))
navigationItem.titleView = titleView
} else {
navigationItem.title = photoCollection.localizedTitle()
}
let featureFlag_isMultiselectEnabled = true
if featureFlag_isMultiselectEnabled {
@ -242,7 +246,11 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
photoCollection = collection
photoCollectionContents = photoCollection.contents()
if #available(iOS 11, *) {
titleLabel.text = photoCollection.localizedTitle()
} else {
navigationItem.title = photoCollection.localizedTitle()
}
collectionView?.reloadData()
}

@ -37,6 +37,7 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg
override func viewDidLoad() {
super.viewDidLoad()
if #available(iOS 11, *) {
let titleLabel = UILabel()
titleLabel.text = previousPhotoCollection.localizedTitle()
titleLabel.textColor = Theme.primaryColor
@ -53,6 +54,9 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg
titleView.isUserInteractionEnabled = true
titleView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(titleTapped)))
navigationItem.titleView = titleView
} else {
navigationItem.title = previousPhotoCollection.localizedTitle()
}
library.add(delegate: self)

Loading…
Cancel
Save