Merge branch 'release/3.0.1'

.swiftformat

@@ -20,8 +20,9 @@
 --patternlet inline
 --ranges spaced
 --self remove
---semicolons inline
+--closingparen balanced
 --stripunusedargs always
+--semicolons inline
 --trimwhitespace always
 --wraparguments beforefirst
 --wrapcollections beforefirst

RMessage.podspec

@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "RMessage"
-  s.version          = "3.0.0"
+  s.version          = "3.0.1"
   s.license          = 'MIT'
   s.summary          = "Easy to use and customizable messages/notifications for iOS"
   s.homepage         = "https://github.com/donileo/RMessage"

Sources/RMPresenter/RMPresenter.swift

@@ -69,12 +69,15 @@ import UIKit
   init(
     message: RMessage, targetPosition: RMessagePosition, animator: RMAnimator,
     animationOptions animationOpts: RMAnimationOptions,
-    tapCompletion _: (() -> Void)? = nil, presentCompletion _: (() -> Void)? = nil, dismissCompletion _: (() -> Void)? = nil
+    tapCompletion: (() -> Void)? = nil, presentCompletion: (() -> Void)? = nil, dismissCompletion: (() -> Void)? = nil
   ) {
     self.message = message
     self.targetPosition = targetPosition
     self.animator = animator
     self.animationOpts = animationOpts
+    self.tapCompletion = tapCompletion
+    self.presentCompletion = presentCompletion
+    self.dismissCompletion = dismissCompletion
     super.init()
     setupAnimator()
     setupGestureRecognizers()

Sources/RMessage/Animators/SlideAnimator.swift

@@ -179,21 +179,23 @@ class SlideAnimator: NSObject, RMAnimator {
       // For now lets be safe and not call this code inside the animation block. Though there may be some slight timing
       // issue in notifying exactly when the animator is animating it should be fine.
       self.delegate?.animatorIsAnimatingDismissal?(self)
-      UIView.animate(withDuration: self.dismissalDuration, animations: {
-        self.viewTopConstraint.isActive = false
-        self.viewTopConstraint = self.viewTopStartConstraint
-        self.viewTopConstraint.isActive = true
-        self.delegate?.animationBlockForDismissal?(self)
-        self.view.alpha = self.animationStartAlpha
-        self.view.superview!.layoutIfNeeded()
-      }, completion: { finished in
-        self.isDismissing = false
-        self.hasPresented = false
-        self.hasDismissed = true
-        self.view.removeFromSuperview()
-        self.delegate?.animatorDidDismiss?(self)
-        if finished { completion?() }
-      })
+      UIView.animate(
+        withDuration: self.dismissalDuration, animations: {
+          self.viewTopConstraint.isActive = false
+          self.viewTopConstraint = self.viewTopStartConstraint
+          self.viewTopConstraint.isActive = true
+          self.delegate?.animationBlockForDismissal?(self)
+          self.view.alpha = self.animationStartAlpha
+          self.view.superview!.layoutIfNeeded()
+        }, completion: { finished in
+          self.isDismissing = false
+          self.hasPresented = false
+          self.hasDismissed = true
+          self.view.removeFromSuperview()
+          self.delegate?.animatorDidDismiss?(self)
+          if finished { completion?() }
+        }
+      )
     }
   }
 

Sources/RMessage/Extensions/RMessage+Components.swift

@@ -19,16 +19,6 @@ extension RMessage {
     return iconImageView
   }
 
-  func iconImageView(withImage image: UIImage, imageTintColor: UIColor?, superview: UIView, contentView _: UIView) -> UIView {
-    let iconImageView = UIImageView(image: image)
-
-    iconImageView.clipsToBounds = true
-    iconImageView.tintColor = imageTintColor
-    iconImageView.contentMode = .scaleAspectFit
-    setup(leftView: iconImageView, inSuperview: superview)
-    return iconImageView
-  }
-
   func setup(leftView view: UIView, inSuperview superview: UIView) {
     view.translatesAutoresizingMaskIntoConstraints = false
 

Sources/RMessage/RMessage.swift

@@ -115,19 +115,23 @@ public class RMessage: UIView, RMessageAnimatorDelegate {
       trailingConstraint.isActive = false
     }
 
-    NSLayoutConstraint.deactivate([
-      titleLabelLeadingConstraint, titleLabelTrailingConstraint,
-      bodyLabelLeadingConstraint, bodyLabelTrailingConstraint,
-    ])
+    NSLayoutConstraint.deactivate(
+      [
+        titleLabelLeadingConstraint, titleLabelTrailingConstraint,
+        bodyLabelLeadingConstraint, bodyLabelTrailingConstraint,
+      ]
+    )
 
     titleLabelLeadingConstraint = titleLabel.leadingAnchor.constraint(greaterThanOrEqualTo: contentView.leadingAnchor)
     titleLabelTrailingConstraint = titleLabel.trailingAnchor.constraint(lessThanOrEqualTo: contentView.trailingAnchor)
     bodyLabelLeadingConstraint = bodyLabel.leadingAnchor.constraint(greaterThanOrEqualTo: contentView.leadingAnchor)
     bodyLabelTrailingConstraint = bodyLabel.trailingAnchor.constraint(lessThanOrEqualTo: contentView.trailingAnchor)
-    NSLayoutConstraint.activate([
-      titleLabelLeadingConstraint, titleLabelTrailingConstraint,
-      bodyLabelLeadingConstraint, bodyLabelTrailingConstraint,
-    ])
+    NSLayoutConstraint.activate(
+      [
+        titleLabelLeadingConstraint, titleLabelTrailingConstraint,
+        bodyLabelLeadingConstraint, bodyLabelTrailingConstraint,
+      ]
+    )
   }
 
   // MARK: - Respond to Layout Changes