Skip to content

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Moore committed Jul 30, 2019
2 parents e5a70e0 + f3f616e commit 48dc84f
Show file tree
Hide file tree
Showing 172 changed files with 3,457 additions and 346 deletions.
184 changes: 184 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,187 @@
# 85.10.0

This minor release expands support for trait collection and Material Elevation
changes in several components. Bottom Sheet and Navigation Drawer now support
shadows and elevation.

## Breaking changes

The following breaking changes were made for Beta components that are not
published to CocoaPods.

* `MDCBottomNavigationBarController` now positions child view controllers'
views behind the Bottom Navigation bar.
* `MDCBannerView` now uses a `UITextView` for the message text instead of a
`UILabel`.

## New features

Several more components received APIs that allow responding to
`UITraitCollection` changes. Assigning a `traitCollectionDidBlock` on a
supported component enables code to be executed in the component's
`traitCollectionDidChange:` method without subclassing.

Support for Material Elevation expanded to several more components. APIs to
support overriding the computed value for `mdc_baseElevation` and to respond to
elevation changes are available. Assigning an `elevationDidChangeBlock` on a
supported component enables code to be executed whenever the component's
elevation changes. This may include state-based elevation changes (like
pressing on a Chip) or when the component's elevation value is changed
programmatically.

The Bottom Sheet component, specifically `MDCBottomSheetController` now renders
a shadow by default. This may cause a very slight change in the shading around
the edges of the view. If desired, non-elevated Bottom Sheets can be configured
by setting the `elevation` property's value to `0`.

Likewise, the Navigation Drawer's `MDCBottomDrawerPresentationController`
renders a shadow by default. To disable the shadow or modify the drawer's
elevation, set the `elevation` property to the desired value.

```objc
MDCBottomSheetController *bottomSheet =
[[MDCBottomSheetController alloc] initWithContentViewController:mySheetContentVC];
bottomSheet.elevation = 0;
```

`MDCTabBarView`, currently in Beta, now provides an API to set its preferred
layout style.

```objc
MDCTabBarView *tabBarView = [[MDCTabBarView alloc] init];
tabBarView.preferredLayoutStyle = MDCTabBarViewLayoutStyleScrollable;
```

## Changes

### AppBar

