Fix setting wrong cell type & other minor code presentation

carousell · Apr 4, 2019 · d1deed0 · d1deed0
1 parent 83f2f6f
commit d1deed0
Show file tree

Hide file tree

Showing 8 changed files with 542 additions and 440 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.3.2
+
+* Add new configurable to show live camera view cell in photo picker
+
 ## v1.3.1
 
 * Update the project to Xcode 10 [#26](https://github.com/carousell/pickle/pull/26)

diff --git a/Example/Pickle/CarousellImagePickerController.swift b/Example/Pickle/CarousellImagePickerController.swift
@@ -76,6 +76,8 @@ private struct CarousellTheme: ImagePickerConfigurable {
 
     let doneBarButtonItem: UIBarButtonItem? = UIBarButtonItem(title: "Next", style: .plain, target: nil, action: nil)
 
+    let liveCameraViewEnabled: Bool? = false
+
     // MARK: - Navigation Bar
 
     let navigationBarStyle: UIBarStyle? = .blackTranslucent

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pickle/Classes/ImagePickerConfigurable.swift b/Pickle/Classes/ImagePickerConfigurable.swift
@@ -21,9 +21,6 @@ public protocol ImagePickerConfigurable {
     /// A custom bar button item displayed on the right (or trailing) edge of the navigation bar when the receiver is the top navigation item.
     var doneBarButtonItem: UIBarButtonItem? { get }
 
-    /// Configure to enable/disable live camera view in place of the camera icon cell
-    var liveCameraViewEnabled: Bool { get }
-
     // MARK: - Navigation Bar
 
     /// The navigation bar style that specifies its appearance.
@@ -78,6 +75,10 @@ public protocol ImagePickerConfigurable {
 
     /// The margin for the text of the hint label.
     var hintTextMargin: UIEdgeInsets? { get }
+
+    // MARK: -
+    /// Specifies whether the photo gallery should show a live camera view cell
+    var liveCameraViewEnabled: Bool? { get }
 }
 
 

diff --git a/LiveView.swift → Pickle/Classes/LiveView.swift b/LiveView.swift → Pickle/Classes/LiveView.swift
@@ -9,6 +9,7 @@
 //
 
 import AVFoundation
+import UIKit
 
 final class LiveView: UIView {
 

diff --git a/Pickle/Classes/Parameters.swift b/Pickle/Classes/Parameters.swift
@@ -13,6 +13,7 @@ import UIKit
 /// A struct with placeholders that `ImagePickerConfigurable` requires.
 public struct Parameters: ImagePickerConfigurable {
 
+
     /// Returns a configuration instance with default parameters.
     public init() {}
 
@@ -79,4 +80,9 @@ public struct Parameters: ImagePickerConfigurable {
     /// The margin for the text of the hint label.
     public var hintTextMargin: UIEdgeInsets?
 
+    // MARK: -
+
+    /// Specifies weather photo gallery should show a live preview
+    public var liveCameraViewEnabled: Bool?
+
 }
diff --git a/Pickle/Classes/PhotoGalleryLiveViewCell.swift b/Pickle/Classes/PhotoGalleryLiveViewCell.swift
@@ -10,6 +10,7 @@
 
 import Foundation
 import AVFoundation
+import UIKit
 
 final class PhotoGalleryLiveViewCell: UICollectionViewCell {
 

diff --git a/Pickle/Classes/PhotoGalleryViewController.swift b/Pickle/Classes/PhotoGalleryViewController.swift
@@ -141,7 +141,7 @@ internal final class PhotoGalleryViewController: UIViewController,
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: PhotoGalleryLiveViewCell.self), for: indexPath)
                 return cell
             } else {
-                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: PhotoGalleryCell.self), for: indexPath)
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: PhotoGalleryCameraCell.self), for: indexPath)
                 return cell
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     //
     import AVFoundation
+    import UIKit
     final class LiveView: UIView {
@@ Expand Down @@