Merge branch 'release-candidate' into stable

Author: Jeff Verkoeyen

CHANGELOG.md

@@ -1,3 +1,34 @@
+# 2.0.0 (MaterialMotionTransitioning)
+
+The library has been renamed to MaterialMotionTransitioning.
+
+## New features
+
+- `TransitionContext` now exposes a `presentationController` property.
+
+## Source changes
+
+* [Rename the library to MaterialMotionTransitioning.](https://github.com/material-motion/material-motion-transitioning-objc/commit/ce3e250b052fc762ed8682cd2efa9ede437707d4) (Jeff Verkoeyen)
+* [Expose the presentation controller in TransitionContext (#26)](https://github.com/material-motion/material-motion-transitioning-objc/commit/f643cd58b845e2b428e3ef81020c18ea7fd387f6) (Eric Tang)
+
+## API changes
+
+Auto-generated by running:
+
+    apidiff origin/stable release-candidate objc src/MaterialMotionTransitioning.h
+
+## MDMTransitionContext
+
+*new* property: `presentationController` in `MDMTransitionContext`
+
+## Non-source changes
+
+* [Set version to 1.0.0.](https://github.com/material-motion/material-motion-transitioning-objc/commit/5f2804b0213d7720e43152abf0893d6f5fb50048) (Jeff Verkoeyen)
+
+---
+
+Prior releases under the library name `Transitioning`.
+
 # 1.1.1
 
 This is a patch fix release to address build issues within Google's build environment.

Transitioning.podspec renamed to MaterialMotionTransitioning.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
-  s.name         = "Transitioning"
+  s.name         = "MaterialMotionTransitioning"
   s.summary      = "Light-weight API for building UIViewController transitions."
-  s.version      = "1.1.1"
+  s.version      = "2.0.0"
   s.authors      = "The Material Motion Authors"
   s.license      = "Apache 2.0"
   s.homepage     = "https://github.com/material-motion/transitioning-objc"

Podfile

@@ -1,15 +1,15 @@
-workspace 'Transitioning.xcworkspace'
+workspace 'MaterialMotionTransitioning.xcworkspace'
 use_frameworks!
 
 target "TransitionsCatalog" do
   pod 'CatalogByConvention'
-  pod 'Transitioning', :path => './'
+  pod 'MaterialMotionTransitioning', :path => './'
 
   project 'examples/apps/Catalog/TransitionsCatalog.xcodeproj'
 end
 
 target "UnitTests" do
-  pod 'Transitioning', :path => './'
+  pod 'MaterialMotionTransitioning', :path => './'
 
   project 'examples/apps/Catalog/TransitionsCatalog.xcodeproj'
 end
@@ -18,7 +18,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |configuration|
       configuration.build_settings['SWIFT_VERSION'] = "3.0"
-      if target.name.start_with?("Transitioning")
+      if target.name.start_with?("MaterialMotion")
         configuration.build_settings['WARNING_CFLAGS'] ="$(inherited) -Wall -Wcast-align -Wconversion -Werror -Wextra -Wimplicit-atomic-properties -Wmissing-prototypes -Wno-sign-conversion -Wno-unused-parameter -Woverlength-strings -Wshadow -Wstrict-selector-match -Wundeclared-selector -Wunreachable-code"
       end
     end

Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
   - CatalogByConvention (2.1.1)
-  - Transitioning (1.1.1)
+  - MaterialMotionTransitioning (2.0.0)
 
 DEPENDENCIES:
   - CatalogByConvention
-  - Transitioning (from `./`)
+  - MaterialMotionTransitioning (from `./`)
 
 EXTERNAL SOURCES:
-  Transitioning:
+  MaterialMotionTransitioning:
     :path: "./"
 
 SPEC CHECKSUMS:
   CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  Transitioning: ea1a8225812799c7ff07630af17008ab5e306bf3
+  MaterialMotionTransitioning: e89c47d3a019d1cec945c4ab8653cfc417430e8f
 
-PODFILE CHECKSUM: 1949e62e9d70d554783c0bb931d6b52780775cfb
+PODFILE CHECKSUM: a339d385d38b29a0052f32984921c8567d0c57e5
 
 COCOAPODS: 1.2.1

README.md

@@ -1,12 +1,12 @@
-# Transitioning
+# Material Motion Transitioning
 
 > Light-weight API for building UIViewController transitions.
 
 [![Build Status](https://travis-ci.org/material-motion/transitioning-objc.svg?branch=develop)](https://travis-ci.org/material-motion/transitioning-objc)
 [![codecov](https://codecov.io/gh/material-motion/transitioning-objc/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-motion/transitioning-objc)
-[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/Transitioning.svg)](https://cocoapods.org/pods/Transitioning)
-[![Platform](https://img.shields.io/cocoapods/p/Transitioning.svg)](http://cocoadocs.org/docsets/Transitioning)
-[![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/Transitioning.svg)](http://cocoadocs.org/docsets/Transitioning)
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/MaterialMotionTransitioning.svg)](https://cocoapods.org/pods/MaterialMotionTransitioning)
+[![Platform](https://img.shields.io/cocoapods/p/MaterialMotionTransitioning.svg)](http://cocoadocs.org/docsets/MaterialMotionTransitioning)
+[![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/MaterialMotionTransitioning.svg)](http://cocoadocs.org/docsets/MaterialMotionTransitioning)
 
 This library standardizes the way transitions are built on iOS so that with a single line of code
 you can pick the custom transition you want to use:
@@ -73,9 +73,9 @@ final class CustomTransition: NSObject, Transition {
 >
 >     gem install cocoapods
 
-Add `Transitioning` to your `Podfile`:
+Add `MaterialMotionTransitioning` to your `Podfile`:
 
-    pod 'Transitioning'
+    pod 'MaterialMotionTransitioning'
 
 Then run the following command:
 
@@ -85,7 +85,7 @@ Then run the following command:
 
 Import the framework:
 
-    @import Transitioning;
+    @import MaterialMotionTransitioning;
 
 You will now have access to all of the APIs.
 
@@ -97,7 +97,7 @@ commands:
     git clone https://github.com/material-motion/transitioning-objc.git
     cd transitioning-objc
     pod install
-    open Transitioning.xcworkspace
+    open MaterialMotionTransitioning.xcworkspace
 
 ## Guides
 
@@ -112,7 +112,7 @@ commands:
 > animation, interaction, and presentation controller. These controllers are then expected to
 > implement the transition's motion.
 
-Transitioning provides a thin layer atop these protocols with the following advantages:
+MaterialMotionTransitioning provides a thin layer atop these protocols with the following advantages:
 
 - Every view controller has its own **transition controller**. This encourages choosing the
   transition based on the context.

examples/CustomPresentationExample.swift

@@ -15,7 +15,7 @@
  */
 
 import UIKit
-import Transitioning
+import MaterialMotionTransitioning
 
 // This example demonstrates how to make use of presentation controllers to build a flexible modal
 // transition that supports presenting view controllers at aribtrary frames on the screen.

examples/FadeExample.swift

@@ -15,7 +15,7 @@
  */
 
 import UIKit
-import Transitioning
+import MaterialMotionTransitioning
 
 // This example demonstrates the minimal path to building a custom transition using the Material
 // Motion Transitioning APIs in Swift. The essential steps have been documented below.

src/MDMTransitionContext.h

@@ -79,4 +79,8 @@ NS_SWIFT_NAME(TransitionContext)
  */
 @property(nonatomic, strong, readonly, nonnull) UIView *containerView;
 
+/**
+ The presentation view controller for this transition.
+ */
+@property(nonatomic, strong, readonly, nullable) UIPresentationController *presentationController;
 @end

src/Transitioning.h renamed to src/MaterialMotionTransitioning.h

@@ -20,13 +20,13 @@
 
 @implementation MDMViewControllerTransitionContext {
   id<UIViewControllerContextTransitioning> _transitionContext;
-  UIPresentationController *_presentationController;
 }
 
 @synthesize direction = _direction;
 @synthesize sourceViewController = _sourceViewController;
 @synthesize backViewController = _backViewController;
 @synthesize foreViewController = _foreViewController;
+@synthesize presentationController = _presentationController;
 
 - (nonnull instancetype)initWithTransition:(nonnull id<MDMTransition>)transition
                                  direction:(MDMTransitionDirection)direction