remove individual reset calls from each example

u10int · Feb 9, 2019 · d82e256 · d82e256
1 parent ba1e018
commit d82e256
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 64 deletions.
diff --git a/Example/Kinetic/BasicFromToTweenViewController.swift b/Example/Kinetic/BasicFromToTweenViewController.swift
@@ -32,15 +32,7 @@ class BasicFromToTweenViewController: ExampleViewController {
 		square.backgroundColor = UIColor.red
 		view.addSubview(square)
 
-//		let tween = Kinetic.animate(square).from(.Position(50,50)).to(.Position(200,200), .Scale(2)).duration(0.5).ease(Easing.inOutCubic).delay(0.5)
 		let tween = Kinetic.animate(square).from(Position(50,50)).to(Position(200,200)).duration(0.5).ease(Cubic.easeInOut)
 		animation = tween
 	}
-
-	override func reset() {
-		super.reset()
-//		square.layer.transform = CATransform3DIdentity
-//		square.frame = CGRect(x: 0, y: 200, width: 50, height: 50)
-		animation?.seek(0)
-	}
 }
diff --git a/Example/Kinetic/BasicFromTweenViewController.swift b/Example/Kinetic/BasicFromTweenViewController.swift
@@ -35,10 +35,4 @@ class BasicFromTweenViewController: ExampleViewController {
 		let tween = Kinetic.animate(square).from(X(50), Size(height: 10)).duration(0.5).ease(Quartic.easeInOut)
 		animation = tween
 	}
-
-	override func reset() {
-		super.reset()
-//		square.frame = CGRect(x: 200, y: 200, width: 100, height: 100)
-		animation?.seek(0)
-	}
 }
diff --git a/Example/Kinetic/BasicTweenViewController.swift b/Example/Kinetic/BasicTweenViewController.swift
@@ -35,9 +35,4 @@ class BasicTweenViewController: ExampleViewController {
 		let tween = square.tween().to(X(250), Size(height: 100)).duration(0.5).ease(Cubic.easeInOut)
 		animation = tween
     }
-
-	override func reset() {
-		super.reset()
-		square.frame = CGRect(x: 50, y: 50, width: 50, height: 50)
-	}
 }
diff --git a/Example/Kinetic/CountingLabelViewController.swift b/Example/Kinetic/CountingLabelViewController.swift
@@ -48,25 +48,11 @@ class CountingLabelViewController: ExampleViewController {
 			.ease(Exponential.easeOut)
 
 		tween.on(.updated) { (animation) -> Void in
-//			self.textLabel.text = "\(String(format:"%.1f", self.testObject.value))"
-		}.on(.completed) { (animation) -> Void in
-			self.textLabel.text = "\(String(format:"%.1f", self.testObject.value))"
-		}
-
-		tween.on(.updated) { (animation) in
 			self.textLabel.text = "\(String(format:"%.1f", self.testObject.value))"
-		}.on(.completed) { (animation) in
+		}.on(.completed) { (animation) -> Void in
 			print("DONE")
 		}
 
 		animation = tween
 	}
-
-	override func reset() {
-		super.reset()
-
-		testObject.value = 50
-		textLabel.text = "\(testObject.value)"
-	}
-
 }
diff --git a/Example/Kinetic/GroupTweenViewController.swift b/Example/Kinetic/GroupTweenViewController.swift
@@ -34,7 +34,7 @@ class GroupTweenViewController: ExampleViewController {
 
 		let moveX: Tween = Tween(target: square).to(X(200)).duration(0.5).ease(Cubic.easeInOut)
 		let moveY: Tween = Tween(target: square).to(Y(290)).duration(0.75).ease(Sine.easeOut)
-		let color: Tween = Tween(target: square).to(BackgroundColor(UIColor.yellow)).duration(0.5).ease(Sine.easeOut)
+		let color: Tween = Tween(target: square).to(BackgroundColor(.yellow)).duration(0.5).ease(Sine.easeOut)
 
 		let timeline = Timeline(tweens: [moveX, moveY, color], align: .start)
 		timeline.yoyo().forever()

diff --git a/Example/Kinetic/PathTweenViewController.swift b/Example/Kinetic/PathTweenViewController.swift
@@ -95,11 +95,6 @@ class PathTweenViewController: ExampleViewController {
 		setPathType(type: .quadratic)
 	}
 
-	override func reset() {
-		super.reset()
-		square.center = start.center
-	}
-
 	func pathTypeChanged(control: UIControl) {
 		if let control = control as? UISegmentedControl {
 			let type: PathType = control.selectedSegmentIndex == 1 ? .cubic : .quadratic

diff --git a/Example/Kinetic/PhysicsViewController.swift b/Example/Kinetic/PhysicsViewController.swift
@@ -116,9 +116,8 @@ class PhysicsViewController: ExampleViewController {
 	}
 
 	override func reset() {
-		animation?.stop()
+		super.reset()
 		Kinetic.killTweensOf(square)
-		square.frame = CGRect(x: 50, y: 50, width: 50, height: 50)
 	}
 
 	func tensionChanged(_ sender: UISlider) {

diff --git a/Example/Kinetic/PreloaderViewController.swift b/Example/Kinetic/PreloaderViewController.swift
@@ -59,7 +59,6 @@ class PreloaderViewController: ExampleViewController {
 
 			if idx < dotCount {
 //				timeline.add(Kinetic.from(dot, duration: 0.5, options: [ .Alpha(0), .Scale(0.01) ]).ease(Easing.outQuart), position: Float(idx) * 0.1)
-
 				let t = Tween(target: dot).to(Rotation(deg2rad(rotation - 360))).duration(2).ease(Quartic.easeInOut)
 				timeline.add(t, position: Float(idx) * 0.15)
 				timeline.addCallback(Float(idx) * 0.15 + 1.5, block: { [unowned self] in

diff --git a/Example/Kinetic/SequenceViewController.swift b/Example/Kinetic/SequenceViewController.swift
@@ -52,12 +52,6 @@ class SequenceViewController: ExampleViewController {
 
 		animation = timeline
 	}
-
-	override func reset() {
-		super.reset()
-		square.frame = CGRect(x: 50, y: 50, width: 50, height: 50)
-		square.backgroundColor = UIColor.red
-	}
 
 	func slower() {
 //		animation?.slower()

diff --git a/Example/Kinetic/StaggerViewController.swift b/Example/Kinetic/StaggerViewController.swift
@@ -47,12 +47,4 @@ class StaggerViewController: ExampleViewController {
 		}
 		animation = timeline
 	}
-
-	override func reset() {
-		super.reset()
-
-		for square in squares {
-			square.frame.size.width = 50
-		}
-	}
 }
diff --git a/Example/Kinetic/TimelineViewController.swift b/Example/Kinetic/TimelineViewController.swift
@@ -99,13 +99,6 @@ class TimelineViewController: ExampleViewController {
 		}
 	}
 
-	override func reset() {
-		super.reset()
-
-		animation?.stop()
-		updateProgress(0)
-	}
-
 	func timelineProgressChanged(_ sender: UISlider) {
 		timelineProgressValue.text = "\(Int(round(sender.value * 100)))%"