Fix SwiftKickMobile#188 physics animation visual glitch (SwiftKickMobile#189)

wtmoose · web-flow · commit 96f42d6dd239 · 2018-05-23T15:09:04.000-05:00
Fix SwiftKickMobile#188 physics animation visual glitch
diff --git a/Demo/Demo/Info.plist b/Demo/Demo/Info.plist
@@ -35,6 +35,7 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 </dict>
 </plist>
diff --git a/Demo/Pods/Pods.xcodeproj/project.pbxproj b/Demo/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/SwiftMessages.xcodeproj/project.pbxproj b/SwiftMessages.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		220655121FAF82B600F4E00F /* MarginAdjustable+Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 220655111FAF82B600F4E00F /* MarginAdjustable+Animation.swift */; };
 		2270044B1FAFA6DD0045DDC3 /* PhysicsAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2270044A1FAFA6DD0045DDC3 /* PhysicsAnimation.swift */; };
+		22774BA020B5EF2A00813732 /* UIEdgeInsets+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22774B9F20B5EF2A00813732 /* UIEdgeInsets+Utils.swift */; };
 		228DF5261FACAC51004F8A39 /* errorIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 228DF5231FACAC51004F8A39 /* errorIcon.png */; };
 		228DF5271FACAC51004F8A39 /* errorIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 228DF5241FACAC51004F8A39 /* errorIcon@2x.png */; };
 		228DF5281FACAC51004F8A39 /* errorIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 228DF5251FACAC51004F8A39 /* errorIcon@3x.png */; };
@@ -90,6 +91,7 @@
 /* Begin PBXFileReference section */
 		220655111FAF82B600F4E00F /* MarginAdjustable+Animation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MarginAdjustable+Animation.swift"; sourceTree = "<group>"; };
 		2270044A1FAFA6DD0045DDC3 /* PhysicsAnimation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhysicsAnimation.swift; sourceTree = "<group>"; };
+		22774B9F20B5EF2A00813732 /* UIEdgeInsets+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIEdgeInsets+Utils.swift"; sourceTree = "<group>"; };
 		228DF5231FACAC51004F8A39 /* errorIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = errorIcon.png; path = Resources/errorIcon.png; sourceTree = "<group>"; };
 		228DF5241FACAC51004F8A39 /* errorIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "errorIcon@2x.png"; path = "Resources/errorIcon@2x.png"; sourceTree = "<group>"; };
 		228DF5251FACAC51004F8A39 /* errorIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "errorIcon@3x.png"; path = "Resources/errorIcon@3x.png"; sourceTree = "<group>"; };
@@ -252,9 +254,10 @@
 				86AAF81D1D5549680031EE32 /* MarginAdjustable.swift */,
 				22E307FE1E74C5B100E35893 /* AccessibleMessage.swift */,
 				86AAF82A1D580DD70031EE32 /* Error.swift */,
-				86DBE0031D75BE800071E51D /* Array+Utils.swift */,
 				2298C2061EE480D000E2DDC1 /* Animator.swift */,
 				2298C2041EE47DC900E2DDC1 /* Weak.swift */,
+				86DBE0031D75BE800071E51D /* Array+Utils.swift */,
+				22774B9F20B5EF2A00813732 /* UIEdgeInsets+Utils.swift */,
 			);
 			name = Base;
 			sourceTree = "<group>";
@@ -477,6 +480,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				22774BA020B5EF2A00813732 /* UIEdgeInsets+Utils.swift in Sources */,
 				86BBA8FC1D5E03F100FE8F16 /* MessageView.swift in Sources */,
 				86BBA9061D5E040C00FE8F16 /* Identifiable.swift in Sources */,
 				86BBA9011D5E040600FE8F16 /* PassthroughWindow.swift in Sources */,
