Merge branch 'master' of https://github.com/Ramotion/expanding-collection

fixed bug with blinking on iOS 10
Update README.md
2016-10-17 15:48:19 +03:00 · 2016-10-17 15:48:14 +03:00 · 2016-10-17 16:37:10 +04:00 · 2016-10-17 16:35:32 +04:00 · 2016-10-17 14:23:36 +03:00 · 2016-10-17 10:00:40 +03:00
9 changed files with 33 additions and 20 deletions
@@ -1,4 +1,4 @@
-osx_image: xcode7.3
+osx_image: xcode8
 language: objective-c

 xcode_project: DemoExpandingCollection/DemoExpandingCollection.xcodeproj
@@ -759,7 +759,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = 34MUF9YXTA;
 				INFOPLIST_FILE = DemoExpandingCollection/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -777,7 +777,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = 34MUF9YXTA;
 				INFOPLIST_FILE = DemoExpandingCollection/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -824,7 +824,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ExpandingCollection/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -848,7 +848,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ExpandingCollection/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ramotion.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1,5 +1,15 @@
 {
  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
    {
      "idiom" : "iphone",
      "size" : "29x29",
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="L1n-Ia-Jrw">
    <dependencies>
-        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -8,12 +8,13 @@
 [![CocoaPods](https://img.shields.io/cocoapods/metrics/doc-percent/expanding-collection.svg)](https://cdn.rawgit.com/Ramotion/expanding-collection/master/docs/index.html)

 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Ramotion/expanding-collection)
-[![Travis](https://travis-ci.org/Ramotion/elastic-pull-to-update.svg?branch=master)](https://travis-ci.org/Ramotion/elastic-pull-to-update)
+[![Travis](https://travis-ci.org/Ramotion/expanding-collection.svg?branch=master)](https://travis-ci.org/Ramotion/expanding-collection)
 [![codebeat badge](https://codebeat.co/badges/6a009992-5bf2-4730-aa35-f3b20ce7693d)](https://codebeat.co/projects/github-com-ramotion-expanding-collection)
-[![Analytics](https://ga-beacon.appspot.com/UA-84973210-1/ramotion/expanding-collection)](https://github.com/igrigorik/ga-beacon)

 ## About
-This project is maintained by Ramotion, an agency specialized in building dedicated engineering teams and developing custom software.<br><br> [Contact our team](https://business.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=expanding-collection-contact-us) and we’ll help you work with the best engineers from Eastern Europe.
+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)]
+

 [![Animation](https://raw.githubusercontent.com/Ramotion/expanding-collection/master/preview.gif)](https://dribbble.com/shots/2741477-iOS-Expanding-Collection-Open-Source)

@@ -21,8 +22,8 @@ The [iPhone mockup](https://store.ramotion.com/product/iphone-6-mockups?utm_sour

 ## Requirements

- iOS 8.0+
- Xcode 7.3
+- iOS 9.0+
+- Xcode 8

 ## Installation

@@ -30,7 +31,9 @@ Just add the Source folder to your project.

 or use [CocoaPods](https://cocoapods.org) with Podfile:
 ``` ruby
-pod 'expanding-collection'
+pod 'expanding-collection', '~> 1.0.2' swift 3
+
+pod 'expanding-collection', '~> 0.3.2' swift 2
 ```
 or [Carthage](https://github.com/Carthage/Carthage) users can simply add to their `Cartfile`:
 ```
@@ -40,7 +43,7 @@ github "Ramotion/expanding-collection"
 ## Usage

 ```swift
-import ExpandingCollection
+import expanding_collection
 ```

 #### Create CollectionViewCell
@@ -85,7 +85,6 @@ extension BasePageCollectionCell {
    configurationViews()
    shadowView = createShadowViewOnView(frontContainerView)
  }
-
 }

 // MARK: Control 
@@ -13,12 +13,11 @@ class PageCollectionView: UICollectionView {
 }

 // MARK: init
-
 extension PageCollectionView {
  
  class func createOnView(_ view: UIView,
                          layout: UICollectionViewLayout,
-                          height:CGFloat,
+                          height: CGFloat,
                          dataSource: UICollectionViewDataSource,
                          delegate: UICollectionViewDelegate) -> PageCollectionView {
    
@@ -89,6 +89,9 @@ extension ExpandingViewController {
                                                     height: itemSize.height + itemSize.height / 5 * 2,
                                                     dataSource: self,
                                                     delegate: self)
+    if #available(iOS 10.0, *) {
+      collectionView?.isPrefetchingEnabled = false
+    } 
    transitionDriver = TransitionDriver(view: view)
  }
 }
@@ -109,18 +112,18 @@ extension ExpandingViewController {

 extension ExpandingViewController: UICollectionViewDataSource, UICollectionViewDelegate {
  
-  public func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+  open func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
    guard case let cell as BasePageCollectionCell = cell else {
      return
    }
    
    cell.configureCellViewConstraintsWithSize(itemSize)
  }
-  public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+  open func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
    fatalError("need emplementation in subclass")
  }
  
-  public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+  open func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
    fatalError("need emplementation in subclass")
  }
 }
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = 'expanding-collection'
-  s.version      = '1.0.0'
+  s.version      = '1.0.2'
  s.summary      = 'Transition animtion from CollectionView to TableView'
  s.license      = 'MIT'
  s.homepage     = 'https://github.com/Ramotion/expanding-collection'
Author	SHA1	Message	Date
Alex.k	c9d69f148c	Merge branch 'master' of https://github.com/Ramotion/expanding-collection	2016-10-17 15:48:19 +03:00
Alex.k	e4f0d79eaa	fixed bug with blinking on iOS 10	2016-10-17 15:48:14 +03:00
Juri Vasylenko	a44e54d7e9	Update README.md	2016-10-17 16:37:10 +04:00
Juri Vasylenko	b11b0ce612	Update .travis.yml	2016-10-17 16:35:32 +04:00
Alex	8976f8e45f	Update README.md Fixes #30	2016-10-17 14:23:36 +03:00
aleksei1000000	717cccf841	Update README.md	2016-10-17 10:00:40 +03:00
aleksei1000000	9d7e14d7f5	Update README.md	2016-10-14 14:39:18 +03:00
aleksei1000000	6ac142d507	Update README.md	2016-10-14 14:04:41 +03:00
aleksei1000000	6fb5efd349	Update README.md	2016-10-14 13:56:59 +03:00
aleksei1000000	e0ef4dd95c	Update README.md	2016-10-14 13:00:40 +03:00
aleksei1000000	b00bd352c0	Update README.md	2016-10-14 12:56:40 +03:00
aleksei1000000	224131ffc3	Update README.md	2016-10-14 12:55:39 +03:00
aleksei1000000	017a311d93	Update README.md	2016-10-14 12:49:20 +03:00
Alex.k	c424208817	updated readme and podspect	2016-10-14 10:42:52 +03:00
Alex.k	307d2d8951	deployment target -> 9.0	2016-10-14 10:29:08 +03:00
Alex.k	c2cb27dc85	updated readme	2016-10-14 10:25:37 +03:00
Alex.k	5f30473885	update readme	2016-10-10 16:58:23 +03:00
Alex	0ad7a826d1	Merge pull request #37 from EckoEdc/patch-1 Mark method from UICollectionViewDataSource open	2016-10-10 16:47:02 +03:00
Edric	3e98254fbd	Mark method from UICollectionViewDataSource open This fix compiling error: override of non open method. (Seen using Carthage)	2016-10-10 09:25:01 -04:00
Alex.k	83090712f9	update readme	2016-09-30 17:18:39 +03:00