Crash fix on <5 items rend, delegation updates

Author: yervandsar

ExpandedTabBar.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = 'ExpandedTabBar'
-s.version          = '3.0.0'
+s.version          = '3.0.1'
 s.summary          = 'ExpandedTabBar is a very creative designed solution for "more" items in UITabBarController'
 
 s.homepage         = 'https://github.com/yervandsar/ExpandedTabBar'

ExpandedTabBar.xcodeproj/project.pbxproj

@@ -508,11 +508,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 94ST773MP3;
 				INFOPLIST_FILE = ExpandedTabBar/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yervandsar.ExpandedTabBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -525,11 +526,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 94ST773MP3;
 				INFOPLIST_FILE = ExpandedTabBar/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yervandsar.ExpandedTabBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

ExpandedTabBar/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

README.md

@@ -1,4 +1,4 @@
-# ExpandedTabBar v3.0.0
+# ExpandedTabBar v3.0.1
 ![Platform](https://img.shields.io/badge/platform-iOS-black.svg) ![Badge w/ Version](https://img.shields.io/cocoapods/v/ExpandedTabBar.svg)  ![Platform](https://img.shields.io/badge/Swift_Package_Manager-compatible-green.svg) 
 
 

Sources/ExpandedTabBar/ExpandedTabBarConstraints.swift

@@ -85,7 +85,7 @@ internal extension ExpandedTabBarController {
     /// Adding container view to background
     func addContainerView(with items: [UIStackView]) {
 
-        parentContainerView = ContainerView.create(for: tabBar)
+        let parentContainerView = ContainerView.create(for: tabBar)
         parentContainerView.roundCorners(corners: options.container.roundedCorners,
                                          radius: options.container.cornerRadius)
         parentContainerView.setOptions(options.container)
@@ -114,6 +114,8 @@ internal extension ExpandedTabBarController {
 
         parentViewWidthConstraint = widthConstraint
         parentViewHeightConstraint = heightConstraint
+
+        self.parentContainerView = parentContainerView
     }
 
     /// Content indicator right margin.

Sources/ExpandedTabBar/ExpandedTabBarController.swift

@@ -50,7 +50,7 @@ open class ExpandedTabBarController: UITabBarController {
     internal var innerContainer = UIView()
     internal var indicatorView = UIView()
 
-    internal var parentContainerView: ContainerView!
+    internal var parentContainerView: ContainerView?
 
     // MARK: Constraints
     internal var indicatorRightConstraint: NSLayoutConstraint?
@@ -90,8 +90,8 @@ open class ExpandedTabBarController: UITabBarController {
         bgViewBottomConstraint?.constant = -1 * offset
 
         let maxSize = ExpandedTabBarViews.containerMaxSize
-        let containerWidth = min(maxSize.width - 40, parentContainerView.stackView.frame.size.width)
-        let containerHeight = min(maxSize.height - 40, parentContainerView.stackView.frame.size.height)
+        let containerWidth = min(maxSize.width - 40, parentContainerView?.stackView.frame.size.width ?? 0)
+        let containerHeight = min(maxSize.height - 40, parentContainerView?.stackView.frame.size.height ?? 0)
 
         parentViewWidthConstraint?.constant = max(200, containerWidth)
         parentViewHeightConstraint?.constant = containerHeight
@@ -135,36 +135,38 @@ open class ExpandedTabBarController: UITabBarController {
 // MARK: - Animartion Handling
 internal extension ExpandedTabBarController {
     func showMoreContainer() {
+        guard let parent = self.parentContainerView else { return }
 
-        self.options.animationType.animation
-            .willShow(container: self.parentContainerView, background: self.backgroundView)
+        self.options.animationType.animation.willShow(container: parent, background: self.backgroundView)
 
         let showAnimation = {
             self.backgroundView.alpha = 1
-            self.options.animationType.animation.show(container: self.parentContainerView, on: self.backgroundView)
+            self.options.animationType.animation.show(container: parent, on: self.backgroundView)
             self.backgroundView.layoutIfNeeded()
         }
 
-        UIView.animate(withDuration: options.animationType.animation.duration, animations: showAnimation) { _ in
-            self.options.animationType.animation
-                .didShow(container: self.parentContainerView, background: self.backgroundView)
+        UIView.animate(withDuration: options.animationType.animation.duration, animations: showAnimation) {
+            [weak self] _ in
+            guard let self = self else { return }
+            self.options.animationType.animation.didShow(container: parent, background: self.backgroundView)
         }
     }
 
     func hideMoreContainer() {
+        guard let parent = self.parentContainerView else { return }
 
-        self.options.animationType.animation
-            .willHide(container: self.parentContainerView, background: self.backgroundView)
+        self.options.animationType.animation.willHide(container: parent, background: self.backgroundView)
 
         let hideAnimation = {
-            self.options.animationType.animation.hide(container: self.parentContainerView, from: self.backgroundView)
+            self.options.animationType.animation.hide(container: parent, from: self.backgroundView)
             self.backgroundView.alpha = 0
             self.backgroundView.layoutIfNeeded()
         }
 
-        UIView.animate(withDuration: options.animationType.animation.duration, animations: hideAnimation) { _ in
-            self.options.animationType.animation
-                .didHide(container: self.parentContainerView, background: self.backgroundView)
+        UIView.animate(withDuration: options.animationType.animation.duration, animations: hideAnimation) {
+            [weak self] _ in
+            guard let self = self else { return }
+            self.options.animationType.animation.didHide(container: parent, background: self.backgroundView)
         }
     }
 }

Sources/ExpandedTabBar/ExpandedTabBarControllerDelegate.swift

@@ -25,6 +25,9 @@ extension ExpandedTabBarController: UITabBarControllerDelegate {
     public func tabBarController(_ tabBarController: UITabBarController,
                                  didSelect viewController: UIViewController) {
         deselectMore()
+        expandedDelegate?.expandedTabBarController(self,
+                                                   didSelect: viewController,
+                                                   withItem: viewController.tabBarItem)
     }
 }
 
@@ -43,7 +46,9 @@ internal extension ExpandedTabBarController {
         viewControllers?[index] = selectedViewController
         self.selectedIndex = index
 
-        expandedDelegate?.expandedTabBarController(self, didSelect: selectedViewController, withItem: tabBarItem)
+        expandedDelegate?.expandedTabBarController(self,
+                                                   didSelect: selectedViewController,
+                                                   withItem: tabBarItem)
     }
 
     private func deselectMore() {