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
63bc2c3e
Commit
63bc2c3e
authored
Aug 04, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor cleanup
parent
5bbb8555
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
16 deletions
+13
-16
Sources/iOS/FABMenuController.swift
+12
-15
Sources/iOS/TransitionController.swift
+1
-1
No files found.
Sources/iOS/FABMenuController.swift
View file @
63bc2c3e
...
...
@@ -87,21 +87,21 @@ extension FABMenuController {
}
}
extension
FABMenuController
{
fileprivate
extension
FABMenuController
{
/// Shows the fabMenuBacking.
f
ileprivate
f
unc
showFabMenuBacking
()
{
func
showFabMenuBacking
()
{
showFade
()
showBlurView
()
}
/// Hides the fabMenuBacking.
f
ileprivate
f
unc
hideFabMenuBacking
()
{
func
hideFabMenuBacking
()
{
hideFade
()
hideBlurView
()
}
/// Shows the blurView.
f
ileprivate
f
unc
showBlurView
()
{
func
showBlurView
()
{
guard
.
blur
==
fabMenuBacking
else
{
return
}
...
...
@@ -122,7 +122,7 @@ extension FABMenuController {
}
/// Hides the blurView.
f
ileprivate
f
unc
hideBlurView
()
{
func
hideBlurView
()
{
guard
.
blur
==
fabMenuBacking
else
{
return
}
...
...
@@ -136,7 +136,7 @@ extension FABMenuController {
}
/// Shows the fade.
f
ileprivate
f
unc
showFade
()
{
func
showFade
()
{
guard
.
fade
==
fabMenuBacking
else
{
return
}
...
...
@@ -151,7 +151,7 @@ extension FABMenuController {
}
/// Hides the fade.
f
ileprivate
f
unc
hideFade
()
{
func
hideFade
()
{
guard
.
fade
==
fabMenuBacking
else
{
return
}
...
...
@@ -166,13 +166,12 @@ extension FABMenuController {
}
}
extension
FABMenuController
{
fileprivate
extension
FABMenuController
{
/**
Handler to toggle the FABMenu opened or closed.
- Parameter button: A UIButton.
*/
@objc
fileprivate
func
handleFABButtonCallback
(
button
:
UIButton
)
{
func
handleFABButtonCallback
(
button
:
UIButton
)
{
guard
fabMenu
.
isOpened
else
{
fabMenu
.
open
(
isTriggeredByUserInteraction
:
true
)
return
...
...
@@ -182,15 +181,13 @@ extension FABMenuController {
}
/// Handler for when the FABMenu.open function is called.
@objc
fileprivate
func
handleOpenCallback
()
{
func
handleOpenCallback
()
{
isUserInteractionEnabled
=
false
showFabMenuBacking
()
}
/// Handler for when the FABMenu.close function is called.
@objc
fileprivate
func
handleCloseCallback
()
{
func
handleCloseCallback
()
{
isUserInteractionEnabled
=
false
hideFabMenuBacking
()
}
...
...
@@ -199,7 +196,7 @@ extension FABMenuController {
Completion handler for FABMenu open and close calls.
- Parameter view: A UIView.
*/
f
ileprivate
f
unc
handleCompletionCallback
(
view
:
UIView
)
{
func
handleCompletionCallback
(
view
:
UIView
)
{
if
view
==
fabMenu
.
fabMenuItems
.
last
{
isUserInteractionEnabled
=
true
}
...
...
Sources/iOS/TransitionController.swift
View file @
63bc2c3e
...
...
@@ -144,7 +144,7 @@ open class TransitionController: UIViewController {
tvc
.
motionModalTransitionType
=
motionTransitionType
view
.
isUserInteractionEnabled
=
false
Motion
.
shared
.
transition
(
from
:
fvc
,
to
:
tvc
,
in
:
container
)
{
[
weak
self
,
completion
=
completion
]
(
isFinished
)
in
Motion
.
shared
.
transition
(
from
:
fvc
,
to
:
tvc
,
in
:
container
)
{
[
weak
self
,
tvc
=
tvc
,
completion
=
completion
]
(
isFinished
)
in
guard
let
s
=
self
else
{
return
}
...
...
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