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 Oct 13, 2016
2 parents 5c8c77b + ece361d commit 4dd600a
Show file tree
Hide file tree
Showing 23 changed files with 1,093 additions and 375 deletions.
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
# 15.2.0

## API diffs

### Palettes

- [new] [`MDCPalette.paletteGeneratedFromColor](https://github.com/google/material-components-ios/blob/fad8519b6a1ba5c29a0368fb470cca3c6da74431/components/Palettes/src/MDCPalettes.h#L137)

## Component changes

### FlexibleHeader

#### Changes

* [MDC_#121 - Added write-up for re-applying swipe to go back feature on MDCFlexibleHeaderController with hidden navigation bar in README.md](https://github.com/google/material-components-ios/commit/1aadd7f468d1d00b7fcbc6c4f9979986229f3df7) (Justin Shephard)

### Ink

#### Changes

* [Added emphasis to reference count warning.](https://github.com/google/material-components-ios/commit/6a7a48a9ebb2cb94cdb253e06298a07132db92bd) (Will Larche)
* [Handling lack of strong reference to ink touch controller in both examples and instructions.](https://github.com/google/material-components-ios/commit/ca5b9a9ef775e06234cec8f64477402d65153670) (Will Larche)

### NavigationBar

#### Changes

* [[NavBar] Corrected mapping of NSTextAlignment to MDCNavigationBarTitleAligment](https://github.com/google/material-components-ios/commit/fdf1ff083d3c27c00263251c7fac5738317ce896) (randallli)

### Palettes

#### Changes

* [Added missing example initializer.](https://github.com/google/material-components-ios/commit/f5378746668facc793bf31c96a27a4e6b47324d3) (Adrian Secord)
* [Generate palettes to match a target color (#729)](https://github.com/google/material-components-ios/commit/fad8519b6a1ba5c29a0368fb470cca3c6da74431) (Adrian Secord)

# 15.1.0

## API diffs
Expand Down
4 changes: 2 additions & 2 deletions 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 = "15.1.0"
s.version = "15.2.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 Expand Up @@ -216,7 +216,7 @@ Pod::Spec.new do |s|
s.subspec "Palettes" do |ss|
ss.ios.deployment_target = '7.0'
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
ss.header_mappings_dir = "components/#{ss.base_name}/src"
end

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 = "15.1.0"
s.version = "15.2.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 = "15.1.0"
s.version = "15.2.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
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 (15.1.0):
- MaterialComponents/ActivityIndicator (= 15.1.0)
- MaterialComponents/AnimationTiming (= 15.1.0)
- MaterialComponents/AppBar (= 15.1.0)
- MaterialComponents/ButtonBar (= 15.1.0)
- MaterialComponents/Buttons (= 15.1.0)
- MaterialComponents/CollectionCells (= 15.1.0)
- MaterialComponents/CollectionLayoutAttributes (= 15.1.0)
- MaterialComponents/Collections (= 15.1.0)
- MaterialComponents/Dialogs (= 15.1.0)
- MaterialComponents/FlexibleHeader (= 15.1.0)
- MaterialComponents/FontDiskLoader (= 15.1.0)
- MaterialComponents/HeaderStackView (= 15.1.0)
- MaterialComponents/Ink (= 15.1.0)
- MaterialComponents/NavigationBar (= 15.1.0)
- MaterialComponents/OverlayWindow (= 15.1.0)
- MaterialComponents/PageControl (= 15.1.0)
- MaterialComponents/Palettes (= 15.1.0)
- MaterialComponents/private (= 15.1.0)
- MaterialComponents/ProgressView (= 15.1.0)
- MaterialComponents/RobotoFontLoader (= 15.1.0)
- MaterialComponents/ShadowElevations (= 15.1.0)
- MaterialComponents/ShadowLayer (= 15.1.0)
- MaterialComponents/Slider (= 15.1.0)
- MaterialComponents/Snackbar (= 15.1.0)
- MaterialComponents/SpritedAnimationView (= 15.1.0)
- MaterialComponents/Switch (= 15.1.0)
- MaterialComponents/Typography (= 15.1.0)
- MaterialComponents/ActivityIndicator (15.1.0):
- MaterialComponents (15.2.0):
- MaterialComponents/ActivityIndicator (= 15.2.0)
- MaterialComponents/AnimationTiming (= 15.2.0)
- MaterialComponents/AppBar (= 15.2.0)
- MaterialComponents/ButtonBar (= 15.2.0)
- MaterialComponents/Buttons (= 15.2.0)
- MaterialComponents/CollectionCells (= 15.2.0)
- MaterialComponents/CollectionLayoutAttributes (= 15.2.0)
- MaterialComponents/Collections (= 15.2.0)
- MaterialComponents/Dialogs (= 15.2.0)
- MaterialComponents/FlexibleHeader (= 15.2.0)
- MaterialComponents/FontDiskLoader (= 15.2.0)
- MaterialComponents/HeaderStackView (= 15.2.0)
- MaterialComponents/Ink (= 15.2.0)
- MaterialComponents/NavigationBar (= 15.2.0)
- MaterialComponents/OverlayWindow (= 15.2.0)
- MaterialComponents/PageControl (= 15.2.0)
- MaterialComponents/Palettes (= 15.2.0)
- MaterialComponents/private (= 15.2.0)
- MaterialComponents/ProgressView (= 15.2.0)
- MaterialComponents/RobotoFontLoader (= 15.2.0)
- MaterialComponents/ShadowElevations (= 15.2.0)
- MaterialComponents/ShadowLayer (= 15.2.0)
- MaterialComponents/Slider (= 15.2.0)
- MaterialComponents/Snackbar (= 15.2.0)
- MaterialComponents/SpritedAnimationView (= 15.2.0)
- MaterialComponents/Switch (= 15.2.0)
- MaterialComponents/Typography (= 15.2.0)
- MaterialComponents/ActivityIndicator (15.2.0):
- MaterialComponents/private/RTL
- MaterialComponents/AnimationTiming (15.1.0)
- MaterialComponents/AppBar (15.1.0):
- MaterialComponents/AnimationTiming (15.2.0)
- MaterialComponents/AppBar (15.2.0):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
Expand All @@ -41,16 +41,16 @@ PODS:
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (15.1.0):
- MaterialComponents/ButtonBar (15.2.0):
- MaterialComponents/Buttons
- MaterialComponents/private/RTL
- MaterialComponents/Buttons (15.1.0):
- MaterialComponents/Buttons (15.2.0):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MDFTextAccessibility
- MaterialComponents/CollectionCells (15.1.0):
- MaterialComponents/CollectionCells (15.2.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 (15.1.0)
- MaterialComponents/Collections (15.1.0):
- MaterialComponents/CollectionLayoutAttributes (15.2.0)
- MaterialComponents/Collections (15.2.0):
- MaterialComponents/CollectionCells
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/Dialogs (15.1.0):
- MaterialComponents/Dialogs (15.2.0):
- MaterialComponents/Buttons
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/FlexibleHeader (15.1.0):
- MaterialComponents/FlexibleHeader (15.2.0):
- MDFTextAccessibility
- MaterialComponents/FontDiskLoader (15.1.0)
- MaterialComponents/HeaderStackView (15.1.0)
- MaterialComponents/Ink (15.1.0)
- MaterialComponents/NavigationBar (15.1.0):
- MaterialComponents/FontDiskLoader (15.2.0)
- MaterialComponents/HeaderStackView (15.2.0)
- MaterialComponents/Ink (15.2.0)
- MaterialComponents/NavigationBar (15.2.0):
- MaterialComponents/ButtonBar
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/OverlayWindow (15.1.0)
- MaterialComponents/PageControl (15.1.0)
- MaterialComponents/Palettes (15.1.0)
- MaterialComponents/private (15.1.0):
- MaterialComponents/private/Color (= 15.1.0)
- MaterialComponents/private/Icons (= 15.1.0)
- MaterialComponents/private/KeyboardWatcher (= 15.1.0)
- MaterialComponents/private/Overlay (= 15.1.0)
- MaterialComponents/private/RTL (= 15.1.0)
- MaterialComponents/private/ThumbTrack (= 15.1.0)
- MaterialComponents/private/Color (15.1.0)
- MaterialComponents/private/Icons (15.1.0):
- MaterialComponents/private/Icons/Base (= 15.1.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 15.1.0)
- MaterialComponents/private/Icons/ic_check (= 15.1.0)
- MaterialComponents/private/Icons/ic_check_circle (= 15.1.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 15.1.0)
- MaterialComponents/private/Icons/ic_info (= 15.1.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.1.0)
- MaterialComponents/private/Icons/ic_reorder (= 15.1.0)
- MaterialComponents/private/Icons/Base (15.1.0)
- MaterialComponents/private/Icons/ic_arrow_back (15.1.0):
- MaterialComponents/OverlayWindow (15.2.0)
- MaterialComponents/PageControl (15.2.0)
- MaterialComponents/Palettes (15.2.0)
- MaterialComponents/private (15.2.0):
- MaterialComponents/private/Color (= 15.2.0)
- MaterialComponents/private/Icons (= 15.2.0)
- MaterialComponents/private/KeyboardWatcher (= 15.2.0)
- MaterialComponents/private/Overlay (= 15.2.0)
- MaterialComponents/private/RTL (= 15.2.0)
- MaterialComponents/private/ThumbTrack (= 15.2.0)
- MaterialComponents/private/Color (15.2.0)
- MaterialComponents/private/Icons (15.2.0):
- MaterialComponents/private/Icons/Base (= 15.2.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 15.2.0)
- MaterialComponents/private/Icons/ic_check (= 15.2.0)
- MaterialComponents/private/Icons/ic_check_circle (= 15.2.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 15.2.0)
- MaterialComponents/private/Icons/ic_info (= 15.2.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.2.0)
- MaterialComponents/private/Icons/ic_reorder (= 15.2.0)
- MaterialComponents/private/Icons/Base (15.2.0)
- MaterialComponents/private/Icons/ic_arrow_back (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check (15.1.0):
- MaterialComponents/private/Icons/ic_check (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check_circle (15.1.0):
- MaterialComponents/private/Icons/ic_check_circle (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_chevron_right (15.1.0):
- MaterialComponents/private/Icons/ic_chevron_right (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_info (15.1.0):
- MaterialComponents/private/Icons/ic_info (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.1.0):
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_reorder (15.1.0):
- MaterialComponents/private/Icons/ic_reorder (15.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/KeyboardWatcher (15.1.0)
- MaterialComponents/private/Overlay (15.1.0)
- MaterialComponents/private/RTL (15.1.0)
- MaterialComponents/private/ThumbTrack (15.1.0):
- MaterialComponents/private/KeyboardWatcher (15.2.0)
- MaterialComponents/private/Overlay (15.2.0)
- MaterialComponents/private/RTL (15.2.0)
- MaterialComponents/private/ThumbTrack (15.2.0):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ProgressView (15.1.0):
- MaterialComponents/ProgressView (15.2.0):
- MaterialComponents/private/RTL
- MaterialComponents/RobotoFontLoader (15.1.0):
- MaterialComponents/RobotoFontLoader (15.2.0):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ShadowElevations (15.1.0)
- MaterialComponents/ShadowLayer (15.1.0)
- MaterialComponents/Slider (15.1.0):
- MaterialComponents/ShadowElevations (15.2.0)
- MaterialComponents/ShadowLayer (15.2.0)
- MaterialComponents/Slider (15.2.0):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Snackbar (15.1.0):
- MaterialComponents/Snackbar (15.2.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Buttons
- MaterialComponents/OverlayWindow
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/private/Overlay
- MaterialComponents/SpritedAnimationView (15.1.0)
- MaterialComponents/Switch (15.1.0):
- MaterialComponents/SpritedAnimationView (15.2.0)
- MaterialComponents/Switch (15.2.0):
- MaterialComponents/private/RTL
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (15.1.0)
- MaterialComponentsCatalog (15.1.0):
- MaterialComponents/Typography (15.2.0)
- MaterialComponentsCatalog (15.2.0):
- MaterialComponents
- MaterialComponentsUnitTests (15.1.0):
- MaterialComponentsUnitTests (15.2.0):
- MaterialComponents
- MDFTextAccessibility
- MDFTextAccessibility (1.1.1)
Expand All @@ -172,9 +172,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
MaterialComponents: 6a31779376e67f6422ce3d391e053dc1d43b6785
MaterialComponentsCatalog: b6d8151b3e62ef2ad650969f850ed520e938bec6
MaterialComponentsUnitTests: d06fda653cfc7dfc746b4e694184300fc5aaf339
MaterialComponents: afa91c7e2ac6b4de1406035a86dd26fb178a9243
MaterialComponentsCatalog: 9ac9cbaa764b3f5b2e19900ff5e01cbcdadca924
MaterialComponentsUnitTests: d960a72b969898af51f42a8f8bd312e88f327374
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e

PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01
Expand Down
Loading

0 comments on commit 4dd600a

Please sign in to comment.