Merge pull request Ramotion#27 from strivingboy/master

convert to swift 1.2
wangmy · Jun 8, 2015 · fbcbd63 · fbcbd63
2 parents 88898ce + a1de2dc
commit fbcbd63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/RAMAnimatedTabBarController/Animations/FrameAnimation/RAMFrameItemAnimation.swift b/RAMAnimatedTabBarController/Animations/FrameAnimation/RAMFrameItemAnimation.swift
@@ -38,7 +38,7 @@ class RAMFrameItemAnimation: RAMItemAnimation {
 
         let dict : NSDictionary = NSDictionary(contentsOfFile: path!)!
 
-        let animationImagesName = dict["images"] as Array<String>
+        let animationImagesName = dict["images"] as! Array<String>
         createImagesArray(animationImagesName)
 
         // selected image

diff --git a/RAMAnimatedTabBarController/RAMAnimatedTabBarController.swift b/RAMAnimatedTabBarController/RAMAnimatedTabBarController.swift
@@ -71,11 +71,11 @@ class RAMAnimatedTabBarController: UITabBarController {
         if let items = tabBar.items {
             let itemsCount = tabBar.items!.count as Int - 1
             var index = 0
-            for item in self.tabBar.items as [RAMAnimatedTabBarItem] {
+            for item in self.tabBar.items as! [RAMAnimatedTabBarItem] {
 
                 assert(item.image != nil, "add image icon in UITabBarItem")
 
-                var container : UIView = containers["container\(itemsCount-index)"] as UIView
+                var container : UIView = containers["container\(itemsCount-index)"] as! UIView
                 container.tag = index
 
                 var icon = UIImageView(image: item.image)
@@ -171,7 +171,7 @@ class RAMAnimatedTabBarController: UITabBarController {
         var  constranints = NSLayoutConstraint.constraintsWithVisualFormat(formatString,
                                                                     options:NSLayoutFormatOptions.DirectionRightToLeft,
                                                                     metrics: nil,
-                                                                      views: containersDict)
+                                                                      views: containersDict as [NSObject : AnyObject])
         view.addConstraints(constranints)
 
         return containersDict
@@ -215,7 +215,7 @@ class RAMAnimatedTabBarController: UITabBarController {
 
     func tapHandler(gesture:UIGestureRecognizer) {
 
-        let items = tabBar.items as [RAMAnimatedTabBarItem]
+        let items = tabBar.items as! [RAMAnimatedTabBarItem]
 
         let currentIndex = gesture.view!.tag
         if selectedIndex != currentIndex {