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
6c33811f
Commit
6c33811f
authored
Apr 18, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor updates on ordering for bottomNavigationBar
parent
6251dcdc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Examples/Programmatic/App/App/AppNavigationController.swift
+0
-1
Examples/Programmatic/App/App/RecipesViewController.swift
+1
-1
Sources/iOS/BottomNavigationController.swift
+3
-2
No files found.
Examples/Programmatic/App/App/AppNavigationController.swift
View file @
6c33811f
...
@@ -61,7 +61,6 @@ class AppNavigationController: NavigationController {
...
@@ -61,7 +61,6 @@ class AppNavigationController: NavigationController {
/// Prepares the navigationBar
/// Prepares the navigationBar
private
func
prepareNavigationBar
()
{
private
func
prepareNavigationBar
()
{
navigationBar
.
tintColor
=
MaterialColor
.
white
navigationBar
.
backgroundColor
=
MaterialColor
.
blue
.
base
navigationBar
.
backgroundColor
=
MaterialColor
.
blue
.
base
}
}
}
}
Examples/Programmatic/App/App/RecipesViewController.swift
View file @
6c33811f
...
@@ -108,7 +108,7 @@ class RecipesViewController: UIViewController {
...
@@ -108,7 +108,7 @@ class RecipesViewController: UIViewController {
let
vc
:
AppSearchBarController
=
AppSearchBarController
(
rootViewController
:
RecommendationViewController
(
dataSourceItems
:
recommended
))
let
vc
:
AppSearchBarController
=
AppSearchBarController
(
rootViewController
:
RecommendationViewController
(
dataSourceItems
:
recommended
))
vc
.
modalTransitionStyle
=
.
CrossDissolve
vc
.
modalTransitionStyle
=
.
CrossDissolve
navigationController
?
.
presentViewController
(
vc
,
animated
:
true
,
completion
:
nil
)
presentViewController
(
vc
,
animated
:
true
,
completion
:
nil
)
}
}
/// Prepares the items Array.
/// Prepares the items Array.
...
...
Sources/iOS/BottomNavigationController.swift
View file @
6c33811f
...
@@ -143,8 +143,9 @@ public class BottomNavigationController : UITabBarController, UITabBarController
...
@@ -143,8 +143,9 @@ public class BottomNavigationController : UITabBarController, UITabBarController
/// Prepares the tabBar.
/// Prepares the tabBar.
private
func
prepareTabBar
()
{
private
func
prepareTabBar
()
{
tabBar
.
depth
=
.
Depth1
tabBar
.
depth
=
.
Depth1
let
image
:
UIImage
?
=
UIImage
.
imageWithColor
(
MaterialColor
.
clear
,
size
:
CGSizeMake
(
1
,
1
))
tabBar
.
shadowImage
=
image
tabBar
.
backgroundImage
=
image
tabBar
.
backgroundColor
=
MaterialColor
.
white
tabBar
.
backgroundColor
=
MaterialColor
.
white
tabBar
.
shadowImage
=
UIImage
.
imageWithColor
(
MaterialColor
.
clear
,
size
:
CGSizeMake
(
1
,
1
))
tabBar
.
backgroundImage
=
UIImage
()
}
}
}
}
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