Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
58a621a6
Unverified
Commit
58a621a6
authored
Apr 15, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated PageTabMenuController to PageMenuController
parent
6f38ea16
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
28 deletions
+28
-28
Material.xcodeproj/project.pbxproj
+4
-4
Sources/iOS/PageMenuController.swift
+24
-24
No files found.
Material.xcodeproj/project.pbxproj
View file @
58a621a6
...
...
@@ -7,7 +7,7 @@
objects
=
{
/* Begin PBXBuildFile section */
9606CFAC1E957AC3006B4E74
/* Page
TabMenuController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9606CFAB1E957AC3006B4E74
/* PageTab
MenuController.swift */
;
};
9606CFAC1E957AC3006B4E74
/* Page
MenuController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9606CFAB1E957AC3006B4E74
/* Page
MenuController.swift */
;
};
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
,
);
};
};
961409B21E43D15C00E7BA99
/* FABMenuController.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96A183641E0C6DD400083C30
/* FABMenuController.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
...
...
@@ -190,7 +190,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
9606CFAB1E957AC3006B4E74
/* Page
TabMenuController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
PageTab
MenuController.swift
;
sourceTree
=
"<group>"
;
};
9606CFAB1E957AC3006B4E74
/* Page
MenuController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Page
MenuController.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>"
;
};
961E6BDE1DDA2A95004E6C93
/* Application.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Application.swift
;
sourceTree
=
"<group>"
;
};
...
...
@@ -368,7 +368,7 @@
isa
=
PBXGroup
;
children
=
(
963FBF071D669D14008F8512
/* PageTabBarController.swift */
,
9606CFAB1E957AC3006B4E74
/* Page
Tab
MenuController.swift */
,
9606CFAB1E957AC3006B4E74
/* PageMenuController.swift */
,
);
name
=
PageTabMenu
;
sourceTree
=
"<group>"
;
...
...
@@ -995,7 +995,7 @@
965E80D81DD4C50600D61E4B
/* Layer.swift in Sources */
,
965E80D91DD4C50600D61E4B
/* Layout.swift in Sources */
,
965E80DA1DD4C50600D61E4B
/* Border.swift in Sources */
,
9606CFAC1E957AC3006B4E74
/* Page
Tab
MenuController.swift in Sources */
,
9606CFAC1E957AC3006B4E74
/* PageMenuController.swift in Sources */
,
965E80DB1DD4C50600D61E4B
/* InterimSpace.swift in Sources */
,
965E80DC1DD4C50600D61E4B
/* Depth.swift in Sources */
,
965E80DD1DD4C50600D61E4B
/* EdgeInsets.swift in Sources */
,
...
...
Sources/iOS/Page
Tab
MenuController.swift
→
Sources/iOS/PageMenuController.swift
View file @
58a621a6
...
...
@@ -30,48 +30,48 @@
import
UIKit
/// A memory reference to the Page
Tab
MenuBarItem instance for UIViewController extensions.
fileprivate
var
Page
Tab
MenuBarItemKey
:
UInt8
=
0
/// A memory reference to the PageMenuBarItem instance for UIViewController extensions.
fileprivate
var
PageMenuBarItemKey
:
UInt8
=
0
open
class
Page
Tab
MenuBarItem
:
FlatButton
{
open
class
PageMenuBarItem
:
FlatButton
{
open
override
func
prepare
()
{
super
.
prepare
()
pulseAnimation
=
.
none
}
}
@objc(Page
Tab
MenuAlignment)
public
enum
Page
Tab
MenuAlignment
:
Int
{
@objc(PageMenuAlignment)
public
enum
PageMenuAlignment
:
Int
{
case
top
case
bottom
case
hidden
}
extension
UIViewController
{
/// page
Tab
MenuBarItem reference.
public
private(set)
var
page
TabMenuBarItem
:
PageTab
MenuBarItem
{
/// pageMenuBarItem reference.
public
private(set)
var
page
MenuBarItem
:
Page
MenuBarItem
{
get
{
return
AssociatedObject
(
base
:
self
,
key
:
&
Page
Tab
MenuBarItemKey
)
{
return
Page
Tab
MenuBarItem
()
return
AssociatedObject
(
base
:
self
,
key
:
&
PageMenuBarItemKey
)
{
return
PageMenuBarItem
()
}
}
set
(
value
)
{
AssociateObject
(
base
:
self
,
key
:
&
Page
Tab
MenuBarItemKey
,
value
:
value
)
AssociateObject
(
base
:
self
,
key
:
&
PageMenuBarItemKey
,
value
:
value
)
}
}
}
extension
UIViewController
{
/**
A convenience property that provides access to the Page
Tab
MenuController.
This is the recommended method of accessing the Page
Tab
MenuController
A convenience property that provides access to the PageMenuController.
This is the recommended method of accessing the PageMenuController
through child UIViewControllers.
*/
public
var
page
TabMenuController
:
PageTab
MenuController
?
{
public
var
page
MenuController
:
Page
MenuController
?
{
var
viewController
:
UIViewController
?
=
self
while
nil
!=
viewController
{
if
viewController
is
Page
Tab
MenuController
{
return
viewController
as?
Page
Tab
MenuController
if
viewController
is
PageMenuController
{
return
viewController
as?
PageMenuController
}
viewController
=
viewController
?
.
parent
}
...
...
@@ -79,7 +79,7 @@ extension UIViewController {
}
}
open
class
Page
Tab
MenuController
:
UIViewController
{
open
class
PageMenuController
:
UIViewController
{
/// A reference to the currently selected view controller index value.
@IBInspectable
open
var
selectedIndex
=
0
...
...
@@ -117,7 +117,7 @@ open class PageTabMenuController: UIViewController {
}
}
open
var
page
TabMenuAlignment
=
PageTab
MenuAlignment
.
bottom
{
open
var
page
MenuAlignment
=
Page
MenuAlignment
.
bottom
{
didSet
{
layoutSubviews
()
}
...
...
@@ -170,7 +170,7 @@ open class PageTabMenuController: UIViewController {
tabBar
?
.
height
=
p
tabBar
?
.
width
=
view
.
width
+
(
tabBar
?
.
layoutEdgeInsets
.
left
??
0
)
+
(
tabBar
?
.
layoutEdgeInsets
.
right
??
0
)
switch
page
Tab
MenuAlignment
{
switch
pageMenuAlignment
{
case
.
top
:
tabBar
?
.
isHidden
=
false
tabBar
?
.
y
=
0
...
...
@@ -201,7 +201,7 @@ open class PageTabMenuController: UIViewController {
}
}
extension
Page
Tab
MenuController
{
extension
PageMenuController
{
/// Prepares the scrollView used to pan through view controllers.
fileprivate
func
prepareScrollView
()
{
scrollView
.
delegate
=
self
...
...
@@ -269,7 +269,7 @@ extension PageTabMenuController {
var
buttons
=
[
UIButton
]()
for
v
in
viewControllers
{
let
button
=
v
.
page
Tab
MenuBarItem
as
UIButton
let
button
=
v
.
pageMenuBarItem
as
UIButton
buttons
.
append
(
button
)
}
...
...
@@ -310,7 +310,7 @@ extension PageTabMenuController {
}
}
extension
Page
Tab
MenuController
{
extension
PageMenuController
{
fileprivate
func
layoutScrollView
()
{
scrollView
.
frame
=
view
.
bounds
scrollView
.
contentSize
=
CGSize
(
width
:
scrollView
.
width
*
CGFloat
(
viewControllers
.
count
),
height
:
scrollView
.
height
)
...
...
@@ -358,7 +358,7 @@ extension PageTabMenuController {
}
}
extension
Page
Tab
MenuController
{
extension
PageMenuController
{
/// Removes the view controllers not within the scrollView.
fileprivate
func
removeViewControllers
()
{
let
n
=
viewControllers
.
count
...
...
@@ -416,7 +416,7 @@ extension PageTabMenuController {
}
}
extension
Page
Tab
MenuController
{
extension
PageMenuController
{
/**
Handles the pageTabBarButton.
- Parameter button: A UIButton.
...
...
@@ -443,7 +443,7 @@ extension PageTabMenuController {
}
}
extension
Page
Tab
MenuController
:
UIScrollViewDelegate
{
extension
PageMenuController
:
UIScrollViewDelegate
{
@objc
open
func
scrollViewDidScroll
(
_
scrollView
:
UIScrollView
)
{
guard
let
tb
=
tabBar
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment