Merge pull request #58 from AntiVIRUZ/additional-customization

Adding customization

DemoExpandingCollection/DemoExpandingCollection.xcodeproj/project.pbxproj

@@ -569,7 +569,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftgen >/dev/null; then\nswiftgen images \"$PROJECT_DIR/DemoExpandingCollection/Assets.xcassets\" --output \"$PROJECT_DIR/DemoExpandingCollection/Constants/Images.swift\"\nelse\necho \"warning: SwiftGen not installed, download it from https://github.com/AliSoftware/SwiftGen\"\nfi";
+			shellScript = "if which swiftgen >/dev/null; then\nswiftgen images \"$PROJECT_DIR/DemoExpandingCollection/Assets.xcassets\" -t swift3 --output \"$PROJECT_DIR/DemoExpandingCollection/Constants/Images.swift\"\nelse\necho \"warning: SwiftGen not installed, download it from https://github.com/AliSoftware/SwiftGen\"\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 

DemoExpandingCollection/DemoExpandingCollection/Constants/Images.swift

@@ -1,35 +1,59 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/AliSoftware/SwiftGen
 
-import Foundation
-import UIKit
+#if os(iOS) || os(tvOS) || os(watchOS)
+  import UIKit.UIImage
+  typealias Image = UIImage
+#elseif os(OSX)
+  import AppKit.NSImage
+  typealias Image = NSImage
+#endif
 
-extension UIImage {
-  enum Asset: String {
-    case BackgroundImage = "BackgroundImage"
-    case CloseButton = "CloseButton"
-    case Dots = "dots"
-    case Face1 = "face1"
-    case Face2 = "face2"
-    case Heand = "heand"
-    case Icons = "icons"
-    case Image = "image"
-    case Item0 = "item0"
-    case Item1 = "item1"
-    case Item2 = "item2"
-    case Item3 = "item3"
-    case LocationButton = "locationButton"
-    case Map = "map"
-    case PinIcon = "pinIcon"
-    case SearchIcon = "searchIcon"
-    case Stars = "stars"
-    case Title = "Title"
+// swiftlint:disable file_length
+// swiftlint:disable line_length
 
-    var image: UIImage {
-      return UIImage(asset: self)
-    }
-  }
+// swiftlint:disable type_body_length
+enum Asset: String {
+  case backgroundImage = "BackgroundImage"
+  case closeButton = "CloseButton"
+  case dots = "dots"
+  case face1 = "face1"
+  case face2 = "face2"
+  case heand = "heand"
+  case icons = "icons"
+  case image = "image"
+  case item0 = "item0"
+  case item1 = "item1"
+  case item2 = "item2"
+  case item3 = "item3"
+  case locationButton = "locationButton"
+  case map = "map"
+  case pinIcon = "pinIcon"
+  case searchIcon = "searchIcon"
+  case stars = "stars"
+  case title = "Title"
 
-  convenience init!(asset: Asset) {
-    self.init(named: asset.rawValue)
+  var image: Image {
+    let bundle = Bundle(for: BundleToken.self)
+    #if os(iOS) || os(tvOS) || os(watchOS)
+    let image = Image(named: rawValue, in: bundle, compatibleWith: nil)
+    #elseif os(OSX)
+    let image = bundle.image(forResource: rawValue)
+    #endif
+    guard let result = image else { fatalError("Unable to load image \(rawValue).") }
+    return result
   }
 }
+// swiftlint:enable type_body_length
+
+extension Image {
+  convenience init!(asset: Asset) {
+    #if os(iOS) || os(tvOS) || os(watchOS)
+    let bundle = Bundle(for: BundleToken.self)
+    self.init(named: asset.rawValue, in: bundle, compatibleWith: nil)
+    #elseif os(OSX)
+    self.init(named: asset.rawValue)
+    #endif
+  }
+}
+
+private final class BundleToken {}

DemoExpandingCollection/DemoExpandingCollection/ViewControllers/DemoTableViewController/DemoTableViewController.swift

@@ -14,7 +14,7 @@ class DemoTableViewController: ExpandingTableViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
     configureNavBar()
-    let image1 = UIImage.Asset.BackgroundImage.image
+    let image1 = Asset.backgroundImage.image
     tableView.backgroundView = UIImageView(image: image1)
   }
 }

