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
4108d345
Commit
4108d345
authored
Dec 10, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated for latest changes to Motion's iPhone X update
parent
9d03ba4e
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
13 deletions
+16
-13
Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme
+1
-1
Sources/Frameworks/Motion
+1
-1
Sources/iOS/Layout.swift
+1
-1
Sources/iOS/NavigationController.swift
+5
-2
Sources/iOS/TabsController.swift
+6
-6
Sources/iOS/TransitionController.swift
+2
-2
No files found.
Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme
View file @
4108d345
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion =
"09
0
0"
LastUpgradeVersion =
"09
2
0"
version =
"1.3"
>
<BuildAction
parallelizeBuildables =
"YES"
...
...
Motion
@
f85a6744
Subproject commit
7128c6dec22076cc6e422ecddbc8d8b6a73988c0
Subproject commit
f85a6744caf408f9a104e0363038dccf0d8ed3f6
Sources/iOS/Layout.swift
View file @
4108d345
...
...
@@ -635,8 +635,8 @@ fileprivate extension Layout {
- Parameter for view: A UIView.
*/
class
func
updateConstraints
(
for
view
:
UIView
)
{
view
.
setNeedsUpdateConstraints
()
view
.
updateConstraintsIfNeeded
()
view
.
updateConstraints
()
view
.
setNeedsLayout
()
view
.
layoutIfNeeded
()
}
...
...
Sources/iOS/NavigationController.swift
View file @
4108d345
...
...
@@ -29,6 +29,7 @@
*/
import
UIKit
import
Motion
extension
NavigationController
{
/// Device status bar style.
...
...
@@ -137,7 +138,7 @@ open class NavigationController: UINavigationController {
/// Calls the layout functions for the view heirarchy.
open
func
layoutSubviews
()
{
navigationBar
.
setNeedsUpdateConstraints
()
navigationBar
.
updateConstraints
()
navigationBar
.
updateConstraints
IfNeeded
()
navigationBar
.
setNeedsLayout
()
navigationBar
.
layoutIfNeeded
()
}
...
...
@@ -180,10 +181,12 @@ extension NavigationController: UINavigationBarDelegate {
item
.
backButton
.
removeTarget
(
self
,
action
:
#selector(
handle(backButton:)
)
,
for
:
.
touchUpInside
)
}
}
internal
extension
NavigationController
{
/// Handler for the backbutton.
@objc
internal
func
handle
(
backButton
:
UIButton
)
{
func
handle
(
backButton
:
UIButton
)
{
popViewController
(
animated
:
true
)
}
}
...
...
Sources/iOS/TabsController.swift
View file @
4108d345
...
...
@@ -216,12 +216,12 @@ fileprivate extension TabsController {
delegate
?
.
tabsController
?(
tabsController
:
self
,
willSelect
:
viewController
)
}
super
.
transition
(
to
:
viewController
)
{
[
weak
self
,
viewController
=
viewController
,
completion
=
completion
]
(
isFinish
ed
)
in
super
.
transition
(
to
:
viewController
)
{
[
weak
self
,
viewController
=
viewController
,
completion
=
completion
]
(
isFinish
ing
)
in
guard
let
s
=
self
else
{
return
}
completion
?(
isFinish
ed
)
completion
?(
isFinish
ing
)
if
isTriggeredByUserInteraction
{
s
.
delegate
?
.
tabsController
?(
tabsController
:
s
,
didSelect
:
viewController
)
...
...
@@ -331,8 +331,8 @@ extension TabsController {
s
.
tabBar
.
select
(
at
:
index
)
s
.
transition
(
to
:
s
.
viewControllers
[
index
],
isTriggeredByUserInteraction
:
false
)
{
[
weak
self
]
(
isFinish
ed
)
in
guard
isFinish
ed
else
{
s
.
transition
(
to
:
s
.
viewControllers
[
index
],
isTriggeredByUserInteraction
:
false
)
{
[
weak
self
]
(
isFinish
ing
)
in
guard
isFinish
ing
else
{
return
}
...
...
@@ -361,8 +361,8 @@ extension TabsController: TabBarDelegate, _TabBarDelegate {
return
}
transition
(
to
:
viewControllers
[
i
],
isTriggeredByUserInteraction
:
true
)
{
[
weak
self
]
(
isFinish
ed
)
in
guard
isFinish
ed
else
{
transition
(
to
:
viewControllers
[
i
],
isTriggeredByUserInteraction
:
true
)
{
[
weak
self
]
(
isFinish
ing
)
in
guard
isFinish
ing
else
{
return
}
...
...
Sources/iOS/TransitionController.swift
View file @
4108d345
...
...
@@ -159,14 +159,14 @@ open class TransitionController: UIViewController {
}
view
.
isUserInteractionEnabled
=
false
Motion
.
shared
.
transition
(
from
:
rootViewController
,
to
:
viewController
,
in
:
container
)
{
[
weak
self
,
viewController
=
viewController
,
completion
=
completion
]
(
isFinish
ed
)
in
Motion
.
shared
.
transition
(
from
:
rootViewController
,
to
:
viewController
,
in
:
container
)
{
[
weak
self
,
viewController
=
viewController
,
completion
=
completion
]
(
isFinish
ing
)
in
guard
let
s
=
self
else
{
return
}
s
.
rootViewController
=
viewController
s
.
view
.
isUserInteractionEnabled
=
true
completion
?(
isFinish
ed
)
completion
?(
isFinish
ing
)
}
}
...
...
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