Merge pull request #59 from anuragalla/master

updated to swift 1.2
mamaral · Jul 9, 2015 · b3f2f05 · b3f2f05
2 parents 1fe514f + 4dd12da
commit b3f2f05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Swift/OnboardSwift/OnboardingContentViewController.swift b/Swift/OnboardSwift/OnboardingContentViewController.swift
@@ -111,7 +111,7 @@ class OnboardingContentViewController: UIViewController {
         bodyLabel.center = CGPointMake(horizontalCenter, bodyLabel.center.y)
         self.view.addSubview(bodyLabel)
 
-        if (countElements(self.buttonText) != 0) {
+        if (count(self.buttonText) != 0) {
             var actionButton: UIButton = UIButton(frame: CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - kDefaultMainPageControlHeight - kDefaultActionButtonHeight - self.bottomPadding, contentWidth, kDefaultActionButtonHeight))
             actionButton.titleLabel?.font = UIFont .systemFontOfSize(24)
             actionButton.setTitle(self.buttonText, forState: .Normal)

diff --git a/Swift/OnboardSwift/OnboardingViewController.swift b/Swift/OnboardSwift/OnboardingViewController.swift
@@ -163,12 +163,12 @@ class OnboardingViewController: UIViewController, UIPageViewControllerDataSource
 
     // PRAGMA: page view controller delegate
 
-    func pageViewController(pageViewController: UIPageViewController!, didFinishAnimating finished: Bool, previousViewControllers: [AnyObject]!, transitionCompleted completed: Bool) {
+    func pageViewController(pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [AnyObject], transitionCompleted completed: Bool) {
         if !completed {
             return
         }
 
-        let newViewController = pageViewController.viewControllers[0] as UIViewController
+        let newViewController = pageViewController.viewControllers[0] as! UIViewController
         pageControl.currentPage = indexOfViewController(newViewController)
     }
-}
+}