DemoExpandingCollection/DemoExpandingCollection/Views/AnimatingBarButton/Animations/Rotatable.swift

@@ -17,10 +17,10 @@ extension Rotatable {
 
   func rotateAnimationFrom(_ fromItem: UIView, toItem: UIView, duration: Double) {
     
-    let fromRotate  = animationFrom(0, to: M_PI, key: "transform.rotation", duration: duration)
+    let fromRotate  = animationFrom(0, to: Double.pi, key: "transform.rotation", duration: duration)
     let fromOpacity = animationFrom(1, to: 0, key: "opacity", duration: duration)
 
-    let toRotate    = animationFrom(-M_PI, to: 0, key: "transform.rotation", duration: duration)
+    let toRotate    = animationFrom(-Double.pi, to: 0, key: "transform.rotation", duration: duration)
     let toOpacity   = animationFrom(0, to: 1, key: "opacity", duration: duration)
     
     fromItem.layer.add(fromRotate, forKey: nil)

README.md

@@ -13,12 +13,18 @@
 
 ## About
 This project is maintained by Ramotion, Inc.<br>
-We specialize in the designing and coding of custom UI for Mobile Apps and Websites.<br><br>**Looking for developers for your project?** [[▶︎CONTACT OUR TEAM◀︎](http://business.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-contact-us/#Get_in_Touch)]
+We specialize in the designing and coding of custom UI for Mobile Apps and Websites.<br><br>**Looking for developers for your project?** 
+
+<a href="https://business.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-contact-us/#Get_in_Touch" > <img src="https://github.com/Ramotion/navigation-stack/raw/master/contact_our_team@2x.png" width="150" height="30"></a>
 
 
 [![Animation](https://raw.githubusercontent.com/Ramotion/expanding-collection/master/preview.gif)](https://dribbble.com/shots/2741477-iOS-Expanding-Collection-Open-Source)
 
-The [iPhone mockup](https://store.ramotion.com/product/iphone-6-mockups?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection) available [here](https://store.ramotion.com/product/iphone-6-mockups?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection).
+The [iPhone mockup](https://store.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection) available [here](https://store.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection).
+
+## Try this UI control in action
+
+<a href="https://itunes.apple.com/app/apple-store/id1182360240?pt=550053&ct=gthb-expanding-collection&mt=8" > <img src="https://github.com/Ramotion/navigation-stack/raw/master/Download_on_the_App_Store_Badge_US-UK_135x40.png" width="170" height="58"></a>
 
 ## Requirements
 
@@ -31,7 +37,7 @@ Just add the Source folder to your project.
 
 or use [CocoaPods](https://cocoapods.org) with Podfile:
 ``` ruby
-pod 'expanding-collection', '~> 1.0.2' swift 3
+pod 'expanding-collection', '~> 1.0.3' swift 3
 
 pod 'expanding-collection', '~> 0.3.2' swift 2
 ```

Source/ExpandingViewController/CollectionView/Cells/BasePageCollectionCell.swift

@@ -11,8 +11,16 @@ import UIKit
 /// Base class for UICollectionViewCell
 open class BasePageCollectionCell: UICollectionViewCell {
   
-  /// Animation oposition offset when cell is open
+  /// DEPRECATED! Animation oposition offset when cell is open
   @IBInspectable open var yOffset: CGFloat = 40
+  /// Spacing between centers of views
+  @IBInspectable open var ySpacing: CGFloat = CGFloat.greatestFiniteMagnitude
+  /// Additional height of back view, when it grows
+  @IBInspectable open var additionalHeight: CGFloat = CGFloat.greatestFiniteMagnitude
+  /// Additional width of back view, when it grows
+  @IBInspectable open var additionalWidth: CGFloat = CGFloat.greatestFiniteMagnitude
+  /// Should front view drow shadow to bottom or not
+  @IBInspectable open var dropShadow: Bool = true
   
   // MARK: Constants
   
@@ -100,19 +108,32 @@ extension BasePageCollectionCell {
   public func cellIsOpen(_ isOpen: Bool, animated: Bool = true) {
     if isOpen == isOpened { return }
     
-    frontConstraintY.constant = isOpen == true ? -frontContainerView.bounds.size.height / 5 : 0
-    backConstraintY.constant  = isOpen == true ? frontContainerView.bounds.size.height / 5 - yOffset / 2 : 0
+    if ySpacing == .greatestFiniteMagnitude {
+      frontConstraintY.constant = isOpen == true ? -frontContainerView.bounds.size.height / 5 : 0
+      backConstraintY.constant  = isOpen == true ? frontContainerView.bounds.size.height / 5 - yOffset / 2 : 0
+    } else {
+      frontConstraintY.constant = isOpen == true ? -ySpacing / 2 : 0
+      backConstraintY.constant  = isOpen == true ? ySpacing / 2 : 0
+    }
     
     if let widthConstant = backContainerView.getConstraint(.width) {
-      widthConstant.constant = isOpen == true ? frontContainerView.bounds.size.width + yOffset : frontContainerView.bounds.size.width
+      if additionalWidth == .greatestFiniteMagnitude {
+        widthConstant.constant = isOpen == true ? frontContainerView.bounds.size.width + yOffset : frontContainerView.bounds.size.width
+      } else {
+        widthConstant.constant = isOpen == true ? frontContainerView.bounds.size.width + additionalWidth : frontContainerView.bounds.size.width
+      }
     }
     
     if let heightConstant = backContainerView.getConstraint(.height) {
-      heightConstant.constant = isOpen == true ? frontContainerView.bounds.size.height + yOffset : frontContainerView.bounds.size.height
+      if additionalHeight == .greatestFiniteMagnitude {
+        heightConstant.constant = isOpen == true ? frontContainerView.bounds.size.height + yOffset : frontContainerView.bounds.size.height
+      } else {
+        heightConstant.constant = isOpen == true ? frontContainerView.bounds.size.height + additionalHeight : frontContainerView.bounds.size.height
+      }
     }
     
+    isOpened = isOpen
     configurationCell()
-
     
     if animated == true {
       UIView.animate(withDuration: 0.3, delay: 0, options: UIViewAnimationOptions(), animations: {
@@ -122,7 +143,6 @@ extension BasePageCollectionCell {
       self.contentView.layoutIfNeeded()
     }
    
-    isOpened = isOpen
   }
 }
 
@@ -148,10 +168,12 @@ extension BasePageCollectionCell {
       $0.backgroundColor                           = UIColor(white: 0, alpha: 0)
       $0.translatesAutoresizingMaskIntoConstraints = false
       $0.layer.masksToBounds                       = false;
-      $0.layer.shadowColor                         = UIColor.black.cgColor
-      $0.layer.shadowRadius                        = 10
-      $0.layer.shadowOpacity                       = 0.3
-      $0.layer.shadowOffset                        = CGSize(width: 0, height:0)
+      if dropShadow {
+        $0.layer.shadowColor                         = UIColor.black.cgColor
+        $0.layer.shadowRadius                        = 10
+        $0.layer.shadowOpacity                       = 0.3
+        $0.layer.shadowOffset                        = CGSize(width: 0, height:0)
+      }
     }
     contentView.insertSubview(shadow, belowSubview: view)
     
@@ -191,8 +213,13 @@ extension BasePageCollectionCell {
 		
 		frame.size.height += i * superHeight
 		frame.origin.y -= i * superHeight / 2
-		frame.origin.x -= i * yOffset / 2
-		frame.size.width += i * yOffset
+        if additionalWidth == .greatestFiniteMagnitude {
+            frame.origin.x -= i * yOffset / 2
+            frame.size.width += i * yOffset
+        } else {
+            frame.origin.x -= i * additionalWidth / 2
+            frame.size.width += i * additionalWidth
+        }
 	}
 	
   

expanding-collection.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'expanding-collection'
-  s.version      = '1.0.2'
+  s.version      = '1.0.3'
   s.summary      = 'Transition animtion from CollectionView to TableView'
   s.license      = 'MIT'
   s.homepage     = 'https://github.com/Ramotion/expanding-collection'
   s.author       = { 'Juri Vasylenko' => 'juri.v@ramotion.com' }
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.source       = { :git => 'https://github.com/Ramotion/expanding-collection.git', :tag => s.version.to_s }
   s.source_files  = 'Source/**/*.swift'
 end