From 30bd13f54f3c67e9599d2790ff4eaf0350299367 Mon Sep 17 00:00:00 2001 From: Anton Skopin Date: Fri, 8 Feb 2019 13:23:02 +0300 Subject: [PATCH] added tabbar height parameter --- .../Classes/CBFlashyTabBarController.swift | 17 ++++++++++++----- CBFlashyTabBarController/Info.plist | 2 +- Example/Info.plist | 2 +- FlashyTabBar.xcodeproj/project.pbxproj | 4 ++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift b/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift index 9e73f87..e67343c 100644 --- a/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift +++ b/CBFlashyTabBarController/Classes/CBFlashyTabBarController.swift @@ -49,12 +49,19 @@ open class CBFlashyTabBarController: UITabBarController { super.viewDidAppear(animated) } - private var barHeight: CGFloat { - var height: CGFloat = 74 - if #available(iOS 11.0, *) { - height += view.safeAreaInsets.bottom + private var _barHeight: CGFloat = 74 + open var barHeight: CGFloat { + get { + if #available(iOS 11.0, *) { + return _barHeight + view.safeAreaInsets.bottom + } else { + return _barHeight + } + } + set { + _barHeight = newValue + updateTabBarFrame() } - return height } private func updateTabBarFrame() { diff --git a/CBFlashyTabBarController/Info.plist b/CBFlashyTabBarController/Info.plist index e1fe4cf..af2604d 100644 --- a/CBFlashyTabBarController/Info.plist +++ b/CBFlashyTabBarController/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0 + 0.81 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Example/Info.plist b/Example/Info.plist index a05dbf8..6649878 100644 --- a/Example/Info.plist +++ b/Example/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 0.81 CFBundleSignature ???? CFBundleVersion diff --git a/FlashyTabBar.xcodeproj/project.pbxproj b/FlashyTabBar.xcodeproj/project.pbxproj index b5407f5..de08faf 100644 --- a/FlashyTabBar.xcodeproj/project.pbxproj +++ b/FlashyTabBar.xcodeproj/project.pbxproj @@ -466,6 +466,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = SK7A63GXF6; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -485,6 +486,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = SK7A63GXF6; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -509,6 +511,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = CBFlashyTabBarController/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -537,6 +540,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = CBFlashyTabBarController/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks",