Merge pull request #262 in MA/avito-ios-media-picker from SEL-4049 to…

… develop

* commit '524888aaf71dd72d1de95049f2338dd5f0519ce5':
  SEL-4049: Update ImageSource. Remove some redundant code.

Example/PaparazzoExample.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
 </plist>

Example/Podfile

@@ -7,25 +7,25 @@ use_frameworks!
 target 'PaparazzoExample' do
   pod 'Paparazzo', :path => '../'
   pod 'Marshroute', '0.4.2'
-  pod 'ImageSource', '~> 2.2'
+  pod 'ImageSource', '2.2.1'
 end
 
 target 'PaparazzoExample_NoMarshroute' do
   pod 'Paparazzo/Core', :path => '../'
   pod 'Paparazzo/SDWebImage', :path => '../'
-  pod 'ImageSource/Core', '~> 2.2'
-  pod 'ImageSource/PHAsset', '~> 2.2'
-  pod 'ImageSource/Local', '~> 2.2'
-  pod 'ImageSource/Remote', '~> 2.2'
-  pod 'ImageSource/SDWebImage', '~> 2.2'
+  pod 'ImageSource/Core', '2.2.1'
+  pod 'ImageSource/PHAsset', '2.2.1'
+  pod 'ImageSource/Local', '2.2.1'
+  pod 'ImageSource/Remote', '2.2.1'
+  pod 'ImageSource/SDWebImage', '2.2.1'
 end
 
 target 'PaparazzoExample_Storyboard' do
   pod 'Paparazzo/Core', :path => '../'
-  pod 'ImageSource', '~> 2.2'
+  pod 'ImageSource', '2.2.1'
 end
 
 target 'PaparazzoTests' do
     pod 'Paparazzo', :path => '../'
-    pod 'ImageSource', '~> 2.2'
+    pod 'ImageSource', '2.2.1'
 end

Example/Podfile.lock

@@ -1,28 +1,28 @@
 PODS:
-  - Alamofire (4.8.0)
+  - Alamofire (4.8.1)
   - AlamofireImage (3.5.0):
     - Alamofire (~> 4.8)
-  - ImageSource (2.2.0):
-    - ImageSource/AlamofireImage (= 2.2.0)
-    - ImageSource/Core (= 2.2.0)
-    - ImageSource/Local (= 2.2.0)
-    - ImageSource/PHAsset (= 2.2.0)
-    - ImageSource/Remote (= 2.2.0)
-  - ImageSource/AlamofireImage (2.2.0):
+  - ImageSource (2.2.1):
+    - ImageSource/AlamofireImage (= 2.2.1)
+    - ImageSource/Core (= 2.2.1)
+    - ImageSource/Local (= 2.2.1)
+    - ImageSource/PHAsset (= 2.2.1)
+    - ImageSource/Remote (= 2.2.1)
+  - ImageSource/AlamofireImage (2.2.1):
     - AlamofireImage (~> 3)
     - ImageSource/Remote
-  - ImageSource/Core (2.2.0)
-  - ImageSource/Local (2.2.0):
+  - ImageSource/Core (2.2.1)
+  - ImageSource/Local (2.2.1):
     - ImageSource/Core
-  - ImageSource/PHAsset (2.2.0):
+  - ImageSource/PHAsset (2.2.1):
     - ImageSource/Core
-  - ImageSource/Remote (2.2.0):
+  - ImageSource/Remote (2.2.1):
     - ImageSource/Core
     - ImageSource/UIKit
-  - ImageSource/SDWebImage (2.2.0):
+  - ImageSource/SDWebImage (2.2.1):
     - ImageSource/Remote
     - SDWebImage (~> 3.8)
-  - ImageSource/UIKit (2.2.0):
+  - ImageSource/UIKit (2.2.1):
     - ImageSource/Core
   - JNWSpringAnimation (0.7.1)
   - Marshroute (0.4.2)
