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
ab7ddf72
Unverified
Commit
ab7ddf72
authored
Oct 02, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup for TabBar that utilizzes Bar::centerViews
parent
59bd53e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
10 deletions
+5
-10
Examples/Programmatic/Bar/Bar/ViewController.swift
+1
-4
Sources/iOS/Bar.swift
+1
-1
Sources/iOS/TabBar.swift
+3
-5
No files found.
Examples/Programmatic/Bar/Bar/ViewController.swift
View file @
ab7ddf72
...
@@ -71,15 +71,12 @@ class ViewController: UIViewController {
...
@@ -71,15 +71,12 @@ class ViewController: UIViewController {
}
}
private
func
prepareBar
()
{
private
func
prepareBar
()
{
bar
=
Bar
()
bar
=
Bar
(
leftViews
:
[
menuButton
],
rightViews
:
[
favoriteButton
,
shareButton
]
)
bar
.
backgroundColor
=
Color
.
blue
.
base
bar
.
backgroundColor
=
Color
.
blue
.
base
bar
.
contentView
.
cornerRadiusPreset
=
.
cornerRadius1
bar
.
contentView
.
cornerRadiusPreset
=
.
cornerRadius1
bar
.
contentView
.
backgroundColor
=
Color
.
blue
.
lighten3
bar
.
contentView
.
backgroundColor
=
Color
.
blue
.
lighten3
bar
.
leftViews
=
[
menuButton
]
bar
.
rightViews
=
[
favoriteButton
,
shareButton
]
view
.
layout
(
bar
)
.
horizontally
()
.
center
()
view
.
layout
(
bar
)
.
horizontally
()
.
center
()
}
}
}
}
...
...
Sources/iOS/Bar.swift
View file @
ab7ddf72
...
@@ -241,9 +241,9 @@ open class Bar: View {
...
@@ -241,9 +241,9 @@ open class Bar: View {
*/
*/
open
override
func
prepare
()
{
open
override
func
prepare
()
{
super
.
prepare
()
super
.
prepare
()
autoresizingMask
=
.
flexibleWidth
interimSpacePreset
=
.
interimSpace3
interimSpacePreset
=
.
interimSpace3
contentEdgeInsetsPreset
=
.
square1
contentEdgeInsetsPreset
=
.
square1
prepareContentView
()
prepareContentView
()
}
}
...
...
Sources/iOS/TabBar.swift
View file @
ab7ddf72
...
@@ -78,7 +78,7 @@ open class TabBar: Bar {
...
@@ -78,7 +78,7 @@ open class TabBar: Bar {
b
.
removeFromSuperview
()
b
.
removeFromSuperview
()
}
}
c
ontentView
.
grid
.
v
iews
=
buttons
as
[
UIView
]
c
enterV
iews
=
buttons
as
[
UIView
]
layoutSubviews
()
layoutSubviews
()
}
}
...
@@ -137,11 +137,10 @@ open class TabBar: Bar {
...
@@ -137,11 +137,10 @@ open class TabBar: Bar {
return
return
}
}
let
columns
:
Int
=
contentView
.
grid
.
axis
.
columns
/
buttons
.
count
for
b
in
buttons
{
for
b
in
buttons
{
b
.
grid
.
columns
=
columns
b
.
grid
.
columns
=
0
b
.
contentEdgeInsets
=
.
zero
b
.
cornerRadius
=
0
b
.
cornerRadius
=
0
b
.
contentEdgeInsets
=
.
zero
if
isLineAnimated
{
if
isLineAnimated
{
prepareLineAnimationHandler
(
button
:
b
)
prepareLineAnimationHandler
(
button
:
b
)
...
@@ -210,7 +209,6 @@ open class TabBar: Bar {
...
@@ -210,7 +209,6 @@ open class TabBar: Bar {
super
.
prepare
()
super
.
prepare
()
contentEdgeInsetsPreset
=
.
none
contentEdgeInsetsPreset
=
.
none
interimSpacePreset
=
.
none
interimSpacePreset
=
.
none
autoresizingMask
=
.
flexibleWidth
prepareLine
()
prepareLine
()
prepareDivider
()
prepareDivider
()
}
}
...
...
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