Merge commit '02da15df6b08e054b69b815c4f0b7bcf98f3fad0' into swift-4.2

# Conflicts: # Example/Podfile.lock
avito-tech · May 30, 2019 · b324083 · b324083
2 parents 396c10c + 02da15d
commit b324083
Show file tree

Hide file tree

Showing 23 changed files with 465 additions and 266 deletions.
diff --git a/Example/PaparazzoExample/AppSpecificUITheme.swift b/Example/PaparazzoExample/AppSpecificUITheme.swift
@@ -10,6 +10,8 @@ extension PaparazzoUITheme {
         theme.photoLibraryAlbumCellFont = UIFont(name: "Latoto", size: 17)!
         theme.photoLibraryPlaceholderFont = UIFont(name: "Latoto", size: 17)!
         theme.cameraTitleFont = UIFont(name: "LatotoSemibold", size: 17)!
+        theme.cameraBottomContinueButtonFont = UIFont(name: "Latoto", size: 16)!
+        theme.libraryBottomContinueButtonFont = UIFont(name: "Latoto", size: 16)!
         return theme
     }
 }
diff --git a/Example/PaparazzoExample/Example/Presenter/ExamplePresenter.swift b/Example/PaparazzoExample/Example/Presenter/ExamplePresenter.swift
@@ -76,6 +76,7 @@ final class ExamplePresenter {
                     maxSelectedItemsCount: 5)
                 { module in
                     weak var weakModule = module
+                    module.setContinueButtonPlacement(.bottom)
                     module.onFinish = { result in
                         weakModule?.dismissModule()
                     }
@@ -150,7 +151,7 @@ final class ExamplePresenter {
                     recognitionHandler.onRecognize = { label in
                         module?.showInfoMessage(label, timeout: 3)
                     }
-            }
+                }
             )   
         }
     }
@@ -214,6 +215,7 @@ final class ExamplePresenter {
         }
 
         module.setContinueButtonTitle("Done")
+        module.setContinueButtonPlacement(.bottom)
 
         module.onCancel = { [weak module] in
             module?.dismissModule()

diff --git a/Paparazzo/Core/Extensions/CGRectExtensions.swift b/Paparazzo/Core/Extensions/CGRectExtensions.swift
@@ -55,6 +55,10 @@ extension CGRect {
         self.init(x: left, y: top, width: right - left, height: height)
     }
 
+    init(left: CGFloat, right: CGFloat, bottom: CGFloat, height: CGFloat) {
+        self.init(x: left, y: bottom - height, width: right - left, height: height)
+    }
+
     // Возвращает прямоугольник, повернутый относительно исходного на угол angle и описанный
     // вокруг него (все вершины исходного прямоугольника лежат на сторонах искомого).
     // Результат описан в повернутой системе координат.

diff --git a/Paparazzo/Core/Extensions/UIDeviceExtensions.swift b/Paparazzo/Core/Extensions/UIDeviceExtensions.swift
@@ -8,4 +8,12 @@ extension UIDevice {
         let iPhonePlusHeight = CGFloat(2208)
         return userInterfaceIdiom == .phone && UIScreen.main.nativeBounds.height > iPhonePlusHeight
     }
+
+    var hasTopSafeAreaInset: Bool {
+        if #available(iOS 11.0, *) {
+            let top = UIApplication.shared.keyWindow?.safeAreaInsets.top ?? 0
+            return top > 0
+        }
+        return false
+    }
 }
diff --git a/Paparazzo/Core/PaparazzoPickerModule.swift b/Paparazzo/Core/PaparazzoPickerModule.swift
@@ -8,6 +8,11 @@ public enum MediaPickerContinueButtonStyle {
     case spinner
 }
 
