Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
likedan committed Oct 6, 2015
1 parent fedae70 commit b6454b4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 9 deletions.
2 changes: 2 additions & 0 deletions Example/IntroViewDemo/IntroViewDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@
42F139A71B49DB2F003D31A3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0640;
ORGANIZATIONNAME = "TakeFive Interactive";
TargetAttributes = {
Expand Down
5 changes: 3 additions & 2 deletions Example/IntroViewDemo/IntroViewDemo/1View.xib
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand Down
2 changes: 1 addition & 1 deletion Example/IntroViewDemo/IntroViewDemo/FourthView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class FourthView: KDIntroView {

@IBOutlet var slideBoard: UIView!

required init(coder aDecoder: NSCoder) {
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
addYears()
}
Expand Down
4 changes: 2 additions & 2 deletions Example/IntroViewDemo/IntroViewDemo/ThirdView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class ThirdView: KDIntroView {
override func moveEverythingAccordingToIndex(index: CGFloat){

var stay = CGAffineTransformMakeTranslation(index, 0)
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)
var transform = CGAffineTransformMake(1 - (index - 250) / 210, 0, 0, 1 - (index - 250) / 210, -(index - 250) / 2, -(index - 250) / 3)
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)
let transform = CGAffineTransformMake(1 - (index - 250) / 210, 0, 0, 1 - (index - 250) / 210, -(index - 250) / 2, -(index - 250) / 3)

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

Expand Down
2 changes: 1 addition & 1 deletion Example/IntroViewDemo/IntroViewDemo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ViewController: KDIntroViewController {

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

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

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)
}else{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Example/IntroViewDemo/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b6454b4

Please sign in to comment.