bug fix and merge pull request. (see change.md)

suzuki-0000 · Mar 29, 2018 · 327ff4a · 327ff4a
1 parent f7d97a5
commit 327ff4a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.0.7
+
+#### Updated
+- #301 SKPhotoBrowserOptions.displayCounterLabel is not working 
+- #297 I want to hide SKPagingScrollView's horizontal indicator by mothule
+
 ## 5.0.6
 
 #### Updated

diff --git a/SKPhotoBrowser/SKPaginationView.swift b/SKPhotoBrowser/SKPaginationView.swift
@@ -85,6 +85,8 @@ private extension SKPaginationView {
     }
 
     func setupCounterLabel() {
+        guard SKPhotoBrowserOptions.displayCounterLabel else { return }
+
         let label = UILabel(frame: CGRect(x: 0, y: 0, width: 100, height: 50))
         label.center = CGPoint(x: frame.width / 2, y: frame.height / 2)
         label.textAlignment = .center

diff --git a/SKPhotoBrowser/SKPhotoBrowser.swift b/SKPhotoBrowser/SKPhotoBrowser.swift
@@ -538,9 +538,8 @@ private extension SKPhotoBrowser {
     }
 
     func configureGestureControl() {
-        guard !SKPhotoBrowserOptions.disableVerticalSwipe else {
-            return
-        }
+        guard !SKPhotoBrowserOptions.disableVerticalSwipe else { return }
+
         panGesture = UIPanGestureRecognizer(target: self, action: #selector(SKPhotoBrowser.panGestureRecognized(_:)))
         panGesture?.minimumNumberOfTouches = 1
         panGesture?.maximumNumberOfTouches = 1

diff --git a/SKPhotoBrowser/SKZoomingScrollView.swift b/SKPhotoBrowser/SKZoomingScrollView.swift
@@ -22,8 +22,9 @@ open class SKZoomingScrollView: UIScrollView {
         }
     }
 
-    fileprivate(set) var imageView: SKDetectingImageView!
     fileprivate weak var browser: SKPhotoBrowser?
+
+    fileprivate(set) var imageView: SKDetectingImageView!
     fileprivate var tapView: SKDetectingView!
     fileprivate var indicatorView: SKIndicatorView!
 

diff --git a/SKPhotoBrowserExample/SKPhotoBrowserExample/FromCameraRollViewController.swift b/SKPhotoBrowserExample/SKPhotoBrowserExample/FromCameraRollViewController.swift
@@ -68,7 +68,6 @@ class FromCameraRollViewController: UIViewController, SKPhotoBrowserDelegate, UI
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "exampleCollectionViewCell", for: indexPath)
         let asset = assets[(indexPath as NSIndexPath).row]
 

diff --git a/SKPhotoBrowserExample/SKPhotoBrowserExample/FromLocalViewController.swift b/SKPhotoBrowserExample/SKPhotoBrowserExample/FromLocalViewController.swift
@@ -25,10 +25,6 @@ class FromLocalViewController: UIViewController, UICollectionViewDataSource, UIC
         setupCollectionView()
     }
 
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-    }
-
     override var prefersStatusBarHidden: Bool {
         return false
     }