Support horizontal scrolling #15

Author: muukii

Podfile.lock

@@ -1,20 +1,20 @@
 PODS:
-  - EasyPeasy (1.8.0)
-  - Reveal-SDK (21)
+  - EasyPeasy (1.10.0)
+  - Reveal-SDK (32)
 
 DEPENDENCIES:
   - EasyPeasy
   - Reveal-SDK
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - EasyPeasy
     - Reveal-SDK
 
 SPEC CHECKSUMS:
-  EasyPeasy: bfffe5d47bbaaef3e32888c250a196768484b43a
-  Reveal-SDK: 3523e0eb7c562811c51bb71da6e523a6373702c8
+  EasyPeasy: b9b1bae024d21a7dfa9bad26d6826d88348cc6f1
+  Reveal-SDK: 559f22118e742b3e7d03cd50350efe21a0d0b3ba
 
 PODFILE CHECKSUM: 801a5623355ad33f423fde4c805d2477d85eadb4
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.11.2

StackScrollView.xcodeproj/project.pbxproj

@@ -321,10 +321,12 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-StackScrollView-Demo/Pods-StackScrollView-Demo-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/EasyPeasy/EasyPeasy.framework",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Reveal-SDK/RevealServer.framework/RevealServer",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EasyPeasy.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

StackScrollView/StackCell.swift

@@ -1,14 +1,7 @@
-//
-//  StackCell.swift
-//  StackScrollView
-//
-//  Created by muukii on 5/2/17.
-//  Copyright © 2017 muukii. All rights reserved.
-//
 
 import Foundation
+import UIKit
 
-// MARK: Beta
 open class StackCell: UIView, StackCellType {
 
   open var shouldAnimateLayoutChanges: Bool = true

StackScrollView/StackCellType.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public protocol StackCellType : class {
+public protocol StackCellType : AnyObject {
 
 }
 
@@ -45,7 +45,7 @@ extension StackCellType where Self : UIView {
 
   public func scrollToSelf(animated: Bool) {
 
-    stackScrollView?.scroll(to: self, animated: animated)
+    stackScrollView?.scroll(to: self, at: .centeredVertically, animated: animated)
   }
 
   public func scrollToSelf(at position: UICollectionView.ScrollPosition, animated: Bool) {

StackScrollView/StackScrollView.swift

@@ -30,6 +30,7 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
     static let left = "me.muukii.StackScrollView.left"
     static let bottom = "me.muukii.StackScrollView.bottom"
     static let width = "me.muukii.StackScrollView.width"
+    static let height = "me.muukii.StackScrollView.height"
   }
 
   private static func defaultLayout() -> UICollectionViewFlowLayout {
@@ -51,6 +52,10 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
     didSet {
     }
   }
+
+  private var direction: UICollectionView.ScrollDirection {
+    (collectionViewLayout as! UICollectionViewFlowLayout).scrollDirection
+  }
 
   // MARK: - Initializers
 
@@ -323,27 +328,61 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
 
     if let view = view as? ManualLayoutStackCellType {
 
-      return view.size(maxWidth: collectionView.bounds.width, maxHeight: nil)
+      switch direction {
+      case .vertical:
+        return view.size(maxWidth: collectionView.bounds.width, maxHeight: nil)
+      case .horizontal:
+        return view.size(maxWidth: nil, maxHeight: collectionView.bounds.height)
+      @unknown default:
+        fatalError()
+      }
 
     } else {
 
-      let width: NSLayoutConstraint = {
+      switch direction {
+      case .vertical:
 
-        guard let c = view.constraints.filter({ $0.identifier == LayoutKeys.width }).first else {
-          let width = view.widthAnchor.constraint(equalToConstant: collectionView.bounds.width)
-          width.identifier = LayoutKeys.width
-          width.isActive = true
-          return width
-        }
+        let width: NSLayoutConstraint = {
 
-        return c
-      }()
+          guard let c = view.constraints.first(where: { $0.identifier == LayoutKeys.width }) else {
+            let width = view.widthAnchor.constraint(equalToConstant: collectionView.bounds.width)
+            width.identifier = LayoutKeys.width
+            width.isActive = true
+            return width
+          }
 
-      width.constant = collectionView.bounds.width
+          return c
+        }()
 
-      let size = view.superview?.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize) ?? view.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
-      
-      return size
+        width.constant = collectionView.bounds.width
+
+        let size = view.superview?.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize) ?? view.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
+
+        return size
+
+      case .horizontal:
+
+        let heightConstraint: NSLayoutConstraint = {
+
+          guard let c = view.constraints.first(where: { $0.identifier == LayoutKeys.height }) else {
+            let heightConstraint = view.heightAnchor.constraint(equalToConstant: collectionView.bounds.height)
+            heightConstraint.identifier = LayoutKeys.height
+            heightConstraint.isActive = true
+            return heightConstraint
+          }
+
+          return c
+        }()
+
+        heightConstraint.constant = collectionView.bounds.width
+
+        let size = view.superview?.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize) ?? view.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
+
+        return size
+
+      @unknown default:
+        fatalError()
+      }
 
     }
   }