Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 5bb0d57

Browse files
author
featherless
committed
Merge branch 'release-candidate' into stable
2 parents 8f360fc + fbe5b9a commit 5bb0d57

13 files changed

+40
-31
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# 7.0.1
2+
3+
This patch release fixes a bug on iOS 13 where the presented view controller would not be added to
4+
the view hierarchy.
5+
6+
## Source changes
7+
8+
* [Always add the toView to the container. (#68)](https://github.com/material-motion/motion-transitioning-objc/commit/0a9568b21375bb5e04e5cf10123eaa06b63f80bd) (featherless)
9+
10+
111
# 7.0.0
212

313
This major release drops official support for iOS 8.

MotionTransitioning.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "MotionTransitioning"
33
s.summary = "Light-weight API for building UIViewController transitions."
4-
s.version = "7.0.0"
4+
s.version = "7.0.1"
55
s.authors = "The Material Motion Authors"
66
s.license = "Apache 2.0"
77
s.homepage = "https://github.com/material-motion/transitioning-objc"

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
workspace 'MotionTransitioning.xcworkspace'
22
use_frameworks!
3-
platform :ios, '8.0'
3+
platform :ios, '9.0'
44

55
target "TransitionsCatalog" do
66
pod 'CatalogByConvention'

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ SPEC CHECKSUMS:
1818
CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
1919
MotionTransitioning: afdc2fb08fc6e8744dab4f160b3764c9bde59338
2020

21-
PODFILE CHECKSUM: 25d5942fb7698339a03667bb46c3fbb77529b92d
21+
PODFILE CHECKSUM: c1fb58e87919bf8979e1ee2b4db99797e975d789
2222

2323
COCOAPODS: 1.6.0

examples/ContextualExample.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import MotionTransitioning
2121

2222
class ContextualExampleViewController: ExampleViewController {
2323

24-
func didTap(_ tapGesture: UITapGestureRecognizer) {
24+
@objc func didTap(_ tapGesture: UITapGestureRecognizer) {
2525
let controller = DestinationViewController()
2626

2727
// A contextual transition is provided with information relevant to the transition, such as the
@@ -142,7 +142,7 @@ private class DestinationViewController: ExampleViewController {
142142
view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
143143
}
144144

145-
func didTap() {
145+
@objc func didTap() {
146146
dismiss(animated: true)
147147
}
148148
}

examples/FadeExample.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ - (void)didTap {
4343
- (void)viewDidLoad {
4444
[super viewDidLoad];
4545

46-
self.view.backgroundColor = [UIColor backgroundColor];
46+
self.view.backgroundColor = [UIColor whiteColor];
4747

4848
UILabel *label = [[UILabel alloc] initWithFrame:self.view.bounds];
4949
label.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;

examples/FadeExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import MotionTransitioning
2222

2323
class FadeExampleViewController: ExampleViewController {
2424

25-
func didTap() {
25+
@objc func didTap() {
2626
let modalViewController = ModalViewController()
2727

2828
// The transition controller is an associated object on all UIViewController instances that

examples/MenuExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import MotionTransitioning
1919

2020
class MenuExampleViewController: ExampleViewController {
2121

22-
func didTap() {
22+
@objc func didTap() {
2323
let modalViewController = ModalViewController()
2424
modalViewController.mdm_transitionController.transition = MenuTransition()
2525
present(modalViewController, animated: true)

examples/NavControllerFadeExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import MotionTransitioning
2222

2323
class NavControllerFadeExampleViewController: ExampleViewController {
2424

25-
func didTap() {
25+
@objc func didTap() {
2626
let modalViewController = ModalViewController()
2727
modalViewController.title = "Example view controller"
2828

examples/apps/Catalog/TableOfContents.swift

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,30 @@
1414
limitations under the License.
1515
*/
1616

17+
import Foundation
18+
1719
// MARK: Catalog by convention
1820

1921
extension ContextualExampleViewController {
20-
class func catalogBreadcrumbs() -> [String] { return ["Contextual transition"] }
22+
@objc class func catalogBreadcrumbs() -> [String] { return ["Contextual transition"] }
2123
}
2224

2325
extension FadeExampleViewController {
24-
class func catalogBreadcrumbs() -> [String] { return ["Fade transition"] }
26+
@objc class func catalogBreadcrumbs() -> [String] { return ["Fade transition"] }
2527
}
2628

2729
extension NavControllerFadeExampleViewController {
28-
class func catalogBreadcrumbs() -> [String] { return ["Fade transition (nav controller)"] }
30+
@objc class func catalogBreadcrumbs() -> [String] { return ["Fade transition (nav controller)"] }
2931
}
3032

3133
extension MenuExampleViewController {
32-
class func catalogBreadcrumbs() -> [String] { return ["Menu transition"] }
34+
@objc class func catalogBreadcrumbs() -> [String] { return ["Menu transition"] }
3335
}
3436

3537
extension PhotoAlbumExampleViewController {
36-
class func catalogBreadcrumbs() -> [String] { return ["Photo album transition"] }
38+
@objc class func catalogBreadcrumbs() -> [String] { return ["Photo album transition"] }
3739
}
3840

3941
extension CustomPresentationExampleViewController {
40-
class func catalogBreadcrumbs() -> [String] { return ["Custom presentation transitions"] }
42+
@objc class func catalogBreadcrumbs() -> [String] { return ["Custom presentation transitions"] }
4143
}

0 commit comments

Comments
 (0)