From b16ede0fe96f9f6d48f5ba3c21e1acd285960a5e Mon Sep 17 00:00:00 2001 From: Nelson Tai Date: Thu, 7 Apr 2016 17:39:18 +0800 Subject: [PATCH 1/3] Update travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2780b6..fc2648a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c before_install: -- cd Demo +- cd Demo/Objective-C script: - xctool -project Demo.xcodeproj -scheme Demo -sdk iphonesimulator From db39e8617b63f3297853613936c12fdc8c19aad2 Mon Sep 17 00:00:00 2001 From: Nelson Tai Date: Thu, 7 Apr 2016 18:06:40 +0800 Subject: [PATCH 2/3] Update podspec --- CHTCollectionViewWaterfallLayout.podspec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHTCollectionViewWaterfallLayout.podspec b/CHTCollectionViewWaterfallLayout.podspec index cf52b43..cfe6274 100644 --- a/CHTCollectionViewWaterfallLayout.podspec +++ b/CHTCollectionViewWaterfallLayout.podspec @@ -1,23 +1,24 @@ Pod::Spec.new do |s| s.name = "CHTCollectionViewWaterfallLayout" - s.version = "0.9.2" + s.version = "0.9.3" s.summary = "The waterfall (i.e., Pinterest-like) layout for UICollectionView." s.homepage = "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout" s.screenshots = "https://raw.github.com/chiahsien/UICollectionViewWaterfallLayout/master/Screenshots/2-columns.png" s.license = 'MIT' s.author = { "Nelson" => "chiahsien@gmail.com" } s.source = { :git => "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout.git", :tag => "#{s.version}" } - s.ios.deployment_target = '6.0' s.tvos.deployment_target = '9.0' s.requires_arc = true s.default_subspec = 'ObjC' s.subspec 'ObjC' do |ss| - ss.source_files = '*.{h,m}' + ss.ios.deployment_target = '6.0' + ss.source_files = '*.{h,m}' end s.subspec 'Swift' do |ss| - ss.source_files = '*.swift' + ss.ios.deployment_target = '8.0' + ss.source_files = '*.swift' end end From 2772b200807b0d7811104dc426ec87757de4c01d Mon Sep 17 00:00:00 2001 From: Nelson Tai Date: Fri, 8 Apr 2016 07:49:44 +0800 Subject: [PATCH 3/3] Update podspec and README --- CHTCollectionViewWaterfallLayout.podspec | 6 ++++-- README.md | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHTCollectionViewWaterfallLayout.podspec b/CHTCollectionViewWaterfallLayout.podspec index cfe6274..6d29927 100644 --- a/CHTCollectionViewWaterfallLayout.podspec +++ b/CHTCollectionViewWaterfallLayout.podspec @@ -1,15 +1,17 @@ Pod::Spec.new do |s| s.name = "CHTCollectionViewWaterfallLayout" - s.version = "0.9.3" + s.version = "0.9.4" s.summary = "The waterfall (i.e., Pinterest-like) layout for UICollectionView." s.homepage = "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout" s.screenshots = "https://raw.github.com/chiahsien/UICollectionViewWaterfallLayout/master/Screenshots/2-columns.png" s.license = 'MIT' s.author = { "Nelson" => "chiahsien@gmail.com" } s.source = { :git => "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout.git", :tag => "#{s.version}" } - s.tvos.deployment_target = '9.0' s.requires_arc = true + s.ios.deployment_target = '6.0' + s.tvos.deployment_target = '9.0' + s.default_subspec = 'ObjC' s.subspec 'ObjC' do |ss| diff --git a/README.md b/README.md index 4f2aa32..257ab1b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Screen Shots Features -------- -* Easy to use, it trys to imitate [UICollectionViewFlowLayout]'s usage as much as possible. +* Easy to use, it tries to imitate [UICollectionViewFlowLayout]'s usage as much as possible. * Highly customizable. * Outstanding performance, try 10,000+ items and see the smoothness for yourself. * Support header and footer views. @@ -31,16 +31,17 @@ Prerequisite How to install -------------- * [CocoaPods] - Add `pod 'CHTCollectionViewWaterfallLayout'` to your podfile. + - Add `pod 'CHTCollectionViewWaterfallLayout'` to your Podfile. + - If you prefer Swift, `pod 'CHTCollectionViewWaterfallLayout/Swift'` is ready for you. * Manual - Copy `CHTCollectionViewWaterfallLayout.h/m` to your project. + - Copy `CHTCollectionViewWaterfallLayout.h/m` or `CHTCollectionViewWaterfallLayout.swift` to your project. How to Use ---------- Read the demo codes and `CHTCollectionViewWaterfallLayout.h` header file for more information. #### Step 1 -Below lists the properties for you to customize the layout. Although they have default values, I strongly recommand you to set up at least the `columnCount` property to suit your needs. +Below lists the properties for you to customize the layout. Although they have default values, I strongly recommend you to set up at least the `columnCount` property to suit your needs. The `itemRenderDirection` property is an enum which decides the order in which your items will be rendered in subsequent rows. For eg. Left-Right | Right-Left | Shortest column filling up first. ``` objc @@ -104,4 +105,3 @@ Refer to the [Releases page](https://github.com/chiahsien/CHTCollectionViewWater [Pinterest]: http://pinterest.com/ [PSTCollectionView]: https://github.com/steipete/PSTCollectionView [CocoaPods]: http://cocoapods.org/ -