updated SideNavigationController and MaterialIcon images

Examples/Programmatic/SideNavigationController/SideNavigationController/AppDelegate.swift

@@ -37,8 +37,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 	
 	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+		let sideNavigationController: SideNavigationController = SideNavigationController(rootViewController: YellowViewController(), leftViewController: AppLeftViewController(), rightViewController: BlueViewController())
+		
+//		sideNavigationController.enabled = true
+//		
+//		sideNavigationController.enabledLeftView = true
+//		sideNavigationController.enabledLeftTapGesture = true
+//		sideNavigationController.enabledLeftPanGesture = true
+//		
+//		sideNavigationController.enabledRightView = true
+//		sideNavigationController.enabledRightTapGesture = true
+//		sideNavigationController.enabledRightPanGesture = true
+		
 		window = UIWindow(frame: UIScreen.mainScreen().bounds)
-		window!.rootViewController = SideNavigationController(rootViewController: YellowViewController(), leftViewController: AppLeftViewController(), rightViewController: BlueViewController())
+		window!.rootViewController = sideNavigationController
 		window!.makeKeyAndVisible()
 		return true
 	}

Examples/Programmatic/SideNavigationController/SideNavigationController/YellowViewController.swift

@@ -37,6 +37,11 @@ class YellowViewController: UIViewController {
 		prepareView()
 	}
 	
