Skip to content

M
Material
Commit b3a2b3a0 by Daniel Dahan Committed by GitHub
Options

Merge pull request #1096 from OrkhanAlikhanov/fix-1046 

Fixed bad merge in #1046
parents abccb7b1 d54caaca
Showing with 88 additions and 128 deletions
Sources/iOS/FABMenu.swift
...@@ -138,59 +138,59 @@ extension FABMenuItem { ...@@ -138,59 +138,59 @@ extension FABMenuItem {
} }
@objc(FABMenuDelegate) @objc(FABMenuDelegate)
public protocol FABMenuDelegate { public protocol FABMenuDelegate {
/** /**
A delegation method that is executed to determine whether fabMenu should open. A delegation method that is executed to determine whether fabMenu should open.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
*/ */
@objc @objc
optional func fabMenuShouldOpen(fabMenu: FABMenu) -> Bool optional func fabMenuShouldOpen(fabMenu: FABMenu) -> Bool
/** /**
A delegation method that is execited when the fabMenu will open. A delegation method that is execited when the fabMenu will open.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
*/ */
@objc @objc
optional func fabMenuWillOpen(fabMenu: FABMenu) optional func fabMenuWillOpen(fabMenu: FABMenu)
/** /**
A delegation method that is execited when the fabMenu did open. A delegation method that is execited when the fabMenu did open.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
*/ */
@objc @objc
optional func fabMenuDidOpen(fabMenu: FABMenu) optional func fabMenuDidOpen(fabMenu: FABMenu)
/** /**
A delegation method that is executed to determine whether fabMenu should close. A delegation method that is executed to determine whether fabMenu should close.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
*/ */
@objc @objc
optional func fabMenuShouldClose(fabMenu: FABMenu) -> Bool optional func fabMenuShouldClose(fabMenu: FABMenu) -> Bool
/** /**
A delegation method that is execited when the fabMenu will close. A delegation method that is execited when the fabMenu will close.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
*/ */
@objc @objc
optional func fabMenuWillClose(fabMenu: FABMenu) optional func fabMenuWillClose(fabMenu: FABMenu)
/** /**
A delegation method that is execited when the fabMenu did close. A delegation method that is execited when the fabMenu did close.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
*/ */
@objc @objc
optional func fabMenuDidClose(fabMenu: FABMenu) optional func fabMenuDidClose(fabMenu: FABMenu)
/** /**
A delegation method that is executed when the user taps while A delegation method that is executed when the user taps while
the menu is opened. the menu is opened.
- Parameter fabMenu: A FABMenu. - Parameter fabMenu: A FABMenu.
- Parameter tappedAt point: A CGPoint. - Parameter tappedAt point: A CGPoint.
- Parameter isOutside: A boolean indicating whether the tap - Parameter isOutside: A boolean indicating whether the tap
was outside the menu button area. was outside the menu button area.
*/ */
@objc @objc
optional func fabMenu(fabMenu: FABMenu, tappedAt point: CGPoint, isOutside: Bool) optional func fabMenu(fabMenu: FABMenu, tappedAt point: CGPoint, isOutside: Bool)
} }
@objc(FABMenu) @objc(FABMenu)
...@@ -372,50 +372,29 @@ extension FABMenu { ...@@ -372,50 +372,29 @@ extension FABMenu {
- Parameter completion: A completion block to execute on each view's animation. - Parameter completion: A completion block to execute on each view's animation.
*/ */
open func open(isTriggeredByUserInteraction: Bool, duration: TimeInterval = 0.15, delay: TimeInterval = 0, usingSpringWithDamping: CGFloat = 0.5, initialSpringVelocity: CGFloat = 0, options: UIViewAnimationOptions = [], animations: ((UIView) -> Void)? = nil, completion: ((UIView) -> Void)? = nil) { open func open(isTriggeredByUserInteraction: Bool, duration: TimeInterval = 0.15, delay: TimeInterval = 0, usingSpringWithDamping: CGFloat = 0.5, initialSpringVelocity: CGFloat = 0, options: UIViewAnimationOptions = [], animations: ((UIView) -> Void)? = nil, completion: ((UIView) -> Void)? = nil) {
if delegate?.fabMenuShouldOpen?(fabMenu: self) == false {
return
}
handleOpenCallback?() handleOpenCallback?()
if isTriggeredByUserInteraction { if isTriggeredByUserInteraction {
delegate?.fabMenuWillOpen?(fabMenu: self) delegate?.fabMenuWillOpen?(fabMenu: self)
} }
}
/** spring.expand(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in
Open the Menu component with animation options. guard let `self` = self else {
- Parameter isTriggeredByUserInteraction: A boolean indicating whether the return
state was changed by a user interaction, true if yes, false otherwise. }
- Parameter duration: The time for each view's animation.
- Parameter delay: A delay time for each view's animation. (view as? FABMenuItem)?.showTitleLabel()
- Parameter usingSpringWithDamping: A damping ratio for the animation.
- Parameter initialSpringVelocity: The initial velocity for the animation. if isTriggeredByUserInteraction && view == self.fabMenuItems.last {
- Parameter options: Options to pass to the animation. self.delegate?.fabMenuDidOpen?(fabMenu: self)
- Parameter animations: An animation block to execute on each view's animation. }
- Parameter completion: A completion block to execute on each view's animation.
*/ completion?(view)
public func open(isTriggeredByUserInteraction: Bool, duration: TimeInterval = 0.15, delay: TimeInterval = 0, usingSpringWithDamping: CGFloat = 0.5, initialSpringVelocity: CGFloat = 0, options: UIViewAnimationOptions = [], animations: ((UIView) -> Void)? = nil, completion: ((UIView) -> Void)? = nil) { self.handleCompletionCallback?(view)
if delegate?.fabMenuShouldOpen?(fabMenu: self) == false {
return
}
handleOpenCallback?()
if isTriggeredByUserInteraction {
delegate?.fabMenuWillOpen?(fabMenu: self)
}
spring.expand(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in
guard let `self` = self else {
return
}
(view as? FABMenuItem)?.showTitleLabel()
if isTriggeredByUserInteraction && view == self.fabMenuItems.last {
self.delegate?.fabMenuDidOpen?(fabMenu: self)
}
completion?(view)
self.handleCompletionCallback?(view)
}
} }
} }
...@@ -446,49 +425,30 @@ extension FABMenu { ...@@ -446,49 +425,30 @@ extension FABMenu {
- Parameter completion: A completion block to execute on each view's animation. - Parameter completion: A completion block to execute on each view's animation.
*/ */
open func close(isTriggeredByUserInteraction: Bool, duration: TimeInterval = 0.15, delay: TimeInterval = 0, usingSpringWithDamping: CGFloat = 0.5, initialSpringVelocity: CGFloat = 0, options: UIViewAnimationOptions = [], animations: ((UIView) -> Void)? = nil, completion: ((UIView) -> Void)? = nil) { open func close(isTriggeredByUserInteraction: Bool, duration: TimeInterval = 0.15, delay: TimeInterval = 0, usingSpringWithDamping: CGFloat = 0.5, initialSpringVelocity: CGFloat = 0, options: UIViewAnimationOptions = [], animations: ((UIView) -> Void)? = nil, completion: ((UIView) -> Void)? = nil) {
if delegate?.fabMenuShouldClose?(fabMenu: self) == false {
return
}
handleCloseCallback?() handleCloseCallback?()
if isTriggeredByUserInteraction { if isTriggeredByUserInteraction {
delegate?.fabMenuWillClose?(fabMenu: self) delegate?.fabMenuWillClose?(fabMenu: self)
} }
/** spring.contract(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in
Close the Menu component with animation options. guard let `self` = self else {
- Parameter isTriggeredByUserInteraction: A boolean indicating whether the return
state was changed by a user interaction, true if yes, false otherwise. }
- Parameter duration: The time for each view's animation.
- Parameter delay: A delay time for each view's animation. (view as? FABMenuItem)?.hideTitleLabel()
- Parameter usingSpringWithDamping: A damping ratio for the animation.
- Parameter initialSpringVelocity: The initial velocity for the animation. if isTriggeredByUserInteraction && view == self.fabMenuItems.last {
- Parameter options: Options to pass to the animation. self.delegate?.fabMenuDidClose?(fabMenu: self)
- Parameter animations: An animation block to execute on each view's animation. }
- Parameter completion: A completion block to execute on each view's animation.
*/ completion?(view)
open func close(isTriggeredByUserInteraction: Bool, duration: TimeInterval = 0.15, delay: TimeInterval = 0, usingSpringWithDamping: CGFloat = 0.5, initialSpringVelocity: CGFloat = 0, options: UIViewAnimationOptions = [], animations: ((UIView) -> Void)? = nil, completion: ((UIView) -> Void)? = nil) { self.handleCompletionCallback?(view)
if delegate?.fabMenuShouldClose?(fabMenu: self) == false {
return
}
handleCloseCallback?()
if isTriggeredByUserInteraction {
delegate?.fabMenuWillClose?(fabMenu: self)
}
spring.contract(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in
guard let `self` = self else {
return
}
(view as? FABMenuItem)?.hideTitleLabel()
if isTriggeredByUserInteraction && view == self.fabMenuItems.last {
self.delegate?.fabMenuDidClose?(fabMenu: self)
}
completion?(view)
self.handleCompletionCallback?(view)
}
} }
} }
} }
......
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