Skip to content
This repository has been archived by the owner on Aug 13, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Apr 14, 2017
2 parents 959ecd2 + 03ec0f7 commit e6dfc04
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module: MaterialMotion
module_version: 1.2.0
module_version: 1.2.1
sdk: iphonesimulator
xcodebuild_arguments:
- -workspace
- MaterialMotion.xcworkspace
- -scheme
- MaterialMotion
github_url: https://github.com/material-motion/material-motion-swift
github_file_prefix: https://github.com/material-motion/material-motion-swift/tree/v1.2.0
github_file_prefix: https://github.com/material-motion/material-motion-swift/tree/v1.2.1
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 1.2.1

This is a patch release resolving a crashing bug when `runtime.shouldVisualizeMotion` was enabled and an `ArcMove` interaction was added to a view without a parent.

## Source changes

* [Use a reasonable fallback when adding visualization views to the runtime container view.](https://github.com/material-motion/reactive-motion-swift/commit/efc790a13783f54ff583296a2a7245597c2dbee2) (Jeff Verkoeyen)

# 1.2.0

This minor release introduces a new operator, `startWith`, which is meant to replace the `initialValue` operator.
Expand Down
2 changes: 1 addition & 1 deletion MaterialMotion.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "MaterialMotion"
s.summary = "Reactive motion driven by Core Animation."
s.version = "1.2.0"
s.version = "1.2.1"
s.authors = "The Material Motion Authors"
s.license = "Apache 2.0"
s.homepage = "https://github.com/material-motion/material-motion-swift"
Expand Down
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PODS:
- IndefiniteObservable (3.1.0):
- IndefiniteObservable/lib (= 3.1.0)
- IndefiniteObservable/lib (3.1.0)
- MaterialMotion (1.2.0):
- MaterialMotion (1.2.1):
- IndefiniteObservable (~> 3.0)

DEPENDENCIES:
Expand All @@ -17,7 +17,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
IndefiniteObservable: 2789d61f487d8d37fa2b9c3153cc44d4447ff744
MaterialMotion: 4a4f155a35fce5e1dad7cc838719ef1c9c590dc6
MaterialMotion: 599cd0743c60cdb62d7bae2b25bebbc77f6cd9b5

PODFILE CHECKSUM: f503265a0d60526a0d28c96dd4bdcfb40fb562fc

Expand Down
6 changes: 5 additions & 1 deletion src/reactivetypes/ReactiveCALayer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,11 @@ public func createCoreAnimationProperty<T>(_ name: String, initialValue: T, exte
lastView.removeFromSuperview()
}
view.isUserInteractionEnabled = false
view.frame = layer.superlayer!.convert(layer.superlayer!.bounds, to: containerView.layer)
if let superlayer = layer.superlayer {
view.frame = superlayer.convert(superlayer.bounds, to: containerView.layer)
} else {
view.frame = containerView.bounds
}
containerView.addSubview(view)
lastView = view
}
Expand Down

0 comments on commit e6dfc04

Please sign in to comment.