+	override func viewWillAppear(animated: Bool) {
+		super.viewWillAppear(animated)
+		sideNavigationController?.openRightView()
+	}
+	
 	/// Prepares view.
 	private func prepareView() {
 		view.backgroundColor = MaterialColor.yellow.base

Examples/Programmatic/Toolbar/Toolbar/ViewController.swift

@@ -39,7 +39,7 @@ import Material
 
 class ViewController: UIViewController {
 	/// Reference for Toolbar.
-	private var toolbar: Toolbar = Toolbar()
+	private var toolbar: Toolbar!
 	
 	override func viewDidLoad() {
 		super.viewDidLoad()
@@ -54,6 +54,8 @@ class ViewController: UIViewController {
 	
 	/// Prepares the toolbar
 	private func prepareToolbar() {
+		toolbar = Toolbar()
+		
 		// Title label.
 		let titleLabel: UILabel = UILabel()
 		titleLabel.text = "Material"

Material.podspec

 Pod::Spec.new do |s|
   s.name = 'Material'
-  s.version = '1.40.0'
+  s.version = '1.40.1'
   s.license = 'BSD'
   s.summary = 'An animation and graphics framework for Material Design in Swift.'
   s.homepage = 'http://cosmicmind.io'

Sources/Assets.xcassets/cm_add_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_add_white_2x.png",
+      "filename" : "cm_add_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_add_white_3x.png",
+      "filename" : "cm_add_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_arrow_back_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_arrow_back_white_2x.png",
+      "filename" : "cm_arrow_back_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_arrow_back_white_3x.png",
+      "filename" : "cm_arrow_back_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_arrow_downward_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_arrow_downward_white_2x.png",
+      "filename" : "cm_arrow_downward_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_arrow_downward_white_3x.png",
+      "filename" : "cm_arrow_downward_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_audio_library_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_audio_library_white_2x.png",
+      "filename" : "cm_audio_library_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_audio_library_white_3x.png",
+      "filename" : "cm_audio_library_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_audio_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_audio_white_2x.png",
+      "filename" : "cm_audio_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_audio_white_3x.png",
+      "filename" : "cm_audio_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_bell_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_bell_white_2x.png",
+      "filename" : "cm_bell_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_bell_white_3x.png",
+      "filename" : "cm_bell_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_check_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_check_white_2x.png",
+      "filename" : "cm_check_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_check_white_3x.png",
+      "filename" : "cm_check_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_close_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_close_white_2x.png",
+      "filename" : "cm_close_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_close_white_3x.png",
+      "filename" : "cm_close_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_image_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_image_white_2x.png",
+      "filename" : "cm_image_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_image_white_3x.png",
+      "filename" : "cm_image_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_menu_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_menu_white_2x.png",
+      "filename" : "cm_menu_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_menu_white_3x.png",
+      "filename" : "cm_menu_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_microphone_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_microphone_white_2x.png",
+      "filename" : "cm_microphone_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_microphone_white_3x.png",
+      "filename" : "cm_microphone_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_more_horiz_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_more_horiz_white_2x.png",
+      "filename" : "cm_more_horiz_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_more_horiz_white_3x.png",
+      "filename" : "cm_more_horiz_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_more_vert_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_more_vert_white_2x.png",
+      "filename" : "cm_more_vert_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_more_vert_white_3x.png",
+      "filename" : "cm_more_vert_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_movie_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_movie_white_2x.png",
+      "filename" : "cm_movie_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_movie_white_3x.png",
+      "filename" : "cm_movie_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_pause_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_pause_white_2x.png",
+      "filename" : "cm_pause_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_pause_white_3x.png",
+      "filename" : "cm_pause_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_pen_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_pen_white_2x.png",
+      "filename" : "cm_pen_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_pen_white_3x.png",
+      "filename" : "cm_pen_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_photo_camera_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_photo_camera_white_2x.png",
+      "filename" : "cm_photo_camera_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_photo_camera_white_3x.png",
+      "filename" : "cm_photo_camera_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_photo_library_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_photo_library_white_2x.png",
+      "filename" : "cm_photo_library_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_photo_library_white_3x.png",
+      "filename" : "cm_photo_library_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_play_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_play_white_2x.png",
+      "filename" : "cm_play_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_play_white_3x.png",
+      "filename" : "cm_play_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_search_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_search_white_2x.png",
+      "filename" : "cm_search_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_search_white_3x.png",
+      "filename" : "cm_search_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_settings_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_settings_white_2x.png",
+      "filename" : "cm_settings_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_settings_white_3x.png",
+      "filename" : "cm_settings_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_share_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_share_white_2x.png",
+      "filename" : "cm_share_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_share_white_3x.png",
+      "filename" : "cm_share_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_shuffle_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_shuffle_white_2x.png",
+      "filename" : "cm_shuffle_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_shuffle_white_3x.png",
+      "filename" : "cm_shuffle_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_skip_backward_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_skip_backward_white_2x.png",
+      "filename" : "cm_skip_backward_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_skip_backward_white_3x.png",
+      "filename" : "cm_skip_backward_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_skip_forward_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_skip_forward_white_2x.png",
+      "filename" : "cm_skip_forward_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_skip_forward_white_3x.png",
+      "filename" : "cm_skip_forward_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_star_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_star_white_2x.png",
+      "filename" : "cm_star_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_star_white_3x.png",
+      "filename" : "cm_star_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_videocam_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_videocam_white_2x.png",
+      "filename" : "cm_videocam_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_videocam_white_3x.png",
+      "filename" : "cm_videocam_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_volume_high_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_volume_high_white_2x.png",
+      "filename" : "cm_volume_high_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_volume_high_white_3x.png",
+      "filename" : "cm_volume_high_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_volume_medium_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_volume_medium_white_2x.png",
+      "filename" : "cm_volume_medium_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_volume_medium_white_3x.png",
+      "filename" : "cm_volume_medium_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/cm_volume_off_white.imageset/Contents.json

@@ -7,12 +7,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_volume_off_white_2x.png",
+      "filename" : "cm_volume_off_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "cm_volume_off_white_3x.png",
+      "filename" : "cm_volume_off_white@3x.png",
       "scale" : "3x"
     }
   ],

Sources/Assets.xcassets/ic_add_circle_outline_white.imageset/Contents.json

 {
-    "images": [
-        {
-            "filename": "ic_add_circle_outline_white.png",
-            "idiom": "universal",
-            "scale": "1x"
-        },
-        {
-            "filename": "ic_add_circle_outline_white_2x.png",
-            "idiom": "universal",
-            "scale": "2x"
-        },
-        {
-            "filename": "ic_add_circle_outline_white_3x.png",
-            "idiom": "universal",
-            "scale": "3x"
-        }
-    ],
-    "info": {
-        "author": "xcode",
-        "version": 1
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_add_circle_outline_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_add_circle_outline_white@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_add_circle_outline_white@3x.png",
+      "scale" : "3x"
     }
-}
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Sources/Assets.xcassets/ic_add_circle_white.imageset/Contents.json

 {
-    "images": [
-        {
-            "filename": "ic_add_circle_white.png",
-            "idiom": "universal",
-            "scale": "1x"
-        },
-        {
-            "filename": "ic_add_circle_white_2x.png",
-            "idiom": "universal",
-            "scale": "2x"
-        },
-        {
-            "filename": "ic_add_circle_white_3x.png",
-            "idiom": "universal",
-            "scale": "3x"
-        }
-    ],
-    "info": {
-        "author": "xcode",
-        "version": 1
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_add_circle_white.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_add_circle_white@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_add_circle_white@3x.png",
+      "scale" : "3x"
     }
-}
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file