fixed image rendering mode

Author: askopin

BubbleTabBar.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = 'BubbleTabBar'
   s.swift_version = '4.2'
-  s.version          = '0.8.4'
+  s.version          = '0.8.5'
   s.summary          = 'One another nice animated tabbar'
   s.homepage         = 'https://github.com/Cuberto/bubble-icon-tabbar'
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'

BubbleTabBar/Classes/CBTabBarButton.swift

@@ -26,17 +26,17 @@ public class CBTabBarButton: UIControl {
             setSelected(newValue)
         }
     }
-    
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         configureSubviews()
     }
-    
+
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         configureSubviews()
     }
-    
+
     init(item: UITabBarItem) {
         super.init(frame: .zero)
         tabImage = UIImageView(image: item.image)
@@ -47,24 +47,29 @@ public class CBTabBarButton: UIControl {
     }
 
     private var currentImage: UIImage? {
+        var maybeImage: UIImage?
         if _isSelected {
-                return item?.selectedImage ?? item?.image
+                maybeImage = item?.selectedImage ?? item?.image
             } else {
-                return item?.image
+                maybeImage = item?.image
             }
+        guard let image = maybeImage else {
+            return nil
+        }
+        return image.renderingMode == .automatic ? image.withRenderingMode(.alwaysTemplate) : image
     }
-    
+
     public var item: UITabBarItem? {
         didSet {
-            tabImage.image = currentImage?.withRenderingMode(.alwaysTemplate)
+            tabImage.image = currentImage
             tabLabel.text = item?.title
             if let tabItem = item as? CBTabBarItem,
                let color = tabItem.tintColor {
                tintColor = color
             }
         }
     }
-    
+
     override public var tintColor: UIColor! {
         didSet {
             if _isSelected {
@@ -78,22 +83,22 @@ public class CBTabBarButton: UIControl {
     private var tabImage = UIImageView()
     private var tabLabel = UILabel()
     private var tabBg = UIView()
-    
+
     private let bgHeight: CGFloat = 42.0
     private var csFoldedBgTrailing: NSLayoutConstraint!
     private var csUnfoldedBgTrailing: NSLayoutConstraint!
     private var csFoldedLblLeading: NSLayoutConstraint!
     private var csUnfoldedLblLeading: NSLayoutConstraint!
-    
+
     private var foldedConstraints: [NSLayoutConstraint] {
         return [csFoldedLblLeading, csFoldedBgTrailing]
     }
-    
+
     private var unfoldedConstraints: [NSLayoutConstraint] {
         return [csUnfoldedLblLeading, csUnfoldedBgTrailing]
     }
-    
-    
+
+
     private func configureSubviews() {
         tabImage.contentMode = .center
         tabImage.translatesAutoresizingMaskIntoConstraints = false
@@ -106,17 +111,17 @@ public class CBTabBarButton: UIControl {
         tabImage.setContentHuggingPriority(.required, for: .vertical)
         tabImage.setContentCompressionResistancePriority(.required, for: .horizontal)
         tabImage.setContentCompressionResistancePriority(.required, for: .vertical)
-        
+
         self.addSubview(tabBg)
         self.addSubview(tabLabel)
         self.addSubview(tabImage)
-        
+
         tabBg.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
         tabBg.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
         tabBg.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
         tabBg.heightAnchor.constraint(equalToConstant: bgHeight).isActive = true
-        
-        
+
+
         tabImage.leadingAnchor.constraint(equalTo: tabBg.leadingAnchor, constant: bgHeight/2.0).isActive = true
         tabImage.centerYAnchor.constraint(equalTo: tabBg.centerYAnchor).isActive = true
         tabLabel.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
@@ -127,7 +132,7 @@ public class CBTabBarButton: UIControl {
         fold()
         setNeedsLayout()
     }
-    
+
     private func fold(animationDuration duration: Double = 0.0) {
         unfoldedConstraints.forEach{ $0.isActive = false }
         foldedConstraints.forEach{ $0.isActive = true }
@@ -140,9 +145,9 @@ public class CBTabBarButton: UIControl {
         UIView.transition(with: tabImage, duration: duration, options: [.transitionCrossDissolve], animations: {
             self.tabImage.tintColor = .black
         }, completion: nil)
-        
+
     }
-    
+
     private func unfold(animationDuration duration: Double = 0.0) {
         foldedConstraints.forEach{ $0.isActive = false }
         unfoldedConstraints.forEach{ $0.isActive = true }
@@ -156,7 +161,7 @@ public class CBTabBarButton: UIControl {
             self.tabImage.tintColor = self.tintColor
         }, completion: nil)
     }
-    
+
     public func setSelected(_ selected: Bool, animationDuration duration: Double = 0.0) {
         _isSelected = selected
          UIView.transition(with: tabImage, duration: 0.05, options: [.beginFromCurrentState], animations: {
@@ -168,7 +173,7 @@ public class CBTabBarButton: UIControl {
             fold(animationDuration: duration)
         }
     }
-    
+
     override public func layoutSubviews() {
         super.layoutSubviews()
         tabBg.layer.cornerRadius = tabBg.bounds.height / 2.0

BubbleTabBar/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.4</string>
+	<string>0.8.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>