Fix BaseView.installContentView()

wtmoose · wtmoose · commit 538283e2942e · 2016-08-18T16:20:51.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.0.3](https://github.com/SwiftKickMobile/SwiftMessages/releases/tag/1.0.2)
+
+### Improvements
+
+* Remove the `iconContainer` property from `MessageView`.
+
+### Bug Fixes
+
+* Fix constraints generated by `BaseView.installContentView()`.
+
 ## [1.0.2](https://github.com/SwiftKickMobile/SwiftMessages/releases/tag/1.0.2)
 
 ### Feature
diff --git a/Demo/Demo/ExploreViewController.swift b/Demo/Demo/ExploreViewController.swift
@@ -63,7 +63,8 @@ class ExploreViewController: UITableViewController, UITextFieldDelegate {
         }
         
         if !showIcon.on {
-            view.iconContainer?.hidden = true
+            view.iconImageView?.hidden = true
+            view.iconLabel?.hidden = true
         }
         
         if !showTitle.on {
diff --git a/Demo/Demo/ViewController.swift b/Demo/Demo/ViewController.swift
@@ -59,7 +59,6 @@ class ViewController: UITableViewController {
         error.configureTheme(.Error)
         error.configureContent(title: "Error", body: "Something is horribly wrong!")
         error.button?.setTitle("Stop", forState: .Normal)
-        error.iconContainer?.hidden = true
         
         let warning = MessageView.viewFromNib(layout: .CardView)
         warning.configureTheme(.Warning)
diff --git a/Demo/Pods/Pods.xcodeproj/xcuserdata/wtmoose.xcuserdatad/xcschemes/Pods-Demo.xcscheme b/Demo/Pods/Pods.xcodeproj/xcuserdata/wtmoose.xcuserdatad/xcschemes/Pods-Demo.xcscheme
diff --git a/Demo/Pods/Pods.xcodeproj/xcuserdata/wtmoose.xcuserdatad/xcschemes/xcschememanagement.plist b/Demo/Pods/Pods.xcodeproj/xcuserdata/wtmoose.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/README.md b/README.md
@@ -108,16 +108,22 @@ SwiftMessages.show(config: config, view: view)
 
 ### Customization
 
-`MessageView` provides the following UI elements:
+`MessageView` provides the following UI elements, exposed as public, optional `@IBOutlets`:
 
 * __Title__ (`UILabel`)
 * __Message body__ (`UILabel`)
-* __Icon__ (both `UIImageView` and `UILabel` variants)
+* __Image Icon__ (`UIImageView`)
+* __Text Icon__ (`UILabel`)
 * __Button__ (`UIButton`)
 
-All of these are defined as optional `@IBOutlets`, so you can freely omit the ones you don't need. The easiest way to customize `MessageView` is to drag-and-drop one of the provide nib files into your project and make changes. When using one of the `UIStackView`-based layouts as a starting point, you can simply delete elements from the nib file or hide them — no need to adjust the Auto Layout constraints.
+Because they are optional, you can freely omit the ones you don't need.
 
-`MessageView` provides some convenience methods for creating the included layouts while `SwiftMessages` provides additional, more generic nib loading methods:
+**The easiest way to customize `MessageView` is to drag-and-drop one of the pre-defined nib files into your project and make changes.** SwiftMessages always searches the main bundle for nib files first, so it is not necessary to rename the file or make a different API call. However, there are some OS-specific considerations to be aware of:
+
+* **iOS 9+** When using one of the `UIStackView` layouts, MessageView.nib or CardView.nib, as a starting point, you can simply delete elements from the nib file or hide them — no need to adjust the Auto Layout constraints.
+* **iOS 8** When using MessageViewIOS8.nib, you'll delete the unwanted elements and fix up the Auto Layout constraints. Or just create your own nib from scratch, which is much like creating a custom `UITableViewCell` or `UICollectionViewCell` — set the base view's class to `MessageView` or whatever subclass or view class you're using and wire up the outlets.
+
+To facilitate the use of nib-based layouts, `MessageView` provides some type-safe convenience methods for loading the pre-defined nibs. In addition, the `SwiftMessages` class provides some generic loading methods:
 
 ````swift
 // Instantiate MessageView from one of the provided nibs in a type-safe way.
diff --git a/SwiftMessages.podspec b/SwiftMessages.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
     spec.name             = 'SwiftMessages'
-    spec.version          = '1.0.2'
+    spec.version          = '1.0.3'
     spec.license          = { :type => 'MIT' }
     spec.homepage         = 'https://github.com/SwiftKickMobile/SwiftMessages'
     spec.authors          = { 'Timothy Moose' => 'tim@swiftkick.it' }
     spec.summary          = 'A very flexible message bar for iOS written in Swift.'
-    spec.source           = {:git => 'https://github.com/SwiftKickMobile/SwiftMessages.git', :tag => '1.0.2'}
+    spec.source           = {:git => 'https://github.com/SwiftKickMobile/SwiftMessages.git', :tag => '1.0.3'}
     spec.platform         = :ios, '8.0'
     spec.ios.deployment_target = '8.0'
     spec.source_files     = 'SwiftMessages/**/*.swift'
diff --git a/SwiftMessages/BaseView.swift b/SwiftMessages/BaseView.swift
@@ -77,10 +77,13 @@ public class BaseView: UIView, BackgroundViewable, MarginAdjustable {
        Default is zero inset.
      */
     public func installContentView(contentView: UIView, insets: UIEdgeInsets = UIEdgeInsetsZero) {
-        contentView.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
-        contentView.translatesAutoresizingMaskIntoConstraints = true
-        contentView.frame = UIEdgeInsetsInsetRect(self.bounds, insets)
+        contentView.translatesAutoresizingMaskIntoConstraints = false
         backgroundView.addSubview(contentView)
+        let top = NSLayoutConstraint(item: contentView, attribute: .Top, relatedBy: .Equal, toItem: backgroundView, attribute: .TopMargin, multiplier: 1.0, constant: insets.top)
+        let left = NSLayoutConstraint(item: contentView, attribute: .Left, relatedBy: .Equal, toItem: backgroundView, attribute: .LeftMargin, multiplier: 1.0, constant: insets.left)
+        let bottom = NSLayoutConstraint(item: contentView, attribute: .Bottom, relatedBy: .Equal, toItem: backgroundView, attribute: .BottomMargin, multiplier: 1.0, constant: -insets.bottom)
+        let right = NSLayoutConstraint(item: contentView, attribute: .Right, relatedBy: .Equal, toItem: backgroundView, attribute: .RightMargin, multiplier: 1.0, constant: -insets.right)
+        backgroundView.addConstraints([top, left, bottom, right])
         self.contentView = contentView
     }
     
diff --git a/SwiftMessages/MessageView.swift b/SwiftMessages/MessageView.swift
@@ -45,7 +45,6 @@ public class MessageView: BaseView, Identifiable {
     
     @IBOutlet public var titleLabel: UILabel?
     @IBOutlet public var bodyLabel: UILabel?
-    @IBOutlet public var iconContainer: UIView?
     @IBOutlet public var iconImageView: UIImageView?
     @IBOutlet public var iconLabel: UILabel?
     
@@ -110,6 +109,8 @@ extension MessageView {
         button?.tintColor = backgroundColor
         button?.contentEdgeInsets = UIEdgeInsetsMake(7.0, 7.0, 7.0, 7.0)
         button?.layer.cornerRadius = 5.0
+        iconImageView?.hidden = iconImageView?.image == nil
+        iconLabel?.hidden = iconLabel?.text == nil
     }
 }
 
@@ -131,13 +132,17 @@ extension MessageView {
     public func configureContent(title title: String, body: String, iconImage: UIImage) {
         configureContent(title: title, body: body)
         iconImageView?.image = iconImage
+        iconImageView?.hidden = false
         iconLabel?.text = nil
+        iconLabel?.hidden = true
     }
     
     public func configureContent(title title: String, body: String, iconText: String) {
         configureContent(title: title, body: body)
-        iconImageView?.image = nil
         iconLabel?.text = iconText
+        iconLabel?.hidden = false
+        iconImageView?.hidden = true
+        iconImageView?.image = nil
     }
     
     public func configureContent(title title: String?, body: String?, iconImage: UIImage?, iconText: String?, buttonImage: UIImage?, buttonTitle: String?, buttonTapHandler: ((button: UIButton) -> Void)?) {
diff --git a/SwiftMessages/Resources/CardView.xib b/SwiftMessages/Resources/CardView.xib
@@ -18,33 +18,17 @@
                         <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="RJH-Fp-YDa" userLabel="Content view">
                             <rect key="frame" x="20" y="20" width="532" height="93"/>
                             <subviews>
-                                <view contentMode="scaleToFill" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="cFe-Hg-5FF" userLabel="Icon container">
-                                    <rect key="frame" x="0.0" y="22" width="50" height="50"/>
-                                    <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="pFx-Py-lZQ" userLabel="Icon label">
-                                            <rect key="frame" x="0.0" y="0.0" width="38" height="45.5"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="38"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" image="errorIcon" translatesAutoresizingMaskIntoConstraints="NO" id="eGt-Nj-7Fu" userLabel="Icon image view">
-                                            <rect key="frame" x="0.0" y="0.0" width="38" height="45.5"/>
-                                        </imageView>
-                                    </subviews>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstItem="eGt-Nj-7Fu" firstAttribute="top" secondItem="cFe-Hg-5FF" secondAttribute="top" id="4oY-HE-Qmy"/>
-                                        <constraint firstAttribute="trailing" secondItem="pFx-Py-lZQ" secondAttribute="trailing" id="Kqe-Zy-nft"/>
-                                        <constraint firstItem="pFx-Py-lZQ" firstAttribute="top" secondItem="cFe-Hg-5FF" secondAttribute="top" id="Mxd-2w-2eb"/>
-                                        <constraint firstAttribute="bottom" secondItem="eGt-Nj-7Fu" secondAttribute="bottom" id="XKp-Rn-McQ"/>
-                                        <constraint firstAttribute="bottom" secondItem="pFx-Py-lZQ" secondAttribute="bottom" id="cdl-57-WWl"/>
-                                        <constraint firstItem="pFx-Py-lZQ" firstAttribute="leading" secondItem="cFe-Hg-5FF" secondAttribute="leading" id="kXo-k0-3Nw"/>
-                                        <constraint firstAttribute="trailing" secondItem="eGt-Nj-7Fu" secondAttribute="trailing" id="rgg-3H-nhZ"/>
-                                        <constraint firstItem="eGt-Nj-7Fu" firstAttribute="leading" secondItem="cFe-Hg-5FF" secondAttribute="leading" id="vfR-tQ-fEp"/>
-                                    </constraints>
-                                </view>
+                                <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="pFx-Py-lZQ" userLabel="Icon label">
+                                    <rect key="frame" x="0.0" y="24" width="38" height="46"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="38"/>
+                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" image="errorIcon" translatesAutoresizingMaskIntoConstraints="NO" id="eGt-Nj-7Fu" userLabel="Icon image view">
+                                    <rect key="frame" x="48" y="30" width="33" height="34"/>
+                                </imageView>
                                 <stackView opaque="NO" contentMode="scaleToFill" misplaced="YES" axis="vertical" distribution="fillProportionally" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="cJi-r8-oeb">
-                                    <rect key="frame" x="60" y="29" width="408" height="37"/>
+                                    <rect key="frame" x="91" y="28" width="377" height="37"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" misplaced="YES" text="[Title]" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IWB-BS-FgD">
                                             <rect key="frame" x="0.0" y="0.0" width="46" height="20"/>
@@ -105,7 +89,6 @@
                 <outlet property="bodyLabel" destination="gMT-Vh-S3z" id="BkZ-P0-0dh"/>
                 <outlet property="button" destination="VUM-rq-TVm" id="7RH-Cf-FAH"/>
                 <outlet property="contentView" destination="RJH-Fp-YDa" id="2Eb-fy-uEf"/>
-                <outlet property="iconContainer" destination="cFe-Hg-5FF" id="cGw-VP-Ben"/>
                 <outlet property="iconImageView" destination="eGt-Nj-7Fu" id="N4v-CG-mEM"/>
                 <outlet property="iconLabel" destination="pFx-Py-lZQ" id="xKK-gA-Otu"/>
                 <outlet property="titleLabel" destination="IWB-BS-FgD" id="ZFQ-sh-fDL"/>
diff --git a/SwiftMessages/Resources/MessageView.xib b/SwiftMessages/Resources/MessageView.xib
diff --git a/SwiftMessages/Resources/MessageViewIOS8.xib b/SwiftMessages/Resources/MessageViewIOS8.xib

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ class ExploreViewController: UITableViewController, UITextFieldDelegate {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if !showIcon.on {`
`66`		`- view.iconContainer?.hidden = true`
	`66`	`+ view.iconImageView?.hidden = true`
	`67`	`+ view.iconLabel?.hidden = true`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`if !showTitle.on {`