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
212e652c
Commit
212e652c
authored
Oct 22, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated to Motion.async and partial update on TabsController lifecycle
parent
36c2c4d6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
30 deletions
+23
-30
Sources/iOS/Layout.swift
+1
-1
Sources/iOS/Material+UIImage.swift
+2
-1
Sources/iOS/NavigationDrawerController.swift
+3
-2
Sources/iOS/TabsController.swift
+17
-26
No files found.
Sources/iOS/Layout.swift
View file @
212e652c
...
@@ -635,7 +635,7 @@ fileprivate extension Layout {
...
@@ -635,7 +635,7 @@ fileprivate extension Layout {
- Parameter for view: A UIView.
- Parameter for view: A UIView.
*/
*/
class
func
updateConstraints
(
for
view
:
UIView
)
{
class
func
updateConstraints
(
for
view
:
UIView
)
{
DispatchQueue
.
mai
n
.
async
{
Motio
n
.
async
{
view
.
setNeedsLayout
()
view
.
setNeedsLayout
()
view
.
layoutIfNeeded
()
view
.
layoutIfNeeded
()
view
.
updateConstraintsIfNeeded
()
view
.
updateConstraintsIfNeeded
()
...
...
Sources/iOS/Material+UIImage.swift
View file @
212e652c
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
import
UIKit
import
UIKit
import
Accelerate
import
Accelerate
import
Motion
@objc(ImageFormat)
@objc(ImageFormat)
public
enum
ImageFormat
:
Int
{
public
enum
ImageFormat
:
Int
{
...
@@ -198,7 +199,7 @@ extension UIImage {
...
@@ -198,7 +199,7 @@ extension UIImage {
*/
*/
open
class
func
contentsOfURL
(
url
:
URL
,
completion
:
@escaping
((
UIImage
?,
Error
?)
->
Void
))
{
open
class
func
contentsOfURL
(
url
:
URL
,
completion
:
@escaping
((
UIImage
?,
Error
?)
->
Void
))
{
URLSession
.
shared
.
dataTask
(
with
:
URLRequest
(
url
:
url
))
{
[
completion
=
completion
]
(
data
:
Data
?,
response
:
URLResponse
?,
error
:
Error
?)
in
URLSession
.
shared
.
dataTask
(
with
:
URLRequest
(
url
:
url
))
{
[
completion
=
completion
]
(
data
:
Data
?,
response
:
URLResponse
?,
error
:
Error
?)
in
DispatchQueue
.
mai
n
.
async
{
Motio
n
.
async
{
if
let
v
=
error
{
if
let
v
=
error
{
completion
(
nil
,
v
)
completion
(
nil
,
v
)
}
else
if
let
v
=
data
{
}
else
if
let
v
=
data
{
...
...
Sources/iOS/NavigationDrawerController.swift
View file @
212e652c
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
*/
*/
import
UIKit
import
UIKit
import
Motion
@objc(NavigationDrawerPosition)
@objc(NavigationDrawerPosition)
public
enum
NavigationDrawerPosition
:
Int
{
public
enum
NavigationDrawerPosition
:
Int
{
...
@@ -863,7 +864,7 @@ open class NavigationDrawerController: TransitionController {
...
@@ -863,7 +864,7 @@ open class NavigationDrawerController: TransitionController {
/// Shows the statusBar.
/// Shows the statusBar.
fileprivate
func
showStatusBar
()
{
fileprivate
func
showStatusBar
()
{
DispatchQueue
.
mai
n
.
async
{
[
weak
self
]
in
Motio
n
.
async
{
[
weak
self
]
in
guard
let
s
=
self
else
{
guard
let
s
=
self
else
{
return
return
}
}
...
@@ -884,7 +885,7 @@ open class NavigationDrawerController: TransitionController {
...
@@ -884,7 +885,7 @@ open class NavigationDrawerController: TransitionController {
return
return
}
}
DispatchQueue
.
mai
n
.
async
{
[
weak
self
]
in
Motio
n
.
async
{
[
weak
self
]
in
guard
let
s
=
self
else
{
guard
let
s
=
self
else
{
return
return
}
}
...
...
Sources/iOS/TabsController.swift
View file @
212e652c
...
@@ -197,48 +197,48 @@ fileprivate extension TabsController {
...
@@ -197,48 +197,48 @@ fileprivate extension TabsController {
return
return
}
}
fvc
.
beginAppearanceTransition
(
false
,
animated
:
true
)
guard
let
fvcIndex
=
viewControllers
.
index
(
of
:
fvc
)
else
{
return
}
let
fvcIndex
=
viewControllers
.
index
(
of
:
fvc
)
guard
let
tvcIndex
=
viewControllers
.
index
(
of
:
viewController
)
else
{
let
tvcIndex
=
viewControllers
.
index
(
of
:
viewController
)
return
}
let
tvc
=
viewController
viewController
.
view
.
isHidden
=
false
tvc
.
view
.
isHidden
=
false
viewController
.
view
.
frame
=
container
.
bounds
tvc
.
view
.
frame
=
container
.
bounds
var
isAuto
=
false
switch
tvc
.
motionModalTransitionType
{
var
isAuto
=
false
switch
viewController
.
motionModalTransitionType
{
case
.
auto
:
case
.
auto
:
isAuto
=
true
isAuto
=
true
tvc
.
motionModalTransitionType
=
fvcIndex
!
<
tvcIndex
!
?
.
slide
(
direction
:
.
left
)
:
.
slide
(
direction
:
.
right
)
viewController
.
motionModalTransitionType
=
fvcIndex
<
tvcIndex
?
.
slide
(
direction
:
.
left
)
:
.
slide
(
direction
:
.
right
)
default
:
break
default
:
break
}
}
if
isTriggeredByUserInteraction
{
if
isTriggeredByUserInteraction
{
delegate
?
.
tabsController
?(
tabsController
:
self
,
willSelect
:
tvc
)
delegate
?
.
tabsController
?(
tabsController
:
self
,
willSelect
:
viewController
)
}
}
view
.
isUserInteractionEnabled
=
false
view
.
isUserInteractionEnabled
=
false
Motion
.
shared
.
transition
(
from
:
fvc
,
to
:
tvc
,
in
:
container
)
{
[
weak
self
,
tvc
=
tvc
,
isAuto
=
isAuto
,
completion
=
completion
]
(
isFinished
)
in
Motion
.
shared
.
transition
(
from
:
fvc
,
to
:
viewController
,
in
:
container
)
{
[
weak
self
,
viewController
=
viewController
,
isAuto
=
isAuto
,
completion
=
completion
]
(
isFinished
)
in
guard
let
s
=
self
else
{
guard
let
s
=
self
else
{
return
return
}
}
if
isAuto
{
if
isAuto
{
tvc
.
motionModalTransitionType
=
.
auto
viewController
.
motionModalTransitionType
=
.
auto
}
}
s
.
rootViewController
=
tvc
s
.
rootViewController
=
viewController
s
.
view
.
isUserInteractionEnabled
=
true
s
.
view
.
isUserInteractionEnabled
=
true
s
.
removeViewController
(
viewController
:
fvc
)
s
.
removeViewController
(
viewController
:
fvc
)
fvc
.
endAppearanceTransition
()
completion
?(
isFinished
)
completion
?(
isFinished
)
if
isTriggeredByUserInteraction
{
if
isTriggeredByUserInteraction
{
s
.
delegate
?
.
tabsController
?(
tabsController
:
s
,
didSelect
:
tvc
)
s
.
delegate
?
.
tabsController
?(
tabsController
:
s
,
didSelect
:
viewController
)
}
}
}
}
}
}
...
@@ -254,15 +254,6 @@ internal extension TabsController {
...
@@ -254,15 +254,6 @@ internal extension TabsController {
fileprivate
extension
TabsController
{
fileprivate
extension
TabsController
{
/// Prepares all the view controllers.
/// Prepares all the view controllers.
func
prepareViewControllers
()
{
func
prepareViewControllers
()
{
for
i
in
0
..<
viewControllers
.
count
{
guard
i
!=
selectedIndex
else
{
continue
}
viewControllers
[
i
]
.
view
.
isHidden
=
true
prepareViewController
(
at
:
i
)
}
prepareViewController
(
at
:
selectedIndex
)
prepareViewController
(
at
:
selectedIndex
)
prepareRootViewController
()
prepareRootViewController
()
}
}
...
...
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