Skip to content

Commit

Permalink
Fix issue with the tab bar
Browse files Browse the repository at this point in the history
  • Loading branch information
andreamazz committed Sep 14, 2018
1 parent c38950d commit a71c388
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 4 deletions.
31 changes: 30 additions & 1 deletion Demo/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 1 addition & 2 deletions Source/ScrollingNavigationController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ open class ScrollingNavigationController: UINavigationController, UIGestureRecog
- parameter duration: Optional animation duration. Defaults to 0.1
*/
open func showNavbar(animated: Bool = true, duration: TimeInterval = 0.1) {
print("show")
guard let _ = self.scrollableView, let visibleViewController = self.visibleViewController else { return }

guard state == .collapsed else {
Expand Down Expand Up @@ -463,7 +462,7 @@ open class ScrollingNavigationController: UINavigationController, UIGestureRecog
return
}
tabBar.isTranslucent = true
tabBar.frame.origin.y = percentage * (tabBar.frame.height / navigationBar.frame.height)
tabBar.transform = CGAffineTransform(translationX: 0, y: percentage * tabBar.frame.height)

// Set the bar to its original state if it's in its original position
if let originalTabBar = sourceTabBar, originalTabBar.origin.y == round(tabBar.frame.origin.y) {
Expand Down

0 comments on commit a71c388

Please sign in to comment.