Skip to content

M
Material
Commit b864a98b by Daniel Dahan
Options

updated last selector issues

parent 8d47964e
Showing with 16 additions and 17 deletions
Examples/Programmatic/App/App/AppDelegate.swift
...@@ -39,7 +39,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -39,7 +39,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
let bottomNavigationController: BottomNavigationController = BottomNavigationController() let bottomNavigationController: BottomNavigationController = BottomNavigationController()
bottomNavigationController.viewControllers = [AppMenuViewController(mainViewController: AppNavigationController(rootViewController: RecipesViewController())), VideoViewController(), PhotoViewController()] bottomNavigationController.viewControllers = [AppNavigationController(rootViewController: RecipesViewController()), VideoViewController(), PhotoViewController()]
bottomNavigationController.selectedIndex = 0 bottomNavigationController.selectedIndex = 0
bottomNavigationController.tabBar.tintColor = MaterialColor.lightBlue.base bottomNavigationController.tabBar.tintColor = MaterialColor.lightBlue.base
bottomNavigationController.tabBar.backgroundColor = MaterialColor.grey.darken4 bottomNavigationController.tabBar.backgroundColor = MaterialColor.grey.darken4
......
Examples/Programmatic/BottomNavigationController/BottomNavigationController.xcodeproj/project.pbxproj
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
......
Examples/Programmatic/MenuView/MenuView/ViewController.swift
...@@ -104,7 +104,7 @@ class ViewController: UIViewController { ...@@ -104,7 +104,7 @@ class ViewController: UIViewController {
btn2.borderWidth = 1 btn2.borderWidth = 1
btn2.setImage(image, forState: .Normal) btn2.setImage(image, forState: .Normal)
btn2.setImage(image, forState: .Highlighted) btn2.setImage(image, forState: .Highlighted)
btn2.addTarget(self, action: #selector(handleButton(_:)), forControlEvents: .TouchUpInside) btn2.addTarget(self, action: #selector(handleButton), forControlEvents: .TouchUpInside)
menuView.addSubview(btn2) menuView.addSubview(btn2)
image = UIImage(named: "ic_photo_camera_white")?.imageWithRenderingMode(.AlwaysTemplate) image = UIImage(named: "ic_photo_camera_white")?.imageWithRenderingMode(.AlwaysTemplate)
...@@ -117,7 +117,7 @@ class ViewController: UIViewController { ...@@ -117,7 +117,7 @@ class ViewController: UIViewController {
btn3.borderWidth = 1 btn3.borderWidth = 1
btn3.setImage(image, forState: .Normal) btn3.setImage(image, forState: .Normal)
btn3.setImage(image, forState: .Highlighted) btn3.setImage(image, forState: .Highlighted)
btn3.addTarget(self, action: #selector(handleButton(_:)), forControlEvents: .TouchUpInside) btn3.addTarget(self, action: #selector(handleButton), forControlEvents: .TouchUpInside)
menuView.addSubview(btn3) menuView.addSubview(btn3)
image = UIImage(named: "ic_note_add_white")?.imageWithRenderingMode(.AlwaysTemplate) image = UIImage(named: "ic_note_add_white")?.imageWithRenderingMode(.AlwaysTemplate)
...@@ -130,7 +130,7 @@ class ViewController: UIViewController { ...@@ -130,7 +130,7 @@ class ViewController: UIViewController {
btn4.borderWidth = 1 btn4.borderWidth = 1
btn4.setImage(image, forState: .Normal) btn4.setImage(image, forState: .Normal)
btn4.setImage(image, forState: .Highlighted) btn4.setImage(image, forState: .Highlighted)
btn4.addTarget(self, action: #selector(handleButton(_:)), forControlEvents: .TouchUpInside) btn4.addTarget(self, action: #selector(handleButton), forControlEvents: .TouchUpInside)
menuView.addSubview(btn4) menuView.addSubview(btn4)
// Initialize the menu and setup the configuration options. // Initialize the menu and setup the configuration options.
......
Examples/Storyboards/BottomNavigationBar/BottomNavigationBar.xcodeproj/project.pbxproj
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
......
Sources/CaptureView.swift
...@@ -128,7 +128,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -128,7 +128,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
if tapToFocusEnabled { if tapToFocusEnabled {
tapToResetEnabled = true tapToResetEnabled = true
prepareFocusLayer() prepareFocusLayer()
prepareTapGesture(&tapToFocusGesture, numberOfTapsRequired: 1, numberOfTouchesRequired: 1, selector: #selector(handleTapToFocusGesture(_:))) prepareTapGesture(&tapToFocusGesture, numberOfTapsRequired: 1, numberOfTouchesRequired: 1, selector: #selector(handleTapToFocusGesture))
if let v: UITapGestureRecognizer = tapToExposeGesture { if let v: UITapGestureRecognizer = tapToExposeGesture {
tapToFocusGesture!.requireGestureRecognizerToFail(v) tapToFocusGesture!.requireGestureRecognizerToFail(v)
} }
...@@ -148,7 +148,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -148,7 +148,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
if tapToExposeEnabled { if tapToExposeEnabled {
tapToResetEnabled = true tapToResetEnabled = true
prepareExposureLayer() prepareExposureLayer()
prepareTapGesture(&tapToExposeGesture, numberOfTapsRequired: 2, numberOfTouchesRequired: 1, selector: #selector(handleTapToExposeGesture(_:))) prepareTapGesture(&tapToExposeGesture, numberOfTapsRequired: 2, numberOfTouchesRequired: 1, selector: #selector(handleTapToExposeGesture))
if let v: UITapGestureRecognizer = tapToFocusGesture { if let v: UITapGestureRecognizer = tapToFocusGesture {
v.requireGestureRecognizerToFail(tapToExposeGesture!) v.requireGestureRecognizerToFail(tapToExposeGesture!)
} }
...@@ -167,7 +167,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate { ...@@ -167,7 +167,7 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
didSet { didSet {
if tapToResetEnabled { if tapToResetEnabled {
prepareResetLayer() prepareResetLayer()
prepareTapGesture(&tapToResetGesture, numberOfTapsRequired: 2, numberOfTouchesRequired: 2, selector: #selector(handleTapToResetGesture(_:))) prepareTapGesture(&tapToResetGesture, numberOfTapsRequired: 2, numberOfTouchesRequired: 2, selector: #selector(handleTapToResetGesture))
if let v: UITapGestureRecognizer = tapToFocusGesture { if let v: UITapGestureRecognizer = tapToFocusGesture {
v.requireGestureRecognizerToFail(tapToResetGesture!) v.requireGestureRecognizerToFail(tapToResetGesture!)
} }
......
Sources/MaterialSwitch.swift
...@@ -386,9 +386,9 @@ public class MaterialSwitch : UIControl { ...@@ -386,9 +386,9 @@ public class MaterialSwitch : UIControl {
private func prepareButton() { private func prepareButton() {
button.pulseColor = nil button.pulseColor = nil
button.addTarget(self, action: #selector(handleTouchUpInside), forControlEvents: .TouchUpInside) button.addTarget(self, action: #selector(handleTouchUpInside), forControlEvents: .TouchUpInside)
button.addTarget(self, action: #selector(handleTouchDragInside(_: _:), forControlEvents: .TouchDragInside) button.addTarget(self, action: #selector(handleTouchDragInside), forControlEvents: .TouchDragInside)
button.addTarget(self, action: #selector(handleTouchUpOutsideOrCanceled(_: _:)), forControlEvents: .TouchCancel) button.addTarget(self, action: #selector(handleTouchUpOutsideOrCanceled), forControlEvents: .TouchCancel)
button.addTarget(self, action: #selector(handleTouchUpOutsideOrCanceled(_: _:)), forControlEvents: .TouchUpOutside) button.addTarget(self, action: #selector(handleTouchUpOutsideOrCanceled), forControlEvents: .TouchUpOutside)
addSubview(button) addSubview(button)
} }
......
Sources/SideNavigationController.swift
...@@ -734,7 +734,6 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel ...@@ -734,7 +734,6 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
/// A method that prepares the mainViewController. /// A method that prepares the mainViewController.
private func prepareMainViewController() { private func prepareMainViewController() {
prepareViewControllerWithinContainer(mainViewController, container: view) prepareViewControllerWithinContainer(mainViewController, container: view)
mainViewController.view.frame = view.bounds
} }
/// A method that prepares the leftViewController. /// A method that prepares the leftViewController.
...@@ -809,13 +808,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel ...@@ -809,13 +808,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
*/ */
private func prepareGestures() { private func prepareGestures() {
if nil == panGesture { if nil == panGesture {
panGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:))) panGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture))
panGesture!.delegate = self panGesture!.delegate = self
view.addGestureRecognizer(panGesture!) view.addGestureRecognizer(panGesture!)
} }
if nil == tapGesture { if nil == tapGesture {
tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:))) tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture))
tapGesture!.delegate = self tapGesture!.delegate = self
tapGesture!.cancelsTouchesInView = false tapGesture!.cancelsTouchesInView = false
view.addGestureRecognizer(tapGesture!) view.addGestureRecognizer(tapGesture!)
......
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