Skip to content

M
Material
Commit 58a621a6 by Daniel Dahan
Options

updated PageTabMenuController to PageMenuController

parent 6f38ea16
Showing with 28 additions and 28 deletions
Material.xcodeproj/project.pbxproj
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
9606CFAC1E957AC3006B4E74 /* PageTabMenuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9606CFAB1E957AC3006B4E74 /* PageTabMenuController.swift */; }; 9606CFAC1E957AC3006B4E74 /* PageMenuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9606CFAB1E957AC3006B4E74 /* PageMenuController.swift */; };
961409B01E43D15C00E7BA99 /* CollectionViewCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 961730591E145DE900A9A297 /* CollectionViewCard.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 961409B01E43D15C00E7BA99 /* CollectionViewCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 961730591E145DE900A9A297 /* CollectionViewCard.swift */; settings = {ATTRIBUTES = (Public, ); }; };
961409B11E43D15C00E7BA99 /* FABMenu.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183621E0C6CE200083C30 /* FABMenu.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 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, ); }; }; 961409B21E43D15C00E7BA99 /* FABMenuController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183641E0C6DD400083C30 /* FABMenuController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
9606CFAB1E957AC3006B4E74 /* PageTabMenuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageTabMenuController.swift; sourceTree = "<group>"; }; 9606CFAB1E957AC3006B4E74 /* PageMenuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageMenuController.swift; sourceTree = "<group>"; };
961276621DCD8B1800A7D920 /* CharacterAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterAttribute.swift; sourceTree = "<group>"; }; 961276621DCD8B1800A7D920 /* CharacterAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterAttribute.swift; sourceTree = "<group>"; };
961730591E145DE900A9A297 /* CollectionViewCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewCard.swift; sourceTree = "<group>"; }; 961730591E145DE900A9A297 /* CollectionViewCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewCard.swift; sourceTree = "<group>"; };
961E6BDE1DDA2A95004E6C93 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; }; 961E6BDE1DDA2A95004E6C93 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
963FBF071D669D14008F8512 /* PageTabBarController.swift */, 963FBF071D669D14008F8512 /* PageTabBarController.swift */,
9606CFAB1E957AC3006B4E74 /* PageTabMenuController.swift */, 9606CFAB1E957AC3006B4E74 /* PageMenuController.swift */,
); );
name = PageTabMenu; name = PageTabMenu;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -995,7 +995,7 @@ ...@@ -995,7 +995,7 @@
965E80D81DD4C50600D61E4B /* Layer.swift in Sources */, 965E80D81DD4C50600D61E4B /* Layer.swift in Sources */,
965E80D91DD4C50600D61E4B /* Layout.swift in Sources */, 965E80D91DD4C50600D61E4B /* Layout.swift in Sources */,
965E80DA1DD4C50600D61E4B /* Border.swift in Sources */, 965E80DA1DD4C50600D61E4B /* Border.swift in Sources */,
9606CFAC1E957AC3006B4E74 /* PageTabMenuController.swift in Sources */, 9606CFAC1E957AC3006B4E74 /* PageMenuController.swift in Sources */,
965E80DB1DD4C50600D61E4B /* InterimSpace.swift in Sources */, 965E80DB1DD4C50600D61E4B /* InterimSpace.swift in Sources */,
965E80DC1DD4C50600D61E4B /* Depth.swift in Sources */, 965E80DC1DD4C50600D61E4B /* Depth.swift in Sources */,
965E80DD1DD4C50600D61E4B /* EdgeInsets.swift in Sources */, 965E80DD1DD4C50600D61E4B /* EdgeInsets.swift in Sources */,
......
Sources/iOS/PageTabMenuController.swift → Sources/iOS/PageMenuController.swift
...@@ -30,48 +30,48 @@ ...@@ -30,48 +30,48 @@
import UIKit import UIKit
/// A memory reference to the PageTabMenuBarItem instance for UIViewController extensions. /// A memory reference to the PageMenuBarItem instance for UIViewController extensions.
fileprivate var PageTabMenuBarItemKey: UInt8 = 0 fileprivate var PageMenuBarItemKey: UInt8 = 0
open class PageTabMenuBarItem: FlatButton { open class PageMenuBarItem: FlatButton {
open override func prepare() { open override func prepare() {
super.prepare() super.prepare()
pulseAnimation = .none pulseAnimation = .none
} }
} }
@objc(PageTabMenuAlignment) @objc(PageMenuAlignment)
public enum PageTabMenuAlignment: Int { public enum PageMenuAlignment: Int {
case top case top
case bottom case bottom
case hidden case hidden
} }
extension UIViewController { extension UIViewController {
/// pageTabMenuBarItem reference. /// pageMenuBarItem reference.
public private(set) var pageTabMenuBarItem: PageTabMenuBarItem { public private(set) var pageMenuBarItem: PageMenuBarItem {
get { get {
return AssociatedObject(base: self, key: &PageTabMenuBarItemKey) { return AssociatedObject(base: self, key: &PageMenuBarItemKey) {
return PageTabMenuBarItem() return PageMenuBarItem()
} }
} }
set(value) { set(value) {
AssociateObject(base: self, key: &PageTabMenuBarItemKey, value: value) AssociateObject(base: self, key: &PageMenuBarItemKey, value: value)
} }
} }
} }
extension UIViewController { extension UIViewController {
/** /**
A convenience property that provides access to the PageTabMenuController. A convenience property that provides access to the PageMenuController.
This is the recommended method of accessing the PageTabMenuController This is the recommended method of accessing the PageMenuController
through child UIViewControllers. through child UIViewControllers.
*/ */
public var pageTabMenuController: PageTabMenuController? { public var pageMenuController: PageMenuController? {
var viewController: UIViewController? = self var viewController: UIViewController? = self
while nil != viewController { while nil != viewController {
if viewController is PageTabMenuController { if viewController is PageMenuController {
return viewController as? PageTabMenuController return viewController as? PageMenuController
} }
viewController = viewController?.parent viewController = viewController?.parent
} }
...@@ -79,7 +79,7 @@ extension UIViewController { ...@@ -79,7 +79,7 @@ extension UIViewController {
} }
} }
open class PageTabMenuController: UIViewController { open class PageMenuController: UIViewController {
/// A reference to the currently selected view controller index value. /// A reference to the currently selected view controller index value.
@IBInspectable @IBInspectable
open var selectedIndex = 0 open var selectedIndex = 0
...@@ -117,7 +117,7 @@ open class PageTabMenuController: UIViewController { ...@@ -117,7 +117,7 @@ open class PageTabMenuController: UIViewController {
} }
} }
open var pageTabMenuAlignment = PageTabMenuAlignment.bottom { open var pageMenuAlignment = PageMenuAlignment.bottom {
didSet { didSet {
layoutSubviews() layoutSubviews()
} }
...@@ -170,7 +170,7 @@ open class PageTabMenuController: UIViewController { ...@@ -170,7 +170,7 @@ open class PageTabMenuController: UIViewController {
tabBar?.height = p tabBar?.height = p
tabBar?.width = view.width + (tabBar?.layoutEdgeInsets.left ?? 0) + (tabBar?.layoutEdgeInsets.right ?? 0) tabBar?.width = view.width + (tabBar?.layoutEdgeInsets.left ?? 0) + (tabBar?.layoutEdgeInsets.right ?? 0)
switch pageTabMenuAlignment { switch pageMenuAlignment {
case .top: case .top:
tabBar?.isHidden = false tabBar?.isHidden = false
tabBar?.y = 0 tabBar?.y = 0
...@@ -201,7 +201,7 @@ open class PageTabMenuController: UIViewController { ...@@ -201,7 +201,7 @@ open class PageTabMenuController: UIViewController {
} }
} }
extension PageTabMenuController { extension PageMenuController {
/// Prepares the scrollView used to pan through view controllers. /// Prepares the scrollView used to pan through view controllers.
fileprivate func prepareScrollView() { fileprivate func prepareScrollView() {
scrollView.delegate = self scrollView.delegate = self
...@@ -269,7 +269,7 @@ extension PageTabMenuController { ...@@ -269,7 +269,7 @@ extension PageTabMenuController {
var buttons = [UIButton]() var buttons = [UIButton]()
for v in viewControllers { for v in viewControllers {
let button = v.pageTabMenuBarItem as UIButton let button = v.pageMenuBarItem as UIButton
buttons.append(button) buttons.append(button)
} }
...@@ -310,7 +310,7 @@ extension PageTabMenuController { ...@@ -310,7 +310,7 @@ extension PageTabMenuController {
} }
} }
extension PageTabMenuController { extension PageMenuController {
fileprivate func layoutScrollView() { fileprivate func layoutScrollView() {
scrollView.frame = view.bounds scrollView.frame = view.bounds
scrollView.contentSize = CGSize(width: scrollView.width * CGFloat(viewControllers.count), height: scrollView.height) scrollView.contentSize = CGSize(width: scrollView.width * CGFloat(viewControllers.count), height: scrollView.height)
...@@ -358,7 +358,7 @@ extension PageTabMenuController { ...@@ -358,7 +358,7 @@ extension PageTabMenuController {
} }
} }
extension PageTabMenuController { extension PageMenuController {
/// Removes the view controllers not within the scrollView. /// Removes the view controllers not within the scrollView.
fileprivate func removeViewControllers() { fileprivate func removeViewControllers() {
let n = viewControllers.count let n = viewControllers.count
...@@ -416,7 +416,7 @@ extension PageTabMenuController { ...@@ -416,7 +416,7 @@ extension PageTabMenuController {
} }
} }
extension PageTabMenuController { extension PageMenuController {
/** /**
Handles the pageTabBarButton. Handles the pageTabBarButton.
- Parameter button: A UIButton. - Parameter button: A UIButton.
...@@ -443,7 +443,7 @@ extension PageTabMenuController { ...@@ -443,7 +443,7 @@ extension PageTabMenuController {
} }
} }
extension PageTabMenuController: UIScrollViewDelegate { extension PageMenuController: UIScrollViewDelegate {
@objc @objc
open func scrollViewDidScroll(_ scrollView: UIScrollView) { open func scrollViewDidScroll(_ scrollView: UIScrollView) {
guard let tb = tabBar else { guard let tb = tabBar else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment