Commit a5d7594f by Daniel Dahan

updated SideNavigationController and MaterialIcon images

parent 896b88da
...@@ -37,8 +37,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -37,8 +37,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow? var window: UIWindow?
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { 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 = UIWindow(frame: UIScreen.mainScreen().bounds)
window!.rootViewController = SideNavigationController(rootViewController: YellowViewController(), leftViewController: AppLeftViewController(), rightViewController: BlueViewController()) window!.rootViewController = sideNavigationController
window!.makeKeyAndVisible() window!.makeKeyAndVisible()
return true return true
} }
......
...@@ -37,6 +37,11 @@ class YellowViewController: UIViewController { ...@@ -37,6 +37,11 @@ class YellowViewController: UIViewController {
prepareView() prepareView()
} }
override func viewWillAppear(animated: Bool) {
super.viewWillAppear(animated)
sideNavigationController?.openRightView()
}
/// Prepares view. /// Prepares view.
private func prepareView() { private func prepareView() {
view.backgroundColor = MaterialColor.yellow.base view.backgroundColor = MaterialColor.yellow.base
......
...@@ -39,7 +39,7 @@ import Material ...@@ -39,7 +39,7 @@ import Material
class ViewController: UIViewController { class ViewController: UIViewController {
/// Reference for Toolbar. /// Reference for Toolbar.
private var toolbar: Toolbar = Toolbar() private var toolbar: Toolbar!
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -54,6 +54,8 @@ class ViewController: UIViewController { ...@@ -54,6 +54,8 @@ class ViewController: UIViewController {
/// Prepares the toolbar /// Prepares the toolbar
private func prepareToolbar() { private func prepareToolbar() {
toolbar = Toolbar()
// Title label. // Title label.
let titleLabel: UILabel = UILabel() let titleLabel: UILabel = UILabel()
titleLabel.text = "Material" titleLabel.text = "Material"
......
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '1.40.0' s.version = '1.40.1'
s.license = 'BSD' s.license = 'BSD'
s.summary = 'An animation and graphics framework for Material Design in Swift.' s.summary = 'An animation and graphics framework for Material Design in Swift.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_add_white_2x.png", "filename" : "cm_add_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_add_white_3x.png", "filename" : "cm_add_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_arrow_back_white_2x.png", "filename" : "cm_arrow_back_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_arrow_back_white_3x.png", "filename" : "cm_arrow_back_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_arrow_downward_white_2x.png", "filename" : "cm_arrow_downward_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_arrow_downward_white_3x.png", "filename" : "cm_arrow_downward_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_audio_library_white_2x.png", "filename" : "cm_audio_library_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_audio_library_white_3x.png", "filename" : "cm_audio_library_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_audio_white_2x.png", "filename" : "cm_audio_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_audio_white_3x.png", "filename" : "cm_audio_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_bell_white_2x.png", "filename" : "cm_bell_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_bell_white_3x.png", "filename" : "cm_bell_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_check_white_2x.png", "filename" : "cm_check_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_check_white_3x.png", "filename" : "cm_check_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_close_white_2x.png", "filename" : "cm_close_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_close_white_3x.png", "filename" : "cm_close_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_image_white_2x.png", "filename" : "cm_image_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_image_white_3x.png", "filename" : "cm_image_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_menu_white_2x.png", "filename" : "cm_menu_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_menu_white_3x.png", "filename" : "cm_menu_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_microphone_white_2x.png", "filename" : "cm_microphone_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_microphone_white_3x.png", "filename" : "cm_microphone_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_more_horiz_white_2x.png", "filename" : "cm_more_horiz_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_more_horiz_white_3x.png", "filename" : "cm_more_horiz_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_more_vert_white_2x.png", "filename" : "cm_more_vert_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_more_vert_white_3x.png", "filename" : "cm_more_vert_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_movie_white_2x.png", "filename" : "cm_movie_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_movie_white_3x.png", "filename" : "cm_movie_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_pause_white_2x.png", "filename" : "cm_pause_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_pause_white_3x.png", "filename" : "cm_pause_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_pen_white_2x.png", "filename" : "cm_pen_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_pen_white_3x.png", "filename" : "cm_pen_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_photo_camera_white_2x.png", "filename" : "cm_photo_camera_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_photo_camera_white_3x.png", "filename" : "cm_photo_camera_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_photo_library_white_2x.png", "filename" : "cm_photo_library_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_photo_library_white_3x.png", "filename" : "cm_photo_library_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_play_white_2x.png", "filename" : "cm_play_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_play_white_3x.png", "filename" : "cm_play_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_search_white_2x.png", "filename" : "cm_search_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_search_white_3x.png", "filename" : "cm_search_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_settings_white_2x.png", "filename" : "cm_settings_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_settings_white_3x.png", "filename" : "cm_settings_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_share_white_2x.png", "filename" : "cm_share_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_share_white_3x.png", "filename" : "cm_share_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_shuffle_white_2x.png", "filename" : "cm_shuffle_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_shuffle_white_3x.png", "filename" : "cm_shuffle_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_skip_backward_white_2x.png", "filename" : "cm_skip_backward_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_skip_backward_white_3x.png", "filename" : "cm_skip_backward_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_skip_forward_white_2x.png", "filename" : "cm_skip_forward_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_skip_forward_white_3x.png", "filename" : "cm_skip_forward_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_star_white_2x.png", "filename" : "cm_star_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_star_white_3x.png", "filename" : "cm_star_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_videocam_white_2x.png", "filename" : "cm_videocam_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_videocam_white_3x.png", "filename" : "cm_videocam_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_volume_high_white_2x.png", "filename" : "cm_volume_high_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_volume_high_white_3x.png", "filename" : "cm_volume_high_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_volume_medium_white_2x.png", "filename" : "cm_volume_medium_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_volume_medium_white_3x.png", "filename" : "cm_volume_medium_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_volume_off_white_2x.png", "filename" : "cm_volume_off_white@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "cm_volume_off_white_3x.png", "filename" : "cm_volume_off_white@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
{ {
"images": [ "images" : [
{ {
"filename": "ic_add_circle_outline_white.png", "idiom" : "universal",
"idiom": "universal", "filename" : "ic_add_circle_outline_white.png",
"scale": "1x" "scale" : "1x"
}, },
{ {
"filename": "ic_add_circle_outline_white_2x.png", "idiom" : "universal",
"idiom": "universal", "filename" : "ic_add_circle_outline_white@2x.png",
"scale": "2x" "scale" : "2x"
}, },
{ {
"filename": "ic_add_circle_outline_white_3x.png", "idiom" : "universal",
"idiom": "universal", "filename" : "ic_add_circle_outline_white@3x.png",
"scale": "3x" "scale" : "3x"
}
],
"info": {
"author": "xcode",
"version": 1
} }
} ],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{ {
"images": [ "images" : [
{ {
"filename": "ic_add_circle_white.png", "idiom" : "universal",
"idiom": "universal", "filename" : "ic_add_circle_white.png",
"scale": "1x" "scale" : "1x"
}, },
{ {
"filename": "ic_add_circle_white_2x.png", "idiom" : "universal",
"idiom": "universal", "filename" : "ic_add_circle_white@2x.png",
"scale": "2x" "scale" : "2x"
}, },
{ {
"filename": "ic_add_circle_white_3x.png", "idiom" : "universal",
"idiom": "universal", "filename" : "ic_add_circle_white@3x.png",
"scale": "3x" "scale" : "3x"
}
],
"info": {
"author": "xcode",
"version": 1
} }
} ],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment