development: minor tweaks to Card types for code clarity

Material.podspec

 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
   s.name = 'Material'
   s.name = 'Material'
-  s.version = '2.3.15'
+  s.version = '2.3.16'
   s.license = 'BSD-3-Clause'
   s.license = 'BSD-3-Clause'
   s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.'
   s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.'
   s.homepage = 'http://materialswift.com'
   s.homepage = 'http://materialswift.com'

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.15</string>
+	<string>2.3.16</string>
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>

Sources/iOS/Card.swift

@@ -209,9 +209,6 @@ open class Card: PulseView {
         
         
         container.height = h
         container.height = h
         bounds.size.height = h
         bounds.size.height = h
-        
-        container.height = h
-        bounds.size.height = h
     }
     }
     
     
     /**
     /**
@@ -237,26 +234,22 @@ open class Card: PulseView {
      - Returns: A CGFloat.
      - Returns: A CGFloat.
      */
      */
     @discardableResult
     @discardableResult
-    open func prepare(view: UIView?, with insets: EdgeInsets, from top: CGFloat) -> CGFloat {
-        guard let v = view else {
-            return top
-        }
-        
+    open func prepare(view: UIView, with insets: EdgeInsets, from top: CGFloat) -> CGFloat {
         let t = insets.top + top
         let t = insets.top + top
         
         
-        v.y = t
-        v.x = insets.left
+        view.y = t
+        view.x = insets.left
         
         
         let w = container.width - insets.left - insets.right
         let w = container.width - insets.left - insets.right
-        var h = v.height
+        var h = view.height
         
         
         if 0 == h {
         if 0 == h {
-            (v as? UILabel)?.sizeToFit()
-            h = v.sizeThatFits(CGSize(width: w, height: CGFloat.greatestFiniteMagnitude)).height
+            (view as? UILabel)?.sizeToFit()
+            h = view.sizeThatFits(CGSize(width: w, height: CGFloat.greatestFiniteMagnitude)).height
         }
         }
         
         
-        v.width = w
-        v.height = h
+        view.width = w
+        view.height = h
         
         
         return t + h + insets.bottom
         return t + h + insets.bottom
     }
     }

Sources/iOS/ImageCard.swift

@@ -87,12 +87,10 @@ open class ImageCard: Card {
         
         
         if let v = contentView {
         if let v = contentView {
             h = prepare(view: v, with: contentViewEdgeInsets, from: h)
             h = prepare(view: v, with: contentViewEdgeInsets, from: h)
-            container.sendSubview(toBack: v)
         }
         }
         
         
         if let v = bottomBar {
         if let v = bottomBar {
             h = prepare(view: v, with: bottomBarEdgeInsets, from: h)
             h = prepare(view: v, with: bottomBarEdgeInsets, from: h)
-            container.sendSubview(toBack: v)
         }
         }
         
         
         container.height = h
         container.height = h