diff --git a/SwiftMessages.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftMessages.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SwiftMessages/MarginAdjustable+Animation.swift b/SwiftMessages/MarginAdjustable+Animation.swift
@@ -10,40 +10,45 @@ import UIKit
 
 public extension MarginAdjustable where Self: UIView {
 
-    public func topAdjustment(container: UIView, context: AnimationContext) -> CGFloat {
+    public func defaultMarginAdjustment(context: AnimationContext) -> UIEdgeInsets {
+        return UIEdgeInsets(top: topAdjustment(context: context), left: 0, bottom: bottomAdjustment(context: context), right: 0)
+    }
+
+    private func topAdjustment(context: AnimationContext) -> CGFloat {        
         var top: CGFloat = 0
-        top += bounceAnimationOffset
         if !context.safeZoneConflicts.isDisjoint(with: [.sensorNotch, .statusBar]) {
             if #available(iOS 11, *)  {
                 do {
                     // To accommodate future safe areas, using a linear formula based on
                     // two data points:
                     // iPhone 8 - 20pt top safe area needs 0pt adjustment
                     // iPhone X - 44pt top safe area needs -6pt adjustment
-                    top -= 6 * (container.safeAreaInsets.top - 20) / (44 - 20)
+                    top -= 6 * (safeAreaInsets.top - 20) / (44 - 20)
                 }
                 top += safeAreaTopOffset
             } else if UIApplication.shared.statusBarOrientation == .portrait || UIApplication.shared.statusBarOrientation == .portraitUpsideDown {
-                top += statusBarOffset
+                let frameInWindow = convert(bounds, to: window)
+                if frameInWindow.minY == 0 {
+                    top += statusBarOffset
+                }
             }
         } else if #available(iOS 11, *), !context.safeZoneConflicts.isDisjoint(with: .overStatusBar) {
             top -= safeAreaInsets.top
         }
         return top
     }
 
-    public func bottomAdjustment(container: UIView, context: AnimationContext) -> CGFloat {
+    private func bottomAdjustment(context: AnimationContext) -> CGFloat {
         var bottom: CGFloat = 0
-        bottom += bounceAnimationOffset
         if !context.safeZoneConflicts.isDisjoint(with: [.homeIndicator]) {
-            if #available(iOS 11, *), container.safeAreaInsets.bottom > 0  {
+            if #available(iOS 11, *), safeAreaInsets.bottom > 0  {
                 do {
                     // This adjustment was added to fix a layout issue with iPhone X in
                     // landscape mode. Using a linear formula based on two data points to help
                     // future proof against future safe areas:
                     // iPhone X portrait: 34pt bottom safe area needs 0pt adjustment
                     // iPhone X landscape: 21pt bottom safe area needs 12pt adjustment
-                    bottom -= 12 * (container.safeAreaInsets.bottom - 34) / (34 - 21)
+                    bottom -= 12 * (safeAreaInsets.bottom - 34) / (34 - 21)
                 }
                 bottom += safeAreaBottomOffset
             }
diff --git a/SwiftMessages/PhysicsAnimation.swift b/SwiftMessages/PhysicsAnimation.swift
@@ -85,29 +85,14 @@ public class PhysicsAnimation: NSObject, Animator {
 
     @objc public func adjustMargins() {
         guard let adjustable = messageView as? MarginAdjustable & UIView,
-            let container = containerView,
             let context = context else { return }
-        var top: CGFloat = 0
-        var bottom: CGFloat = 0
-        switch placement {
-        case .top:
-            top += adjustable.topAdjustment(container: container, context: context)
-        case .bottom:
-            bottom += adjustable.bottomAdjustment(container: container, context: context)
-        case .center:
-            break
-        }
         adjustable.preservesSuperviewLayoutMargins = false
+        let defaultMarginAdjustment = adjustable.defaultMarginAdjustment(context: context)
         if #available(iOS 11, *) {
-            var margins = adjustable.safeAreaInsets
-            margins.top = top
-            margins.bottom = bottom
-            adjustable.layoutMargins = margins
+            adjustable.insetsLayoutMarginsFromSafeArea = false
+            adjustable.layoutMargins = adjustable.safeAreaInsets + defaultMarginAdjustment
         } else {
-            var margins = adjustable.layoutMargins
-            margins.top = top
-            margins.bottom = bottom
-            adjustable.layoutMargins = margins
+            adjustable.layoutMargins = defaultMarginAdjustment
         }
     }
 
diff --git a/SwiftMessages/PhysicsPanHandler.swift b/SwiftMessages/PhysicsPanHandler.swift
@@ -145,9 +145,9 @@ open class PhysicsPanHandler {
                 state.itemBehavior.addAngularVelocity(escapeAngularVelocity, for: messageView)
                 state.attachmentBehavior = nil
             } else {
-                animator.delegate?.panEnded(animator: animator)
                 state.stop()
                 self.state = nil
+                animator.delegate?.panEnded(animator: animator)
                 UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 0.65, initialSpringVelocity: 0, options: .beginFromCurrentState, animations: {
                     messageView.center = self.restingCenter ?? CGPoint(x: containerView.bounds.width / 2, y: containerView.bounds.height / 2)
                     messageView.transform = CGAffineTransform.identity
diff --git a/SwiftMessages/Resources/MessageView.xib b/SwiftMessages/Resources/MessageView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="2304" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Nx9-Zd-fca">
-                    <rect key="frame" x="40" y="20" width="600" height="63"/>
+                    <rect key="frame" x="40" y="20" width="520" height="63"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="😬" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Bu-DY-qZo" userLabel="Icon label">
                             <rect key="frame" x="0.0" y="9" width="43" height="45.5"/>
@@ -32,7 +32,7 @@
                             <rect key="frame" x="53" y="14.5" width="33" height="34"/>
                         </imageView>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="MKC-Mf-yZN">
-                            <rect key="frame" x="96" y="10" width="524" height="43.5"/>
+                            <rect key="frame" x="96" y="10" width="357" height="43.5"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="[Title]" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8T6-4T-ytS">
                                     <rect key="frame" x="0.0" y="0.0" width="48.5" height="20.5"/>
@@ -44,7 +44,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="[Message Body]" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dFP-4Z-N2a">
-                                    <rect key="frame" x="0.0" y="25.5" width="524" height="18"/>
+                                    <rect key="frame" x="0.0" y="25.5" width="112" height="18"/>
                                     <accessibility key="accessibilityConfiguration">
                                         <bool key="isElement" value="NO"/>
                                     </accessibility>
@@ -56,7 +56,7 @@
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         </stackView>
                         <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="752" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VCW-IQ-FfQ">
-                            <rect key="frame" x="600" y="16.5" width="57" height="30"/>
+                            <rect key="frame" x="463" y="16.5" width="57" height="30"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                             <state key="normal" title="[Button]"/>
                         </button>
@@ -66,7 +66,7 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="Nx9-Zd-fca" secondAttribute="trailing" constant="20" id="4sW-g4-sKy"/>
+                <constraint firstAttribute="trailingMargin" secondItem="Nx9-Zd-fca" secondAttribute="trailing" constant="20" id="4sW-g4-sKy"/>
                 <constraint firstAttribute="bottomMargin" secondItem="Nx9-Zd-fca" secondAttribute="bottom" constant="20" id="SPZ-ev-Lj3"/>
                 <constraint firstItem="Nx9-Zd-fca" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="topMargin" constant="20" id="UDP-8w-ZKv"/>
                 <constraint firstItem="Nx9-Zd-fca" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" constant="20" id="jKx-hQ-JzW"/>
diff --git a/SwiftMessages/TopBottomAnimation.swift b/SwiftMessages/TopBottomAnimation.swift
@@ -102,27 +102,20 @@ public class TopBottomAnimation: NSObject, Animator {
 
     @objc public func adjustMargins() {
         guard let adjustable = messageView as? MarginAdjustable & UIView,
-            let container = containerView,
             let context = context else { return }
-        var top: CGFloat = 0
-        var bottom: CGFloat = 0
+        adjustable.preservesSuperviewLayoutMargins = false
+        var defaultMarginAdjustment = adjustable.defaultMarginAdjustment(context: context)
         switch style {
         case .top:
-            top = adjustable.topAdjustment(container: container, context: context)
+            defaultMarginAdjustment.top += bounceOffset
         case .bottom:
-            bottom = adjustable.bottomAdjustment(container: container, context: context)
+            defaultMarginAdjustment.bottom += bounceOffset
         }
-        adjustable.preservesSuperviewLayoutMargins = false
         if #available(iOS 11, *) {
-            var margins = adjustable.safeAreaInsets
-            margins.top = top
-            margins.bottom = bottom
-            adjustable.layoutMargins = margins
+            adjustable.insetsLayoutMarginsFromSafeArea = false
+            adjustable.layoutMargins = adjustable.safeAreaInsets + defaultMarginAdjustment
         } else {
-            var margins = adjustable.layoutMargins
-            margins.top = top
-            margins.bottom = bottom
-            adjustable.layoutMargins = margins
+            adjustable.layoutMargins = defaultMarginAdjustment
         }
     }
 
diff --git a/SwiftMessages/UIEdgeInsets+Utils.swift b/SwiftMessages/UIEdgeInsets+Utils.swift
@@ -0,0 +1,19 @@
+//
+//  UIEdgeInsets+Utils.swift
+//  SwiftMessages
+//
+//  Created by Timothy Moose on 5/23/18.
+//  Copyright © 2018 SwiftKick Mobile. All rights reserved.
+//
+
+import UIKit
+
+extension UIEdgeInsets {
+    public static func +(left: UIEdgeInsets, right: UIEdgeInsets) -> UIEdgeInsets {
+        let topSum = left.top + right.top
+        let leftSum = left.left + right.left
+        let bottomSum = left.bottom + right.bottom
+        let rightSum = left.right + right.right
+        return UIEdgeInsets(top: topSum, left: leftSum, bottom: bottomSum, right: rightSum)
+    }
+}
