Merge pull request #735 from Iterable/finalizing-constraints

[MOB-7679] Updates OOTB constraints

Author: Ayyanchira

sample-apps/swift-sample-app/swift-sample-app/EmbeddedMessages/EmbeddedMessagesViewController.swift

@@ -80,7 +80,6 @@ class EmbeddedMessagesViewController: UIViewController {
     }
 
     func loadCardView(_ embeddedView: IterableEmbeddedView, _ embeddedMessage: IterableEmbeddedMessage) {
-        embeddedView.iterableEmbeddedViewDelegate = self
         embeddedView.primaryBtn.isRoundedSides = true
         embeddedView.secondaryBtn.isRoundedSides = true
         // We are setting the width of buttons as 140 as per our embedded messages width. You can change as per your need
@@ -93,7 +92,6 @@ class EmbeddedMessagesViewController: UIViewController {
     func loadBannerView(_ embeddedMessage: IterableEmbeddedMessage) {
         let config = IterableEmbeddedViewConfig(borderCornerRadius: 10)
         let embeddedView = IterableEmbeddedView(message: embeddedMessage, viewType: .banner, config: config)
-        embeddedView.iterableEmbeddedViewDelegate = self
         embeddedView.primaryBtn.isRoundedSides = true
         embeddedView.secondaryBtn.isRoundedSides = true
         // We are setting the width of buttons as 140 as per our embedded messages width. You can change as per your need
@@ -123,24 +121,6 @@ class EmbeddedMessagesViewController: UIViewController {
     }
 }
 
-extension EmbeddedMessagesViewController: IterableEmbeddedViewDelegate {
-    func didPressPrimaryButton(button: UIButton, viewTag: Int, message: IterableSDK.IterableEmbeddedMessage?) {
-        let buttonData =  message?.elements?.buttons?.first
-        let url = buttonData?.action?.data
-        openUrl(url)
-    }
-    
-    func didPressSecondaryButton(button: UIButton, viewTag: Int, message: IterableSDK.IterableEmbeddedMessage?) {
-        let buttonData =  message?.elements?.buttons?[1]
-        let url = buttonData?.action?.data
-        openUrl(url)
-    }
-    
-    func didPressBanner(banner: IterableSDK.IterableEmbeddedView, viewTag: Int, message: IterableSDK.IterableEmbeddedMessage?) {
-        openUrl(message?.elements?.defaultAction?.data)
-    }
-}
-
 extension EmbeddedMessagesViewController: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
 
     func collectionView(_ collectionView: UICollectionView,

swift-sdk/Resources/IterableEmbeddedView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -48,7 +48,7 @@
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZp-8m-qQK">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZp-8m-qQK">
                                             <rect key="frame" x="0.0" y="29.333333333333339" width="120.33333333333333" height="40.666666666666657"/>
                                             <string key="text">Description text
 Description text</string>

swift-sdk/uicomponents/IterableEmbeddedView.swift

@@ -200,6 +200,13 @@ public class IterableEmbeddedView:UIView {
         ])
     }
 
+//    func loadViewFromNib() -> UIView? {
+//        let nib = UINib(nibName: "IterableEmbeddedView", bundle: Bundle.module)
+//        let view = nib.instantiate(withOwner: self, options: nil).first as? UIView
+//        self.clipsToBounds = false
+//        return view
+//    }
+    
     func loadViewFromNib() -> UIView? {
         var nib: UINib
         #if COCOAPODS
@@ -217,6 +224,7 @@ public class IterableEmbeddedView:UIView {
         self.clipsToBounds = false
         return view
     }
+
 
     public func configure(message: IterableEmbeddedMessage, viewType: IterableEmbeddedViewType, config: IterableEmbeddedViewConfig?) {
 
@@ -382,41 +390,8 @@ public class IterableEmbeddedView:UIView {
         return size.width
     }
 
-    public func updateButtonConstraints() {
-        let bothButtonsVisible = !primaryBtn.isHidden && !secondaryBtn.isHidden
-
-        if !bothButtonsVisible {
-            buttonStackView.axis = .horizontal
-            horizontalButtonStackViewSpacer.isHidden = false
-            return
-        }
-
-        let doesTextWrapInPrimary = doesTextWrapInButton(primaryBtn)
-        let doesTextWrapInSecondary = doesTextWrapInButton(secondaryBtn)
-        
-        let shouldStackVertically = doesTextWrapInPrimary || doesTextWrapInSecondary
-
-        buttonStackView.axis = shouldStackVertically ? .vertical : .horizontal
-        horizontalButtonStackViewSpacer.isHidden = shouldStackVertically
-    }
-
-    private func doesTextWrapInButton(_ button: UIButton) -> Bool {
-        guard let text = button.titleLabel?.text, let font = button.titleLabel?.font else {
-            return false
-        }
-
-        let maxSize = CGSize(width: CGFloat.greatestFiniteMagnitude, height: button.bounds.height)
-        let textRect = text.boundingRect(with: maxSize, options: .usesLineFragmentOrigin, attributes: [.font: font], context: nil)
-
-        return textRect.width > button.bounds.width
-    }
-
-    
     public override func layoutSubviews() {
         super.layoutSubviews()
-        DispatchQueue.main.async {
-            self.updateButtonConstraints()
-        }
     }
 }
 
@@ -507,6 +482,9 @@ public class IterableEMButton: UIButton {
                                     cornerRadii: CGSize(width: bounds.height / 2, height: bounds.height / 2))
             maskLayer.path = path.cgPath
         }
+        
+        titleLabel?.numberOfLines = 1
+        titleLabel?.lineBreakMode = .byTruncatingTail
     }
 }