oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/photopicker-design'

This commit is contained in:
Michael Kirk 2018-11-27 10:27:25 -07:00
parent 753c88437f 9bcc6a6c57
commit 2c344f6a5b
5 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Signal/src/ViewControllers/MediaGalleryViewController.swift
View File

@ -291,11 +291,7 @@ class MediaGalleryNavigationController: OWSNavigationController {
return
}
navigationBar.respectsTheme = false
navigationBar.barStyle = .black
navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: Theme.darkThemePrimaryColor]
navigationBar.barTintColor = Theme.darkThemeBackgroundColor.withAlphaComponent(0.6)
navigationBar.tintColor = Theme.darkThemePrimaryColor
navigationBar.overrideTheme(type: .alwaysDark)
}
override func viewDidAppear(_ animated: Bool) {

12
Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift
View File

@ -59,12 +59,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
view.backgroundColor = .ows_gray95
if let navBar = self.navigationController?.navigationBar as? OWSNavigationBar {
navBar.makeClear()
} else {
owsFailDebug("Invalid nav bar.")
}
let cancelButton = UIBarButtonItem(barButtonSystemItem: .stop,
target: self,
action: #selector(didPressCancel))
@ -107,6 +101,12 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if let navBar = self.navigationController?.navigationBar as? OWSNavigationBar {
navBar.overrideTheme(type: .alwaysDark)
} else {
owsFailDebug("Invalid nav bar.")
}
// Determine the size of the thumbnails to request
let scale = UIScreen.main.scale
let cellSize = collectionViewFlowLayout.itemSize

16
Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift
View File

@ -39,12 +39,6 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg
view.backgroundColor = .ows_gray95
if let navBar = self.navigationController?.navigationBar as? OWSNavigationBar {
navBar.makeClear()
} else {
owsFailDebug("Invalid nav bar.")
}
if #available(iOS 11, *) {
let titleLabel = UILabel()
titleLabel.text = previousPhotoCollection.localizedTitle()
@ -77,6 +71,16 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg
updateContents()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if let navBar = self.navigationController?.navigationBar as? OWSNavigationBar {
navBar.overrideTheme(type: .alwaysDark)
} else {
owsFailDebug("Invalid nav bar.")
}
}
private func updateContents() {
photoCollections = library.allPhotoCollections()

8
SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
View File

@ -145,7 +145,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
owsFailDebug("navigationBar was nil or unexpected class")
return navController
}
navigationBar.makeClear()
navigationBar.overrideTheme(type: .clear)
return navController
}
@ -247,6 +247,12 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
super.viewWillAppear(animated)
CurrentAppContext().setStatusBarHidden(true, animated: animated)
guard let navigationBar = navigationController?.navigationBar as? OWSNavigationBar else {
owsFailDebug("navigationBar was nil or unexpected class")
return
}
navigationBar.overrideTheme(type: .clear)
}
override public func viewDidAppear(_ animated: Bool) {

58
SignalMessaging/Views/OWSNavigationBar.swift
View File

@ -59,14 +59,11 @@ public class OWSNavigationBar: UINavigationBar {
private func applyTheme() {
guard respectsTheme else {
removeBlurEffectView()
self.setBackgroundImage(nil, for: .default)
return
}
if UIAccessibilityIsReduceTransparencyEnabled() {
removeBlurEffectView()
blurEffectView?.isHidden = true
let color = Theme.navbarBackgroundColor
let backgroundImage = UIImage(color: color)
self.setBackgroundImage(backgroundImage, for: .default)
@ -189,38 +186,37 @@ public class OWSNavigationBar: UINavigationBar {
}
}
// MARK:
// MARK: Override Theme
@objc
public func makeClear() {
self.backgroundColor = .clear
// Making a toolbar transparent requires setting an empty uiimage
self.setBackgroundImage(UIImage(), for: .default)
self.shadowImage = UIImage()
self.clipsToBounds = true
removeBlurEffectView()
public enum NavigationBarThemeOverride: Int {
case clear, alwaysDark
}
// MARK:
@objc
public func overrideTheme(type: NavigationBarThemeOverride) {
respectsTheme = false
private func removeBlurEffectView() {
// Avoid crash on iOS 10.3.3 and iOS 9.4.
//
// Last Exception Backtrace:
// 0 CoreFoundation 0x1b6bfb38 __exceptionPreprocess + 124 (NSException.m:165)
// 1 libobjc.A.dylib 0x1a947062 objc_exception_throw + 34 (objc-exception.mm:521)
// 2 CoreFoundation 0x1b6bfa80 +[NSException raise:format:] + 104 (NSException.m:140)
// 3 UIKit 0x20bfc9fe -[UINavigationBar removeConstraint:] + 84 (UINavigationBar.m:4618)
// 4 UIKit 0x208ee3d4 _UIViewRemoveConstraintsMadeDanglyByChangingSuperview + 534 // (NSLayoutConstraint_UIKitAdditions.m:4716)
// 5 UIKit 0x208ede90 __45-[UIView(Hierarchy) _postMovedFromSuperview:]_block_invoke + 40 // (UIView.m:9467)
// 6 UIKit 0x208edd6c -[UIView(Hierarchy) _postMovedFromSuperview:] + 710 (UIView.m:361)
// 7 UIKit 0x20bd19e8 __UIViewWasRemovedFromSuperview + 154 (UIView.m:8889)
// 8 UIKit 0x208ecf6a -[UIView(Hierarchy) removeFromSuperview] + 528 (UIView.m:8961)
// 9 SignalMessaging 0x1d42b64 OWSNavigationBar.applyTheme() + 218 (OWSNavigationBar.swift:62)
if #available(iOS 11, *) {
self.blurEffectView?.removeFromSuperview()
} else {
self.blurEffectView?.isHidden = true
barStyle = .black
titleTextAttributes = [NSAttributedStringKey.foregroundColor: Theme.darkThemePrimaryColor]
barTintColor = Theme.darkThemeBackgroundColor.withAlphaComponent(0.6)
tintColor = Theme.darkThemePrimaryColor
switch type {
case .clear:
blurEffectView?.isHidden = true
clipsToBounds = true
// Making a toolbar transparent requires setting an empty uiimage
setBackgroundImage(UIImage(), for: .default)
shadowImage = UIImage()
backgroundColor = .clear
case .alwaysDark:
blurEffectView?.isHidden = false
clipsToBounds = false
setBackgroundImage(nil, for: .default)
shadowImage = nil
}
}
}