Skip to content

M
Motion
Commit a5cf3342 by Daniel Dahan
Options

updated access rights for Material internal access

parent 13d10d3d
Showing with 62 additions and 48 deletions
Motion.xcodeproj/project.pbxproj
......@@ -279,7 +279,7 @@
96C98DC81E424AB000B22906 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = "CosmicMind, Inc.";
TargetAttributes = {
96C98DD01E424AB000B22906 = {
......@@ -361,7 +361,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
......@@ -369,7 +371,11 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
......@@ -415,7 +421,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
......@@ -423,7 +431,11 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
......
Motion.xcodeproj/xcshareddata/xcschemes/Motion iOS.xcscheme
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......@@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
......@@ -36,6 +37,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
......
Sources/Extensions/Motion+CG.swift
......@@ -28,7 +28,7 @@
import MetalKit
extension CGSize {
public extension CGSize {
/// THe center point based on width and height.
var center: CGPoint {
return CGPoint(x: width / 2, y: height / 2)
......@@ -73,7 +73,7 @@ extension CGSize {
}
}
extension CGRect {
public extension CGRect {
/// A center point based on the origin and size values.
var center: CGPoint {
return CGPoint(x: origin.x + size.width / 2, y: origin.y + size.height / 2)
......@@ -94,7 +94,7 @@ extension CGRect {
}
}
extension CGFloat {
public extension CGFloat {
/**
Calculates the limiting position to an area.
- Parameter _ a: A CGFloat.
......@@ -106,7 +106,7 @@ extension CGFloat {
}
}
extension CGPoint {
public extension CGPoint {
/**
Calculates a translation point based on the origin value.
- Parameter _ dx: A CGFloat.
......@@ -151,7 +151,7 @@ extension CGPoint {
- Parameter right: A CGPoint.
- Returns: A CGPoint.
*/
func +(left: CGPoint, right: CGPoint) -> CGPoint {
public func +(left: CGPoint, right: CGPoint) -> CGPoint {
return CGPoint(x: left.x + right.x, y: left.y + right.y)
}
......@@ -161,7 +161,7 @@ func +(left: CGPoint, right: CGPoint) -> CGPoint {
- Parameter right: A CGPoint.
- Returns: A CGPoint.
*/
func -(left: CGPoint, right: CGPoint) -> CGPoint {
public func -(left: CGPoint, right: CGPoint) -> CGPoint {
return CGPoint(x: left.x - right.x, y: left.y - right.y)
}
......@@ -171,7 +171,7 @@ func -(left: CGPoint, right: CGPoint) -> CGPoint {
- Parameter right: A CGFloat.
- Returns: A CGPoint.
*/
func /(left: CGPoint, right: CGFloat) -> CGPoint {
public func /(left: CGPoint, right: CGFloat) -> CGPoint {
return CGPoint(x: left.x / right, y: left.y / right)
}
......@@ -181,7 +181,7 @@ func /(left: CGPoint, right: CGFloat) -> CGPoint {
- Parameter right: A CGPoint.
- Returns: A CGPoint.
*/
func /(left: CGPoint, right: CGPoint) -> CGPoint {
public func /(left: CGPoint, right: CGPoint) -> CGPoint {
return CGPoint(x: left.x / right.x, y: left.y / right.y)
}
......@@ -191,7 +191,7 @@ func /(left: CGPoint, right: CGPoint) -> CGPoint {
- Parameter right: A CGSize.
- Returns: A CGSize.
*/
func /(left: CGSize, right: CGSize) -> CGSize {
public func /(left: CGSize, right: CGSize) -> CGSize {
return CGSize(width: left.width / right.width, height: left.height / right.height)
}
......@@ -201,7 +201,7 @@ func /(left: CGSize, right: CGSize) -> CGSize {
- Parameter right: A CGFloat.
- Returns: A CGPoint.
*/
func *(left: CGPoint, right: CGFloat) -> CGPoint {
public func *(left: CGPoint, right: CGFloat) -> CGPoint {
return CGPoint(x: left.x * right, y: left.y * right)
}
......@@ -211,7 +211,7 @@ func *(left: CGPoint, right: CGFloat) -> CGPoint {
- Parameter right: A CGSize.
- Returns: A CGPoint.
*/
func *(left: CGPoint, right: CGSize) -> CGPoint {
public func *(left: CGPoint, right: CGSize) -> CGPoint {
return CGPoint(x: left.x * right.width, y: left.y * right.width)
}
......@@ -221,7 +221,7 @@ func *(left: CGPoint, right: CGSize) -> CGPoint {
- Parameter right: A CGPoint.
- Returns: A CGPoint.
*/
func *(left: CGFloat, right: CGPoint) -> CGPoint {
public func *(left: CGFloat, right: CGPoint) -> CGPoint {
return right * left
}
......@@ -231,7 +231,7 @@ func *(left: CGFloat, right: CGPoint) -> CGPoint {
- Parameter right: A CGPoint.
- Returns: A CGPoint.
*/
func *(left: CGPoint, right: CGPoint) -> CGPoint {
public func *(left: CGPoint, right: CGPoint) -> CGPoint {
return CGPoint(x: left.x * right.x, y: left.y * right.y)
}
......@@ -241,7 +241,7 @@ func *(left: CGPoint, right: CGPoint) -> CGPoint {
- Parameter right: A CGFloat.
- Returns: A CGSize.
*/
func *(left: CGSize, right: CGFloat) -> CGSize {
public func *(left: CGSize, right: CGFloat) -> CGSize {
return CGSize(width: left.width * right, height: left.height * right)
}
......@@ -251,7 +251,7 @@ func *(left: CGSize, right: CGFloat) -> CGSize {
- Parameter right: A CGSize.
- Returns: A CGSize.
*/
func *(left: CGSize, right: CGSize) -> CGSize {
public func *(left: CGSize, right: CGSize) -> CGSize {
return CGSize(width: left.width * right.width, height: left.height * right.width)
}
......@@ -261,10 +261,10 @@ func *(left: CGSize, right: CGSize) -> CGSize {
- Parameter rhs: A CATransform3D.
- Returns: A Bool.
*/
func ==(lhs: CATransform3D, rhs: CATransform3D) -> Bool {
public func ==(lhs: CATransform3D, rhs: CATransform3D) -> Bool {
var lhs = lhs
var rhs = rhs
return memcmp(&lhs, &rhs, MemoryLayout<CATransform3D>.size) == 0
return 0 == memcmp(&lhs, &rhs, MemoryLayout<CATransform3D>.size)
}
/**
......@@ -273,7 +273,7 @@ func ==(lhs: CATransform3D, rhs: CATransform3D) -> Bool {
- Parameter rhs: A CATransform3D.
- Returns: A Bool.
*/
func !=(lhs: CATransform3D, rhs: CATransform3D) -> Bool {
public func !=(lhs: CATransform3D, rhs: CATransform3D) -> Bool {
return !(lhs == rhs)
}
......@@ -282,7 +282,7 @@ func !=(lhs: CATransform3D, rhs: CATransform3D) -> Bool {
- Parameter point: A CGPoint.
- Returns: A CGPoint.
*/
prefix func -(point: CGPoint) -> CGPoint {
public prefix func -(point: CGPoint) -> CGPoint {
return CGPoint.zero - point
}
......@@ -291,6 +291,6 @@ prefix func -(point: CGPoint) -> CGPoint {
- Parameter _ p: A CGPoint.
- Returns: A CGPoint.
*/
func abs(_ p: CGPoint) -> CGPoint {
public func abs(_ p: CGPoint) -> CGPoint {
return CGPoint(x: abs(p.x), y: abs(p.y))
}
Sources/Extensions/Motion+Obj-C.swift
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
internal struct AssociatedObject {
public struct AssociatedObject {
/**
Gets the Obj-C reference for the instance object within the UIView extension.
- Parameter base: Base object.
......@@ -31,7 +31,7 @@ internal struct AssociatedObject {
- Parameter initializer: Object initializer.
- Returns: The associated reference for the initializer object.
*/
static func get<T: Any>(base: Any, key: UnsafePointer<UInt8>, initializer: () -> T) -> T {
public static func get<T: Any>(base: Any, key: UnsafePointer<UInt8>, initializer: () -> T) -> T {
if let v = objc_getAssociatedObject(base, key) as? T {
return v
}
......@@ -48,7 +48,7 @@ internal struct AssociatedObject {
- Parameter value: The object instance to set for the associated object.
- Returns: The associated reference for the initializer object.
*/
static func set<T: Any>(base: Any, key: UnsafePointer<UInt8>, value: T) {
public static func set<T: Any>(base: Any, key: UnsafePointer<UInt8>, value: T) {
objc_setAssociatedObject(base, key, value, .OBJC_ASSOCIATION_RETAIN)
}
}
Sources/Motion.swift
......@@ -246,6 +246,29 @@ public extension Motion {
}
}
public extension Motion {
/**
A helper transition function.
- Parameter from: A UIViewController.
- Parameter to: A UIViewController.
- Parameter in view: A UIView.
- Parameter completion: An optional completion handler.
*/
func transition(from: UIViewController, to: UIViewController, in view: UIView, completion: ((Bool) -> Void)? = nil) {
guard !isTransitioning else {
return
}
isPresenting = true
transitionContainer = view
fromViewController = from
toViewController = to
completionCallback = completion
start()
}
}
fileprivate extension Motion {
/// Starts the transition animation.
func start() {
......@@ -619,29 +642,6 @@ fileprivate extension Motion {
internal extension Motion {
/**
A helper transition function.
- Parameter from: A UIViewController.
- Parameter to: A UIViewController.
- Parameter in view: A UIView.
- Parameter completion: An optional completion handler.
*/
func transition(from: UIViewController, to: UIViewController, in view: UIView, completion: ((Bool) -> Void)? = nil) {
guard !isTransitioning else {
return
}
isPresenting = true
transitionContainer = view
fromViewController = from
toViewController = to
completionCallback = completion
start()
}
}
internal extension Motion {
/**
Helper for processing the MotionViewControllerDelegate.
- Parameter viewController: A UIViewController of type `T`.
- Parameter execute: A callback for execution during processing.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment