Skip to content

Commit

Permalink
Merge branch 'release-candidate'
Browse files Browse the repository at this point in the history
  • Loading branch information
ajsecord committed Sep 29, 2016
2 parents 1926458 + 3118c37 commit 2035625
Show file tree
Hide file tree
Showing 38 changed files with 924 additions and 434 deletions.
2 changes: 1 addition & 1 deletion .arcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"coverage": {
"product": "MaterialComponents.framework/MaterialComponents"
},
"pre-build": "pod install --project-directory=catalog/ --no-repo-update"
"pre-build": "pushd catalog; pod install; popd"
}
}
76 changes: 76 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,79 @@
# 15.0.0

## API diffs

Auto-generated by running:

scripts/api_diff -o 1926458f491c928adfb573a6eda38b6d5b5bc55e -n c39811a2344114302327b6fa64d86346bacbea9a

### Dialogs

- [new] [`MDCDialogPresentationController.dismissOnBackgroundTap`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Dialogs/src/MDCDialogPresentationController.h#L47)
- [new] [`UIViewController (MaterialDialogs)`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Dialogs/src/UIViewController+MaterialDialogs.h#L28)
- [new] [`UIViewController.mdc_dialogPresentationController`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Dialogs/src/UIViewController+MaterialDialogs.h#L35)

### Ink

- [new] [`MDCInkTouchController.gestureRecognizer`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Ink/src/MDCInkTouchController.h#L73)

### NavigationBar

- [new] [`MDCNavigationBar.textAlignment`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/NavigationBar/src/MDCNavigationBar.h#L110)

### Switch

- [protocols changed] [`MDCSwitch`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Switch/src/MDCSwitch.h#L32).
Removed *NSCoding*.
Added *NSSecureCoding*.

## Component changes

### Collections

#### Changes

* [- Added autoscroll functionality to MDCCollectionViewEditor class](https://github.com/google/material-components-ios/commit/54e319f6ab8ed52bb7e6810d3fae3c7829396f75) (Justin Shephard)

### Dialogs

#### Changes

* [Add disable background dismiss property](https://github.com/google/material-components-ios/commit/0e3b8b2a3521ebc3961df0938e8089b9969e9fa9) (Ian Gordon)
* [[Catalog] Restore Xcode 7 compatibility](https://github.com/google/material-components-ios/commit/7f596f6f2a82bf13e1392a3611ff885c04ce3c1e) (Ian Gordon)

### Ink

#### Changes

* [Expose ink gesture recognizer in MDCInkTouchController, prevent inkLayer color from being set to nil](https://github.com/google/material-components-ios/commit/868fa6677d6b4a9dd05e7231ce35fd693ecf3d97) (Junius Gunaratne)

### NavigationBar

#### Changes

* [[MDCNavigationBar] Add ability to center title based on iOS design guidelines](https://github.com/google/material-components-ios/commit/2afee9916a8ca37706d408b46e3fe64100cd56db) (randallli)

### Slider

#### Changes

* [Change MDCSlider and MDCSwitch to use NSSecureCoding](https://github.com/google/material-components-ios/commit/19a06ed4251e66f04e9fe8a0184e0937066270e0) (Sam Morrison)
* [MDC_#767 - Removed bad import and changed public delegate declaration of MDCThumbTrackDelegate to private.](https://github.com/google/material-components-ios/commit/4a7ee8154e7b175c91715b4f53217decabdb12ee) (Justin Shephard)

### Snackbar

#### Changes

* [Fix incorrect type annotation found by clang static analyzer. (#700)](https://github.com/google/material-components-ios/commit/e92b8bcecaaa9ad8347ee1eaba944cd37edeefa2) (Sylvain Defresne)

### Switch

#### Changes

* [Change MDCSlider and MDCSwitch to use NSSecureCoding](https://github.com/google/material-components-ios/commit/19a06ed4251e66f04e9fe8a0184e0937066270e0) (Sam Morrison)
* [Fixed Xcode 7 analyzer warnings about leaking CGPaths in MDCSwitch.](https://github.com/google/material-components-ios/commit/c2b4b3d258add88da728ed5016b50f94ef72ceff) (Adrian Secord)
* [[MDCSwitch] Only dispatch control events for user generated changes](https://github.com/google/material-components-ios/commit/90d54bcd555495aaa2c0a038b26e032636a00377) (Sam Morrison)

# 14.0.0

## API diffs
Expand Down
2 changes: 1 addition & 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 |s|
s.name = "MaterialComponents"
s.version = "14.0.0"
s.version = "15.0.0"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsCatalog.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsCatalog"
s.version = "14.0.0"
s.version = "15.0.0"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsUnitTests.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsUnitTests"
s.version = "14.0.0"
s.version = "15.0.0"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 2 additions & 0 deletions catalog/MDCCatalog/MDCNodeListViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class MDCNodeListViewController: CBCNodeListViewController {

self.addChildViewController(appBar.headerViewController)
appBar.headerViewController.headerView.backgroundColor = UIColor.whiteColor()
appBar.navigationBar.textAlignment = .Center
}

override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
Expand Down Expand Up @@ -315,6 +316,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
vc = contentVC
} else {
let container = MDCAppBarContainerViewController(contentViewController: contentVC)
container.appBar.navigationBar.textAlignment = .Center

// TODO(featherless): Remove once
// https://github.com/google/material-components-ios/issues/367 is resolved.
Expand Down
176 changes: 88 additions & 88 deletions catalog/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
PODS:
- CatalogByConvention (1.0.1)
- EarlGrey (1.3.0)
- MaterialComponents (14.0.0):
- MaterialComponents/ActivityIndicator (= 14.0.0)
- MaterialComponents/AnimationTiming (= 14.0.0)
- MaterialComponents/AppBar (= 14.0.0)
- MaterialComponents/ButtonBar (= 14.0.0)
- MaterialComponents/Buttons (= 14.0.0)
- MaterialComponents/CollectionCells (= 14.0.0)
- MaterialComponents/CollectionLayoutAttributes (= 14.0.0)
- MaterialComponents/Collections (= 14.0.0)
- MaterialComponents/Dialogs (= 14.0.0)
- MaterialComponents/FlexibleHeader (= 14.0.0)
- MaterialComponents/FontDiskLoader (= 14.0.0)
- MaterialComponents/HeaderStackView (= 14.0.0)
- MaterialComponents/Ink (= 14.0.0)
- MaterialComponents/NavigationBar (= 14.0.0)
- MaterialComponents/OverlayWindow (= 14.0.0)
- MaterialComponents/PageControl (= 14.0.0)
- MaterialComponents/Palettes (= 14.0.0)
- MaterialComponents/private (= 14.0.0)
- MaterialComponents/ProgressView (= 14.0.0)
- MaterialComponents/RobotoFontLoader (= 14.0.0)
- MaterialComponents/ShadowElevations (= 14.0.0)
- MaterialComponents/ShadowLayer (= 14.0.0)
- MaterialComponents/Slider (= 14.0.0)
- MaterialComponents/Snackbar (= 14.0.0)
- MaterialComponents/SpritedAnimationView (= 14.0.0)
- MaterialComponents/Switch (= 14.0.0)
- MaterialComponents/Typography (= 14.0.0)
- MaterialComponents/ActivityIndicator (14.0.0):
- MaterialComponents (15.0.0):
- MaterialComponents/ActivityIndicator (= 15.0.0)
- MaterialComponents/AnimationTiming (= 15.0.0)
- MaterialComponents/AppBar (= 15.0.0)
- MaterialComponents/ButtonBar (= 15.0.0)
- MaterialComponents/Buttons (= 15.0.0)
- MaterialComponents/CollectionCells (= 15.0.0)
- MaterialComponents/CollectionLayoutAttributes (= 15.0.0)
- MaterialComponents/Collections (= 15.0.0)
- MaterialComponents/Dialogs (= 15.0.0)
- MaterialComponents/FlexibleHeader (= 15.0.0)
- MaterialComponents/FontDiskLoader (= 15.0.0)
- MaterialComponents/HeaderStackView (= 15.0.0)
- MaterialComponents/Ink (= 15.0.0)
- MaterialComponents/NavigationBar (= 15.0.0)
- MaterialComponents/OverlayWindow (= 15.0.0)
- MaterialComponents/PageControl (= 15.0.0)
- MaterialComponents/Palettes (= 15.0.0)
- MaterialComponents/private (= 15.0.0)
- MaterialComponents/ProgressView (= 15.0.0)
- MaterialComponents/RobotoFontLoader (= 15.0.0)
- MaterialComponents/ShadowElevations (= 15.0.0)
- MaterialComponents/ShadowLayer (= 15.0.0)
- MaterialComponents/Slider (= 15.0.0)
- MaterialComponents/Snackbar (= 15.0.0)
- MaterialComponents/SpritedAnimationView (= 15.0.0)
- MaterialComponents/Switch (= 15.0.0)
- MaterialComponents/Typography (= 15.0.0)
- MaterialComponents/ActivityIndicator (15.0.0):
- MaterialComponents/private/RTL
- MaterialComponents/AnimationTiming (14.0.0)
- MaterialComponents/AppBar (14.0.0):
- MaterialComponents/AnimationTiming (15.0.0)
- MaterialComponents/AppBar (15.0.0):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
Expand All @@ -41,16 +41,16 @@ PODS:
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (14.0.0):
- MaterialComponents/ButtonBar (15.0.0):
- MaterialComponents/Buttons
- MaterialComponents/private/RTL
- MaterialComponents/Buttons (14.0.0):
- MaterialComponents/Buttons (15.0.0):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MDFTextAccessibility
- MaterialComponents/CollectionCells (14.0.0):
- MaterialComponents/CollectionCells (15.0.0):
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/private/Icons/ic_check
Expand All @@ -61,95 +61,95 @@ PODS:
- MaterialComponents/private/Icons/ic_reorder
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/CollectionLayoutAttributes (14.0.0)
- MaterialComponents/Collections (14.0.0):
- MaterialComponents/CollectionLayoutAttributes (15.0.0)
- MaterialComponents/Collections (15.0.0):
- MaterialComponents/CollectionCells
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/Dialogs (14.0.0):
- MaterialComponents/Dialogs (15.0.0):
- MaterialComponents/Buttons
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/FlexibleHeader (14.0.0):
- MaterialComponents/FlexibleHeader (15.0.0):
- MDFTextAccessibility
- MaterialComponents/FontDiskLoader (14.0.0)
- MaterialComponents/HeaderStackView (14.0.0)
- MaterialComponents/Ink (14.0.0)
- MaterialComponents/NavigationBar (14.0.0):
- MaterialComponents/FontDiskLoader (15.0.0)
- MaterialComponents/HeaderStackView (15.0.0)
- MaterialComponents/Ink (15.0.0)
- MaterialComponents/NavigationBar (15.0.0):
- MaterialComponents/ButtonBar
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/OverlayWindow (14.0.0)
- MaterialComponents/PageControl (14.0.0)
- MaterialComponents/Palettes (14.0.0)
- MaterialComponents/private (14.0.0):
- MaterialComponents/private/Color (= 14.0.0)
- MaterialComponents/private/Icons (= 14.0.0)
- MaterialComponents/private/KeyboardWatcher (= 14.0.0)
- MaterialComponents/private/Overlay (= 14.0.0)
- MaterialComponents/private/RTL (= 14.0.0)
- MaterialComponents/private/ThumbTrack (= 14.0.0)
- MaterialComponents/private/Color (14.0.0)
- MaterialComponents/private/Icons (14.0.0):
- MaterialComponents/private/Icons/Base (= 14.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 14.0.0)
- MaterialComponents/private/Icons/ic_check (= 14.0.0)
- MaterialComponents/private/Icons/ic_check_circle (= 14.0.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 14.0.0)
- MaterialComponents/private/Icons/ic_info (= 14.0.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 14.0.0)
- MaterialComponents/private/Icons/ic_reorder (= 14.0.0)
- MaterialComponents/private/Icons/Base (14.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (14.0.0):
- MaterialComponents/OverlayWindow (15.0.0)
- MaterialComponents/PageControl (15.0.0)
- MaterialComponents/Palettes (15.0.0)
- MaterialComponents/private (15.0.0):
- MaterialComponents/private/Color (= 15.0.0)
- MaterialComponents/private/Icons (= 15.0.0)
- MaterialComponents/private/KeyboardWatcher (= 15.0.0)
- MaterialComponents/private/Overlay (= 15.0.0)
- MaterialComponents/private/RTL (= 15.0.0)
- MaterialComponents/private/ThumbTrack (= 15.0.0)
- MaterialComponents/private/Color (15.0.0)
- MaterialComponents/private/Icons (15.0.0):
- MaterialComponents/private/Icons/Base (= 15.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 15.0.0)
- MaterialComponents/private/Icons/ic_check (= 15.0.0)
- MaterialComponents/private/Icons/ic_check_circle (= 15.0.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 15.0.0)
- MaterialComponents/private/Icons/ic_info (= 15.0.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.0.0)
- MaterialComponents/private/Icons/ic_reorder (= 15.0.0)
- MaterialComponents/private/Icons/Base (15.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check (14.0.0):
- MaterialComponents/private/Icons/ic_check (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check_circle (14.0.0):
- MaterialComponents/private/Icons/ic_check_circle (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_chevron_right (14.0.0):
- MaterialComponents/private/Icons/ic_chevron_right (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_info (14.0.0):
- MaterialComponents/private/Icons/ic_info (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_radio_button_unchecked (14.0.0):
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_reorder (14.0.0):
- MaterialComponents/private/Icons/ic_reorder (15.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/KeyboardWatcher (14.0.0)
- MaterialComponents/private/Overlay (14.0.0)
- MaterialComponents/private/RTL (14.0.0)
- MaterialComponents/private/ThumbTrack (14.0.0):
- MaterialComponents/private/KeyboardWatcher (15.0.0)
- MaterialComponents/private/Overlay (15.0.0)
- MaterialComponents/private/RTL (15.0.0)
- MaterialComponents/private/ThumbTrack (15.0.0):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ProgressView (14.0.0):
- MaterialComponents/ProgressView (15.0.0):
- MaterialComponents/private/RTL
- MaterialComponents/RobotoFontLoader (14.0.0):
- MaterialComponents/RobotoFontLoader (15.0.0):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ShadowElevations (14.0.0)
- MaterialComponents/ShadowLayer (14.0.0)
- MaterialComponents/Slider (14.0.0):
- MaterialComponents/ShadowElevations (15.0.0)
- MaterialComponents/ShadowLayer (15.0.0)
- MaterialComponents/Slider (15.0.0):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Snackbar (14.0.0):
- MaterialComponents/Snackbar (15.0.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Buttons
- MaterialComponents/OverlayWindow
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/private/Overlay
- MaterialComponents/SpritedAnimationView (14.0.0)
- MaterialComponents/Switch (14.0.0):
- MaterialComponents/SpritedAnimationView (15.0.0)
- MaterialComponents/Switch (15.0.0):
- MaterialComponents/private/RTL
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (14.0.0)
- MaterialComponentsCatalog (14.0.0):
- MaterialComponents/Typography (15.0.0)
- MaterialComponentsCatalog (15.0.0):
- MaterialComponents
- MaterialComponentsUnitTests (14.0.0):
- MaterialComponentsUnitTests (15.0.0):
- MaterialComponents
- MDFTextAccessibility
- MDFTextAccessibility (1.1.1)
Expand All @@ -172,9 +172,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
MaterialComponents: 2e9e691a79578348d0c1468204387193cd0c0859
MaterialComponentsCatalog: b9884eaca58aa3c5b62b124860362b1f76b9a94f
MaterialComponentsUnitTests: 9bdf33e2cea304a5789a21c17c15e1cf9811cfa6
MaterialComponents: 93b2c5d4ade111902fe63afb293b1d0ff48e4e81
MaterialComponentsCatalog: fe35be22863a94075d9c25b205dead8df53df0ae
MaterialComponentsUnitTests: 5eca3cb1a741ab815a1f820f88119f90696fbdcb
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e

PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01
Expand Down
Loading

0 comments on commit 2035625

Please sign in to comment.