Skip to content

Commit 40b90a0

Browse files
committed
Updated readme and colors
1 parent c39291b commit 40b90a0

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Example/CKWaveCollectionViewTransition/Base.lproj/Main.storyboard

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3333
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
3434
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="2" minimumInteritemSpacing="2" id="DbD-Ay-08d">
35-
<size key="itemSize" width="158" height="158"/>
35+
<size key="itemSize" width="159" height="159"/>
3636
<size key="headerReferenceSize" width="0.0" height="0.0"/>
3737
<size key="footerReferenceSize" width="0.0" height="0.0"/>
3838
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -42,11 +42,11 @@
4242
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
4343
<autoresizingMask key="autoresizingMask"/>
4444
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
45-
<rect key="frame" x="0.0" y="0.0" width="158" height="158"/>
45+
<rect key="frame" x="0.0" y="0.0" width="159" height="159"/>
4646
<autoresizingMask key="autoresizingMask"/>
4747
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
4848
</view>
49-
<color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
49+
<color key="backgroundColor" red="0.94901960784313721" green="0.45098039215686275" blue="0.42352941176470588" alpha="1" colorSpace="calibratedRGB"/>
5050
</collectionViewCell>
5151
</cells>
5252
<connections>
@@ -83,7 +83,7 @@
8383
<autoresizingMask key="autoresizingMask"/>
8484
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
8585
</view>
86-
<color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
86+
<color key="backgroundColor" red="0.21176470588235294" green="0.5725490196078431" blue="0.85882352941176465" alpha="1" colorSpace="calibratedRGB"/>
8787
</collectionViewCell>
8888
</cells>
8989
<connections>
@@ -106,7 +106,7 @@
106106
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
107107
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
108108
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="2" minimumInteritemSpacing="2" id="pkt-fL-J2w">
109-
<size key="itemSize" width="50" height="50"/>
109+
<size key="itemSize" width="78" height="78"/>
110110
<size key="headerReferenceSize" width="0.0" height="0.0"/>
111111
<size key="footerReferenceSize" width="0.0" height="0.0"/>
112112
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -116,11 +116,11 @@
116116
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
117117
<autoresizingMask key="autoresizingMask"/>
118118
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
119-
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
119+
<rect key="frame" x="0.0" y="0.0" width="78" height="78"/>
120120
<autoresizingMask key="autoresizingMask"/>
121121
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
122122
</view>
123-
<color key="backgroundColor" red="0.68774584790000004" green="0.049961756990000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
123+
<color key="backgroundColor" red="0.13725490196078433" green="0.80392156862745101" blue="0.69019607843137254" alpha="1" colorSpace="calibratedRGB"/>
124124
</collectionViewCell>
125125
</cells>
126126
<connections>

README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
This is a cool custom transition between two or more UICollectionViewControllers with wave like cell animation.
44
Could be used in e.g. galleries.
55

6-
![anim.gif](https://bitbucket.org/repo/bdbxyL/images/1848372571-anim.gif)
6+
![anim.gif](http://i.giphy.com/3o85xyoYepG177Bhte.gif)
7+
8+
Animation idea was taken from [Łukasz Frankiewicz](http://twitter.com/almetien) [Dribble project](https://dribbble.com/shots/2044312-Bits-and-pixels-Tide-Transition)
79

810
## Installation
911

@@ -54,21 +56,20 @@ func navigationController(navigationController: UINavigationController, animatio
5456

5557

5658
```swift
57-
internal let animationDuration = 1.0
59+
internal let animationDuration: Double! = 1.0
5860
```
5961

60-
6162
Total animation duration
6263

6364
```swift
64-
internal let kCellAnimSmallDelta: Double = 0.01
65+
internal let kCellAnimSmallDelta: Double! = 0.01
6566
```
6667

6768
Small delay between cell animations
6869

6970

7071
```swift
71-
internal let kCellAnimBigDelta: Double = 0.03
72+
internal let kCellAnimBigDelta: Double! = 0.03
7273
```
7374

7475
Big delay between cell animations

0 commit comments

Comments
 (0)