Skip to content

Commit b6454b4

Browse files
committed
update
1 parent fedae70 commit b6454b4

7 files changed

Lines changed: 13 additions & 9 deletions

File tree

Example/IntroViewDemo/IntroViewDemo.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@
240240
42F139A71B49DB2F003D31A3 /* Project object */ = {
241241
isa = PBXProject;
242242
attributes = {
243+
LastSwiftMigration = 0700;
244+
LastSwiftUpdateCheck = 0700;
243245
LastUpgradeCheck = 0640;
244246
ORGANIZATIONNAME = "TakeFive Interactive";
245247
TargetAttributes = {

Example/IntroViewDemo/IntroViewDemo/1View.xib

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
56
</dependencies>
67
<objects>
78
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

Example/IntroViewDemo/IntroViewDemo/FourthView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class FourthView: KDIntroView {
2828

2929
@IBOutlet var slideBoard: UIView!
3030

31-
required init(coder aDecoder: NSCoder) {
31+
required init?(coder aDecoder: NSCoder) {
3232
super.init(coder: aDecoder)
3333
addYears()
3434
}

Example/IntroViewDemo/IntroViewDemo/ThirdView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class ThirdView: KDIntroView {
2424
override func moveEverythingAccordingToIndex(index: CGFloat){
2525

2626
var stay = CGAffineTransformMakeTranslation(index, 0)
27-
var turn = CGAffineTransformMake(1 - (index - 250) / 70, (index - 250) / 70 - (index - 250) / 210, -(index - 250) / 70 + (index - 250) / 210, 1 - (index - 250) / 70, (index - 250), (index - 250) * 2.0)
28-
var transform = CGAffineTransformMake(1 - (index - 250) / 210, 0, 0, 1 - (index - 250) / 210, -(index - 250) / 2, -(index - 250) / 3)
27+
let turn = CGAffineTransformMake(1 - (index - 250) / 70, (index - 250) / 70 - (index - 250) / 210, -(index - 250) / 70 + (index - 250) / 210, 1 - (index - 250) / 70, (index - 250), (index - 250) * 2.0)
28+
let transform = CGAffineTransformMake(1 - (index - 250) / 210, 0, 0, 1 - (index - 250) / 210, -(index - 250) / 2, -(index - 250) / 3)
2929

3030
var enlarge = CGAffineTransformMake(1 + index / 20, 0, 0, 1 + index / 20, index, 0)
3131

Example/IntroViewDemo/IntroViewDemo/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ViewController: KDIntroViewController {
4545

4646
if index >= view.frame.width * 3.75 && index <= view.frame.width * 4{
4747

48-
println(index - view.frame.width * 3.75)
48+
print(index - view.frame.width * 3.75)
4949

5050
beginButtonView.transform = CGAffineTransformMake((index - view.frame.width * 3.75) * 2 / 150, 0, 0, (index - view.frame.width * 3.75) * 2 / 150, 0, 160 - (index - view.frame.width * 3.75) * 2)
5151
}else{

Example/IntroViewDemo/Pods/KDIntroView/Pod/Classes/KDIntroViewController.swift

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/IntroViewDemo/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)