renamed TabsController to TabBarController

Material.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		961154CC1F32A7B100A78D74 /* Chips.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961154CB1F32A7B100A78D74 /* Chips.swift */; };
+		961154CC1F32A7B100A78D74 /* ChipBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961154CB1F32A7B100A78D74 /* ChipBar.swift */; };
 		961409B11E43D15C00E7BA99 /* FABMenu.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183621E0C6CE200083C30 /* FABMenu.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		961409B21E43D15C00E7BA99 /* FABMenuController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183641E0C6DD400083C30 /* FABMenuController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		9615277E1F393C0E00E8B2AC /* LICENSE.md in Sources */ = {isa = PBXBuildFile; fileRef = 961527541F393C0E00E8B2AC /* LICENSE.md */; };
@@ -48,6 +48,7 @@
 		961527A11F393C0E00E8B2AC /* MotionPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615277B1F393C0E00E8B2AC /* MotionPreprocessor.swift */; };
 		961527A21F393C0E00E8B2AC /* SourcePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615277C1F393C0E00E8B2AC /* SourcePreprocessor.swift */; };
 		961527A31F393C0E00E8B2AC /* TransitionPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615277D1F393C0E00E8B2AC /* TransitionPreprocessor.swift */; };
+		961527B91F3A509900E8B2AC /* ChipBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527B81F3A509900E8B2AC /* ChipBarController.swift */; };
 		9617B07D1DFCA8CF00410F8F /* Application.swift in Headers */ = {isa = PBXBuildFile; fileRef = 961E6BDE1DDA2A95004E6C93 /* Application.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		9617B07E1DFCA8CF00410F8F /* Card.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB75D1CB40DC500C806FE /* Card.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		9617B07F1DFCA8CF00410F8F /* ImageCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7621CB40DC500C806FE /* ImageCard.swift */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -199,18 +200,18 @@
 		96BFC1541E5E486F0075DE1F /* SpringAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965532281E47E388005C2792 /* SpringAnimation.swift */; };
 		96BFC16F1E63C10A0075DE1F /* SpringAnimation.swift in Headers */ = {isa = PBXBuildFile; fileRef = 965532281E47E388005C2792 /* SpringAnimation.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96D88C321C1328D800B91418 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D88C091C1328D800B91418 /* Material.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		96E09DC81F2287E50000B121 /* TabsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E09DC71F2287E50000B121 /* TabsController.swift */; };
+		96E09DC81F2287E50000B121 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E09DC71F2287E50000B121 /* TabBarController.swift */; };
 		96E3C3951D3A1CC20086A024 /* IconButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9658F2161CD6FA4700B902C1 /* IconButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E3C3961D3A1CC20086A024 /* CollectionReusableView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 966ECF291CF4C20100BB0BDF /* CollectionReusableView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E3C3971D3A1CC20086A024 /* Material+UIView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E3C3931D397AE90086A024 /* Material+UIView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E3C3991D3A1CC20086A024 /* StatusBarController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 967A48181D0F425A00B8CEB7 /* StatusBarController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E3C39A1D3A1CC20086A024 /* ErrorTextField.swift in Headers */ = {isa = PBXBuildFile; fileRef = 961F18E71CD93E3E008927C5 /* ErrorTextField.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96E3C39C1D3A1CC20086A024 /* Offset.swift in Headers */ = {isa = PBXBuildFile; fileRef = 968C99461D377849000074FF /* Offset.swift */; settings = {ATTRIBUTES = (Public, ); }; };
-		96F1A5531F24F17A001D8CAF /* TabsController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E09DC71F2287E50000B121 /* TabsController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
+		96F1A5531F24F17A001D8CAF /* TabBarController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96E09DC71F2287E50000B121 /* TabBarController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		961154CB1F32A7B100A78D74 /* Chips.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Chips.swift; sourceTree = "<group>"; };
+		961154CB1F32A7B100A78D74 /* ChipBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChipBar.swift; sourceTree = "<group>"; };
 		961276621DCD8B1800A7D920 /* CharacterAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterAttribute.swift; sourceTree = "<group>"; };
 		961527541F393C0E00E8B2AC /* LICENSE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
 		961527551F393C0E00E8B2AC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -250,6 +251,7 @@
 		9615277B1F393C0E00E8B2AC /* MotionPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPreprocessor.swift; sourceTree = "<group>"; };
 		9615277C1F393C0E00E8B2AC /* SourcePreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SourcePreprocessor.swift; sourceTree = "<group>"; };
 		9615277D1F393C0E00E8B2AC /* TransitionPreprocessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionPreprocessor.swift; sourceTree = "<group>"; };
+		961527B81F3A509900E8B2AC /* ChipBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChipBarController.swift; sourceTree = "<group>"; };
 		961E6BDE1DDA2A95004E6C93 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
 		961E6BE11DDA2AF3004E6C93 /* Screen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Screen.swift; sourceTree = "<group>"; };
 		961EFC571D738FF600E84652 /* SnackbarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnackbarController.swift; sourceTree = "<group>"; };
@@ -333,7 +335,7 @@
 		96D88BFC1C1328D800B91418 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		96D88BFD1C1328D800B91418 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		96D88C091C1328D800B91418 /* Material.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Material.h; sourceTree = "<group>"; };
-		96E09DC71F2287E50000B121 /* TabsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabsController.swift; sourceTree = "<group>"; };
+		96E09DC71F2287E50000B121 /* TabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; };
 		96E3C3931D397AE90086A024 /* Material+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+UIView.swift"; sourceTree = "<group>"; };
 		96F1DC871D654FDF0025F925 /* Material+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Material+CALayer.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -362,7 +364,8 @@
 		961154CA1F32999000A78D74 /* Chip */ = {
 			isa = PBXGroup;
 			children = (
-				961154CB1F32A7B100A78D74 /* Chips.swift */,
+				961154CB1F32A7B100A78D74 /* ChipBar.swift */,
+				961527B81F3A509900E8B2AC /* ChipBarController.swift */,
 			);
 			name = Chip;
 			sourceTree = "<group>";
@@ -563,7 +566,7 @@
 			isa = PBXGroup;
 			children = (
 				96BCB79A1CB40DC500C806FE /* TabBar.swift */,
-				96E09DC71F2287E50000B121 /* TabsController.swift */,
+				96E09DC71F2287E50000B121 /* TabBarController.swift */,
 			);
 			name = Tab;
 			sourceTree = "<group>";
@@ -923,7 +926,7 @@
 				9685D5AF1F0F04CB00AFEB79 /* CardCollectionViewCell.swift in Headers */,
 				9685D5B01F0F04CB00AFEB79 /* CardCollectionViewController.swift in Headers */,
 				9685D5B11F0F04CB00AFEB79 /* Material+MotionAnimation.swift in Headers */,
-				96F1A5531F24F17A001D8CAF /* TabsController.swift in Headers */,
+				96F1A5531F24F17A001D8CAF /* TabBarController.swift in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1057,6 +1060,7 @@
 				9615279C1F393C0E00E8B2AC /* MotionTransitionState.swift in Sources */,
 				965E80EC1DD4C55200D61E4B /* Material+Array.swift in Sources */,
 				965E80ED1DD4C55200D61E4B /* Material+UIWindow.swift in Sources */,
+				961527B91F3A509900E8B2AC /* ChipBarController.swift in Sources */,
 				965E80E41DD4C53300D61E4B /* PulseView.swift in Sources */,
 				966C17731F0439F600D3E83C /* Material+MotionAnimation.swift in Sources */,
 				961527841F393C0E00E8B2AC /* MotionTransitionAnimator.swift in Sources */,
@@ -1073,8 +1077,8 @@
 				9615278E1F393C0E00E8B2AC /* MotionAnimationFillMode.swift in Sources */,
 				9615278C1F393C0E00E8B2AC /* Motion+UIView.swift in Sources */,
 				961527961F393C0E00E8B2AC /* MotionCoordinateSpace.swift in Sources */,
-				96E09DC81F2287E50000B121 /* TabsController.swift in Sources */,
-				961154CC1F32A7B100A78D74 /* Chips.swift in Sources */,
+				96E09DC81F2287E50000B121 /* TabBarController.swift in Sources */,
+				961154CC1F32A7B100A78D74 /* ChipBar.swift in Sources */,
 				961527941F393C0E00E8B2AC /* MotionContext.swift in Sources */,
 				965689611F002F4C001C656D /* CardCollectionViewController.swift in Sources */,
 				965E80CC1DD4C50600D61E4B /* Bar.swift in Sources */,

Sources/iOS/Chips.swift → Sources/iOS/ChipBar.swift

@@ -84,36 +84,36 @@ fileprivate extension ChipItem {
     }
 }
 
-@objc(ChipsDelegate)
-public protocol ChipsDelegate {
+@objc(ChipBarDelegate)
+public protocol ChipBarDelegate {
     /**
      A delegation method that is executed when the chipItem will trigger the
      animation to the next chip.
-     - Parameter chipBar: A Chips.
+     - Parameter chipBar: A ChipBar.
      - Parameter chipItem: A ChipItem.
      */
     @objc
-    optional func chipBar(chipBar: Chips, willSelect chipItem: ChipItem)
+    optional func chipBar(chipBar: ChipBar, willSelect chipItem: ChipItem)
     
     /**
      A delegation method that is executed when the chipItem did complete the
      animation to the next chip.
-     - Parameter chipBar: A Chips.
+     - Parameter chipBar: A ChipBar.
      - Parameter chipItem: A ChipItem.
      */
     @objc
-    optional func chipBar(chipBar: Chips, didSelect chipItem: ChipItem)
+    optional func chipBar(chipBar: ChipBar, didSelect chipItem: ChipItem)
 }
 
-@objc(ChipsStyle)
-public enum ChipsStyle: Int {
+@objc(ChipBarStyle)
+public enum ChipBarStyle: Int {
     case auto
     case nonScrollable
     case scrollable
 }
 
-open class Chips: Bar {
-    /// A boolean indicating if the Chips line is in an animation state.
+open class ChipBar: Bar {
+    /// A boolean indicating if the ChipBar is in an animation state.
     open fileprivate(set) var isAnimating = false
     
     /// The total width of the chipItems.
@@ -128,7 +128,7 @@ open class Chips: Bar {
     }
     
     /// An enum that determines the chip bar style.
-    open var chipBarStyle = ChipsStyle.auto {
+    open var chipBarStyle = ChipBarStyle.auto {
         didSet {
             layoutSubviews()
         }
@@ -148,7 +148,7 @@ open class Chips: Bar {
     }
     
     /// A delegation reference.
-    open weak var delegate: ChipsDelegate?
+    open weak var delegate: ChipBarDelegate?
     
     /// The currently selected chipItem.
     open fileprivate(set) var selected: ChipItem?
@@ -330,7 +330,7 @@ open class Chips: Bar {
     }
 }
 
-fileprivate extension Chips {
+fileprivate extension ChipBar {
     /// Prepares the divider.
     func prepareDivider() {
         dividerColor = Color.grey.lighten3
@@ -362,7 +362,7 @@ fileprivate extension Chips {
     }
 }
 
-fileprivate extension Chips {
+fileprivate extension ChipBar {
     /// Handles the chipItem touch event.
     @objc
     func handle(chipItem: ChipItem) {
@@ -370,7 +370,7 @@ fileprivate extension Chips {
     }
 }
 
-extension Chips {
+extension ChipBar {
     /**
      Selects a given index from the chipItems array.
      - Parameter at index: An Int.
@@ -393,7 +393,7 @@ extension Chips {
     }
 }
 
-fileprivate extension Chips {
+fileprivate extension ChipBar {
     /**
      Animates to a given chipItem.
      - Parameter to chipItem: A ChipItem.

Sources/iOS/ChipBarController.swift

+/*
+ * Copyright (C) 2015 - 2017, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *	*	Redistributions of source code must retain the above copyright notice, this
+ *		list of conditions and the following disclaimer.
+ *
+ *	*	Redistributions in binary form must reproduce the above copyright notice,
+ *		this list of conditions and the following disclaimer in the documentation
+ *		and/or other materials provided with the distribution.
+ *
+ *	*	Neither the name of CosmicMind nor the names of its
+ *		contributors may be used to endorse or promote products derived from
+ *		this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import UIKit
+
+fileprivate var ChipItemKey: UInt8 = 0
+
+@objc(ChipBarAlignment)
+public enum ChipBarAlignment: Int {
+    case top
+    case bottom
+    case hidden
+}
+
+extension UIViewController {
+    /**
+     A convenience property that provides access to the ChipBarController.
+     This is the recommended method of accessing the ChipBarController
+     through child UIViewControllers.
+     */
+    public var chipsController: ChipBarController? {
+        return traverseViewControllerHierarchyForClassType()
+    }
+}
+
+open class ChipBarController: TransitionController {
+    /**
+     A Display value to indicate whether or not to
+     display the rootViewController to the full view
+     bounds, or up to the toolbar height.
+     */
+    open var displayStyle = DisplayStyle.partial {
+        didSet {
+            layoutSubviews()
+        }
+    }
+    
+    /// The ChipBar used to switch between view controllers.
+    @IBInspectable
+    open let chipBar = ChipBar()
+    
+    /// The chipBar alignment.
+    open var chipBarAlignment = ChipBarAlignment.bottom {
+        didSet {
+            layoutSubviews()
+        }
+    }
+    
+    open override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        chipBar.width = view.width
+        
+        switch displayStyle {
+        case .partial:
+            let h = chipBar.height
+            container.y = h
+            container.height = view.height - h
+        case .full:
+            container.frame = view.bounds
+        }
+        
+        rootViewController.view.frame = container.bounds
+    }
+    
+    open override func prepare() {
+        super.prepare()
+        prepareChipBar()
+    }
+}
+
+fileprivate extension ChipBarController {
+    /// Prepares the ChipBar.
+    func prepareChipBar() {
+        chipBar.depthPreset = .depth1
+        view.addSubview(chipBar)
+    }
+}

Sources/iOS/FABButton.swift

@@ -31,13 +31,6 @@
 import UIKit
 
 open class FABButton: Button {
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
 		depthPreset = .depth1

Sources/iOS/FlatButton.swift

@@ -31,13 +31,6 @@
 import UIKit
 
 open class FlatButton: Button {
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
 		cornerRadiusPreset = .cornerRadius1

Sources/iOS/IconButton.swift

@@ -31,13 +31,6 @@
 import UIKit
 
 open class IconButton: Button {
-    /**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
     open override func prepare() {
 		super.prepare()
 		pulseAnimation = .center

Sources/iOS/RaisedButton.swift

@@ -31,13 +31,6 @@
 import UIKit
 
 open class RaisedButton: Button {
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
 		depthPreset = .depth1

Sources/iOS/SearchBar.swift

@@ -153,13 +153,6 @@ open class SearchBar: Bar {
         layoutClearButton()
     }
     
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
         prepareTextField()

Sources/iOS/SearchBarController.swift

@@ -66,13 +66,6 @@ open class SearchBarController: StatusBarController {
         rootViewController.view.frame = container.bounds
 	}
 	
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
         displayStyle = .partial

Sources/iOS/StatusBarController.swift

@@ -80,11 +80,6 @@ open class StatusBarController: TransitionController {
     /// A reference to the statusBar.
     open let statusBar = UIView()
 	
-	/**
-     To execute in the order of the layout chain, override this
-     method. LayoutSubviews should be called immediately, unless you
-     have a certain need.
-     */
 	open override func layoutSubviews() {
 		super.layoutSubviews()
         
@@ -106,13 +101,6 @@ open class StatusBarController: TransitionController {
         rootViewController.view.frame = container.bounds
 	}
 	
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
         super.prepare()
 		prepareStatusBar()

Sources/iOS/TabBar.swift

@@ -72,7 +72,7 @@ public enum TabBarStyle: Int {
 }
 
 open class TabBar: Bar {
-    /// A boolean indicating if the TabBar line is in an animation state.
+    /// A boolean indicating if the TabBar is in an animation state.
     open fileprivate(set) var isAnimating = false
     
     /// The total width of the tabItems.

Sources/iOS/TabsController.swift → Sources/iOS/TabBarController.swift

@@ -55,16 +55,16 @@ extension UIViewController {
 
 extension UIViewController {
     /**
-     A convenience property that provides access to the TabsController.
-     This is the recommended method of accessing the TabsController
+     A convenience property that provides access to the TabBarController.
+     This is the recommended method of accessing the TabBarController
      through child UIViewControllers.
      */
-    public var tabsController: TabsController? {
+    public var tabsController: TabBarController? {
         return traverseViewControllerHierarchyForClassType()
     }
 }
 
-open class TabsController: UIViewController {
+open class TabBarController: UIViewController {
     /// The TabBar used to switch between view controllers.
     @IBInspectable
     open let tabBar = TabBar()
@@ -157,7 +157,7 @@ open class TabsController: UIViewController {
     }
 }
 
-fileprivate extension TabsController {
+fileprivate extension TabBarController {
     /// Prepares the container view.
     func prepareContainer() {
         view.addSubview(container)
@@ -218,7 +218,7 @@ fileprivate extension TabsController {
     }
 }
 
-fileprivate extension TabsController {
+fileprivate extension TabBarController {
     /// Layout the container view.
     func layoutContainer() {
         let p = tabBar.height
@@ -263,7 +263,7 @@ fileprivate extension TabsController {
     }
 }
 
-fileprivate extension TabsController {
+fileprivate extension TabBarController {
     /**
      Removes the view controller as a child view controller with
      the given index.
@@ -290,7 +290,7 @@ fileprivate extension TabsController {
     }
 }
 
-fileprivate extension TabsController {
+fileprivate extension TabBarController {
     /**
      Handles the tabItem.
      - Parameter tabItem: A TabItem.

Sources/iOS/Toolbar.swift

@@ -135,13 +135,6 @@ open class Toolbar: Bar {
         }
     }
 
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
         contentViewAlignment = .center

Sources/iOS/ToolbarController.swift

@@ -67,13 +67,6 @@ open class ToolbarController: StatusBarController {
         rootViewController.view.frame = container.bounds
 	}
 	
-	/**
-     Prepares the view instance when intialized. When subclassing,
-     it is recommended to override the prepare method
-     to initialize property values and other setup operations.
-     The super.prepare method should always be called immediately
-     when subclassing.
-     */
 	open override func prepare() {
 		super.prepare()
         displayStyle = .partial