Skip to content

M
Material
Commit a5d7594f by Daniel Dahan
Options

updated SideNavigationController and MaterialIcon images

parent 896b88da
Showing with 675 additions and 545 deletions
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
Sources/Assets.xcassets/ic_add_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_add_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_add_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_add_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_add_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_add_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_add_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_arrow_back_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_arrow_back_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_arrow_back_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_arrow_back_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_arrow_back_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_arrow_back_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_arrow_back_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_arrow_downward_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_arrow_downward_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_arrow_downward_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_arrow_downward_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_arrow_downward_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_arrow_downward_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_arrow_downward_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_audiotrack_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_audiotrack_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_audiotrack_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_audiotrack_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_audiotrack_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_audiotrack_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_audiotrack_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_check_white.imageset/Contents.json
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_check_white_2x.png",
"filename" : "ic_check_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_check_white_3x.png",
"filename" : "ic_check_white@3x.png",
"scale" : "3x"
}
],
......
Sources/Assets.xcassets/ic_close_white.imageset/Contents.json
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_close_white_2x.png",
"filename" : "ic_close_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_close_white_3x.png",
"filename" : "ic_close_white@3x.png",
"scale" : "3x"
}
],
......
Sources/Assets.xcassets/ic_edit_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_edit_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_edit_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_edit_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_edit_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_edit_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_edit_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_history_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_history_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_history_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_history_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_history_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_history_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_history_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_image_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_image_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_image_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_image_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_image_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_image_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_image_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_menu_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_menu_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_menu_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_menu_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_menu_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_menu_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_menu_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_more_horiz_white.imageset/Contents.json
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_more_horiz_white_2x.png",
"filename" : "ic_more_horiz_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_more_horiz_white_3x.png",
"filename" : "ic_more_horiz_white@3x.png",
"scale" : "3x"
}
],
......
Sources/Assets.xcassets/ic_more_vert_white.imageset/Contents.json
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_more_vert_white_2x.png",
"filename" : "ic_more_vert_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_more_vert_white_3x.png",
"filename" : "ic_more_vert_white@3x.png",
"scale" : "3x"
}
],
......
Sources/Assets.xcassets/ic_movie_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_movie_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_movie_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_movie_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_movie_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_movie_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_movie_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_photo_camera_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_photo_camera_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_photo_camera_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_photo_camera_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_photo_library_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_photo_library_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_photo_library_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_photo_library_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_photo_library_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_library_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_library_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_place_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_place_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_place_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_place_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_place_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_place_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_place_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_search_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_search_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_search_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_search_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_search_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_search_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_search_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_settings_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_settings_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_settings_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_settings_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_settings_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_settings_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_settings_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_share_white.imageset/Contents.json
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_share_white_2x.png",
"filename" : "ic_share_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_share_white_3x.png",
"filename" : "ic_share_white@3x.png",
"scale" : "3x"
}
],
......
Sources/Assets.xcassets/ic_star_border_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_star_border_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_star_border_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_star_border_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_star_border_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_star_border_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_star_border_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_star_half_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_star_half_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_star_half_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_star_half_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_star_half_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_star_half_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_star_half_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_star_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_star_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_star_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_star_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_star_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_star_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_star_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_videocam_white.imageset/Contents.json
{
"images": [
{
"filename": "ic_videocam_white.png",
"idiom": "universal",
"scale": "1x"
},
{
"filename": "ic_videocam_white_2x.png",
"idiom": "universal",
"scale": "2x"
},
{
"filename": "ic_videocam_white_3x.png",
"idiom": "universal",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"images" : [
{
"idiom" : "universal",
"filename" : "ic_videocam_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_videocam_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_videocam_white@3x.png",
"scale" : "3x"
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_visibility_white.imageset/Contents.json
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_visibility_white_2x.png",
"filename" : "ic_visibility_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_visibility_white_3x.png",
"filename" : "ic_visibility_white@3x.png",
"scale" : "3x"
}
],
......
Sources/Info.plist
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.40.0</string>
<string>1.40.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
Sources/iOS/MaterialTableViewCell.swift
......@@ -415,6 +415,7 @@ public class MaterialTableViewCell : UITableViewCell {
*/
public func prepareView() {
selectionStyle = .None
separatorInset = UIEdgeInsetsZero
contentScaleFactor = MaterialDevice.scale
imageView?.userInteractionEnabled = false
textLabel?.userInteractionEnabled = false
......
Sources/iOS/NavigationController.swift
......@@ -73,10 +73,10 @@ public class NavigationController : UINavigationController, UIGestureRecognizerD
super.viewWillAppear(animated)
if let v: UIGestureRecognizer = interactivePopGestureRecognizer {
if let x: SideNavigationController = sideNavigationController {
if let l: UIPanGestureRecognizer = x.panLeftViewGesture {
if let l: UIPanGestureRecognizer = x.leftPanGesture {
l.requireGestureRecognizerToFail(v)
}
if let r: UIPanGestureRecognizer = x.panRightViewGesture {
if let r: UIPanGestureRecognizer = x.rightPanGesture {
r.requireGestureRecognizerToFail(v)
}
}
......
Sources/iOS/SideNavigationController.swift
......@@ -127,25 +127,25 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
A UIPanGestureRecognizer property internally used for the
leftView pan gesture.
*/
internal private(set) var panLeftViewGesture: UIPanGestureRecognizer?
internal private(set) var leftPanGesture: UIPanGestureRecognizer?
/**
A UIPanGestureRecognizer property internally used for the
rightView pan gesture.
*/
internal private(set) var panRightViewGesture: UIPanGestureRecognizer?
internal private(set) var rightPanGesture: UIPanGestureRecognizer?
/**
A UITapGestureRecognizer property internally used for the
leftView tap gesture.
*/
internal private(set) var tapLeftViewGesture: UITapGestureRecognizer?
internal private(set) var leftTapGesture: UITapGestureRecognizer?
/**
A UITapGestureRecognizer property internally used for the
rightView tap gesture.
*/
internal private(set) var tapRightViewGesture: UITapGestureRecognizer?
internal private(set) var rightTapGesture: UITapGestureRecognizer?
/**
A CGFloat property that accesses the leftView threshold of
......@@ -155,7 +155,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
leftView is closed. The leftViewThreshold is always at half
the width of the leftView.
*/
@IBInspectable public var leftThreshold: CGFloat = 32
@IBInspectable public var leftThreshold: CGFloat = 64
private var leftViewThreshold: CGFloat = 0
/**
......@@ -166,7 +166,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
rightView is opened. The rightViewThreshold is always at half
the width of the rightView.
*/
@IBInspectable public var rightThreshold: CGFloat = 32
@IBInspectable public var rightThreshold: CGFloat = 64
private var rightViewThreshold: CGFloat = 0
/// Sets the animation type for the statusBar when hiding.
......@@ -242,6 +242,28 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
}
}
/// Enables the left pan gesture.
@IBInspectable public var enabledLeftPanGesture: Bool = true {
didSet {
if enabledLeftPanGesture {
prepareLeftPanGesture()
} else {
removeLeftPanGesture()
}
}
}
/// Enables the left tap gesture.
@IBInspectable public var enabledLeftTapGesture: Bool = true {
didSet {
if enabledLeftTapGesture {
prepareLeftTapGesture()
} else {
removeLeftTapGesture()
}
}
}
/**
A Boolean property that enables and disables the rightView from
opening and closing. Defaults to true.
......@@ -256,6 +278,28 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
}
}
/// Enables the right pan gesture.
@IBInspectable public var enabledRightPanGesture: Bool = true {
didSet {
if enabledRightPanGesture {
prepareRightPanGesture()
} else {
removeRightPanGesture()
}
}
}
/// Enables the right tap gesture.
@IBInspectable public var enabledRightTapGesture: Bool = true {
didSet {
if enabledRightTapGesture {
prepareRightTapGesture()
} else {
removeRightTapGesture()
}
}
}
/**
A Boolean property that triggers the status bar to be hidden
when the leftView is opened. Defaults to true.
......@@ -676,16 +720,16 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
- Returns: A Boolean of whether to continue the gesture or not.
*/
public func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldReceiveTouch touch: UITouch) -> Bool {
if !openedRightView && gestureRecognizer == panLeftViewGesture && (openedLeftView || isPointContainedWithinLeftThreshold(touch.locationInView(view))) {
if !openedRightView && gestureRecognizer == leftPanGesture && (openedLeftView || isPointContainedWithinLeftThreshold(touch.locationInView(view))) {
return true
}
if !openedLeftView && gestureRecognizer == panRightViewGesture && (openedRightView || isPointContainedWithinRighThreshold(touch.locationInView(view))) {
if !openedLeftView && gestureRecognizer == rightPanGesture && (openedRightView || isPointContainedWithinRighThreshold(touch.locationInView(view))) {
return true
}
if openedLeftView && gestureRecognizer == tapLeftViewGesture {
if openedLeftView && gestureRecognizer == leftTapGesture {
return true
}
if openedRightView && gestureRecognizer == tapRightViewGesture {
if openedRightView && gestureRecognizer == rightTapGesture {
return true
}
return false
......@@ -834,10 +878,6 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
prepareRootViewController()
prepareLeftView()
prepareRightView()
prepareLeftViewController()
prepareRightViewController()
prepareLeftViewGestures()
prepareRightViewGestures()
}
/// A method that prepares the rootViewController.
......@@ -854,6 +894,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
leftViewController?.view.clipsToBounds = true
leftViewController?.view.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
prepareViewControllerWithinContainer(leftViewController, container: v)
prepareLeftViewGestures()
}
}
......@@ -863,6 +904,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
rightViewController?.view.clipsToBounds = true
leftViewController?.view.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
prepareViewControllerWithinContainer(rightViewController, container: v)
prepareRightViewGestures()
}
}
......@@ -870,6 +912,8 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
private func prepareLeftView() {
if nil == leftViewController {
enabledLeftView = false
enabledLeftPanGesture = false
enabledLeftTapGesture = false
} else {
leftViewWidth = .iPhone == MaterialDevice.type ? 280 : 320
leftView = MaterialView()
......@@ -880,6 +924,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
leftView!.hidden = true
leftView!.position.x = -leftViewWidth / 2
leftView!.zPosition = 2000
prepareLeftViewController()
}
}
......@@ -887,6 +932,8 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
private func prepareRightView() {
if nil == rightViewController {
enabledRightView = false
enabledRightPanGesture = false
enabledRightTapGesture = false
} else {
rightViewWidth = .iPhone == MaterialDevice.type ? 280 : 320
rightView = MaterialView()
......@@ -897,6 +944,7 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
rightView!.hidden = true
rightView!.position.x = view.bounds.width + rightViewWidth / 2
rightView!.zPosition = 2000
prepareRightViewController()
}
}
......@@ -919,57 +967,96 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
/// A method that prepares the gestures used within the leftView.
private func prepareLeftViewGestures() {
if nil == panLeftViewGesture {
panLeftViewGesture = UIPanGestureRecognizer(target: self, action: #selector(handleLeftViewPanGesture(_:)))
panLeftViewGesture!.delegate = self
view.addGestureRecognizer(panLeftViewGesture!)
prepareLeftPanGesture()
prepareLeftTapGesture()
}
/// Prepare the left pan gesture.
private func prepareLeftPanGesture() {
if nil == leftPanGesture {
leftPanGesture = UIPanGestureRecognizer(target: self, action: #selector(handleLeftViewPanGesture(_:)))
leftPanGesture!.delegate = self
view.addGestureRecognizer(leftPanGesture!)
}
if nil == tapLeftViewGesture {
tapLeftViewGesture = UITapGestureRecognizer(target: self, action: #selector(handleLeftViewTapGesture(_:)))
tapLeftViewGesture!.delegate = self
tapLeftViewGesture!.cancelsTouchesInView = false
view.addGestureRecognizer(tapLeftViewGesture!)
}
/// Prepare the left tap gesture.
private func prepareLeftTapGesture() {
if nil == leftTapGesture {
leftTapGesture = UITapGestureRecognizer(target: self, action: #selector(handleLeftViewTapGesture(_:)))
leftTapGesture!.delegate = self
leftTapGesture!.cancelsTouchesInView = false
view.addGestureRecognizer(leftTapGesture!)
}
}
/// A method that prepares the gestures used within the rightView.
private func prepareRightViewGestures() {
if nil == panRightViewGesture {
panRightViewGesture = UIPanGestureRecognizer(target: self, action: #selector(handleRightViewPanGesture(_:)))
panRightViewGesture!.delegate = self
view.addGestureRecognizer(panRightViewGesture!)
prepareRightPanGesture()
prepareRightTapGesture()
}
/// Prepares the right pan gesture.
private func prepareRightPanGesture() {
if nil == rightPanGesture {
rightPanGesture = UIPanGestureRecognizer(target: self, action: #selector(handleRightViewPanGesture(_:)))
rightPanGesture!.delegate = self
view.addGestureRecognizer(rightPanGesture!)
}
if nil == tapRightViewGesture {
tapRightViewGesture = UITapGestureRecognizer(target: self, action: #selector(handleRightViewTapGesture(_:)))
tapRightViewGesture!.delegate = self
tapRightViewGesture!.cancelsTouchesInView = false
view.addGestureRecognizer(tapRightViewGesture!)
}
/// Prepares the right tap gesture.
private func prepareRightTapGesture() {
if nil == rightTapGesture {
rightTapGesture = UITapGestureRecognizer(target: self, action: #selector(handleRightViewTapGesture(_:)))
rightTapGesture!.delegate = self
rightTapGesture!.cancelsTouchesInView = false
view.addGestureRecognizer(rightTapGesture!)
}
}
/// A method that removes the passed in pan and leftView tap gesture recognizers.
private func removeLeftViewGestures() {
if let v: UIPanGestureRecognizer = panLeftViewGesture {
removeLeftPanGesture()
removeLeftTapGesture()
}
/// Removes the left pan gesture.
private func removeLeftPanGesture() {
if let v: UIPanGestureRecognizer = leftPanGesture {
view.removeGestureRecognizer(v)
panLeftViewGesture = nil
leftPanGesture = nil
}
if let v: UITapGestureRecognizer = tapLeftViewGesture {
}
/// Removes the left tap gesture.
private func removeLeftTapGesture() {
if let v: UITapGestureRecognizer = leftTapGesture {
view.removeGestureRecognizer(v)
tapLeftViewGesture = nil
leftTapGesture = nil
}
}
/// A method that removes the passed in pan and rightView tap gesture recognizers.
private func removeRightViewGestures() {
if let v: UIPanGestureRecognizer = panRightViewGesture {
removeRightPanGesture()
removeRightTapGesture()
}
/// Removes the right pan gesture.
private func removeRightPanGesture() {
if let v: UIPanGestureRecognizer = rightPanGesture {
view.removeGestureRecognizer(v)
panRightViewGesture = nil
rightPanGesture = nil
}
if let v: UITapGestureRecognizer = tapRightViewGesture {
}
/// Removes the right tap gesture.
private func removeRightTapGesture() {
if let v: UITapGestureRecognizer = rightTapGesture {
view.removeGestureRecognizer(v)
tapRightViewGesture = nil
rightTapGesture = nil
}
}
......
Sources/iOS/Toolbar.swift
......@@ -51,9 +51,12 @@ public class Toolbar : StatusBarView {
}
}
/// A convenience initializer.
public convenience init() {
self.init(frame: CGRectZero)
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
/**
......@@ -63,8 +66,8 @@ public class Toolbar : StatusBarView {
- Parameter leftControls: An Array of UIControls that go on the left side.
- Parameter rightControls: An Array of UIControls that go on the right side.
*/
public convenience init?(titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, leftControls: Array<UIControl>? = nil, rightControls: Array<UIControl>? = nil) {
self.init(frame: CGRectZero)
public init(titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, leftControls: Array<UIControl>? = nil, rightControls: Array<UIControl>? = nil) {
super.init(frame: CGRectZero)
prepareProperties(titleLabel, detailLabel: detailLabel, leftControls: leftControls, rightControls: rightControls)
}
......
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