* [Set headerView elevation when shadow intensity changes (#8101)](https://github.com/material-components/material-components-ios/commit/74a65bc6d092c2a6a5a501217165c406d68a4e04) (Bryan Oltman)

### Banner

* [use UITextView for text instead of UILabel. (#7993)](https://github.com/material-components/material-components-ios/commit/e58c550a212040ef8cedd0b7c14ef4521c46de19) (Wenyu Zhang)

### BottomAppBar

* [Remove no-op tests. (#8072)](https://github.com/material-components/material-components-ios/commit/db4b31e1edb5d1460f4282f0196db7a50187071a) (Robert Moore)

### BottomNavigation

* [Add MDCElevation support. (#8038)](https://github.com/material-components/material-components-ios/commit/4768e610a8054741f8024161a5b3ebe28f69f608) (Robert Moore)
* [Deprecate `sizeThatFitsIncludesSafeArea`. (#8066)](https://github.com/material-components/material-components-ios/commit/b6eed78eb43deb580348e293ff561663bf738369) (Robert Moore)
* [Don't set `sizeThatFitsIncludesSafeArea`. (#8065)](https://github.com/material-components/material-components-ios/commit/48e95bbf0e16e361a6e26210790c89650af1bfd7) (Robert Moore)
* [Make KVO safe for `nil`. (#8083)](https://github.com/material-components/material-components-ios/commit/eed4679d887829fc35a160b080eaad24e7995cb3) (Robert Moore)
* [Store child VCs in `childViewControllers`. (#7992)](https://github.com/material-components/material-components-ios/commit/9ed52651c4390722d1a6b3024e896e1d3008520a) (Robert Moore)
* [Test for `mdc_overrideBaseElevation` (#8075)](https://github.com/material-components/material-components-ios/commit/bce0f4937b2c1956afef21cbacd434aef5ab6190) (Robert Moore)

### BottomSheet

* [Add elevation property (#8089)](https://github.com/material-components/material-components-ios/commit/43dddb988e341b88b033419d731e09e2cf003de1) (Cody Weaver)

### Buttons

* [Move MDCButton's defaultContentInset configuration to later in init (#8069)](https://github.com/material-components/material-components-ios/commit/4fcf3cd5a221297d428f965d2f876a139b3a0516) (Bryan Oltman)
* [Support MaterialElevation. (#8073)](https://github.com/material-components/material-components-ios/commit/403c1b6a295da0fd905f4c82ecca5f365fb4aeee) (Robert Moore)

### Cards

* [CardCell Supports MaterialElevation. (#8079)](https://github.com/material-components/material-components-ios/commit/130289a6d4960fa14d773334e381b773f0fd8ee7) (Yarden Eitan)
* [MDCCard conforms to MDCElevation and MDCElevationOverride (#8054)](https://github.com/material-components/material-components-ios/commit/f2b12a10ed25b9c209c0b96832703d814a8cf191) (Yarden Eitan)

### Chips

* [Conform to MDCElevatable and MDCElevationOverriding. (#8068)](https://github.com/material-components/material-components-ios/commit/58aa3402bf0a9ca7cbf876622f6aca90f9a78e30) (Robert Moore)
* [Fix default value for mdc_overrideBaseElevation. (#8076)](https://github.com/material-components/material-components-ios/commit/d93b4e8fd51cef6a95655f5310863ac5b3ef8279) (Robert Moore)

### Dialogs

* [Add MaterialElevation support to AlertController. (#8098)](https://github.com/material-components/material-components-ios/commit/dce2d98f92b38f522e92e379bbf9dc15c1f1aa85) (Robert Moore)

### Elevation

* [Add MDCElevationOverride to umbrella header (#8052)](https://github.com/material-components/material-components-ios/commit/eab643ea8c0afb928b014af3dea88992fd1218b5) (Robert Moore)
* [Add a UIColor category to support resolving color with elevation. (#8085)](https://github.com/material-components/material-components-ios/commit/c3f8c6adeb4e3425d2997a291a3f616202f6c3c5) (Wenyu Zhang)
* [Add absoluteElevation property and clarify the elevationDidChange block param (#8071)](https://github.com/material-components/material-components-ios/commit/c980a95d54ca051468945e9a9b77af7bc9acd17b) (Yarden Eitan)
* [Add elevationDidChange method to UIView category (#8067)](https://github.com/material-components/material-components-ios/commit/e312d88119e34fa3be48c45c4da948223d9cb133) (Cody Weaver)
* [Doc clarification (#8074)](https://github.com/material-components/material-components-ios/commit/50ba836103621f510cfb70fc6fac9a0d7ec486fc) (Yarden Eitan)
* [Improve protocol naming (#8055)](https://github.com/material-components/material-components-ios/commit/d9d038130a30fc57be90bc87ff04218a1ba1a721) (Yarden Eitan)
* [passing self to the elevationDidChangeBlock (#8058)](https://github.com/material-components/material-components-ios/commit/0643370347a8d0b31ef4eb590c84dfa2424d0ed4) (Yarden Eitan)
* [Add category to UIView (#7969)](https://github.com/material-components/material-components-ios/commit/f335b9627799cffa4259a498086a489df811657a) (Cody Weaver)

### FeatureHighlight

* [Add traitCollectionDidChange block (#8036)](https://github.com/material-components/material-components-ios/commit/a57245ed9102726529daa3397bee6138dfd616c7) (Cody Weaver)

### FlexibleHeader

* [ [FlexibleHeader] Conform to MDCElevatable, MDCElevationOverriding (#8099)](https://github.com/material-components/material-components-ios/commit/657483ea40e354ec47fb41d785c1b2b9b69cb502) (Bryan Oltman)

### HeaderStackView

* [Add traitCollectionDidChange block (#8061)](https://github.com/material-components/material-components-ios/commit/6190a33c72554fbd92254c4281168a07408624ec) (Cody Weaver)

### Ink

* [Add traitCollectionDidChange block (#8064)](https://github.com/material-components/material-components-ios/commit/b19962a7472f615a25bd68fcf87cc71e691e20ea) (Cody Weaver)
* [Fix documentation for enum types. (#8090)](https://github.com/material-components/material-components-ios/commit/99f2aec3e28a3d1e1378c3b51f02beb03b6fb775) (Robert Moore)

### List

* [Support MaterialElevation. (#8078)](https://github.com/material-components/material-components-ios/commit/cbeb6f5bc77ddf504c504ad1bf610aab97370005) (Robert Moore)

### NavigationDrawer

* [Adds an elevation and shadow to Bottom Drawer. (#8095)](https://github.com/material-components/material-components-ios/commit/7ded6431437dd364bbb6ca0b7ef16f6b6a981ef3) (Yarden Eitan)
* [Adding MDCElevation support (#8100)](https://github.com/material-components/material-components-ios/commit/b8ea85d21ae3c1affadd68853b8aea4dd79408cc) (Yarden Eitan)

### PageControl

* [Add traitCollectionDidChange block (#8037)](https://github.com/material-components/material-components-ios/commit/61aea173fa31681a84bb7b9e407b1af0ab57a72f) (Cody Weaver)

### ProgressView

* [Add traitCollectionDidChange block (#8035)](https://github.com/material-components/material-components-ios/commit/5ebe48ba4e8f72b5a16d2126ec1ad2d4ca2a8b08) (Cody Weaver)

### Ripple

* [Add traitCollectionDidChange block (#8062)](https://github.com/material-components/material-components-ios/commit/8f6338e0b2d91e31b3df276b66eb6b8ca216a92d) (Cody Weaver)
* [Fix active ripple layer not using active ripple color. (#8059)](https://github.com/material-components/material-components-ios/commit/013f3a890ee637898975bf36ebdda79b9de8eab0) (Wenyu Zhang)

### Slider

* [Add traitCollectionDidChange block (#8057)](https://github.com/material-components/material-components-ios/commit/118840dfc859c217413f0ebb625105cd6c306f82) (Cody Weaver)

### Snackbar

* [Supports MaterialElevation. (#8081)](https://github.com/material-components/material-components-ios/commit/f1a0665d67119b446d6936c5f8ccd5202a2084ba) (Yarden Eitan)

### Tabs

* [Add traitCollectionDidChange block (#8056)](https://github.com/material-components/material-components-ios/commit/7bd0bdf14d9fc9283303e21c12ebf061066242ff) (Cody Weaver)
* [Add traitCollectionDidChange block (#8060)](https://github.com/material-components/material-components-ios/commit/0d624ace58b997447c59d2c0bf6ff84dcc206fd7) (Cody Weaver)
* [Properties before methods. (#8063)](https://github.com/material-components/material-components-ios/commit/6c3877da223db9cca3b56c3d4fd2122e99aa62d5) (Robert Moore)

### TextFields

* [Add traitCollectionDidChange block (#8070)](https://github.com/material-components/material-components-ios/commit/065de4b2884a55bc6ba7bb8b892db08a59d8db39) (Cody Weaver)

### Typography

* [Internal comments to explain font scaling. (#8087)](https://github.com/material-components/material-components-ios/commit/e64c4400356d9eb608add0dd3f7ad7b18322b256) (Robert Moore)

### private/Color

* [add method for regular color blending. (#8077)](https://github.com/material-components/material-components-ios/commit/997b3b2021670b4adddaee3d0abadccc63931df9) (Wenyu Zhang)

## Multi-component changes

* [Add conformance to MDCElevatable, MDCElevationOverriding (#8094)](https://github.com/material-components/material-components-ios/commit/02a707a5b401c8a0321445a77964f0cb38e69440) (Bryan Oltman)
* [Correct `elevationDidChangeBlock` type. (#8106)](https://github.com/material-components/material-components-ios/commit/1c0827f2ef6c80cecb484931c10cd39c63f60b43) (Robert Moore)
* [Create umbrella header. (#8091)](https://github.com/material-components/material-components-ios/commit/66435f1b685c363c2ee534d8f2a065cef369b2b0) (Robert Moore)

---

# 85.9.1

This patch release fixes a crash in BottomNavigation when a KVO'd property is assigned `nil`.
Expand Down
20 changes: 19 additions & 1 deletion MaterialComponents.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'

Pod::Spec.new do |mdc|
mdc.name = "MaterialComponents"
mdc.version = "85.9.1"
mdc.version = "85.10.0"
mdc.authors = "The Material Components authors."
mdc.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
mdc.homepage = "https://github.com/material-components/material-components-ios"
Expand Down Expand Up @@ -287,6 +287,7 @@ Pod::Spec.new do |mdc|
]

component.dependency "MDFInternationalization"
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/Ink"
component.dependency "MaterialComponents/Ripple"
component.dependency "MaterialComponents/Palettes"
Expand Down Expand Up @@ -367,6 +368,8 @@ Pod::Spec.new do |mdc|

component.dependency "MaterialComponents/ShapeLibrary"
component.dependency "MaterialComponents/Shapes"
component.dependency "MaterialComponents/ShadowElevations"
component.dependency "MaterialComponents/ShadowLayer"
component.dependency "MaterialComponents/private/KeyboardWatcher"
component.dependency "MaterialComponents/private/Math"

Expand Down Expand Up @@ -405,6 +408,7 @@ Pod::Spec.new do |mdc|

component.dependency 'MDFInternationalization'
component.dependency 'MDFTextAccessibility'
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/Ink"
component.dependency "MaterialComponents/Ripple"
component.dependency "MaterialComponents/ShadowElevations"
Expand Down Expand Up @@ -578,6 +582,7 @@ Pod::Spec.new do |mdc|
"components/#{component.base_name}/src/MDCCard+Ripple.{h,m}",
"components/#{component.base_name}/src/MDCCardCollectionCell+Ripple.{h,m}"
]
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/Ink"
component.dependency "MaterialComponents/Ripple"
component.dependency "MaterialComponents/ShadowLayer"
Expand Down Expand Up @@ -666,6 +671,7 @@ Pod::Spec.new do |mdc|
"components/#{component.base_name}/src/private/*.{h,m}"
]
component.dependency "MDFInternationalization"
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/Ink"
component.dependency "MaterialComponents/Ripple"
component.dependency "MaterialComponents/ShadowLayer"
Expand Down Expand Up @@ -874,10 +880,12 @@ Pod::Spec.new do |mdc|
]

component.dependency "MaterialComponents/Buttons"
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/ShadowElevations"
component.dependency "MaterialComponents/ShadowLayer"
component.dependency "MaterialComponents/Typography"
component.dependency "MaterialComponents/private/KeyboardWatcher"
component.dependency "MaterialComponents/private/Math"
component.dependency "MDFInternationalization"

component.test_spec 'UnitTests' do |unit_tests|
Expand Down Expand Up @@ -963,12 +971,15 @@ Pod::Spec.new do |mdc|
"components/#{component.base_name}/src/*.{h,m}",
"components/#{component.base_name}/src/private/*.{h,m}"
]
component.dependency "MaterialComponents/private/Color"
component.dependency "MaterialComponents/private/Math"

component.test_spec 'UnitTests' do |unit_tests|
unit_tests.source_files = [
"components/#{component.base_name}/tests/unit/*.{h,m,swift}",
"components/#{component.base_name}/tests/unit/supplemental/*.{h,m,swift}"
]
unit_tests.dependency "MaterialComponents/private/Color"
end
end

Expand Down Expand Up @@ -1064,6 +1075,9 @@ Pod::Spec.new do |mdc|
]

component.dependency 'MDFTextAccessibility'
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/ShadowElevations"
component.dependency "MaterialComponents/ShadowLayer"
component.dependency "MaterialComponents/private/Application"
component.dependency "MaterialComponents/private/Math"
component.dependency "MaterialComponents/private/UIMetrics"
Expand Down Expand Up @@ -1197,6 +1211,7 @@ Pod::Spec.new do |mdc|
"components/#{component.base_name}/src/private/*.{h,m}"
]

component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/Ink"
component.dependency "MaterialComponents/Ripple"
component.dependency "MaterialComponents/ShadowElevations"
Expand Down Expand Up @@ -1364,6 +1379,7 @@ Pod::Spec.new do |mdc|
]
component.exclude_files = "components/#{component.base_name}/src/private/MDCBottomDrawerContainerViewController+Testing.h"

component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/Palettes"
component.dependency "MaterialComponents/ShadowLayer"
component.dependency "MaterialComponents/private/Math"
Expand Down Expand Up @@ -1664,12 +1680,14 @@ Pod::Spec.new do |mdc|

component.dependency "MaterialComponents/AnimationTiming"
component.dependency "MaterialComponents/Buttons"
component.dependency "MaterialComponents/Elevation"
component.dependency "MaterialComponents/OverlayWindow"
component.dependency "MaterialComponents/ShadowElevations"
component.dependency "MaterialComponents/ShadowLayer"
component.dependency "MaterialComponents/Typography"
component.dependency "MaterialComponents/private/Application"
component.dependency "MaterialComponents/private/KeyboardWatcher"
component.dependency "MaterialComponents/private/Math"
component.dependency "MaterialComponents/private/Overlay"

component.test_spec 'UnitTests' do |unit_tests|
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsBeta.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |mdc|
mdc.name = "MaterialComponentsBeta"
mdc.version = "85.9.1"
mdc.version = "85.10.0"
mdc.authors = "The Material Components authors."
mdc.summary = "A collection of stand-alone alpha UI libraries that are not yet guaranteed to be ready for general production use. Use with caution."
mdc.homepage = "https://github.com/material-components/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsEarlGreyTests.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsEarlGreyTests"
s.version = "85.9.1"
s.version = "85.10.0"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components EarlGrey tests."
s.description = "This spec is made for use in the MDC Catalog."
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsExamples.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ experimental_resources = [

Pod::Spec.new do |s|
s.name = "MaterialComponentsExamples"
s.version = "85.9.1"
s.version = "85.10.0"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components examples."
s.description = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsSnapshotTests.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ end

Pod::Spec.new do |s|
s.name = "MaterialComponentsSnapshotTests"
s.version = "85.9.1"
s.version = "85.10.0"
s.authors = "The Material Components authors."
s.summary = "This spec is an aggregate of all the Material Components snapshot tests."
s.homepage = "https://github.com/material-components/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
85.9.1
85.10.0
4 changes: 2 additions & 2 deletions catalog/MDCCatalog/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>85.9.1</string>
<string>85.10.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>85.9.1</string>
<string>85.10.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIAppFonts</key>
Expand Down
Loading

0 comments on commit 48dc84f

Please sign in to comment.