+public enum MediaPickerContinueButtonPlacement {
+    case topRight
+    case bottom
+}
+
 public struct CameraHintData {
     public let title: String
     public let delay: TimeInterval?
@@ -32,6 +37,7 @@ public protocol PaparazzoPickerModule: class {
     func setContinueButtonEnabled(_: Bool)
     func setContinueButtonVisible(_: Bool)
     func setContinueButtonStyle(_: MediaPickerContinueButtonStyle)
+    func setContinueButtonPlacement(_: MediaPickerContinueButtonPlacement)
 
     func setAccessDeniedTitle(_: String)
     func setAccessDeniedMessage(_: String)
@@ -56,6 +62,7 @@ public protocol PaparazzoPickerModule: class {
     var onCropCancel: (() -> ())? { get set }
     var onContinueButtonTap: (() -> ())? { get set }
 
+    var onViewDidLoad: (() -> ())? { get set }
     var onFinish: (([MediaPickerItem]) -> ())? { get set }
     var onCancel: (() -> ())? { get set }
 }
diff --git a/Paparazzo/Core/PaparazzoUITheme.swift b/Paparazzo/Core/PaparazzoUITheme.swift
@@ -40,6 +40,9 @@ public struct PaparazzoUITheme:
     public var cameraSubtitleColor = UIColor(white: 1, alpha: 1)
     public var cameraSubtitleFont = UIFont.systemFont(ofSize: 14)
     public var cameraHintFont = UIFont.systemFont(ofSize: 17)
+    public var cameraBottomContinueButtonBackgroundColor = UIColor(red: 0 / 255, green: 170.0 / 255, blue: 1, alpha: 1)
+    public var cameraBottomContinueButtonTitleColor = UIColor.white
+    public var cameraBottomContinueButtonFont = UIFont.systemFont(ofSize: 16)
 
     public var accessDeniedTitleFont = UIFont.boldSystemFont(ofSize: 17)
     public var accessDeniedMessageFont = UIFont.systemFont(ofSize: 17)
@@ -67,6 +70,9 @@ public struct PaparazzoUITheme:
     public var continueButtonTitleHighlightedColor = UIColor(red: 0, green: 152.0/255, blue: 229.0/255, alpha: 1)
     public var closeIcon = PaparazzoUITheme.image(named: "bt-close")
     public var continueButtonTitleFont = UIFont.systemFont(ofSize: 17)
+    public var libraryBottomContinueButtonBackgroundColor = UIColor(red: 0 / 255, green: 170.0 / 255, blue: 1, alpha: 1)
+    public var libraryBottomContinueButtonTitleColor = UIColor.white
+    public var libraryBottomContinueButtonFont = UIFont.systemFont(ofSize: 16)
 
     // MARK: - ImageCroppingUITheme
 

diff --git a/Paparazzo/Core/VIPER/Camera/View/CameraView.swift b/Paparazzo/Core/VIPER/Camera/View/CameraView.swift
@@ -51,17 +51,19 @@ final class CameraView: UIView, CameraViewInput, ThemeConfigurable {
     override func layoutSubviews() {
         super.layoutSubviews()
 
+        let labelsTargetCenterY = CGFloat(27)
+
         accessDeniedView.bounds = bounds
         accessDeniedView.center = bounds.center
 
         cameraOutputView?.frame = bounds
 
         titleLabel.sizeToFit()
+        subtitleLabel.sizeToFit()
+
         titleLabel.centerX = bounds.centerX
-        let hasSubtitle = (subtitleLabel.text?.count ?? 0) > 0
-        titleLabel.top = hasSubtitle ? 9 : 17
+        titleLabel.top = floor(labelsTargetCenterY - (titleLabel.height + subtitleLabel.height) / 2)
 
-        subtitleLabel.sizeToFit()
         subtitleLabel.centerX = bounds.centerX
         subtitleLabel.top = titleLabel.bottom
 

diff --git a/Paparazzo/Core/VIPER/ImageCropping/View/ImageCroppingView.swift b/Paparazzo/Core/VIPER/ImageCropping/View/ImageCroppingView.swift
@@ -82,7 +82,7 @@ final class ImageCroppingView: UIView, ThemeConfigurable {
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        if UIDevice.current.isIPhoneX {
+        if UIDevice.current.hasTopSafeAreaInset {
             layOutForIPhoneX()
         } else {
             layOutForDevicesExpectForIPhoneX()
@@ -173,7 +173,7 @@ final class ImageCroppingView: UIView, ThemeConfigurable {
 
         switch aspectRatio {
 
-        case .portrait_3x4 where !UIDevice.current.isIPhoneX:
+        case .portrait_3x4 where !UIDevice.current.hasTopSafeAreaInset:
 
             titleLabel.textColor = .white
 

diff --git a/Paparazzo/Core/VIPER/ImageCropping/View/ImageCroppingViewController.swift b/Paparazzo/Core/VIPER/ImageCropping/View/ImageCroppingViewController.swift
@@ -21,13 +21,13 @@ final class ImageCroppingViewController: PaparazzoViewController, ImageCroppingV
         forcePortraitOrientation()
         navigationController?.setNavigationBarHidden(true, animated: animated)
 
-        if !UIDevice.current.isIPhoneX {
+        if !UIDevice.current.hasTopSafeAreaInset {
             UIApplication.shared.setStatusBarHidden(true, with: .fade)
         }
     }
 
     override var prefersStatusBarHidden: Bool {
-        return !UIDevice.current.isIPhoneX
+        return !UIDevice.current.hasTopSafeAreaInset
     }
 
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {

diff --git a/Paparazzo/Core/VIPER/MediaPicker/Presenter/MediaPickerPresenter.swift b/Paparazzo/Core/VIPER/MediaPicker/Presenter/MediaPickerPresenter.swift
@@ -18,6 +18,9 @@ final class MediaPickerPresenter: MediaPickerModule {
         didSet {
             view?.onViewDidLoad = { [weak self] in
                 self?.setUpView()
+                DispatchQueue.main.async {
+                    self?.onViewDidLoad?()
+                }
             }
         }
     }
@@ -32,6 +35,7 @@ final class MediaPickerPresenter: MediaPickerModule {
     var onCropFinish: (() -> ())?
     var onCropCancel: (() -> ())?
     var onContinueButtonTap: (() -> ())?
+    var onViewDidLoad: (() -> ())?
     var onFinish: (([MediaPickerItem]) -> ())?
     var onCancel: (() -> ())?
 
@@ -52,6 +56,11 @@ final class MediaPickerPresenter: MediaPickerModule {
         view?.setContinueButtonStyle(style)
     }
 
+
+    func setContinueButtonPlacement(_ placement: MediaPickerContinueButtonPlacement) {
+        view?.setContinueButtonPlacement(placement)
+    }
+
     public func setCameraTitle(_ title: String) {
         cameraModuleInput.setTitle(title)
     }

diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/Controls/CameraControlsView.swift b/Paparazzo/Core/VIPER/MediaPicker/View/Controls/CameraControlsView.swift
@@ -109,7 +109,7 @@ final class CameraControlsView: UIView, ThemeConfigurable {
         let contentHeight = bounds.inset(by: insets).size.height
         let shutterButtonDiameter = max(shutterButtonMinDiameter, min(shutterButtonMaxDiameter, contentHeight))
         let shutterButtonSize = CGSize(width: shutterButtonDiameter, height: shutterButtonDiameter)
-        let centerY = bounds.centerY - paparazzoSafeAreaInsets.bottom / 2
+        let centerY = bounds.centerY
 
         shutterButton.frame = CGRect(origin: .zero, size: shutterButtonSize)
         shutterButton.center = CGPoint(x: bounds.midX, y: centerY)

diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/Controls/PhotoControlsView.swift b/Paparazzo/Core/VIPER/MediaPicker/View/Controls/PhotoControlsView.swift
@@ -76,7 +76,7 @@ final class PhotoControlsView: UIView, ThemeConfigurable {
             button.size = CGSize.minimumTapAreaSize
             button.center = CGPoint(
                 x: (width * (2.0 * CGFloat(index) + 1.0)) / (2.0 * CGFloat(visibleButtons.count)),
-                y: bounds.centerY - paparazzoSafeAreaInsets.bottom / 2
+                y: bounds.centerY
             )
         }
     }

diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/MediaPickerRootModuleUITheme.swift b/Paparazzo/Core/VIPER/MediaPicker/View/MediaPickerRootModuleUITheme.swift
@@ -1,3 +1,5 @@
+import UIKit
+
 public protocol MediaPickerRootModuleUITheme: AccessDeniedViewTheme {
 
     var shutterButtonColor: UIColor { get }
@@ -14,6 +16,9 @@ public protocol MediaPickerRootModuleUITheme: AccessDeniedViewTheme {
     var cameraSubtitleColor: UIColor { get }
     var cameraSubtitleFont: UIFont { get }
     var cameraHintFont: UIFont { get }
+    var cameraBottomContinueButtonBackgroundColor: UIColor { get }
+    var cameraBottomContinueButtonTitleColor: UIColor { get }
+    var cameraBottomContinueButtonFont: UIFont { get }
 
     var removePhotoIcon: UIImage? { get }
     var autocorrectPhotoIconInactive: UIImage? { get }