master: fixed TabBar interimSpace issue, where it was not referencing the…

master: fixed TabBar interimSpace issue, where it was not referencing the correct contentView container

Material.podspec

 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
   s.name = 'Material'
   s.name = 'Material'
-  s.version = '2.4.9'
+  s.version = '2.4.10'
   s.license = 'BSD-3-Clause'
   s.license = 'BSD-3-Clause'
   s.summary = 'Material is an animation and graphics framework that brings Material Design to iOS with Swift 3.'
   s.summary = 'Material is an animation and graphics framework that brings Material Design to iOS with Swift 3.'
   s.homepage = 'http://materialswift.com'
   s.homepage = 'http://materialswift.com'

Material.xcodeproj/xcshareddata/xcschemes/Material iOS.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    version = "1.3">
    <BuildAction
    <BuildAction
       parallelizeBuildables = "YES"
       parallelizeBuildables = "YES"

Material.xcodeproj/xcshareddata/xcschemes/Material macOS.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    version = "1.3">
    <BuildAction
    <BuildAction
       parallelizeBuildables = "YES"
       parallelizeBuildables = "YES"

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.4.9</string>
+	<string>2.4.10</string>
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>

Sources/iOS/Bar.swift

@@ -75,9 +75,12 @@ open class Bar: View {
     }
     }
     
     
     /// A preset wrapper around interimSpace.
     /// A preset wrapper around interimSpace.
-    open var interimSpacePreset = InterimSpacePreset.none {
-        didSet {
-            interimSpace = InterimSpacePresetToValue(preset: interimSpacePreset)
+    open var interimSpacePreset: InterimSpacePreset {
+        get {
+            return grid.interimSpacePreset
+        }
+        set(value) {
+            grid.interimSpacePreset = value
         }
         }
     }
     }
     
     

Sources/iOS/CollectionReusableView.swift

@@ -172,9 +172,12 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
 	}
 	}
 	
 	
 	/// A preset wrapper around interimSpace.
 	/// A preset wrapper around interimSpace.
-	open var interimSpacePreset = InterimSpacePreset.none {
-		didSet {
-            interimSpace = InterimSpacePresetToValue(preset: interimSpacePreset)
+    open var interimSpacePreset: InterimSpacePreset {
+        get {
+            return grid.interimSpacePreset
+        }
+        set(value) {
+            grid.interimSpacePreset = value
         }
         }
     }
     }
 	
 	

Sources/iOS/TabBar.swift

@@ -67,6 +67,48 @@ open class TabBar: Bar {
     /// The currently selected button.
     /// The currently selected button.
     open internal(set) var selected: UIButton?
     open internal(set) var selected: UIButton?
     
     
+    /// A preset wrapper around contentEdgeInsets.
+    open override var contentEdgeInsetsPreset: EdgeInsetsPreset {
+        get {
+            return contentView.grid.contentEdgeInsetsPreset
+        }
+        set(value) {
+            contentView.grid.contentEdgeInsetsPreset = value
+        }
+    }
+    
+    /// A reference to EdgeInsets.
+    @IBInspectable
+    open override var contentEdgeInsets: EdgeInsets {
+        get {
+            return contentView.grid.contentEdgeInsets
+        }
+        set(value) {
+            contentView.grid.contentEdgeInsets = value
+        }
+    }
+    
+    /// A preset wrapper around interimSpace.
+    open override var interimSpacePreset: InterimSpacePreset {
+        get {
+            return contentView.grid.interimSpacePreset
+        }
+        set(value) {
+            contentView.grid.interimSpacePreset = value
+        }
+    }
+    
+    /// A wrapper around contentView.grid.interimSpace.
+    @IBInspectable
+    open override var interimSpace: InterimSpace {
+        get {
+            return contentView.grid.interimSpace
+        }
+        set(value) {
+            contentView.grid.interimSpace = value
+        }
+    }
+    
 	/// Buttons.
 	/// Buttons.
 	open var buttons = [UIButton]() {
 	open var buttons = [UIButton]() {
 		didSet {
 		didSet {
@@ -95,7 +137,7 @@ open class TabBar: Bar {
     }
     }
     
     
     /// A reference to the line UIView.
     /// A reference to the line UIView.
-    internal var line: UIView!
+    open let line = UIView()
     
     
     /// The line color.
     /// The line color.
     open var lineColor: UIColor? {
     open var lineColor: UIColor? {
@@ -172,9 +214,8 @@ open class TabBar: Bar {
 extension TabBar {
 extension TabBar {
     // Prepares the line.
     // Prepares the line.
     fileprivate func prepareLine() {
     fileprivate func prepareLine() {
-        line = UIView()
         line.zPosition = 6000
         line.zPosition = 6000
-        lineColor = Color.blueGrey.lighten3
+        lineColor = Color.blue.base
         lineHeight = 3
         lineHeight = 3
         addSubview(line)
         addSubview(line)
     }
     }