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
75c4665b
Unverified
Commit
75c4665b
authored
Sep 15, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: updated leftControls and rightControls to leftViews and rightViews, respectively
parent
09cdb27c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
Sources/iOS/NavigationBar.swift
+5
-5
Sources/iOS/NavigationController.swift
+1
-1
Sources/iOS/NavigationItem.swift
+10
-10
No files found.
Sources/iOS/NavigationBar.swift
View file @
75c4665b
...
...
@@ -201,8 +201,8 @@ open class NavigationBar: UINavigationBar {
var
lc
=
0
var
rc
=
0
let
l
=
(
CGFloat
(
item
.
left
Control
s
.
count
)
*
interimSpace
)
let
r
=
(
CGFloat
(
item
.
right
Control
s
.
count
)
*
interimSpace
)
let
l
=
(
CGFloat
(
item
.
left
View
s
.
count
)
*
interimSpace
)
let
r
=
(
CGFloat
(
item
.
right
View
s
.
count
)
*
interimSpace
)
let
p
=
width
-
l
-
r
-
contentEdgeInsets
.
left
-
contentEdgeInsets
.
right
let
columns
=
Int
(
ceil
(
p
/
gridFactor
))
...
...
@@ -210,7 +210,7 @@ open class NavigationBar: UINavigationBar {
item
.
titleView
!.
grid
.
views
.
removeAll
()
item
.
titleView
!.
grid
.
axis
.
columns
=
columns
for
v
in
item
.
left
Control
s
{
for
v
in
item
.
left
View
s
{
(
v
as?
UIButton
)?
.
contentEdgeInsets
=
.
zero
v
.
sizeToFit
()
v
.
grid
.
columns
=
Int
(
ceil
(
v
.
width
/
gridFactor
))
+
1
...
...
@@ -222,7 +222,7 @@ open class NavigationBar: UINavigationBar {
item
.
titleView
!.
grid
.
views
.
append
(
item
.
contentView
)
for
v
in
item
.
right
Control
s
{
for
v
in
item
.
right
View
s
{
(
v
as?
UIButton
)?
.
contentEdgeInsets
=
.
zero
v
.
sizeToFit
()
v
.
grid
.
columns
=
Int
(
ceil
(
v
.
width
/
gridFactor
))
+
1
...
...
@@ -239,7 +239,7 @@ open class NavigationBar: UINavigationBar {
item
.
contentView
.
grid
.
offset
.
columns
=
rc
-
lc
}
else
{
item
.
contentView
.
grid
.
columns
=
columns
-
2
*
lc
item
.
right
Control
s
.
first
?
.
grid
.
offset
.
columns
=
lc
-
rc
item
.
right
View
s
.
first
?
.
grid
.
offset
.
columns
=
lc
-
rc
}
}
else
{
item
.
contentView
.
grid
.
columns
=
columns
-
lc
-
rc
...
...
Sources/iOS/NavigationController.swift
View file @
75c4665b
...
...
@@ -138,7 +138,7 @@ extension NavigationController: UINavigationBarDelegate {
backButton
.
addTarget
(
self
,
action
:
#selector(
handleBackButton
)
,
for
:
.
touchUpInside
)
item
.
backButton
=
backButton
item
.
left
Control
s
.
append
(
backButton
)
item
.
left
View
s
.
append
(
backButton
)
v
.
layoutNavigationItem
(
item
:
item
)
}
return
true
...
...
Sources/iOS/NavigationItem.swift
View file @
75c4665b
...
...
@@ -54,15 +54,15 @@ public class NavigationItem: NSObject {
/// Detail label.
public
private(set)
lazy
var
detailLabel
=
UILabel
()
/// Left
control
s.
public
var
left
Control
s
=
[
UIView
]()
{
/// Left
item
s.
public
var
left
View
s
=
[
UIView
]()
{
didSet
{
navigationBar
?
.
layoutSubviews
()
}
}
/// Right
control
s.
public
var
right
Control
s
=
[
UIView
]()
{
/// Right
item
s.
public
var
right
View
s
=
[
UIView
]()
{
didSet
{
navigationBar
?
.
layoutSubviews
()
}
...
...
@@ -176,22 +176,22 @@ extension UINavigationItem {
}
/// Left side UIViews.
public
var
left
Control
s
:
[
UIView
]
{
public
var
left
View
s
:
[
UIView
]
{
get
{
return
navigationItem
.
left
Control
s
return
navigationItem
.
left
View
s
}
set
(
value
)
{
navigationItem
.
left
Control
s
=
value
navigationItem
.
left
View
s
=
value
}
}
/// Right side UIViews.
public
var
right
Control
s
:
[
UIView
]
{
public
var
right
View
s
:
[
UIView
]
{
get
{
return
navigationItem
.
right
Control
s
return
navigationItem
.
right
View
s
}
set
(
value
)
{
navigationItem
.
right
Control
s
=
value
navigationItem
.
right
View
s
=
value
}
}
}
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