working copy of TabsController using Motion transitions

31330fc6 · Daniel Dahan · ffbc3884 · 31330fc6 · 31330fc6 · ffbc3884
Commit 31330fc6 authored Jul 25, 2017 by Daniel Dahan
6 changed files
--- a/Material.xcodeproj/project.pbxproj
+++ b/Material.xcodeproj/project.pbxproj
@@ -97,7 +97,6 @@
 		965E811F1DD4D5C800D61E4B /* ErrorTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961F18E71CD93E3E008927C5 /* ErrorTextField.swift */; };
 		965E81211DD4D5C800D61E4B /* TextStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB79D1CB40DC500C806FE /* TextStorage.swift */; };
 		965E81221DD4D5C800D61E4B /* TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB79E1CB40DC500C806FE /* TextView.swift */; };
-		965E81231DD4D7C800D61E4B /* BottomTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BCB7591CB40DC500C806FE /* BottomTabBar.swift */; };
 		965E81261DD4D7C800D61E4B /* CharacterAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961276621DCD8B1800A7D920 /* CharacterAttribute.swift */; };
 		966995491F1433C30064E7E4 /* PageTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 966995481F1433C30064E7E4 /* PageTabBarController.swift */; };
 		966C17731F0439F600D3E83C /* Material+MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 966C17721F0439F600D3E83C /* Material+MotionAnimation.swift */; };
@@ -143,7 +142,6 @@
 		96BCB83C1CB4115200C806FE /* Bar.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7981CB40DC500C806FE /* Bar.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96BCB83D1CB4115200C806FE /* RootController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7991CB40DC500C806FE /* RootController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96BCB8441CB4115200C806FE /* BottomNavigationController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
-		96BCB8451CB4115200C806FE /* BottomTabBar.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7591CB40DC500C806FE /* BottomTabBar.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96BCB8461CB4115200C806FE /* NavigationBar.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7901CB40DC500C806FE /* NavigationBar.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96BCB8471CB4115200C806FE /* NavigationController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7911CB40DC500C806FE /* NavigationController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		96BCB8481CB4115200C806FE /* NavigationItem.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96BCB7921CB40DC500C806FE /* NavigationItem.swift */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -240,7 +238,6 @@
 		96A183621E0C6CE200083C30 /* FABMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FABMenu.swift; sourceTree = "<group>"; };
 		96A183641E0C6DD400083C30 /* FABMenuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FABMenuController.swift; sourceTree = "<group>"; };
 		96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BottomNavigationController.swift; sourceTree = "<group>"; };
-		96BCB7591CB40DC500C806FE /* BottomTabBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BottomTabBar.swift; sourceTree = "<group>"; };
 		96BCB75D1CB40DC500C806FE /* Card.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Card.swift; sourceTree = "<group>"; };
 		96BCB75F1CB40DC500C806FE /* FABButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FABButton.swift; sourceTree = "<group>"; };
 		96BCB7601CB40DC500C806FE /* FlatButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlatButton.swift; sourceTree = "<group>"; };
@@ -431,7 +428,6 @@
 		962DDD081D6FBBD0001C307C /* BottomTabBar */ = {
 			isa = PBXGroup;
 			children = (
-				96BCB7591CB40DC500C806FE /* BottomTabBar.swift */,
 				96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */,
 			);
 			name = BottomTabBar;
@@ -878,7 +874,6 @@
 				96BCB83C1CB4115200C806FE /* Bar.swift in Headers */,
 				96BCB83D1CB4115200C806FE /* RootController.swift in Headers */,
 				96BCB8441CB4115200C806FE /* BottomNavigationController.swift in Headers */,
-				96BCB8451CB4115200C806FE /* BottomTabBar.swift in Headers */,
 				96BCB8461CB4115200C806FE /* NavigationBar.swift in Headers */,
 				96BCB8471CB4115200C806FE /* NavigationController.swift in Headers */,
 				96BCB8481CB4115200C806FE /* NavigationItem.swift in Headers */,
@@ -1015,7 +1010,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				965E81231DD4D7C800D61E4B /* BottomTabBar.swift in Sources */,
 				96DE3CE91F269BF00035F7AF /* MotionPlugin.swift in Sources */,
 				961E6BE21DDA2AF3004E6C93 /* Screen.swift in Sources */,
 				96DE3CF01F269BF00035F7AF /* IgnoreSubviewModifiersPreprocessor.swift in Sources */,

--- a/Sources/iOS/BottomNavigationController.swift
+++ b/Sources/iOS/BottomNavigationController.swift
@@ -30,6 +30,24 @@
 import UIKit
+extension UIViewController {
+    /**
+     A convenience property that provides access to the BottomNavigationController.
+     This is the recommended method of accessing the BottomNavigationController
+     through child UIViewControllers.
+     */
+    public var bottomNavigationController: BottomNavigationController? {
+        var viewController: UIViewController? = self
+        while nil != viewController {
+            if viewController is BottomNavigationController {
+                return viewController as? BottomNavigationController
+            }
+            viewController = viewController?.parent
+        }
+        return nil
+    }
+}
 open class BottomNavigationController: UITabBarController {
 	/**
     An initializer that initializes the object with a NSCoder object.
@@ -111,21 +129,25 @@ open class BottomNavigationController: UITabBarController {
     The super.prepare method should always be called immediately
     when subclassing.
     */
-	open func prepare() {
+    open func prepare() {
-		view.clipsToBounds = true
+        view.backgroundColor = .white
+        view.clipsToBounds = true
 		view.contentScaleFactor = Screen.scale
-		view.backgroundColor = .white
        prepareTabBar()
 	}
+}
-	/// Prepares the tabBar.
-	private func prepareTabBar() {
+extension BottomNavigationController {
-		tabBar.heightPreset = .normal
+    /// Prepares the tabBar.
+    fileprivate func prepareTabBar() {
+        tabBar.isTranslucent = false
+        tabBar.heightPreset = .normal
        tabBar.depthPreset = .depth1
        tabBar.dividerAlignment = .top
        let image = UIImage()
-		tabBar.shadowImage = image
+        tabBar.shadowImage = image
-		tabBar.backgroundImage = image
+        tabBar.backgroundImage = image
-		tabBar.backgroundColor = .white
+        tabBar.backgroundColor = .white
-	}
+    }
 }
--- a/Sources/iOS/BottomTabBar.swift
+++ b/Sources/iOS/BottomTabBar.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
-extension UITabBarItem {
-	/// Sets the color of the title color for a state.
-	public func setTitleColor(color: UIColor, forState state: UIControlState) {
-		setTitleTextAttributes([NSForegroundColorAttributeName: color], for: state)
-	}
-}
-open class BottomTabBar: UITabBar {
-    open override var intrinsicContentSize: CGSize {
-        return CGSize(width: width, height: height)
-    }
-    /// Automatically aligns the BottomNavigationBar to the superview.
-	@IBInspectable
-    open var isAlignedToParentAutomatically = true
-	/// A property that accesses the backing layer's background
-	@IBInspectable
-    open override var backgroundColor: UIColor? {
-		didSet {
-			barTintColor = backgroundColor
-		}
-	}
-	/**
-	An initializer that initializes the object with a CGRect object.
-	If AutoLayout is used, it is better to initilize the instance
-	using the init() initializer.
-	- Parameter frame: A CGRect instance.
-	*/
-	public override init(frame: CGRect) {
-		super.init(frame: frame)
-		prepare()
-	}
-	/// A convenience initializer.
-	public convenience init() {
-		self.init(frame: .zero)
-	}
-    public required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        prepare()
-    }
-    open override func layoutSubviews() {
-		super.layoutSubviews()
-        layoutShape()
-        layoutShadowPath()
-		if let v = items {
-			for item in v {
-				if .phone == Device.userInterfaceIdiom {
-					if nil == item.title {
-						let inset: CGFloat = 7
-						item.imageInsets = UIEdgeInsetsMake(inset, 0, -inset, 0)
-					} else {
-						let inset: CGFloat = 6
-						item.titlePositionAdjustment.vertical = -inset
-					}
-				} else if nil == item.title {
-                    let inset: CGFloat = 9
-                    item.imageInsets = UIEdgeInsetsMake(inset, 0, -inset, 0)
-                } else {
-                    let inset: CGFloat = 3
-                    item.imageInsets = UIEdgeInsetsMake(inset, 0, -inset, 0)
-                    item.titlePositionAdjustment.vertical = -inset
-                }
-			}
-		}
-        layoutDivider()
-	}
-	open override func didMoveToSuperview() {
-		super.didMoveToSuperview()
-		if isAlignedToParentAutomatically {
-			if let v = superview {
-				v.layout(self).bottom().horizontally()
-			}
-		}
-	}
-	/**
-     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.
-     */
-	public func prepare() {
-		heightPreset = .normal
-        depthPreset = .depth1
-        dividerAlignment = .top
-		contentScaleFactor = Screen.scale
-		backgroundColor = .white
-        let image = UIImage.image(with: .clear, size: CGSize(width: 1, height: 1))
-		shadowImage = image
-		backgroundImage = image
-	}
-}
--- a/Sources/iOS/NavigationBar.swift
+++ b/Sources/iOS/NavigationBar.swift
@@ -296,6 +296,7 @@ open class NavigationBar: UINavigationBar {
        contentEdgeInsetsPreset = .square1
        contentScaleFactor = Screen.scale
 		backButtonImage = Icon.cm.arrowBack
        let image = UIImage()
        shadowImage = image
 		setBackgroundImage(image, for: .default)

--- a/Sources/iOS/PageTabBarController.swift
+++ b/Sources/iOS/PageTabBarController.swift
@@ -219,7 +219,7 @@ open class PageTabBarController: RootController {
    open override func prepare() {
        super.prepare()
        preparePageTabBar()
-        preparePageTabBarItems()
+        prepareTabItems()
    }
    open override func prepareRootViewController() {
@@ -237,7 +237,7 @@ open class PageTabBarController: RootController {
    }
    /// Prepares the pageTabBarItems.
-    open func preparePageTabBarItems() {
+    open func prepareTabItems() {
        pageTabBar.buttons.removeAll()
        for x in viewControllers {

--- a/Sources/iOS/TabsController.swift
+++ b/Sources/iOS/TabsController.swift