development: fixed issue where ImageCard was not ordering the UIImageView behind the Toolbar

Material.podspec

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

Sources/Info.plist

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

Sources/iOS/Card.swift

@@ -195,9 +195,20 @@ open class Card: PulseView {
     open func reload() {
         var h: CGFloat = 0
         
-        h = prepare(view: toolbar, with: toolbarEdgeInsets, from: h)
-        h = prepare(view: contentView, with: contentViewEdgeInsets, from: h)
-        h = prepare(view: bottomBar, with: bottomBarEdgeInsets, from: h)
+        if let v = toolbar {
+            h = prepare(view: v, with: toolbarEdgeInsets, from: h)
+        }
+        
+        if let v = contentView {
+            h = prepare(view: v, with: contentViewEdgeInsets, from: h)
+        }
+        
+        if let v = bottomBar {
+            h = prepare(view: v, with: bottomBarEdgeInsets, from: h)
+        }
+        
+        container.height = h
+        bounds.size.height = h
         
         container.height = h
         bounds.size.height = h

Sources/iOS/ImageCard.swift

@@ -74,15 +74,26 @@ open class ImageCard: Card {
     open override func reload() {
         var h: CGFloat = 0
         
-        h = prepare(view: imageView, with: imageViewEdgeInsets, from: h)
+        if let v = imageView {
+            h = prepare(view: v, with: imageViewEdgeInsets, from: h)
+            container.sendSubview(toBack: v)
+        }
         
         if let v = toolbar {
             prepare(view: v, with: toolbarEdgeInsets, from: h)
             v.y = .top == toolbarAlignment ? toolbarEdgeInsets.top : h - v.height - toolbarEdgeInsets.bottom
+            container.bringSubview(toFront: v)
+        }
+        
+        if let v = contentView {
+            h = prepare(view: v, with: contentViewEdgeInsets, from: h)
+            container.sendSubview(toBack: v)
         }
         
-        h = prepare(view: contentView, with: contentViewEdgeInsets, from: h)
-        h = prepare(view: bottomBar, with: bottomBarEdgeInsets, from: h)
+        if let v = bottomBar {
+            h = prepare(view: v, with: bottomBarEdgeInsets, from: h)
+            container.sendSubview(toBack: v)
+        }
         
         container.height = h
         bounds.size.height = h

Sources/iOS/PresenterCard.swift

@@ -62,10 +62,21 @@ open class PresenterCard: Card {
     open override func reload() {
         var h: CGFloat = 0
         
-        h = prepare(view: toolbar, with: toolbarEdgeInsets, from: h)
-        h = prepare(view: presenterView, with: presenterViewEdgeInsets, from: h)
-        h = prepare(view: contentView, with: contentViewEdgeInsets, from: h)
-        h = prepare(view: bottomBar, with: bottomBarEdgeInsets, from: h)
+        if let v = toolbar {
+            h = prepare(view: v, with: toolbarEdgeInsets, from: h)
+        }
+        
+        if let v = presenterView {
+            h = prepare(view: v, with: presenterViewEdgeInsets, from: h)
+        }
+        
+        if let v = contentView {
+            h = prepare(view: v, with: contentViewEdgeInsets, from: h)
+        }
+        
+        if let v = bottomBar {
+            h = prepare(view: v, with: bottomBarEdgeInsets, from: h)
+        }
         
         container.height = h
         bounds.size.height = h