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
c7200fdf
Unverified
Commit
c7200fdf
authored
Feb 01, 2017
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: removed interactive MotionTransitions for initial release
parent
ac027518
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
13 deletions
+7
-13
Sources/iOS/BottomNavigationController.swift
+2
-7
Sources/iOS/CollectionViewController.swift
+2
-3
Sources/iOS/MotionAnimation.swift
+2
-2
Sources/iOS/MotionTransition.swift
+0
-0
Sources/iOS/NavigationController.swift
+1
-1
No files found.
Sources/iOS/BottomNavigationController.swift
View file @
c7200fdf
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
open
class
BottomNavigationController
:
UITabBarController
,
UITabBarControllerDelegate
{
open
class
BottomNavigationController
:
UITabBarController
{
/**
/**
An initializer that initializes the object with a NSCoder object.
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
- Parameter aDecoder: A NSCoder instance.
...
@@ -110,15 +110,10 @@ open class BottomNavigationController: UITabBarController, UITabBarControllerDel
...
@@ -110,15 +110,10 @@ open class BottomNavigationController: UITabBarController, UITabBarControllerDel
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
view
.
contentScaleFactor
=
Screen
.
scale
view
.
contentScaleFactor
=
Screen
.
scale
view
.
backgroundColor
=
.
white
view
.
backgroundColor
=
.
white
delegate
=
self
//
delegate = self
prepareTabBar
()
prepareTabBar
()
}
}
/// Handles transitions when tabBarItems are pressed.
open
func
tabBarController
(
_
tabBarController
:
UITabBarController
,
animationControllerForTransitionFrom
fromVC
:
UIViewController
,
to
toVC
:
UIViewController
)
->
UIViewControllerAnimatedTransitioning
?
{
return
nil
}
/// Prepares the tabBar.
/// Prepares the tabBar.
private
func
prepareTabBar
()
{
private
func
prepareTabBar
()
{
tabBar
.
heightPreset
=
.
normal
tabBar
.
heightPreset
=
.
normal
...
...
Sources/iOS/CollectionViewController.swift
View file @
c7200fdf
...
@@ -58,7 +58,7 @@ extension UIViewController {
...
@@ -58,7 +58,7 @@ extension UIViewController {
}
}
}
}
open
class
CollectionViewController
:
MotionTransition
ViewController
{
open
class
CollectionViewController
:
UI
ViewController
{
/// A reference to a Reminder.
/// A reference to a Reminder.
open
let
collectionView
=
CollectionView
()
open
let
collectionView
=
CollectionView
()
...
@@ -81,8 +81,7 @@ open class CollectionViewController: MotionTransitionViewController {
...
@@ -81,8 +81,7 @@ open class CollectionViewController: MotionTransitionViewController {
The super.prepareView method should always be called immediately
The super.prepareView method should always be called immediately
when subclassing.
when subclassing.
*/
*/
open
override
func
prepare
()
{
open
func
prepare
()
{
super
.
prepare
()
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
view
.
backgroundColor
=
.
white
view
.
backgroundColor
=
.
white
view
.
contentScaleFactor
=
Screen
.
scale
view
.
contentScaleFactor
=
Screen
.
scale
...
...
Sources/iOS/MotionAnimation.swift
View file @
c7200fdf
...
@@ -280,7 +280,7 @@ extension CALayer {
...
@@ -280,7 +280,7 @@ extension CALayer {
a
.
append
(
Motion
.
translateY
(
to
:
to
))
a
.
append
(
Motion
.
translateY
(
to
:
to
))
case
let
.
translateZ
(
to
):
case
let
.
translateZ
(
to
):
a
.
append
(
Motion
.
translateZ
(
to
:
to
))
a
.
append
(
Motion
.
translateZ
(
to
:
to
))
case
let
.
x
(
_
),
.
y
(
_
),
.
point
(
_
,
_
):
case
.
x
(
_
),
.
y
(
_
),
.
point
(
_
,
_
):
let
position
=
Motion
.
position
(
to
:
CGPoint
(
x
:
px
,
y
:
py
))
let
position
=
Motion
.
position
(
to
:
CGPoint
(
x
:
px
,
y
:
py
))
a
.
append
(
position
)
a
.
append
(
position
)
case
let
.
position
(
x
,
y
):
case
let
.
position
(
x
,
y
):
...
@@ -295,7 +295,7 @@ extension CALayer {
...
@@ -295,7 +295,7 @@ extension CALayer {
let
zPosition
=
Motion
.
zPosition
(
index
:
index
)
let
zPosition
=
Motion
.
zPosition
(
index
:
index
)
zPosition
.
fromValue
=
s
.
value
(
forKey
:
MotionAnimationKeyPath
.
zPosition
.
rawValue
)
??
NSNumber
(
integerLiteral
:
0
)
zPosition
.
fromValue
=
s
.
value
(
forKey
:
MotionAnimationKeyPath
.
zPosition
.
rawValue
)
??
NSNumber
(
integerLiteral
:
0
)
a
.
append
(
zPosition
)
a
.
append
(
zPosition
)
case
let
.
width
(
_
),
.
height
(
_
),
.
size
(
_
,
_
):
case
.
width
(
_
),
.
height
(
_
),
.
size
(
_
,
_
):
a
.
append
(
Motion
.
size
(
CGSize
(
width
:
w
,
height
:
h
)))
a
.
append
(
Motion
.
size
(
CGSize
(
width
:
w
,
height
:
h
)))
default
:
break
default
:
break
}
}
...
...
Sources/iOS/MotionTransition.swift
View file @
c7200fdf
This diff is collapsed.
Click to expand it.
Sources/iOS/NavigationController.swift
View file @
c7200fdf
...
@@ -121,7 +121,7 @@ open class NavigationController: UINavigationController {
...
@@ -121,7 +121,7 @@ open class NavigationController: UINavigationController {
open
func
prepare
()
{
open
func
prepare
()
{
navigationBar
.
heightPreset
=
.
normal
navigationBar
.
heightPreset
=
.
normal
navigationBar
.
width
=
view
.
width
navigationBar
.
width
=
view
.
width
delegate
=
transitionDelegate
// delegate = self
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
view
.
backgroundColor
=
.
white
view
.
backgroundColor
=
.
white
view
.
contentScaleFactor
=
Screen
.
scale
view
.
contentScaleFactor
=
Screen
.
scale
...
...
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