@@ -70,12 +70,12 @@ PODS:
   - SDWebImage/Core (3.8.2)
 
 DEPENDENCIES:
-  - ImageSource (~> 2.2)
-  - ImageSource/Core (~> 2.2)
-  - ImageSource/Local (~> 2.2)
-  - ImageSource/PHAsset (~> 2.2)
-  - ImageSource/Remote (~> 2.2)
-  - ImageSource/SDWebImage (~> 2.2)
+  - ImageSource (= 2.2.1)
+  - ImageSource/Core (= 2.2.1)
+  - ImageSource/Local (= 2.2.1)
+  - ImageSource/PHAsset (= 2.2.1)
+  - ImageSource/Remote (= 2.2.1)
+  - ImageSource/SDWebImage (= 2.2.1)
   - Marshroute (= 0.4.2)
   - Paparazzo (from `../`)
   - Paparazzo/Core (from `../`)
@@ -95,14 +95,14 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
+  Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
   AlamofireImage: 1aea346f4dda2f6c67622fa5a89fcbb80d79cc16
-  ImageSource: 9588ecfdb8e87bda95ad5fcf6b13e12c5e32f777
+  ImageSource: 51ae8710c111728e9243c50f57dc96b44795f096
   JNWSpringAnimation: cd4c2f4464324f63f176c3624ffccf205211a100
   Marshroute: 15cf8067a997bf298e9db9317dd7c32b8799a787
   Paparazzo: 341cfe0119a30630e857d960cfac6bc344d848b0
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
 
-PODFILE CHECKSUM: b13f9b1ce8f0e18434303e51b543efb5eb6e1a4d
+PODFILE CHECKSUM: 5ae377b4ed464a0fffa4c8ced781286c65669eba
 
 COCOAPODS: 1.5.3

Paparazzo/Core/Helpers/CollectionViewDataSource.swift

@@ -121,7 +121,7 @@ final class CollectionViewDataSource<CellType: Customizable>: NSObject, UICollec
         viewForSupplementaryElementOfKind kind: String,
         at indexPath: IndexPath) -> UICollectionReusableView
     {
-        guard let headerReuseIdentifier = headerReuseIdentifier else {
+        guard let headerReuseIdentifier = headerReuseIdentifier, kind == UICollectionElementKindSectionHeader else {
             preconditionFailure("Invalid supplementary view type for this collection view")
         }
 
@@ -130,6 +130,7 @@ final class CollectionViewDataSource<CellType: Customizable>: NSObject, UICollec
             withReuseIdentifier: headerReuseIdentifier,
             for: indexPath
         )
+        assert(configureHeader != nil)
         configureHeader?(view)
         return view
     }

Paparazzo/Core/VIPER/PhotoLibraryV2/Presenter/PhotoLibraryV2Presenter.swift

@@ -257,10 +257,6 @@ final class PhotoLibraryV2Presenter: PhotoLibraryV2Module {
             self?.view?.hideAlbumsList()
         }
 
-        cameraViewData { [weak self] viewData in
-            self?.view?.setCameraViewData(viewData)
-        }
-
         interactor.observeDeviceOrientation { [weak self] orientation in
             self?.cameraViewData { [weak self] viewData in
                 self?.view?.setCameraViewData(viewData)

Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2View.swift

@@ -205,20 +205,6 @@ final class PhotoLibraryV2View: UIView, UICollectionViewDelegateFlowLayout, Them
 
         cameraViewData = viewData
 
-        dataSource.configureHeader = { [weak self] view in
-            guard let view = view as? PhotoLibraryCameraView else {
-                return
-            }
-
-            view.setCameraIcon(self?.theme?.cameraIcon)
-
-            view.onTap = self?.cameraViewData?.onTap
-
-            if let parameters = self?.cameraViewData?.parameters {
-                view.setOutputParameters(parameters)
-            }
-        }
-
         UIView.performWithoutAnimation {
             // `collectionView.reloadSections(IndexSet(0..<1))` freezes app completely, don't use it
             collectionView.reloadData()