expose tabsView and centralize tabs buttons titles

deliveryhero · Oct 10, 2018 · 1108395 · 1108395
1 parent 7cfd545
commit 1108395
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Sources/ParallaxPagerView.swift b/Sources/ParallaxPagerView.swift
@@ -18,7 +18,7 @@ public final class ParallaxPagerView: UIView {
   private var originalTopInset: CGFloat = 0.0
 
   private var headerView = UIView()
-  private(set) var tabsView: (UIView & PagerTab)?
+  public private(set) var tabsView: (UIView & PagerTab)?
 
   private var viewControllers = [TabViewController]()
   private let hasShownController = NSHashTable<UIViewController>.weakObjects()

diff --git a/Sources/Tabs/TabsView.swift b/Sources/Tabs/TabsView.swift
@@ -26,6 +26,7 @@ fileprivate class TabView: UIView {
     selectedColor: UIColor,
     defaultFont: UIFont,
     selectedFont: UIFont,
+    height: CGFloat,
     tabsView: TabsView
     ) {
     self.index = index
@@ -43,7 +44,7 @@ fileprivate class TabView: UIView {
 
     self.title = title
     let buttonFrame = button.frame
-    let frame = CGRect(x: 0, y: 0, width: buttonFrame.size.width, height: buttonFrame.size.height)
+    let frame = CGRect(x: 0, y: 0, width: buttonFrame.size.width, height: height)
     super.init(frame: frame)
     button.addTarget(self, action:#selector(tabClicked), for: .touchUpInside)
     addSubview(button)
@@ -89,8 +90,8 @@ class TabsView: UIView {
     let bundle = Bundle(identifier:"com.ParallaxPagerView.ParallaxPagerView-iOS")
     let tabsView = bundle!.loadNibNamed("TabsView", owner: nil, options: nil)?.first as! TabsView
     tabsView.tabsConfig = config
-    tabsView.createTabs()
     tabsView.frame = CGRect(x: 0, y: 0, width: tabsView.frame.size.width, height: config.height)
+    tabsView.createTabs()
     tabsView.setupSelectionIndicator()
     return tabsView
   }
@@ -112,6 +113,7 @@ class TabsView: UIView {
         selectedColor: tabsConfig.selectedTabTitleColor,
         defaultFont: tabsConfig.defaultTabTitleFont,
         selectedFont: tabsConfig.selectedTabTitleFont,
+        height: self.frame.size.height,
         tabsView: self
       )
 
@@ -156,7 +158,7 @@ class TabsView: UIView {
     let selectedTabFrame = tabsList[selectedIndex].frame
     let frame = CGRect(
       x: selectedTabFrame.origin.x,
-      y: selectedTabFrame.size.height,
+      y: selectedTabFrame.size.height - tabsConfig.selectionIndicatorHeight,
       width: selectedTabFrame.size.width,
       height: tabsConfig.selectionIndicatorHeight
     )

diff --git a/Sources/Tabs/TabsView.xib b/Sources/Tabs/TabsView.xib
@@ -17,7 +17,7 @@
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n1r-Wd-YDF">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </scrollView>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>