diff --git a/CBFlashyTabBarController.podspec b/CBFlashyTabBarController.podspec index 176afef..13b7151 100644 --- a/CBFlashyTabBarController.podspec +++ b/CBFlashyTabBarController.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'CBFlashyTabBarController' - s.version = '0.8.1' + s.version = '0.8.2' s.summary = 'One another nice animated tabbar' s.homepage = 'https://github.com/Cuberto/flashy-tabbar' s.license = 'MIT' diff --git a/CBFlashyTabBarController/Classes/CBFlashyTabBar.swift b/CBFlashyTabBarController/Classes/CBFlashyTabBar.swift index ab54038..5d520b9 100644 --- a/CBFlashyTabBarController/Classes/CBFlashyTabBar.swift +++ b/CBFlashyTabBarController/Classes/CBFlashyTabBar.swift @@ -20,11 +20,6 @@ open class CBFlashyTabBar: UITabBar { fileprivate var shouldSelectOnTabBar = true open override var selectedItem: UITabBarItem? { willSet { - guard shouldSelectOnTabBar else { - shouldSelectOnTabBar = true - return - - } guard let newValue = newValue else { buttons.forEach { $0.setSelected(false, animated: false) } return @@ -59,7 +54,6 @@ open class CBFlashyTabBar: UITabBar { backgroundColor = UIColor.white isTranslucent = false barTintColor = UIColor.white - tintColor = #colorLiteral(red: 0.1176470588, green: 0.1176470588, blue: 0.431372549, alpha: 1) } open override var items: [UITabBarItem]? { @@ -141,11 +135,6 @@ open class CBFlashyTabBar: UITabBar { button.setSelected(false, animated: false) } selectedbutton.setSelected(true, animated: false) - if let item = items?[index] { - shouldSelectOnTabBar = false - selectedItem = item - } - } } diff --git a/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift b/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift index e67343c..5aad705 100644 --- a/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift +++ b/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift @@ -41,7 +41,11 @@ open class CBFlashyTabBarController: UITabBarController { open override func viewDidLoad() { super.viewDidLoad() + guard self.tabBar as? CBFlashyTabBar == nil else { + return + } let tabBar = CBFlashyTabBar() + tabBar.barTintColor = self.tabBar.barTintColor self.setValue(tabBar, forKey: "tabBar") } diff --git a/CBFlashyTabBarController/Classes/CBTabBarButton.swift b/CBFlashyTabBarController/Classes/CBTabBarButton.swift index d85c203..3857b41 100644 --- a/CBFlashyTabBarController/Classes/CBTabBarButton.swift +++ b/CBFlashyTabBarController/Classes/CBTabBarButton.swift @@ -138,6 +138,7 @@ class CBTabBarButton: UIControl { guard animated, let deselectAnimation = deselectAnimation else { tabLabel.isHidden = true tabImage.isHidden = false + dotView.isHidden = true return } tabImage.isHidden = false diff --git a/CBFlashyTabBarController/Info.plist b/CBFlashyTabBarController/Info.plist index af2604d..278e1be 100644 --- a/CBFlashyTabBarController/Info.plist +++ b/CBFlashyTabBarController/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.81 + 0.8.2 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift index cd3baff..926908a 100644 --- a/Example/AppDelegate.swift +++ b/Example/AppDelegate.swift @@ -7,6 +7,7 @@ // import UIKit +import CBFlashyTabBarController @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { @@ -15,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - + CBFlashyTabBar.appearance().tintColor = #colorLiteral(red: 0.1176470588, green: 0.1176470588, blue: 0.431372549, alpha: 1) return true } diff --git a/Example/Info.plist b/Example/Info.plist index 6649878..a05dbf8 100644 --- a/Example/Info.plist +++ b/Example/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.81 + 1.0 CFBundleSignature ???? CFBundleVersion