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
4d0b9240
Commit
4d0b9240
authored
Aug 02, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed floatViewController from ToolbarController
parent
5d6f18d7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
116 deletions
+4
-116
Sources/iOS/Chips.swift
+1
-1
Sources/iOS/TabBar.swift
+1
-1
Sources/iOS/ToolbarController.swift
+2
-114
No files found.
Sources/iOS/Chips.swift
View file @
4d0b9240
...
...
@@ -401,7 +401,7 @@ fileprivate extension Chips {
state was changed by a user interaction, true if yes, false otherwise.
- Parameter completion: An optional completion block.
*/
f
ileprivate
f
unc
animate
(
to
chipItem
:
ChipItem
,
isTriggeredByUserInteraction
:
Bool
,
completion
:
((
ChipItem
)
->
Void
)?
=
nil
)
{
func
animate
(
to
chipItem
:
ChipItem
,
isTriggeredByUserInteraction
:
Bool
,
completion
:
((
ChipItem
)
->
Void
)?
=
nil
)
{
if
isTriggeredByUserInteraction
{
delegate
?
.
chipBar
?(
chipBar
:
self
,
willSelect
:
chipItem
)
}
...
...
Sources/iOS/TabBar.swift
View file @
4d0b9240
...
...
@@ -452,7 +452,7 @@ fileprivate extension TabBar {
state was changed by a user interaction, true if yes, false otherwise.
- Parameter completion: An optional completion block.
*/
f
ileprivate
f
unc
animate
(
to
tabItem
:
TabItem
,
isTriggeredByUserInteraction
:
Bool
,
completion
:
((
TabItem
)
->
Void
)?
=
nil
)
{
func
animate
(
to
tabItem
:
TabItem
,
isTriggeredByUserInteraction
:
Bool
,
completion
:
((
TabItem
)
->
Void
)?
=
nil
)
{
if
isTriggeredByUserInteraction
{
delegate
?
.
tabBar
?(
tabBar
:
self
,
willSelect
:
tabItem
)
}
...
...
Sources/iOS/ToolbarController.swift
View file @
4d0b9240
...
...
@@ -48,126 +48,13 @@ extension UIViewController {
}
}
@objc(ToolbarControllerDelegate)
public
protocol
ToolbarControllerDelegate
{
/// Delegation method that executes when the floatingViewController will open.
@objc
optional
func
toolbarControllerWillOpenFloatingViewController
(
toolbarController
:
ToolbarController
)
/// Delegation method that executes when the floatingViewController will close.
@objc
optional
func
toolbarControllerWillCloseFloatingViewController
(
toolbarController
:
ToolbarController
)
/// Delegation method that executes when the floatingViewController did open.
@objc
optional
func
toolbarControllerDidOpenFloatingViewController
(
toolbarController
:
ToolbarController
)
/// Delegation method that executes when the floatingViewController did close.
@objc
optional
func
toolbarControllerDidCloseFloatingViewController
(
toolbarController
:
ToolbarController
)
}
@objc(ToolbarController)
open
class
ToolbarController
:
StatusBarController
{
/// Reference to the Toolbar.
@IBInspectable
open
let
toolbar
=
Toolbar
()
/// Internal reference to the floatingViewController.
private
var
internalFloatingViewController
:
UIViewController
?
/// Delegation handler.
open
weak
var
delegate
:
ToolbarControllerDelegate
?
/// A floating UIViewController.
open
var
floatingViewController
:
UIViewController
?
{
get
{
return
internalFloatingViewController
}
set
(
value
)
{
if
let
v
=
internalFloatingViewController
{
v
.
view
.
layer
.
rasterizationScale
=
Screen
.
scale
v
.
view
.
layer
.
shouldRasterize
=
true
delegate
?
.
toolbarControllerWillCloseFloatingViewController
?(
toolbarController
:
self
)
internalFloatingViewController
=
nil
UIView
.
animate
(
withDuration
:
0.5
,
animations
:
{
[
weak
self
]
in
guard
let
s
=
self
else
{
return
}
v
.
view
.
center
.
y
=
2
*
s
.
view
.
bounds
.
height
s
.
toolbar
.
alpha
=
1
s
.
rootViewController
.
view
.
alpha
=
1
})
{
[
weak
self
]
_
in
guard
let
s
=
self
else
{
return
}
v
.
willMove
(
toParentViewController
:
nil
)
v
.
view
.
removeFromSuperview
()
v
.
removeFromParentViewController
()
v
.
view
.
layer
.
shouldRasterize
=
false
s
.
isUserInteractionEnabled
=
true
s
.
toolbar
.
isUserInteractionEnabled
=
true
DispatchQueue
.
main
.
async
{
[
weak
self
]
in
guard
let
s
=
self
else
{
return
}
s
.
delegate
?
.
toolbarControllerDidCloseFloatingViewController
?(
toolbarController
:
s
)
}
}
}
if
let
v
=
value
{
// Add the noteViewController! to the view.
addChildViewController
(
v
)
v
.
view
.
frame
=
view
.
bounds
v
.
view
.
center
.
y
=
2
*
view
.
bounds
.
height
v
.
view
.
isHidden
=
true
view
.
insertSubview
(
v
.
view
,
aboveSubview
:
toolbar
)
v
.
view
.
layer
.
zPosition
=
1500
v
.
didMove
(
toParentViewController
:
self
)
v
.
view
.
isHidden
=
false
v
.
view
.
layer
.
rasterizationScale
=
Screen
.
scale
v
.
view
.
layer
.
shouldRasterize
=
true
view
.
layer
.
rasterizationScale
=
Screen
.
scale
view
.
layer
.
shouldRasterize
=
true
internalFloatingViewController
=
v
isUserInteractionEnabled
=
false
toolbar
.
isUserInteractionEnabled
=
false
delegate
?
.
toolbarControllerWillOpenFloatingViewController
?(
toolbarController
:
self
)
UIView
.
animate
(
withDuration
:
0.5
,
animations
:
{
[
weak
self
,
v
=
v
]
in
guard
let
s
=
self
else
{
return
}
v
.
view
.
center
.
y
=
s
.
view
.
bounds
.
height
/
2
s
.
toolbar
.
alpha
=
0.5
s
.
rootViewController
.
view
.
alpha
=
0.5
})
{
[
weak
self
,
v
=
v
]
_
in
guard
let
s
=
self
else
{
return
}
v
.
view
.
layer
.
shouldRasterize
=
false
s
.
view
.
layer
.
shouldRasterize
=
false
DispatchQueue
.
main
.
async
{
[
weak
self
]
in
guard
let
s
=
self
else
{
return
}
s
.
delegate
?
.
toolbarControllerDidOpenFloatingViewController
?(
toolbarController
:
s
)
}
}
}
}
}
open
override
func
layoutSubviews
()
{
open
override
func
layoutSubviews
()
{
super
.
layoutSubviews
()
let
y
=
Application
.
shouldStatusBarBeHidden
||
statusBar
.
isHidden
?
0
:
statusBar
.
height
...
...
@@ -195,6 +82,7 @@ open class ToolbarController: StatusBarController {
open
override
func
prepare
()
{
super
.
prepare
()
displayStyle
=
.
partial
prepareStatusBar
()
prepareToolbar
()
}
...
...
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