Commit 3130d7be by Daniel Dahan

minor cleanup to self references

parent 4433996f
Subproject commit 8840fda209630cfaa986312702610ea877a15ae1 Subproject commit d74082864a5df29e98eda1ddcdcec167aab5d805
...@@ -107,11 +107,11 @@ extension FABMenuItem { ...@@ -107,11 +107,11 @@ extension FABMenuItem {
titleLabel.isHidden = false titleLabel.isHidden = false
UIView.animate(withDuration: 0.25, animations: { [weak self] in UIView.animate(withDuration: 0.25, animations: { [weak self] in
guard let s = self else { guard let `self` = self else {
return return
} }
s.titleLabel.alpha = 1 `self`.titleLabel.alpha = 1
}) })
} }
...@@ -365,18 +365,18 @@ extension FABMenu { ...@@ -365,18 +365,18 @@ extension FABMenu {
} }
spring.expand(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in spring.expand(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in
guard let s = self else { guard let `self` = self else {
return return
} }
(view as? FABMenuItem)?.showTitleLabel() (view as? FABMenuItem)?.showTitleLabel()
if isTriggeredByUserInteraction && view == s.fabMenuItems.last { if isTriggeredByUserInteraction && view == self.fabMenuItems.last {
s.delegate?.fabMenuDidOpen?(fabMenu: s) self.delegate?.fabMenuDidOpen?(fabMenu: self)
} }
completion?(view) completion?(view)
s.handleCompletionCallback?(view) self.handleCompletionCallback?(view)
} }
} }
...@@ -414,18 +414,18 @@ extension FABMenu { ...@@ -414,18 +414,18 @@ extension FABMenu {
} }
spring.contract(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in spring.contract(duration: duration, delay: delay, usingSpringWithDamping: usingSpringWithDamping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations) { [weak self, isTriggeredByUserInteraction = isTriggeredByUserInteraction, completion = completion] (view) in
guard let s = self else { guard let `self` = self else {
return return
} }
(view as? FABMenuItem)?.hideTitleLabel() (view as? FABMenuItem)?.hideTitleLabel()
if isTriggeredByUserInteraction && view == s.fabMenuItems.last { if isTriggeredByUserInteraction && view == self.fabMenuItems.last {
s.delegate?.fabMenuDidClose?(fabMenu: s) self.delegate?.fabMenuDidClose?(fabMenu: self)
} }
completion?(view) completion?(view)
s.handleCompletionCallback?(view) self.handleCompletionCallback?(view)
} }
} }
} }
......
...@@ -744,13 +744,13 @@ extension TextField { ...@@ -744,13 +744,13 @@ extension TextField {
} }
UIView.animate(withDuration: 0.15, animations: { [weak self] in UIView.animate(withDuration: 0.15, animations: { [weak self] in
guard let s = self else { guard let `self` = self else {
return return
} }
s.placeholderLabel.transform = CGAffineTransform.identity self.placeholderLabel.transform = CGAffineTransform.identity
s.placeholderLabel.frame.origin.x = s.leftViewWidth + s.textInset self.placeholderLabel.frame.origin.x = s.leftViewWidth + s.textInset
s.placeholderLabel.frame.origin.y = 0 self.placeholderLabel.frame.origin.y = 0
}) })
} }
} }
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