From ba14e3c6c9d2dd787080f63de0e0946eee6d04b4 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Wed, 11 May 2016 10:58:41 -0400 Subject: [PATCH 01/22] Add/Update API Diff --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c869465546a..1bf000a6591 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +# 6.1.0 + +## API diffs + +Auto-generated by running: + + scripts/api_diff -o d2f436fdcfa711da5a8a077b42feb052c1abdf9e -n f822350621b6297d301a72166e89cba4229c3ec5 + +### CollectionLayoutAttributes + +- [new] [`MDCCollectionViewLayoutAttributes.backgroundImageViewInsets`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/CollectionLayoutAttributes/src/MDCCollectionViewLayoutAttributes.h#L80) + +### Switch + +- [new] [`MDCSwitch.offImage`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/Switch/src/MDCSwitch.h#L62) +- [new] [`MDCSwitch.onImage`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/Switch/src/MDCSwitch.h#L55) + +### Typography + +- [deprecated] [`MDCTypographyFontLoader`](https://github.com/google/material-components-ios/blob/f822350621b6297d301a72166e89cba4229c3ec5/components/Typography/src/MDCTypography.h#L144) + # 6.0.0 ## API diffs From e1e67f3e1623c4697833935c5311ffe1b39d7062 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Wed, 11 May 2016 11:02:07 -0400 Subject: [PATCH 02/22] Update to reflect major version bump --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf000a6591..166f026adfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 6.1.0 +# 7.0.0 ## API diffs From e3b3451c5e11eb19a218d57c5762d7e0e75a4d90 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Wed, 11 May 2016 11:07:13 -0400 Subject: [PATCH 03/22] Bumped version number to 7.0.0. --- MaterialComponents.podspec | 2 +- MaterialComponentsCatalog.podspec | 2 +- MaterialComponentsUnitTests.podspec | 2 +- catalog/Podfile.lock | 140 ++++++++++++++-------------- demos/Pesto/Podfile.lock | 132 +++++++++++++------------- demos/Shrine/Podfile.lock | 132 +++++++++++++------------- 6 files changed, 205 insertions(+), 205 deletions(-) diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index e17ff33697a..d0b36daa559 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb' Pod::Spec.new do |s| s.name = "MaterialComponents" - s.version = "6.0.0" + s.version = "7.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec index 0df92f0e10c..0ae5ee2e0d5 100644 --- a/MaterialComponentsCatalog.podspec +++ b/MaterialComponentsCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsCatalog" - s.version = "6.0.0" + s.version = "7.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec index dfccb0bd699..8dbc05b855e 100644 --- a/MaterialComponentsUnitTests.podspec +++ b/MaterialComponentsUnitTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsUnitTests" - s.version = "6.0.0" + s.version = "7.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index a1e2c67257e..5687acb82f3 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (6.0.0): - - MaterialComponents/AppBar (= 6.0.0) - - MaterialComponents/ButtonBar (= 6.0.0) - - MaterialComponents/Buttons (= 6.0.0) - - MaterialComponents/CollectionCells (= 6.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 6.0.0) - - MaterialComponents/Collections (= 6.0.0) - - MaterialComponents/FlexibleHeader (= 6.0.0) - - MaterialComponents/FontDiskLoader (= 6.0.0) - - MaterialComponents/HeaderStackView (= 6.0.0) - - MaterialComponents/Ink (= 6.0.0) - - MaterialComponents/NavigationBar (= 6.0.0) - - MaterialComponents/PageControl (= 6.0.0) - - MaterialComponents/Palettes (= 6.0.0) - - MaterialComponents/private (= 6.0.0) - - MaterialComponents/RobotoFontLoader (= 6.0.0) - - MaterialComponents/ShadowElevations (= 6.0.0) - - MaterialComponents/ShadowLayer (= 6.0.0) - - MaterialComponents/Slider (= 6.0.0) - - MaterialComponents/SpritedAnimationView (= 6.0.0) - - MaterialComponents/Switch (= 6.0.0) - - MaterialComponents/Typography (= 6.0.0) - - MaterialComponents/AppBar (6.0.0): + - MaterialComponents (7.0.0): + - MaterialComponents/AppBar (= 7.0.0) + - MaterialComponents/ButtonBar (= 7.0.0) + - MaterialComponents/Buttons (= 7.0.0) + - MaterialComponents/CollectionCells (= 7.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) + - MaterialComponents/Collections (= 7.0.0) + - MaterialComponents/FlexibleHeader (= 7.0.0) + - MaterialComponents/FontDiskLoader (= 7.0.0) + - MaterialComponents/HeaderStackView (= 7.0.0) + - MaterialComponents/Ink (= 7.0.0) + - MaterialComponents/NavigationBar (= 7.0.0) + - MaterialComponents/PageControl (= 7.0.0) + - MaterialComponents/Palettes (= 7.0.0) + - MaterialComponents/private (= 7.0.0) + - MaterialComponents/RobotoFontLoader (= 7.0.0) + - MaterialComponents/ShadowElevations (= 7.0.0) + - MaterialComponents/ShadowLayer (= 7.0.0) + - MaterialComponents/Slider (= 7.0.0) + - MaterialComponents/SpritedAnimationView (= 7.0.0) + - MaterialComponents/Switch (= 7.0.0) + - MaterialComponents/Typography (= 7.0.0) + - MaterialComponents/AppBar (7.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (6.0.0): + - MaterialComponents/ButtonBar (7.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (6.0.0): + - MaterialComponents/Buttons (7.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (6.0.0): + - MaterialComponents/CollectionCells (7.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,71 +46,71 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (6.0.0) - - MaterialComponents/Collections (6.0.0): + - MaterialComponents/CollectionLayoutAttributes (7.0.0) + - MaterialComponents/Collections (7.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (6.0.0) - - MaterialComponents/FontDiskLoader (6.0.0) - - MaterialComponents/HeaderStackView (6.0.0) - - MaterialComponents/Ink (6.0.0) - - MaterialComponents/NavigationBar (6.0.0): + - MaterialComponents/FlexibleHeader (7.0.0) + - MaterialComponents/FontDiskLoader (7.0.0) + - MaterialComponents/HeaderStackView (7.0.0) + - MaterialComponents/Ink (7.0.0) + - MaterialComponents/NavigationBar (7.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (6.0.0) - - MaterialComponents/Palettes (6.0.0) - - MaterialComponents/private (6.0.0): - - MaterialComponents/private/Color (= 6.0.0) - - MaterialComponents/private/Icons (= 6.0.0) - - MaterialComponents/private/ThumbTrack (= 6.0.0) - - MaterialComponents/private/Color (6.0.0) - - MaterialComponents/private/Icons (6.0.0): - - MaterialComponents/private/Icons/Base (= 6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 6.0.0) - - MaterialComponents/private/Icons/ic_check (= 6.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 6.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 6.0.0) - - MaterialComponents/private/Icons/ic_info (= 6.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 6.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 6.0.0) - - MaterialComponents/private/Icons/Base (6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (6.0.0): + - MaterialComponents/PageControl (7.0.0) + - MaterialComponents/Palettes (7.0.0) + - MaterialComponents/private (7.0.0): + - MaterialComponents/private/Color (= 7.0.0) + - MaterialComponents/private/Icons (= 7.0.0) + - MaterialComponents/private/ThumbTrack (= 7.0.0) + - MaterialComponents/private/Color (7.0.0) + - MaterialComponents/private/Icons (7.0.0): + - MaterialComponents/private/Icons/Base (= 7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) + - MaterialComponents/private/Icons/ic_check (= 7.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) + - MaterialComponents/private/Icons/ic_info (= 7.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) + - MaterialComponents/private/Icons/Base (7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (6.0.0): + - MaterialComponents/private/Icons/ic_check (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (6.0.0): + - MaterialComponents/private/Icons/ic_check_circle (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (6.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (6.0.0): + - MaterialComponents/private/Icons/ic_info (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (6.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (6.0.0): + - MaterialComponents/private/Icons/ic_reorder (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (6.0.0): + - MaterialComponents/private/ThumbTrack (7.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (6.0.0): + - MaterialComponents/RobotoFontLoader (7.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (6.0.0) - - MaterialComponents/ShadowLayer (6.0.0) - - MaterialComponents/Slider (6.0.0): + - MaterialComponents/ShadowElevations (7.0.0) + - MaterialComponents/ShadowLayer (7.0.0) + - MaterialComponents/Slider (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (6.0.0) - - MaterialComponents/Switch (6.0.0): + - MaterialComponents/SpritedAnimationView (7.0.0) + - MaterialComponents/Switch (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (6.0.0) - - MaterialComponentsCatalog (6.0.0): + - MaterialComponents/Typography (7.0.0) + - MaterialComponentsCatalog (7.0.0): - MaterialComponents - - MaterialComponentsUnitTests (6.0.0): + - MaterialComponentsUnitTests (7.0.0): - MaterialComponents DEPENDENCIES: @@ -127,8 +127,8 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - MaterialComponents: b864ab0ef10105c0384ada338b4378879fd10a7e - MaterialComponentsCatalog: c6299f406f51f37d2cf79456a1c728c16026e705 - MaterialComponentsUnitTests: 7b03f8062e584546ce7515587242d62863c2f259 + MaterialComponents: 05ef69c4a587807e029cb94e69868f1779ff25f5 + MaterialComponentsCatalog: 2e00536c71df5c61ea8e92a69dc8244a325f5b57 + MaterialComponentsUnitTests: 175a3adb1e4992f4de97b4a8ce4c537dd056427c COCOAPODS: 0.39.0 diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index 4469022b152..bf6fb46f843 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (6.0.0): - - MaterialComponents/AppBar (= 6.0.0) - - MaterialComponents/ButtonBar (= 6.0.0) - - MaterialComponents/Buttons (= 6.0.0) - - MaterialComponents/CollectionCells (= 6.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 6.0.0) - - MaterialComponents/Collections (= 6.0.0) - - MaterialComponents/FlexibleHeader (= 6.0.0) - - MaterialComponents/FontDiskLoader (= 6.0.0) - - MaterialComponents/HeaderStackView (= 6.0.0) - - MaterialComponents/Ink (= 6.0.0) - - MaterialComponents/NavigationBar (= 6.0.0) - - MaterialComponents/PageControl (= 6.0.0) - - MaterialComponents/Palettes (= 6.0.0) - - MaterialComponents/private (= 6.0.0) - - MaterialComponents/RobotoFontLoader (= 6.0.0) - - MaterialComponents/ShadowElevations (= 6.0.0) - - MaterialComponents/ShadowLayer (= 6.0.0) - - MaterialComponents/Slider (= 6.0.0) - - MaterialComponents/SpritedAnimationView (= 6.0.0) - - MaterialComponents/Switch (= 6.0.0) - - MaterialComponents/Typography (= 6.0.0) - - MaterialComponents/AppBar (6.0.0): + - MaterialComponents (7.0.0): + - MaterialComponents/AppBar (= 7.0.0) + - MaterialComponents/ButtonBar (= 7.0.0) + - MaterialComponents/Buttons (= 7.0.0) + - MaterialComponents/CollectionCells (= 7.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) + - MaterialComponents/Collections (= 7.0.0) + - MaterialComponents/FlexibleHeader (= 7.0.0) + - MaterialComponents/FontDiskLoader (= 7.0.0) + - MaterialComponents/HeaderStackView (= 7.0.0) + - MaterialComponents/Ink (= 7.0.0) + - MaterialComponents/NavigationBar (= 7.0.0) + - MaterialComponents/PageControl (= 7.0.0) + - MaterialComponents/Palettes (= 7.0.0) + - MaterialComponents/private (= 7.0.0) + - MaterialComponents/RobotoFontLoader (= 7.0.0) + - MaterialComponents/ShadowElevations (= 7.0.0) + - MaterialComponents/ShadowLayer (= 7.0.0) + - MaterialComponents/Slider (= 7.0.0) + - MaterialComponents/SpritedAnimationView (= 7.0.0) + - MaterialComponents/Switch (= 7.0.0) + - MaterialComponents/Typography (= 7.0.0) + - MaterialComponents/AppBar (7.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (6.0.0): + - MaterialComponents/ButtonBar (7.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (6.0.0): + - MaterialComponents/Buttons (7.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (6.0.0): + - MaterialComponents/CollectionCells (7.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,68 +46,68 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (6.0.0) - - MaterialComponents/Collections (6.0.0): + - MaterialComponents/CollectionLayoutAttributes (7.0.0) + - MaterialComponents/Collections (7.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (6.0.0) - - MaterialComponents/FontDiskLoader (6.0.0) - - MaterialComponents/HeaderStackView (6.0.0) - - MaterialComponents/Ink (6.0.0) - - MaterialComponents/NavigationBar (6.0.0): + - MaterialComponents/FlexibleHeader (7.0.0) + - MaterialComponents/FontDiskLoader (7.0.0) + - MaterialComponents/HeaderStackView (7.0.0) + - MaterialComponents/Ink (7.0.0) + - MaterialComponents/NavigationBar (7.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (6.0.0) - - MaterialComponents/Palettes (6.0.0) - - MaterialComponents/private (6.0.0): - - MaterialComponents/private/Color (= 6.0.0) - - MaterialComponents/private/Icons (= 6.0.0) - - MaterialComponents/private/ThumbTrack (= 6.0.0) - - MaterialComponents/private/Color (6.0.0) - - MaterialComponents/private/Icons (6.0.0): - - MaterialComponents/private/Icons/Base (= 6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 6.0.0) - - MaterialComponents/private/Icons/ic_check (= 6.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 6.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 6.0.0) - - MaterialComponents/private/Icons/ic_info (= 6.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 6.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 6.0.0) - - MaterialComponents/private/Icons/Base (6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (6.0.0): + - MaterialComponents/PageControl (7.0.0) + - MaterialComponents/Palettes (7.0.0) + - MaterialComponents/private (7.0.0): + - MaterialComponents/private/Color (= 7.0.0) + - MaterialComponents/private/Icons (= 7.0.0) + - MaterialComponents/private/ThumbTrack (= 7.0.0) + - MaterialComponents/private/Color (7.0.0) + - MaterialComponents/private/Icons (7.0.0): + - MaterialComponents/private/Icons/Base (= 7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) + - MaterialComponents/private/Icons/ic_check (= 7.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) + - MaterialComponents/private/Icons/ic_info (= 7.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) + - MaterialComponents/private/Icons/Base (7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (6.0.0): + - MaterialComponents/private/Icons/ic_check (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (6.0.0): + - MaterialComponents/private/Icons/ic_check_circle (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (6.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (6.0.0): + - MaterialComponents/private/Icons/ic_info (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (6.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (6.0.0): + - MaterialComponents/private/Icons/ic_reorder (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (6.0.0): + - MaterialComponents/private/ThumbTrack (7.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (6.0.0): + - MaterialComponents/RobotoFontLoader (7.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (6.0.0) - - MaterialComponents/ShadowLayer (6.0.0) - - MaterialComponents/Slider (6.0.0): + - MaterialComponents/ShadowElevations (7.0.0) + - MaterialComponents/ShadowLayer (7.0.0) + - MaterialComponents/Slider (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (6.0.0) - - MaterialComponents/Switch (6.0.0): + - MaterialComponents/SpritedAnimationView (7.0.0) + - MaterialComponents/Switch (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (6.0.0) + - MaterialComponents/Typography (7.0.0) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -117,6 +117,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: b864ab0ef10105c0384ada338b4378879fd10a7e + MaterialComponents: 05ef69c4a587807e029cb94e69868f1779ff25f5 COCOAPODS: 0.39.0 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index 4469022b152..bf6fb46f843 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (6.0.0): - - MaterialComponents/AppBar (= 6.0.0) - - MaterialComponents/ButtonBar (= 6.0.0) - - MaterialComponents/Buttons (= 6.0.0) - - MaterialComponents/CollectionCells (= 6.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 6.0.0) - - MaterialComponents/Collections (= 6.0.0) - - MaterialComponents/FlexibleHeader (= 6.0.0) - - MaterialComponents/FontDiskLoader (= 6.0.0) - - MaterialComponents/HeaderStackView (= 6.0.0) - - MaterialComponents/Ink (= 6.0.0) - - MaterialComponents/NavigationBar (= 6.0.0) - - MaterialComponents/PageControl (= 6.0.0) - - MaterialComponents/Palettes (= 6.0.0) - - MaterialComponents/private (= 6.0.0) - - MaterialComponents/RobotoFontLoader (= 6.0.0) - - MaterialComponents/ShadowElevations (= 6.0.0) - - MaterialComponents/ShadowLayer (= 6.0.0) - - MaterialComponents/Slider (= 6.0.0) - - MaterialComponents/SpritedAnimationView (= 6.0.0) - - MaterialComponents/Switch (= 6.0.0) - - MaterialComponents/Typography (= 6.0.0) - - MaterialComponents/AppBar (6.0.0): + - MaterialComponents (7.0.0): + - MaterialComponents/AppBar (= 7.0.0) + - MaterialComponents/ButtonBar (= 7.0.0) + - MaterialComponents/Buttons (= 7.0.0) + - MaterialComponents/CollectionCells (= 7.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) + - MaterialComponents/Collections (= 7.0.0) + - MaterialComponents/FlexibleHeader (= 7.0.0) + - MaterialComponents/FontDiskLoader (= 7.0.0) + - MaterialComponents/HeaderStackView (= 7.0.0) + - MaterialComponents/Ink (= 7.0.0) + - MaterialComponents/NavigationBar (= 7.0.0) + - MaterialComponents/PageControl (= 7.0.0) + - MaterialComponents/Palettes (= 7.0.0) + - MaterialComponents/private (= 7.0.0) + - MaterialComponents/RobotoFontLoader (= 7.0.0) + - MaterialComponents/ShadowElevations (= 7.0.0) + - MaterialComponents/ShadowLayer (= 7.0.0) + - MaterialComponents/Slider (= 7.0.0) + - MaterialComponents/SpritedAnimationView (= 7.0.0) + - MaterialComponents/Switch (= 7.0.0) + - MaterialComponents/Typography (= 7.0.0) + - MaterialComponents/AppBar (7.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (6.0.0): + - MaterialComponents/ButtonBar (7.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (6.0.0): + - MaterialComponents/Buttons (7.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (6.0.0): + - MaterialComponents/CollectionCells (7.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,68 +46,68 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (6.0.0) - - MaterialComponents/Collections (6.0.0): + - MaterialComponents/CollectionLayoutAttributes (7.0.0) + - MaterialComponents/Collections (7.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (6.0.0) - - MaterialComponents/FontDiskLoader (6.0.0) - - MaterialComponents/HeaderStackView (6.0.0) - - MaterialComponents/Ink (6.0.0) - - MaterialComponents/NavigationBar (6.0.0): + - MaterialComponents/FlexibleHeader (7.0.0) + - MaterialComponents/FontDiskLoader (7.0.0) + - MaterialComponents/HeaderStackView (7.0.0) + - MaterialComponents/Ink (7.0.0) + - MaterialComponents/NavigationBar (7.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (6.0.0) - - MaterialComponents/Palettes (6.0.0) - - MaterialComponents/private (6.0.0): - - MaterialComponents/private/Color (= 6.0.0) - - MaterialComponents/private/Icons (= 6.0.0) - - MaterialComponents/private/ThumbTrack (= 6.0.0) - - MaterialComponents/private/Color (6.0.0) - - MaterialComponents/private/Icons (6.0.0): - - MaterialComponents/private/Icons/Base (= 6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 6.0.0) - - MaterialComponents/private/Icons/ic_check (= 6.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 6.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 6.0.0) - - MaterialComponents/private/Icons/ic_info (= 6.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 6.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 6.0.0) - - MaterialComponents/private/Icons/Base (6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (6.0.0): + - MaterialComponents/PageControl (7.0.0) + - MaterialComponents/Palettes (7.0.0) + - MaterialComponents/private (7.0.0): + - MaterialComponents/private/Color (= 7.0.0) + - MaterialComponents/private/Icons (= 7.0.0) + - MaterialComponents/private/ThumbTrack (= 7.0.0) + - MaterialComponents/private/Color (7.0.0) + - MaterialComponents/private/Icons (7.0.0): + - MaterialComponents/private/Icons/Base (= 7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) + - MaterialComponents/private/Icons/ic_check (= 7.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) + - MaterialComponents/private/Icons/ic_info (= 7.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) + - MaterialComponents/private/Icons/Base (7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (6.0.0): + - MaterialComponents/private/Icons/ic_check (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (6.0.0): + - MaterialComponents/private/Icons/ic_check_circle (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (6.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (6.0.0): + - MaterialComponents/private/Icons/ic_info (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (6.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (6.0.0): + - MaterialComponents/private/Icons/ic_reorder (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (6.0.0): + - MaterialComponents/private/ThumbTrack (7.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (6.0.0): + - MaterialComponents/RobotoFontLoader (7.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (6.0.0) - - MaterialComponents/ShadowLayer (6.0.0) - - MaterialComponents/Slider (6.0.0): + - MaterialComponents/ShadowElevations (7.0.0) + - MaterialComponents/ShadowLayer (7.0.0) + - MaterialComponents/Slider (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (6.0.0) - - MaterialComponents/Switch (6.0.0): + - MaterialComponents/SpritedAnimationView (7.0.0) + - MaterialComponents/Switch (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (6.0.0) + - MaterialComponents/Typography (7.0.0) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -117,6 +117,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: b864ab0ef10105c0384ada338b4378879fd10a7e + MaterialComponents: 05ef69c4a587807e029cb94e69868f1779ff25f5 COCOAPODS: 0.39.0 From f7c84317ec01774be169bd3486ebb8a561376250 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Mon, 9 May 2016 10:46:32 -0400 Subject: [PATCH 04/22] [ButtonBar] Remove deprecated APIs. Summary: No apparent usage in the following blocking clients: - Google. Deleting these deprecated APIs as a result. Reviewers: ajsecord, #mdc_ios_owners Reviewed By: ajsecord, #mdc_ios_owners Projects: #material_components_ios Differential Revision: http://codereview.cc/D847 --- components/ButtonBar/src/MDCButtonBar.h | 36 ------------------- components/ButtonBar/src/MDCButtonBar.m | 34 ++---------------- .../src/private/MDCAppBarButtonBarBuilder.m | 1 + .../src/private/MDCButtonBar+Private.h | 27 ++++++++++++++ .../NavigationBar/src/MDCNavigationBar.h | 19 ---------- .../NavigationBar/src/MDCNavigationBar.m | 16 --------- 6 files changed, 30 insertions(+), 103 deletions(-) create mode 100644 components/ButtonBar/src/private/MDCButtonBar+Private.h diff --git a/components/ButtonBar/src/MDCButtonBar.h b/components/ButtonBar/src/MDCButtonBar.h index 48666fb94cd..cc5909115e5 100644 --- a/components/ButtonBar/src/MDCButtonBar.h +++ b/components/ButtonBar/src/MDCButtonBar.h @@ -150,39 +150,3 @@ typedef NS_OPTIONS(NSUInteger, MDCBarButtonItemLayoutHints) { layoutHints:(MDCBarButtonItemLayoutHints)layoutHints; @end - -// clang-format off -@interface MDCButtonBar () - -/** @see items */ -@property(nonatomic, copy) NSArray *buttonItems -__deprecated_msg("Use items instead."); - -/** The delegate creates button views from UIBarButtonItem instances. */ -@property(nonatomic, weak) id delegate -__deprecated_msg("This API will be removed in an upcoming release. It now has a default value."); - -/** Tells the receiver to rebuild its button views. */ -- (void)reloadButtonViews -__deprecated_msg("This API will be removed in an upcoming release."); - -@end - -/** - Target selector for buttons created from UIBarButtonItems. - - See the MDCButtonBarDelegate documentation for more details on how this method - should be used. - */ -@interface MDCButtonBar (Builder) - -/** - Finds the corresponding UIBarButtonItem and calls its target/action with the item as the first - parameter. - */ -- (void)didTapButton:(UIButton *)button event:(UIEvent *)event -__deprecated_msg("This API will be removed in an upcoming release."); - -@end - -// clang-format on diff --git a/components/ButtonBar/src/MDCButtonBar.m b/components/ButtonBar/src/MDCButtonBar.m index 0bae195981f..af1d4da6e1f 100644 --- a/components/ButtonBar/src/MDCButtonBar.m +++ b/components/ButtonBar/src/MDCButtonBar.m @@ -47,11 +47,6 @@ - (void)commonMDCButtonBarInit { _layoutPosition = MDCButtonBarLayoutPositionNone; _defaultBuilder = [[MDCAppBarButtonBarBuilder alloc] init]; - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - self.delegate = _defaultBuilder; -#pragma clang diagnostic pop } - (instancetype)initWithFrame:(CGRect)frame { @@ -145,12 +140,7 @@ - (NSArray *)viewsForItems:(NSArray *)barButtonItems { if (![barButtonItems count]) { return nil; } - NSAssert(_delegate, - @"No delegate provided to %@. Please provide an instance conforming to %@.", - NSStringFromClass([self class]), - NSStringFromProtocol(@protocol(MDCButtonBarDelegate))); - - id delegate = _delegate; + id delegate = _defaultBuilder; NSMutableArray *views = [NSMutableArray array]; [barButtonItems enumerateObjectsUsingBlock:^(UIBarButtonItem *item, NSUInteger idx, BOOL *stop) { @@ -324,37 +314,17 @@ - (void)setItems:(NSArray *)items { } } -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [self reloadButtonViews]; -#pragma clang diagnostic pop } } -- (void)setDelegate:(id)delegate { - if (_delegate == delegate) { - return; - } - _delegate = delegate; - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - [self reloadButtonViews]; -#pragma clang diagnostic pop -} - - (void)setLayoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection { if (_layoutDirection == layoutDirection) { return; } _layoutDirection = layoutDirection; - if (_delegate) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - [self reloadButtonViews]; -#pragma clang diagnostic pop - } + [self reloadButtonViews]; } - (void)setButtonTitleBaseline:(CGFloat)buttonTitleBaseline { diff --git a/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m b/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m index 79ed7f557fa..4c93bf33d2f 100644 --- a/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m +++ b/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m @@ -20,6 +20,7 @@ #import "MDCAppBarButtonBarBuilder.h" +#import "MDCButtonBar+Private.h" #import "MaterialButtons.h" #import diff --git a/components/ButtonBar/src/private/MDCButtonBar+Private.h b/components/ButtonBar/src/private/MDCButtonBar+Private.h new file mode 100644 index 00000000000..21d8e3ffa76 --- /dev/null +++ b/components/ButtonBar/src/private/MDCButtonBar+Private.h @@ -0,0 +1,27 @@ +/* + Copyright 2016-present Google Inc. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +#import "MDCButtonBar.h" + +@interface MDCButtonBar (Builder) + +/** + Finds the corresponding UIBarButtonItem and calls its target/action with the item as the first + parameter. + */ +- (void)didTapButton:(UIButton *)button event:(UIEvent *)event; + +@end diff --git a/components/NavigationBar/src/MDCNavigationBar.h b/components/NavigationBar/src/MDCNavigationBar.h index a232d837371..57dfc4fb6fc 100644 --- a/components/NavigationBar/src/MDCNavigationBar.h +++ b/components/NavigationBar/src/MDCNavigationBar.h @@ -84,22 +84,3 @@ - (void)unobserveNavigationItem; @end - -// clang-format off -/** @see MDCUINavigationItemObservables */ -__deprecated_msg("Please use MDCUINavigationItemObservables instead.") -@protocol MDCUINavigationItemKVO -@end - -@interface MDCNavigationBar () - -/** The delegate to be provided to the left button bar instance. */ -@property(nonatomic, weak, nullable) id leftButtonBarDelegate -__deprecated_msg("This API will be removed in an upcoming release. It now has a default value."); - -/** The delegate to be provided to the right button bar instance. */ -@property(nonatomic, weak, nullable) id rightButtonBarDelegate -__deprecated_msg("This API will be removed in an upcoming release. It now has a default value."); - -@end - // clang-format on diff --git a/components/NavigationBar/src/MDCNavigationBar.m b/components/NavigationBar/src/MDCNavigationBar.m index df5fd1979c2..f421040b5d0 100644 --- a/components/NavigationBar/src/MDCNavigationBar.m +++ b/components/NavigationBar/src/MDCNavigationBar.m @@ -369,22 +369,6 @@ - (void)setTitleView:(UIView *)titleView { } } -- (void)setLeftButtonBarDelegate:(id)leftButtonBarDelegate { - _leftButtonBar.delegate = leftButtonBarDelegate; -} - -- (id)leftButtonBarDelegate { - return _leftButtonBar.delegate; -} - -- (void)setRightButtonBarDelegate:(id)rightButtonBarDelegate { - _rightButtonBar.delegate = rightButtonBarDelegate; -} - -- (id)rightButtonBarDelegate { - return _rightButtonBar.delegate; -} - - (void)setLeftBarButtonItems:(NSArray *)leftBarButtonItems { _leftBarButtonItems = [leftBarButtonItems copy]; _leftButtonBar.items = [self mdc_buttonItemsForLeftBar]; From dbfc6b783d40e229708af1ee956ded363f621601 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Mon, 9 May 2016 10:21:13 -0400 Subject: [PATCH 05/22] [AppBar] Remove deprecated headerViewController property from MDCAppBarContainerViewController. Reviewers: #mdc_ios_owners, ajsecord Reviewed By: #mdc_ios_owners, ajsecord Subscribers: ajsecord Projects: #material_components_ios Differential Revision: http://codereview.cc/D846 --- .../AppBar/src/MDCAppBarContainerViewController.h | 10 ---------- .../AppBar/src/MDCAppBarContainerViewController.m | 6 ------ 2 files changed, 16 deletions(-) diff --git a/components/AppBar/src/MDCAppBarContainerViewController.h b/components/AppBar/src/MDCAppBarContainerViewController.h index e84bd3f87ed..4ca884f1fce 100644 --- a/components/AppBar/src/MDCAppBarContainerViewController.h +++ b/components/AppBar/src/MDCAppBarContainerViewController.h @@ -61,13 +61,3 @@ @property(nonatomic, strong, nonnull, readonly) UIViewController *contentViewController; @end - -// clang-format off -@interface MDCAppBarContainerViewController () - -/** @see appBar.headerViewController */ -- (nonnull MDCFlexibleHeaderViewController *)headerViewController -__deprecated_msg("Use appBar.headerViewController instead."); - -@end -// clang-format on diff --git a/components/AppBar/src/MDCAppBarContainerViewController.m b/components/AppBar/src/MDCAppBarContainerViewController.m index 6af9de3bba0..35fa60de748 100644 --- a/components/AppBar/src/MDCAppBarContainerViewController.m +++ b/components/AppBar/src/MDCAppBarContainerViewController.m @@ -75,10 +75,4 @@ - (UIStatusBarStyle)preferredStatusBarStyle { return self.appBar.headerViewController.preferredStatusBarStyle; } -#pragma mark - Public - -- (MDCFlexibleHeaderViewController *)headerViewController { - return self.appBar.headerViewController; -} - @end From 65f43009e0361a811d0812d1a4ce07930f9f4542 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Wed, 11 May 2016 15:35:11 -0400 Subject: [PATCH 06/22] Release candidate. Summary: Checklist: - [ ] Ran `arc unit --everything`. - [ ] Ran `scripts/build_all_pod_projects`. - [ ] Ran `scripts/release/api_diff` and pasted the results into CHANGELOG.md. - [ ] Ran `scripts/release/changes` and pasted the results into CHANGELOG.md. - [ ] Visually inspected the API diff to ensure it accurately reflects the release's changes. - [ ] Ran `scripts/release/diff components/*/src/` and visually inspected the changes. - [ ] Ran `scripts/release/bump` with the new version number. - [ ] Updated CHANGELOG.md's latest section header to match the release's version number. Reviewers: ajsecord, #mdc_ios_owners Reviewed By: ajsecord, #mdc_ios_owners Projects: #material_components_ios Differential Revision: http://codereview.cc/D860 --- CHANGELOG.md | 176 ++++++++++++++++++++++++++++ MaterialComponents.podspec | 4 +- MaterialComponentsCatalog.podspec | 2 +- MaterialComponentsUnitTests.podspec | 2 +- catalog/Podfile.lock | 140 +++++++++++----------- demos/Pesto/Podfile.lock | 132 ++++++++++----------- demos/Shrine/Podfile.lock | 132 ++++++++++----------- 7 files changed, 382 insertions(+), 206 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c869465546a..e1928b9ede8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,179 @@ +# 7.0.0 + +## API diffs + +Auto-generated by running: + + scripts/api_diff -o d2f436fdcfa711da5a8a077b42feb052c1abdf9e -n 6c8ca274056aed6850920f6010b47655c67730c9 + + +### AppBar + +- [deleted] [`MDCAppBarAddViews()`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/AppBar/src/MDCAppBar.h#L101) +- [deleted] [`MDCAppBarParenting.headerStackView`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/AppBar/src/MDCAppBar.h#L74) +- [deleted] [`MDCAppBarParenting.headerViewController`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/AppBar/src/MDCAppBar.h#L82) +- [deleted] [`MDCAppBarParenting.navigationBar`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/AppBar/src/MDCAppBar.h#L78) +- [deleted] [`MDCAppBarParenting`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/AppBar/src/MDCAppBar.h#L69) +- [deleted] [`MDCAppBarPrepareParent()`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/AppBar/src/MDCAppBar.h#L93) + +### ButtonBar + +- [new] [`MDCButtonBar.layoutPosition`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/ButtonBar/src/MDCButtonBar.h#L112) +- [new] [`MDCButtonBarLayoutPositionLeft`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/ButtonBar/src/MDCButtonBar.h#L28) +- [new] [`MDCButtonBarLayoutPositionNone`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/ButtonBar/src/MDCButtonBar.h#L25) +- [new] [`MDCButtonBarLayoutPositionRight`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/ButtonBar/src/MDCButtonBar.h#L31) +- [new] [`MDCButtonBarLayoutPosition`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/ButtonBar/src/MDCButtonBar.h#L24) + +### Collections + +- [new] [`-[MDCCollectionViewController collectionView:didHighlightItemAtIndexPath:]`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/Collections/src/MDCCollectionViewController.h#L55) +- [new] [`-[MDCCollectionViewController collectionView:didUnhighlightItemAtIndexPath:]`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/Collections/src/MDCCollectionViewController.h#L58) +- [new] [`-[MDCCollectionViewController collectionView:shouldHighlightItemAtIndexPath:]`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/Collections/src/MDCCollectionViewController.h#L52) +- [new] [`-[MDCCollectionViewStylingDelegate collectionView:inkColorAtIndexPath:]`](https://github.com/google/material-components-ios/blob/6c8ca274056aed6850920f6010b47655c67730c9/components/Collections/src/MDCCollectionViewStylingDelegate.h#L136) +- [modified] [`-[MDCCollectionViewEditingDelegate collectionView:didDeleteItemsAtIndexPaths:]`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/Collections/src/MDCCollectionViewEditingDelegate.h#L197) + +| From | To | Kind | +|:---- |:-- |:---- | +| - (void)collectionView:(nonnull UICollectionView *)collectionView didDeleteItemsAtIndexPaths:(nonnull NSArray *)indexPaths | - (void)collectionView:(nonnull UICollectionView *)collectionView didDeleteItemsAtIndexPaths:(nonnull NSArray *)indexPaths | declaration | + +- [modified] [`-[MDCCollectionViewEditingDelegate collectionView:willDeleteItemsAtIndexPaths:]`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/Collections/src/MDCCollectionViewEditingDelegate.h#L188) + +| From | To | Kind | +|:---- |:-- |:---- | +| - (void)collectionView:(nonnull UICollectionView *)collectionView willDeleteItemsAtIndexPaths:(nonnull NSArray *)indexPaths | - (void)collectionView:(nonnull UICollectionView *)collectionView willDeleteItemsAtIndexPaths:(nonnull NSArray *)indexPaths | declaration | + +- [modified] [`-[MDCCollectionViewStylingDelegate collectionView:didApplyInlayToItemAtIndexPaths:]`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/Collections/src/MDCCollectionViewStylingDelegate.h#L102) + +| From | To | Kind | +|:---- |:-- |:---- | +| - (void)collectionView:(nonnull UICollectionView *)collectionView didApplyInlayToItemAtIndexPaths:(nonnull NSArray *)indexPaths | - (void)collectionView:(nonnull UICollectionView *)collectionView didApplyInlayToItemAtIndexPaths:(nonnull NSArray *)indexPaths | declaration | + +- [modified] [`-[MDCCollectionViewStylingDelegate collectionView:didRemoveInlayFromItemAtIndexPaths:]`](https://github.com/google/material-components-ios/blob/d2f436fdcfa711da5a8a077b42feb052c1abdf9e/components/Collections/src/MDCCollectionViewStylingDelegate.h#L112) + +| From | To | Kind | +|:---- |:-- |:---- | +| - (void)collectionView:(nonnull UICollectionView *)collectionView didRemoveInlayFromItemAtIndexPaths:(nonnull NSArray *)indexPaths | - (void)collectionView:(nonnull UICollectionView *)collectionView didRemoveInlayFromItemAtIndexPaths:(nonnull NSArray *)indexPaths | declaration | + +### Palettes + +**New component.** + +## Component changes + +### AppBar + +#### Changes + +* [Remove deprecated parenting APIs.](https://github.com/google/material-components-ios/commit/f21d3adc78b87017d45f50bc806503689a42efa0) (Jeff Verkoeyen) +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### ButtonBar + +#### Changes + +* [Add padding property to button bar buttons and position property to button bar](https://github.com/google/material-components-ios/commit/b6a7142a8fe0ccbc268c5f348d330f1a853fab15) (Junius Gunaratne) +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### Buttons + +#### Changes + +* [[MDCButton] Center ink properly when insets change](https://github.com/google/material-components-ios/commit/699de7bcfbc346062ac01b59daf31b1b25d30290) (Junius Gunaratne) +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### CollectionCells + +#### Changes + +* [Fixes bug preventing removal of accessoryView.](https://github.com/google/material-components-ios/commit/359ac696fa9e5a224f74631a1af1065b14545fa5) (Chris Cox) +* [Initializes ink if not available when requesting inkView](https://github.com/google/material-components-ios/commit/98eadc5f4c60d70702c316b1093b50c4a18232f9) (Chris Cox) + +### Collections + +#### Breaking changes + +* [**Breaking**: Updates ink to fire on cell highlight/unhighlight for faster response. Also adds demo to catalog.](https://github.com/google/material-components-ios/commit/86174317b321e73b71a02b8dddb43de17defac64) (Chris Cox) + +#### Changes + +* [Adds API to allow setting cell ink color at given index path.](https://github.com/google/material-components-ios/commit/6c8ca274056aed6850920f6010b47655c67730c9) (Chris Cox) +* [Adds lightweight generics to NSArray of NSIndexPath](https://github.com/google/material-components-ios/commit/4e79ce507f20232491ee325a482e04ae58eb3758) (Chris Cox) +* [Breaks out collection styling and editing into own docs.](https://github.com/google/material-components-ios/commit/82bd9cf5500641db0a9125c86464b8008493ca58) (Chris Cox) +* [Fixes bug where collection view subviews do not respect auto layout or rotation.](https://github.com/google/material-components-ios/commit/de5fdfcd8c3284839a45d8a400ddf89490204ccc) (Chris Cox) +* [Fixes swipe-to-dismiss section bug when attempting to snapshot non-existent 'inf' frame.](https://github.com/google/material-components-ios/commit/311ad111948ae0e552ec3cc93840290944322ff2) (Chris Cox) +* [Replaced screenshot with video.](https://github.com/google/material-components-ios/commit/7e124034ee9cf16bdb2c27927add5f36fc1a76c8) (Adrian Secord) +* [Updates readme Swipe to dismiss section](https://github.com/google/material-components-ios/commit/7e3b64e17f6f0212e073f15ab185f42f3458611e) (Chris Cox) + +### FlexibleHeader + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### HeaderStackView + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### Ink + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### NavigationBar + +#### Breaking changes + +* [**Breaking**: Pad the outer-most button's icons in accordance to the Material spec](https://github.com/google/material-components-ios/commit/968a7bc55bdf3a600ef9adbebc2b7b82f6f0eeaf) (Junius Gunaratne) + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### PageControl + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### Palettes + +#### Changes + +* [Final review to land in develop.](https://github.com/google/material-components-ios/commit/10cfe433b05f8557dcdb6f8ea1ebcc0b0368cd93) (Adrian Secord) + +### RobotoFontLoader + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### ShadowLayer + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### Slider + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### Switch + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + +### Typography + +#### Changes + +* [[Website] Added hero videos to component README.md files.](https://github.com/google/material-components-ios/commit/4b3b06d2ce615965db9c6f73b5fc0825122fd982) (Adrian Secord) + # 6.0.0 ## API diffs diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index e17ff33697a..0a8a5b3317a 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb' Pod::Spec.new do |s| s.name = "MaterialComponents" - s.version = "6.0.0" + s.version = "7.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" @@ -159,7 +159,7 @@ Pod::Spec.new do |s| s.subspec "Palettes" do |ss| ss.public_header_files = "components/#{ss.base_name}/src/*.h" - ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}" + ss.source_files = "components/#{ss.base_name}/src/*.{h,m}" ss.header_mappings_dir = "components/#{ss.base_name}/src/*" end diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec index 0df92f0e10c..0ae5ee2e0d5 100644 --- a/MaterialComponentsCatalog.podspec +++ b/MaterialComponentsCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsCatalog" - s.version = "6.0.0" + s.version = "7.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec index dfccb0bd699..8dbc05b855e 100644 --- a/MaterialComponentsUnitTests.podspec +++ b/MaterialComponentsUnitTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsUnitTests" - s.version = "6.0.0" + s.version = "7.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index a1e2c67257e..931e826aa60 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (6.0.0): - - MaterialComponents/AppBar (= 6.0.0) - - MaterialComponents/ButtonBar (= 6.0.0) - - MaterialComponents/Buttons (= 6.0.0) - - MaterialComponents/CollectionCells (= 6.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 6.0.0) - - MaterialComponents/Collections (= 6.0.0) - - MaterialComponents/FlexibleHeader (= 6.0.0) - - MaterialComponents/FontDiskLoader (= 6.0.0) - - MaterialComponents/HeaderStackView (= 6.0.0) - - MaterialComponents/Ink (= 6.0.0) - - MaterialComponents/NavigationBar (= 6.0.0) - - MaterialComponents/PageControl (= 6.0.0) - - MaterialComponents/Palettes (= 6.0.0) - - MaterialComponents/private (= 6.0.0) - - MaterialComponents/RobotoFontLoader (= 6.0.0) - - MaterialComponents/ShadowElevations (= 6.0.0) - - MaterialComponents/ShadowLayer (= 6.0.0) - - MaterialComponents/Slider (= 6.0.0) - - MaterialComponents/SpritedAnimationView (= 6.0.0) - - MaterialComponents/Switch (= 6.0.0) - - MaterialComponents/Typography (= 6.0.0) - - MaterialComponents/AppBar (6.0.0): + - MaterialComponents (7.0.0): + - MaterialComponents/AppBar (= 7.0.0) + - MaterialComponents/ButtonBar (= 7.0.0) + - MaterialComponents/Buttons (= 7.0.0) + - MaterialComponents/CollectionCells (= 7.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) + - MaterialComponents/Collections (= 7.0.0) + - MaterialComponents/FlexibleHeader (= 7.0.0) + - MaterialComponents/FontDiskLoader (= 7.0.0) + - MaterialComponents/HeaderStackView (= 7.0.0) + - MaterialComponents/Ink (= 7.0.0) + - MaterialComponents/NavigationBar (= 7.0.0) + - MaterialComponents/PageControl (= 7.0.0) + - MaterialComponents/Palettes (= 7.0.0) + - MaterialComponents/private (= 7.0.0) + - MaterialComponents/RobotoFontLoader (= 7.0.0) + - MaterialComponents/ShadowElevations (= 7.0.0) + - MaterialComponents/ShadowLayer (= 7.0.0) + - MaterialComponents/Slider (= 7.0.0) + - MaterialComponents/SpritedAnimationView (= 7.0.0) + - MaterialComponents/Switch (= 7.0.0) + - MaterialComponents/Typography (= 7.0.0) + - MaterialComponents/AppBar (7.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (6.0.0): + - MaterialComponents/ButtonBar (7.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (6.0.0): + - MaterialComponents/Buttons (7.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (6.0.0): + - MaterialComponents/CollectionCells (7.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,71 +46,71 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (6.0.0) - - MaterialComponents/Collections (6.0.0): + - MaterialComponents/CollectionLayoutAttributes (7.0.0) + - MaterialComponents/Collections (7.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (6.0.0) - - MaterialComponents/FontDiskLoader (6.0.0) - - MaterialComponents/HeaderStackView (6.0.0) - - MaterialComponents/Ink (6.0.0) - - MaterialComponents/NavigationBar (6.0.0): + - MaterialComponents/FlexibleHeader (7.0.0) + - MaterialComponents/FontDiskLoader (7.0.0) + - MaterialComponents/HeaderStackView (7.0.0) + - MaterialComponents/Ink (7.0.0) + - MaterialComponents/NavigationBar (7.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (6.0.0) - - MaterialComponents/Palettes (6.0.0) - - MaterialComponents/private (6.0.0): - - MaterialComponents/private/Color (= 6.0.0) - - MaterialComponents/private/Icons (= 6.0.0) - - MaterialComponents/private/ThumbTrack (= 6.0.0) - - MaterialComponents/private/Color (6.0.0) - - MaterialComponents/private/Icons (6.0.0): - - MaterialComponents/private/Icons/Base (= 6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 6.0.0) - - MaterialComponents/private/Icons/ic_check (= 6.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 6.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 6.0.0) - - MaterialComponents/private/Icons/ic_info (= 6.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 6.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 6.0.0) - - MaterialComponents/private/Icons/Base (6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (6.0.0): + - MaterialComponents/PageControl (7.0.0) + - MaterialComponents/Palettes (7.0.0) + - MaterialComponents/private (7.0.0): + - MaterialComponents/private/Color (= 7.0.0) + - MaterialComponents/private/Icons (= 7.0.0) + - MaterialComponents/private/ThumbTrack (= 7.0.0) + - MaterialComponents/private/Color (7.0.0) + - MaterialComponents/private/Icons (7.0.0): + - MaterialComponents/private/Icons/Base (= 7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) + - MaterialComponents/private/Icons/ic_check (= 7.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) + - MaterialComponents/private/Icons/ic_info (= 7.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) + - MaterialComponents/private/Icons/Base (7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (6.0.0): + - MaterialComponents/private/Icons/ic_check (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (6.0.0): + - MaterialComponents/private/Icons/ic_check_circle (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (6.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (6.0.0): + - MaterialComponents/private/Icons/ic_info (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (6.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (6.0.0): + - MaterialComponents/private/Icons/ic_reorder (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (6.0.0): + - MaterialComponents/private/ThumbTrack (7.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (6.0.0): + - MaterialComponents/RobotoFontLoader (7.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (6.0.0) - - MaterialComponents/ShadowLayer (6.0.0) - - MaterialComponents/Slider (6.0.0): + - MaterialComponents/ShadowElevations (7.0.0) + - MaterialComponents/ShadowLayer (7.0.0) + - MaterialComponents/Slider (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (6.0.0) - - MaterialComponents/Switch (6.0.0): + - MaterialComponents/SpritedAnimationView (7.0.0) + - MaterialComponents/Switch (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (6.0.0) - - MaterialComponentsCatalog (6.0.0): + - MaterialComponents/Typography (7.0.0) + - MaterialComponentsCatalog (7.0.0): - MaterialComponents - - MaterialComponentsUnitTests (6.0.0): + - MaterialComponentsUnitTests (7.0.0): - MaterialComponents DEPENDENCIES: @@ -127,8 +127,8 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - MaterialComponents: b864ab0ef10105c0384ada338b4378879fd10a7e - MaterialComponentsCatalog: c6299f406f51f37d2cf79456a1c728c16026e705 - MaterialComponentsUnitTests: 7b03f8062e584546ce7515587242d62863c2f259 + MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b + MaterialComponentsCatalog: 2e00536c71df5c61ea8e92a69dc8244a325f5b57 + MaterialComponentsUnitTests: 175a3adb1e4992f4de97b4a8ce4c537dd056427c COCOAPODS: 0.39.0 diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index 4469022b152..31412ae8887 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (6.0.0): - - MaterialComponents/AppBar (= 6.0.0) - - MaterialComponents/ButtonBar (= 6.0.0) - - MaterialComponents/Buttons (= 6.0.0) - - MaterialComponents/CollectionCells (= 6.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 6.0.0) - - MaterialComponents/Collections (= 6.0.0) - - MaterialComponents/FlexibleHeader (= 6.0.0) - - MaterialComponents/FontDiskLoader (= 6.0.0) - - MaterialComponents/HeaderStackView (= 6.0.0) - - MaterialComponents/Ink (= 6.0.0) - - MaterialComponents/NavigationBar (= 6.0.0) - - MaterialComponents/PageControl (= 6.0.0) - - MaterialComponents/Palettes (= 6.0.0) - - MaterialComponents/private (= 6.0.0) - - MaterialComponents/RobotoFontLoader (= 6.0.0) - - MaterialComponents/ShadowElevations (= 6.0.0) - - MaterialComponents/ShadowLayer (= 6.0.0) - - MaterialComponents/Slider (= 6.0.0) - - MaterialComponents/SpritedAnimationView (= 6.0.0) - - MaterialComponents/Switch (= 6.0.0) - - MaterialComponents/Typography (= 6.0.0) - - MaterialComponents/AppBar (6.0.0): + - MaterialComponents (7.0.0): + - MaterialComponents/AppBar (= 7.0.0) + - MaterialComponents/ButtonBar (= 7.0.0) + - MaterialComponents/Buttons (= 7.0.0) + - MaterialComponents/CollectionCells (= 7.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) + - MaterialComponents/Collections (= 7.0.0) + - MaterialComponents/FlexibleHeader (= 7.0.0) + - MaterialComponents/FontDiskLoader (= 7.0.0) + - MaterialComponents/HeaderStackView (= 7.0.0) + - MaterialComponents/Ink (= 7.0.0) + - MaterialComponents/NavigationBar (= 7.0.0) + - MaterialComponents/PageControl (= 7.0.0) + - MaterialComponents/Palettes (= 7.0.0) + - MaterialComponents/private (= 7.0.0) + - MaterialComponents/RobotoFontLoader (= 7.0.0) + - MaterialComponents/ShadowElevations (= 7.0.0) + - MaterialComponents/ShadowLayer (= 7.0.0) + - MaterialComponents/Slider (= 7.0.0) + - MaterialComponents/SpritedAnimationView (= 7.0.0) + - MaterialComponents/Switch (= 7.0.0) + - MaterialComponents/Typography (= 7.0.0) + - MaterialComponents/AppBar (7.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (6.0.0): + - MaterialComponents/ButtonBar (7.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (6.0.0): + - MaterialComponents/Buttons (7.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (6.0.0): + - MaterialComponents/CollectionCells (7.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,68 +46,68 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (6.0.0) - - MaterialComponents/Collections (6.0.0): + - MaterialComponents/CollectionLayoutAttributes (7.0.0) + - MaterialComponents/Collections (7.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (6.0.0) - - MaterialComponents/FontDiskLoader (6.0.0) - - MaterialComponents/HeaderStackView (6.0.0) - - MaterialComponents/Ink (6.0.0) - - MaterialComponents/NavigationBar (6.0.0): + - MaterialComponents/FlexibleHeader (7.0.0) + - MaterialComponents/FontDiskLoader (7.0.0) + - MaterialComponents/HeaderStackView (7.0.0) + - MaterialComponents/Ink (7.0.0) + - MaterialComponents/NavigationBar (7.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (6.0.0) - - MaterialComponents/Palettes (6.0.0) - - MaterialComponents/private (6.0.0): - - MaterialComponents/private/Color (= 6.0.0) - - MaterialComponents/private/Icons (= 6.0.0) - - MaterialComponents/private/ThumbTrack (= 6.0.0) - - MaterialComponents/private/Color (6.0.0) - - MaterialComponents/private/Icons (6.0.0): - - MaterialComponents/private/Icons/Base (= 6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 6.0.0) - - MaterialComponents/private/Icons/ic_check (= 6.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 6.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 6.0.0) - - MaterialComponents/private/Icons/ic_info (= 6.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 6.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 6.0.0) - - MaterialComponents/private/Icons/Base (6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (6.0.0): + - MaterialComponents/PageControl (7.0.0) + - MaterialComponents/Palettes (7.0.0) + - MaterialComponents/private (7.0.0): + - MaterialComponents/private/Color (= 7.0.0) + - MaterialComponents/private/Icons (= 7.0.0) + - MaterialComponents/private/ThumbTrack (= 7.0.0) + - MaterialComponents/private/Color (7.0.0) + - MaterialComponents/private/Icons (7.0.0): + - MaterialComponents/private/Icons/Base (= 7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) + - MaterialComponents/private/Icons/ic_check (= 7.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) + - MaterialComponents/private/Icons/ic_info (= 7.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) + - MaterialComponents/private/Icons/Base (7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (6.0.0): + - MaterialComponents/private/Icons/ic_check (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (6.0.0): + - MaterialComponents/private/Icons/ic_check_circle (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (6.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (6.0.0): + - MaterialComponents/private/Icons/ic_info (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (6.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (6.0.0): + - MaterialComponents/private/Icons/ic_reorder (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (6.0.0): + - MaterialComponents/private/ThumbTrack (7.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (6.0.0): + - MaterialComponents/RobotoFontLoader (7.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (6.0.0) - - MaterialComponents/ShadowLayer (6.0.0) - - MaterialComponents/Slider (6.0.0): + - MaterialComponents/ShadowElevations (7.0.0) + - MaterialComponents/ShadowLayer (7.0.0) + - MaterialComponents/Slider (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (6.0.0) - - MaterialComponents/Switch (6.0.0): + - MaterialComponents/SpritedAnimationView (7.0.0) + - MaterialComponents/Switch (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (6.0.0) + - MaterialComponents/Typography (7.0.0) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -117,6 +117,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: b864ab0ef10105c0384ada338b4378879fd10a7e + MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b COCOAPODS: 0.39.0 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index 4469022b152..31412ae8887 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (6.0.0): - - MaterialComponents/AppBar (= 6.0.0) - - MaterialComponents/ButtonBar (= 6.0.0) - - MaterialComponents/Buttons (= 6.0.0) - - MaterialComponents/CollectionCells (= 6.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 6.0.0) - - MaterialComponents/Collections (= 6.0.0) - - MaterialComponents/FlexibleHeader (= 6.0.0) - - MaterialComponents/FontDiskLoader (= 6.0.0) - - MaterialComponents/HeaderStackView (= 6.0.0) - - MaterialComponents/Ink (= 6.0.0) - - MaterialComponents/NavigationBar (= 6.0.0) - - MaterialComponents/PageControl (= 6.0.0) - - MaterialComponents/Palettes (= 6.0.0) - - MaterialComponents/private (= 6.0.0) - - MaterialComponents/RobotoFontLoader (= 6.0.0) - - MaterialComponents/ShadowElevations (= 6.0.0) - - MaterialComponents/ShadowLayer (= 6.0.0) - - MaterialComponents/Slider (= 6.0.0) - - MaterialComponents/SpritedAnimationView (= 6.0.0) - - MaterialComponents/Switch (= 6.0.0) - - MaterialComponents/Typography (= 6.0.0) - - MaterialComponents/AppBar (6.0.0): + - MaterialComponents (7.0.0): + - MaterialComponents/AppBar (= 7.0.0) + - MaterialComponents/ButtonBar (= 7.0.0) + - MaterialComponents/Buttons (= 7.0.0) + - MaterialComponents/CollectionCells (= 7.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) + - MaterialComponents/Collections (= 7.0.0) + - MaterialComponents/FlexibleHeader (= 7.0.0) + - MaterialComponents/FontDiskLoader (= 7.0.0) + - MaterialComponents/HeaderStackView (= 7.0.0) + - MaterialComponents/Ink (= 7.0.0) + - MaterialComponents/NavigationBar (= 7.0.0) + - MaterialComponents/PageControl (= 7.0.0) + - MaterialComponents/Palettes (= 7.0.0) + - MaterialComponents/private (= 7.0.0) + - MaterialComponents/RobotoFontLoader (= 7.0.0) + - MaterialComponents/ShadowElevations (= 7.0.0) + - MaterialComponents/ShadowLayer (= 7.0.0) + - MaterialComponents/Slider (= 7.0.0) + - MaterialComponents/SpritedAnimationView (= 7.0.0) + - MaterialComponents/Switch (= 7.0.0) + - MaterialComponents/Typography (= 7.0.0) + - MaterialComponents/AppBar (7.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (6.0.0): + - MaterialComponents/ButtonBar (7.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (6.0.0): + - MaterialComponents/Buttons (7.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (6.0.0): + - MaterialComponents/CollectionCells (7.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,68 +46,68 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (6.0.0) - - MaterialComponents/Collections (6.0.0): + - MaterialComponents/CollectionLayoutAttributes (7.0.0) + - MaterialComponents/Collections (7.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (6.0.0) - - MaterialComponents/FontDiskLoader (6.0.0) - - MaterialComponents/HeaderStackView (6.0.0) - - MaterialComponents/Ink (6.0.0) - - MaterialComponents/NavigationBar (6.0.0): + - MaterialComponents/FlexibleHeader (7.0.0) + - MaterialComponents/FontDiskLoader (7.0.0) + - MaterialComponents/HeaderStackView (7.0.0) + - MaterialComponents/Ink (7.0.0) + - MaterialComponents/NavigationBar (7.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (6.0.0) - - MaterialComponents/Palettes (6.0.0) - - MaterialComponents/private (6.0.0): - - MaterialComponents/private/Color (= 6.0.0) - - MaterialComponents/private/Icons (= 6.0.0) - - MaterialComponents/private/ThumbTrack (= 6.0.0) - - MaterialComponents/private/Color (6.0.0) - - MaterialComponents/private/Icons (6.0.0): - - MaterialComponents/private/Icons/Base (= 6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 6.0.0) - - MaterialComponents/private/Icons/ic_check (= 6.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 6.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 6.0.0) - - MaterialComponents/private/Icons/ic_info (= 6.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 6.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 6.0.0) - - MaterialComponents/private/Icons/Base (6.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (6.0.0): + - MaterialComponents/PageControl (7.0.0) + - MaterialComponents/Palettes (7.0.0) + - MaterialComponents/private (7.0.0): + - MaterialComponents/private/Color (= 7.0.0) + - MaterialComponents/private/Icons (= 7.0.0) + - MaterialComponents/private/ThumbTrack (= 7.0.0) + - MaterialComponents/private/Color (7.0.0) + - MaterialComponents/private/Icons (7.0.0): + - MaterialComponents/private/Icons/Base (= 7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) + - MaterialComponents/private/Icons/ic_check (= 7.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) + - MaterialComponents/private/Icons/ic_info (= 7.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) + - MaterialComponents/private/Icons/Base (7.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (6.0.0): + - MaterialComponents/private/Icons/ic_check (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (6.0.0): + - MaterialComponents/private/Icons/ic_check_circle (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (6.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (6.0.0): + - MaterialComponents/private/Icons/ic_info (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (6.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (6.0.0): + - MaterialComponents/private/Icons/ic_reorder (7.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (6.0.0): + - MaterialComponents/private/ThumbTrack (7.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (6.0.0): + - MaterialComponents/RobotoFontLoader (7.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (6.0.0) - - MaterialComponents/ShadowLayer (6.0.0) - - MaterialComponents/Slider (6.0.0): + - MaterialComponents/ShadowElevations (7.0.0) + - MaterialComponents/ShadowLayer (7.0.0) + - MaterialComponents/Slider (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (6.0.0) - - MaterialComponents/Switch (6.0.0): + - MaterialComponents/SpritedAnimationView (7.0.0) + - MaterialComponents/Switch (7.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (6.0.0) + - MaterialComponents/Typography (7.0.0) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -117,6 +117,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: b864ab0ef10105c0384ada338b4378879fd10a7e + MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b COCOAPODS: 0.39.0 From 3e7ce26bacd4ee94177bf3daab0c03d2281a6723 Mon Sep 17 00:00:00 2001 From: Chris Cox Date: Wed, 11 May 2016 11:34:08 -0400 Subject: [PATCH 07/22] [Collections] Adds border to editing action bar Summary: Closes https://github.com/google/material-components-ios/issues/508 Reviewers: ajsecord, #mdc_ios_owners Reviewed By: ajsecord, #mdc_ios_owners Projects: #material_components_ios Differential Revision: http://codereview.cc/D859 --- .../src/private/MDCCollectionInfoBarView.m | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/components/Collections/src/private/MDCCollectionInfoBarView.m b/components/Collections/src/private/MDCCollectionInfoBarView.m index 962210fd389..b922cfd3dee 100644 --- a/components/Collections/src/private/MDCCollectionInfoBarView.m +++ b/components/Collections/src/private/MDCCollectionInfoBarView.m @@ -55,6 +55,7 @@ + (Class)layerClass { @implementation MDCCollectionInfoBarView { CGFloat _backgroundTransformY; + CALayer *_backgroundBorderLayer; UITapGestureRecognizer *_tapGesture; } @@ -106,6 +107,15 @@ - (void)layoutSubviews { } } +- (void)layoutSublayersOfLayer:(CALayer *)layer { + [super layoutSublayersOfLayer:layer]; + // Set border layer frame. + _backgroundBorderLayer.frame = CGRectMake(-1, + 0, + CGRectGetWidth(self.backgroundView.bounds) + 2, + CGRectGetHeight(self.backgroundView.bounds) + 1); +} + - (void)setTintColor:(UIColor *)tintColor { _tintColor = tintColor; _backgroundView.backgroundColor = _tintColor; @@ -158,6 +168,15 @@ - (void)setStyle:(MDCCollectionInfoBarViewStyle)style { self.isAccessibilityElement = YES; self.accessibilityTraits = UIAccessibilityTraitButton; self.accessibilityLabel = self.message; + + // Adds border to be positioned during sublayer layout. + self.backgroundView.clipsToBounds = YES; + if (!_backgroundBorderLayer) { + _backgroundBorderLayer = [CALayer layer]; + _backgroundBorderLayer.borderColor = [UIColor colorWithWhite:0 alpha:0.1f].CGColor; + _backgroundBorderLayer.borderWidth = 1.0f / [[UIScreen mainScreen] scale]; + [self.backgroundView.layer addSublayer:_backgroundBorderLayer]; + } } } From bbca586571eedd7d02b74a1335d62c61b3e10eea Mon Sep 17 00:00:00 2001 From: Louis Romero Date: Wed, 11 May 2016 03:35:08 +0200 Subject: [PATCH 08/22] Update root README.md to include instructions on how to test Catalog. Summary: Closes https://github.com/google/material-components-ios/issues/332. Test Plan: Please be extra critical with the wording and structure used here. Reviewers: featherless, ajsecord, #mdc_ios_owners Reviewed By: ajsecord, #mdc_ios_owners Projects: #material_components_ios Differential Revision: http://codereview.cc/D855 --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 62474e40e53..270f6b70fc5 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,22 @@ Material Components’ visual style is based on the [material design](http://www.google.com/design/spec/material-design/introduction.html) specification, developed by a team of iOS engineers and UX designers at Google. +## Catalog + +Catalog is a demonstration application that showcases the Material Components. + +### If you haven't checked out the repo yet: + +~~~ bash +pod try MaterialComponents +~~~ + +### If you have checked out the repo: + +~~~ bash +pod install --project-directory=catalog/ --no-repo-update +~~~ + ## Quickstart ### 1. Install CocoaPods From 39bda0a60728a5989971cb0a09ee8d40b7bd4f09 Mon Sep 17 00:00:00 2001 From: Louis Romero Date: Thu, 12 May 2016 00:04:19 +0200 Subject: [PATCH 09/22] Propagate the NavigationBar tint color to the bar button items. Summary: Closes https://github.com/google/material-components-ios/issues/511 Test Plan: Apply the patch in https://github.com/google/material-components-ios/issues/511 and check that Catalog > AppBar > AppBar (Swift) has all bar elements red. Reviewers: ajsecord, #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D862 --- components/ButtonBar/src/MDCButtonBar.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/ButtonBar/src/MDCButtonBar.m b/components/ButtonBar/src/MDCButtonBar.m index af1d4da6e1f..d8eec523175 100644 --- a/components/ButtonBar/src/MDCButtonBar.m +++ b/components/ButtonBar/src/MDCButtonBar.m @@ -134,6 +134,12 @@ - (void)layoutSubviews { [self sizeThatFits:self.bounds.size shouldLayout:YES]; } +- (void)tintColorDidChange { + [super tintColorDidChange]; + + _defaultBuilder.buttonTitleColor = self.tintColor; +} + #pragma mark - Private - (NSArray *)viewsForItems:(NSArray *)barButtonItems { From 20cd0ed204462d2873fa05a8a957cfe681a7b136 Mon Sep 17 00:00:00 2001 From: Louis Romero Date: Thu, 12 May 2016 02:35:28 +0200 Subject: [PATCH 10/22] [Catalog] Give enough space for 3 lines of text in the catalog description. Summary: Prior to this CL, not rounding the height of the text view meant that when 3 lines were displayed, the text view was scrollable. This is no longer the case after taking the ceil of the estimated height. Closes https://github.com/google/material-components-ios/issues/320 Test Plan: Look at Catalog > Collections. The description shouldn't scroll within the page. Reviewers: #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D864 --- catalog/MDCCatalog/MDCNodeListViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/MDCCatalog/MDCNodeListViewController.swift b/catalog/MDCCatalog/MDCNodeListViewController.swift index f0d486cb914..e61b0b2adc6 100644 --- a/catalog/MDCCatalog/MDCNodeListViewController.swift +++ b/catalog/MDCCatalog/MDCNodeListViewController.swift @@ -166,7 +166,7 @@ class MDCNodeListViewController: CBCNodeListViewController { textView.frame = CGRectMake(20, 40, tableView.frame.size.width - 40, - (MDCTypography.captionFont().lineHeight) * 3) + ceil(MDCTypography.captionFont().lineHeight * 3)) textView.autoresizingMask = .FlexibleWidth textView.contentInset = UIEdgeInsetsMake(-8, -5, -8, -5) textView.editable = false From acad8c84cdc64a31276fd0dd6c7ca9e6effc85c8 Mon Sep 17 00:00:00 2001 From: Ian Gordon Date: Thu, 12 May 2016 12:22:45 -0400 Subject: [PATCH 11/22] [Docs] Update release instructions Reviewers: featherless, #mdc_ios_owners Reviewed By: featherless, #mdc_ios_owners Subscribers: featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D865 --- contributing/contributor_guides/releasing.md | 36 +++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/contributing/contributor_guides/releasing.md b/contributing/contributor_guides/releasing.md index 2dcb69e3fd7..72263c8ac0c 100644 --- a/contributing/contributor_guides/releasing.md +++ b/contributing/contributor_guides/releasing.md @@ -209,16 +209,6 @@ Commit the results to your branch. git commit -am "Bumped version number to $(pod ipc spec MaterialComponents.podspec | grep '"version"' | cut -d'"' -f4)." git push origin release-candidate -## Send the release out for review - -Sent the release-candidate branch out for review: - - git fetch - git checkout release-candidate - arc diff origin/master --message-file scripts/release/release_checklist.txt - -Check off each item in the diff's checklist before merging the release candidate branch. - ## Release-blocking clients Before you can merge the release branch into either develop or master you **must** get the release @@ -247,10 +237,24 @@ go-ahead from the following clients: --- +## Send the release out for review + +Send the release-candidate branch out for review: + + git fetch + git checkout release-candidate + arc diff origin/master --no-lint --plan-changes --message-file scripts/release/release_checklist.txt + +Check off each item in the diff's checklist. + +Get a reviewer to approve the change. + +Do NOT arc land this diff, its purpose is to have someone sanity check the release. + ## Merge the release candidate branch -Once the release has passed all tests by clients, you may merge the release into the `develop` and -`master` branches. +Once the release-candidate has passed all tests by clients, you may merge the release into the +`develop` and `master` branches. # Did you listen to the dragon? # @@ -288,8 +292,8 @@ and delete the release branch: [GitHub list of releases](https://github.com/google/material-components-ios/releases), click on "Draft a new release". 1. Tag the release "vX.Y.Z". -1. Title the release "Release X.Y.Z". 1. Select the master branch. +1. Title the release "Release X.Y.Z". 1. In the body of the release notes, paste the text from CHANGELOG.md for this release. 1. Publish the release. @@ -297,6 +301,12 @@ and delete the release branch: TODO: Add instructions for regenerating Jazzy docs and deploying them. +### Reply to the original release email message + +Post a reply to you message on [Material Components iOS Discuss] +(https://groups.google.com/forum/#!topic/material-components-ios-discuss/) indicating that you are +done. + ### Pick the next release cut date We generally cut releases every **Wednesday** mid-afternoon EST. From 1015e39dc1ae30ca8762124a482f8d95028126ab Mon Sep 17 00:00:00 2001 From: Chris Cox Date: Wed, 11 May 2016 16:15:51 -0400 Subject: [PATCH 12/22] Marks text as inline code within the From|To|Kind blocks of release notes. Reviewers: #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D861 --- scripts/objc_diff_xml_to_md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/objc_diff_xml_to_md b/scripts/objc_diff_xml_to_md index 98d7fc1ff04..394e3a4a583 100755 --- a/scripts/objc_diff_xml_to_md +++ b/scripts/objc_diff_xml_to_md @@ -130,7 +130,7 @@ if (!empty($structure)) { $lines []= "|:---- |:-- |:---- |"; foreach ($modifications as $modification) { - $lines []= "| ". $modification->previousValue ." | ". $modification->currentValue ." | ".$modification->type ." |"; + $lines []= "| `". $modification->previousValue ."` | `". $modification->currentValue ."` | `".$modification->type ."` |"; } $lines []= ""; } From 120030631e3a695559a49100e62cb7a88502cb3b Mon Sep 17 00:00:00 2001 From: Chris Cox Date: Mon, 16 May 2016 10:32:03 -0400 Subject: [PATCH 13/22] [Collections|CollectionCells] Updates outdated comments referring to style/editing manager. Summary: Closes #521 Reviewers: #mdc_ios_owners, ajsecord Reviewed By: #mdc_ios_owners, ajsecord Projects: #material_components_ios Differential Revision: http://codereview.cc/D871 --- components/CollectionCells/src/MDCCollectionViewCell.h | 4 ++-- components/Collections/src/MDCCollectionViewController.h | 2 +- .../Collections/src/MDCCollectionViewEditingDelegate.h | 8 ++++---- components/Collections/src/MDCCollectionViewFlowLayout.m | 2 +- .../Collections/src/MDCCollectionViewStylingDelegate.h | 2 +- .../Collections/src/private/MDCCollectionViewStyler.h | 2 +- .../Collections/src/private/MDCCollectionViewStyler.m | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/CollectionCells/src/MDCCollectionViewCell.h b/components/CollectionCells/src/MDCCollectionViewCell.h index 6580b48b3c5..2f7a8b82f5c 100644 --- a/components/CollectionCells/src/MDCCollectionViewCell.h +++ b/components/CollectionCells/src/MDCCollectionViewCell.h @@ -52,14 +52,14 @@ typedef NS_ENUM(NSUInteger, MDCCollectionViewCellAccessoryType) { /** Whether to hide the separator for this cell. If not set, the |shouldHideSeparators| property of - the collection view style manager will be used. Defaults to NO. + the collection view styler will be used. Defaults to NO. */ @property(nonatomic) BOOL shouldHideSeparator; /** The separator inset for this cell. Only left/right insets are valid as top/bottom insets will be ignored. If this property is not changed, the |separatorInset| property of the collection view - style manager will be used instead. Defaults to UIEdgeInsetsZero. + styler will be used instead. Defaults to UIEdgeInsetsZero. */ @property(nonatomic) UIEdgeInsets separatorInset; diff --git a/components/Collections/src/MDCCollectionViewController.h b/components/Collections/src/MDCCollectionViewController.h index 41d65f8e0f3..b953fb14d0a 100644 --- a/components/Collections/src/MDCCollectionViewController.h +++ b/components/Collections/src/MDCCollectionViewController.h @@ -38,7 +38,7 @@ /** The collection view styler. */ @property(nonatomic, strong, readonly, nonnull) id styler; -/** The collection view editing manager. */ +/** The collection view editor. */ @property(nonatomic, strong, readonly, nonnull) id editor; #pragma mark - Subclassing diff --git a/components/Collections/src/MDCCollectionViewEditingDelegate.h b/components/Collections/src/MDCCollectionViewEditingDelegate.h index 03f0d0d099c..41721871bf4 100644 --- a/components/Collections/src/MDCCollectionViewEditingDelegate.h +++ b/components/Collections/src/MDCCollectionViewEditingDelegate.h @@ -39,7 +39,7 @@ /** Sent to the receiver when the collection view will begin editing. Typically this method will be - called from a collection view editing manager that has had its editing property set to YES. + called from a collection view editor that has had its editing property set to YES. This will be called before any animations to editing state will begin. @param collectionView The collection view. @@ -48,7 +48,7 @@ /** Sent to the receiver when the collection view did begin editing. Typically this method will be - called from a collection view editing manager that has had its editing property set to YES. + called from a collection view editor that has had its editing property set to YES. This is called after animations to editing state have completed. @param collectionView The collection view. @@ -57,7 +57,7 @@ /** Sent to the receiver when the collection view will end editing. Typically this method will be - called from a collection view editing manager that has had its editing property set to NO. + called from a collection view editor that has had its editing property set to NO. This will be called before any animations from editing state begin. @param collectionView The collection view. @@ -66,7 +66,7 @@ /** Sent to the receiver when the collection view did end editing. Typically this method will be - called from a collection view editing manager that has had its editing property set to NO. + called from a collection view editor that has had its editing property set to NO. This is called after animations from editing state have completed. @param collectionView The collection view. diff --git a/components/Collections/src/MDCCollectionViewFlowLayout.m b/components/Collections/src/MDCCollectionViewFlowLayout.m index 3b48bc6a7f8..83c3e3ea66c 100644 --- a/components/Collections/src/MDCCollectionViewFlowLayout.m +++ b/components/Collections/src/MDCCollectionViewFlowLayout.m @@ -643,7 +643,7 @@ - (void)addDecorationViewIfNecessary:(NSMutableArray *)attributes { // for a grid layout when it is either A) grouped-style or B) card-style with zero padding. When // this happens, the background for those items will not be drawn, and instead this decoration // view will extend to the bounds of the sum of its respective section item frames. Shadowing and - // border will be applied to this decoration view as per the style manager settings. + // border will be applied to this decoration view as per the styler settings. if (self.styler.cellLayoutType == MDCCollectionViewCellLayoutTypeGrid) { NSMutableSet *sectionSet = [NSMutableSet set]; BOOL shouldShowGridBackground = NO; diff --git a/components/Collections/src/MDCCollectionViewStylingDelegate.h b/components/Collections/src/MDCCollectionViewStylingDelegate.h index 7a99214f23c..ab88bbe249b 100644 --- a/components/Collections/src/MDCCollectionViewStylingDelegate.h +++ b/components/Collections/src/MDCCollectionViewStylingDelegate.h @@ -41,7 +41,7 @@ /** Asks the delegate for the cell style at the specified collection view section index. All - remaining sections to have their cells styled per the style managers |cellStyle| property. + remaining sections to have their cells styled per the styler |cellStyle| property. @param collectionView The collection view. @param section The collection view section. diff --git a/components/Collections/src/private/MDCCollectionViewStyler.h b/components/Collections/src/private/MDCCollectionViewStyler.h index ece6adb9036..bdc5797ca68 100644 --- a/components/Collections/src/private/MDCCollectionViewStyler.h +++ b/components/Collections/src/private/MDCCollectionViewStyler.h @@ -25,7 +25,7 @@ - (nonnull instancetype)init NS_UNAVAILABLE; /** - Initializes and returns a newly allocated style manager object with the specified collection view. + Initializes and returns a newly allocated styler object with the specified collection view. Designated initializer. diff --git a/components/Collections/src/private/MDCCollectionViewStyler.m b/components/Collections/src/private/MDCCollectionViewStyler.m index 07f3046ba36..6f154190fa5 100644 --- a/components/Collections/src/private/MDCCollectionViewStyler.m +++ b/components/Collections/src/private/MDCCollectionViewStyler.m @@ -524,7 +524,7 @@ - (UIImage *)backgroundImageForCellLayoutAttributes:(MDCCollectionViewLayoutAttr isHighlighted:isHighlighted]; if (backgroundCacheKey > BackgroundCacheKeyMax) { - NSAssert(NO, @"Invalid style manager cell background cache key"); + NSAssert(NO, @"Invalid styler cell background cache key"); return nil; } From 0a8c80d8a72814e5a8e200a7590b53ba3fe0f901 Mon Sep 17 00:00:00 2001 From: Junius Gunaratne Date: Mon, 16 May 2016 14:17:50 -0400 Subject: [PATCH 14/22] [Catalog] Make sure reused cells have correct color and icon Summary: https://github.com/google/material-components-ios/issues/500 Reviewers: featherless, ajsecord, #mdc_ios_owners Reviewed By: ajsecord, #mdc_ios_owners Projects: #material_components_ios Differential Revision: http://codereview.cc/D872 --- catalog/MDCCatalog/MDCNodeListViewController.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/catalog/MDCCatalog/MDCNodeListViewController.swift b/catalog/MDCCatalog/MDCNodeListViewController.swift index e61b0b2adc6..756ac42ec4a 100644 --- a/catalog/MDCCatalog/MDCNodeListViewController.swift +++ b/catalog/MDCCatalog/MDCNodeListViewController.swift @@ -31,6 +31,11 @@ class NodeViewTableViewDemoCell: UITableViewCell { super.init(coder: coder)! } + override func prepareForReuse() { + super.prepareForReuse() + textLabel!.textColor = UIColor.blackColor() + imageView!.image = UIImage(named: "Demo") + } } class MDCNodeListViewController: CBCNodeListViewController { From 8a7d7cfab162e006dd0b0e39a65b478a51de77eb Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 18 May 2016 15:19:57 -0400 Subject: [PATCH 15/22] [release scripts] Fix error messaging for release cut script. Reviewers: #mdc_ios_owners, featherless Reviewed By: #mdc_ios_owners, featherless Projects: #material_components_ios Differential Revision: http://codereview.cc/D876 --- scripts/release/cut | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/release/cut b/scripts/release/cut index 291ac11e606..44b4b2a0852 100755 --- a/scripts/release/cut +++ b/scripts/release/cut @@ -22,11 +22,12 @@ MDC_ROOT="$(git rev-parse --show-toplevel | tail -n1)"; popd >> /dev/null cd $MDC_ROOT if [ ! $(git rev-parse --verify release-candidate 2> /dev/null) ]; then - git fetch - git checkout -b release-candidate origin/develop + git fetch + git checkout -b release-candidate origin/develop git push origin release-candidate else - echo "Release already cut." + echo "Release already cut. Consider deleting the existing release-candidate branch." + exit 1 fi # Prepare the CHANGELOG for updates. From 98cd8f6c7ce0add90d76587c2f323e3cdd6f8e4a Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 18 May 2016 16:14:08 -0400 Subject: [PATCH 16/22] cut release for May 18, 2016. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1928b9ede8..b6d2cbd33f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# release-candidate TODO: Replace me with version number. + # 7.0.0 ## API diffs From 756b3c4818d58b186b94de271df965a9f8228a2f Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 18 May 2016 16:31:32 -0400 Subject: [PATCH 17/22] Added API diff to CHANGELOG.md. --- CHANGELOG.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6d2cbd33f1..c8f471522a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,22 @@ -# release-candidate TODO: Replace me with version number. +# release-candidate TODO: Replace me with version number. + +## API diffs + +Auto-generated by running: + + scripts/api_diff -o 2153f8fa453ecec4dfe48a328e331846d5d37aac -n 98cd8f6c7ce0add90d76587c2f323e3cdd6f8e4a + +### ButtonBar + +- [modified] [`MDCButtonBar (Builder)`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L177) + +| From | To | Kind | +|:---- |:-- |:---- | +| `MDCButtonBar.h` | `private/MDCButtonBar+Private.h` | `header` | + +### NavigationBar + +- [deleted] [`MDCUINavigationItemKVO`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L91) # 7.0.0 From 2bf85ab35f644cf3913dcd8b69127fd3ef9f510e Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 18 May 2016 16:34:14 -0400 Subject: [PATCH 18/22] Added API changes to CHANGELOG.md. --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8f471522a2..1ed775e0e2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,40 @@ Auto-generated by running: - [deleted] [`MDCUINavigationItemKVO`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L91) +## Component changes + +### AppBar + +#### Changes + +* [Remove deprecated headerViewController property from MDCAppBarContainerViewController.](https://github.com/google/material-components-ios/commit/dbfc6b783d40e229708af1ee956ded363f621601) (Jeff Verkoeyen) + +### ButtonBar + +#### Changes + +* [Propagate the NavigationBar tint color to the bar button items.](https://github.com/google/material-components-ios/commit/39bda0a60728a5989971cb0a09ee8d40b7bd4f09) (Louis Romero) +* [Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen) + +### CollectionCells + +#### Changes + +* [[Collections|CollectionCells] Updates outdated comments referring to style/editing manager.](https://github.com/google/material-components-ios/commit/120030631e3a695559a49100e62cb7a88502cb3b) (Chris Cox) + +### Collections + +#### Changes + +* [Adds border to editing action bar](https://github.com/google/material-components-ios/commit/3e7ce26bacd4ee94177bf3daab0c03d2281a6723) (Chris Cox) +* [[Collections|CollectionCells] Updates outdated comments referring to style/editing manager.](https://github.com/google/material-components-ios/commit/120030631e3a695559a49100e62cb7a88502cb3b) (Chris Cox) + +### NavigationBar + +#### Changes + +* [[ButtonBar] Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen) + # 7.0.0 ## API diffs From b2d61461b3f8118ba009e931df49d75bfa54fc5e Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 18 May 2016 16:45:45 -0400 Subject: [PATCH 19/22] Bumped version number to 8.0.0. --- CHANGELOG.md | 2 +- MaterialComponents.podspec | 2 +- MaterialComponentsCatalog.podspec | 2 +- MaterialComponentsUnitTests.podspec | 2 +- catalog/Podfile.lock | 140 ++++++++++++++-------------- demos/Pesto/Podfile.lock | 132 +++++++++++++------------- demos/Shrine/Podfile.lock | 132 +++++++++++++------------- 7 files changed, 206 insertions(+), 206 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed775e0e2f..bf24314dbf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# release-candidate TODO: Replace me with version number. +# 8.0.0 ## API diffs diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec index 0a8a5b3317a..582cebeeeb2 100644 --- a/MaterialComponents.podspec +++ b/MaterialComponents.podspec @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb' Pod::Spec.new do |s| s.name = "MaterialComponents" - s.version = "7.0.0" + s.version = "8.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec index 0ae5ee2e0d5..5a7e1f43497 100644 --- a/MaterialComponentsCatalog.podspec +++ b/MaterialComponentsCatalog.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsCatalog" - s.version = "7.0.0" + s.version = "8.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec index 8dbc05b855e..942edb7c84c 100644 --- a/MaterialComponentsUnitTests.podspec +++ b/MaterialComponentsUnitTests.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MaterialComponentsUnitTests" - s.version = "7.0.0" + s.version = "8.0.0" s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' } s.summary = "A collection of stand-alone production-ready UI libraries focused on design details." s.homepage = "https://github.com/google/material-components-ios" diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock index 931e826aa60..90181bc564c 100644 --- a/catalog/Podfile.lock +++ b/catalog/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (7.0.0): - - MaterialComponents/AppBar (= 7.0.0) - - MaterialComponents/ButtonBar (= 7.0.0) - - MaterialComponents/Buttons (= 7.0.0) - - MaterialComponents/CollectionCells (= 7.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) - - MaterialComponents/Collections (= 7.0.0) - - MaterialComponents/FlexibleHeader (= 7.0.0) - - MaterialComponents/FontDiskLoader (= 7.0.0) - - MaterialComponents/HeaderStackView (= 7.0.0) - - MaterialComponents/Ink (= 7.0.0) - - MaterialComponents/NavigationBar (= 7.0.0) - - MaterialComponents/PageControl (= 7.0.0) - - MaterialComponents/Palettes (= 7.0.0) - - MaterialComponents/private (= 7.0.0) - - MaterialComponents/RobotoFontLoader (= 7.0.0) - - MaterialComponents/ShadowElevations (= 7.0.0) - - MaterialComponents/ShadowLayer (= 7.0.0) - - MaterialComponents/Slider (= 7.0.0) - - MaterialComponents/SpritedAnimationView (= 7.0.0) - - MaterialComponents/Switch (= 7.0.0) - - MaterialComponents/Typography (= 7.0.0) - - MaterialComponents/AppBar (7.0.0): + - MaterialComponents (8.0.0): + - MaterialComponents/AppBar (= 8.0.0) + - MaterialComponents/ButtonBar (= 8.0.0) + - MaterialComponents/Buttons (= 8.0.0) + - MaterialComponents/CollectionCells (= 8.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 8.0.0) + - MaterialComponents/Collections (= 8.0.0) + - MaterialComponents/FlexibleHeader (= 8.0.0) + - MaterialComponents/FontDiskLoader (= 8.0.0) + - MaterialComponents/HeaderStackView (= 8.0.0) + - MaterialComponents/Ink (= 8.0.0) + - MaterialComponents/NavigationBar (= 8.0.0) + - MaterialComponents/PageControl (= 8.0.0) + - MaterialComponents/Palettes (= 8.0.0) + - MaterialComponents/private (= 8.0.0) + - MaterialComponents/RobotoFontLoader (= 8.0.0) + - MaterialComponents/ShadowElevations (= 8.0.0) + - MaterialComponents/ShadowLayer (= 8.0.0) + - MaterialComponents/Slider (= 8.0.0) + - MaterialComponents/SpritedAnimationView (= 8.0.0) + - MaterialComponents/Switch (= 8.0.0) + - MaterialComponents/Typography (= 8.0.0) + - MaterialComponents/AppBar (8.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (7.0.0): + - MaterialComponents/ButtonBar (8.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (7.0.0): + - MaterialComponents/Buttons (8.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (7.0.0): + - MaterialComponents/CollectionCells (8.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,71 +46,71 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (7.0.0) - - MaterialComponents/Collections (7.0.0): + - MaterialComponents/CollectionLayoutAttributes (8.0.0) + - MaterialComponents/Collections (8.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (7.0.0) - - MaterialComponents/FontDiskLoader (7.0.0) - - MaterialComponents/HeaderStackView (7.0.0) - - MaterialComponents/Ink (7.0.0) - - MaterialComponents/NavigationBar (7.0.0): + - MaterialComponents/FlexibleHeader (8.0.0) + - MaterialComponents/FontDiskLoader (8.0.0) + - MaterialComponents/HeaderStackView (8.0.0) + - MaterialComponents/Ink (8.0.0) + - MaterialComponents/NavigationBar (8.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (7.0.0) - - MaterialComponents/Palettes (7.0.0) - - MaterialComponents/private (7.0.0): - - MaterialComponents/private/Color (= 7.0.0) - - MaterialComponents/private/Icons (= 7.0.0) - - MaterialComponents/private/ThumbTrack (= 7.0.0) - - MaterialComponents/private/Color (7.0.0) - - MaterialComponents/private/Icons (7.0.0): - - MaterialComponents/private/Icons/Base (= 7.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) - - MaterialComponents/private/Icons/ic_check (= 7.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) - - MaterialComponents/private/Icons/ic_info (= 7.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) - - MaterialComponents/private/Icons/Base (7.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): + - MaterialComponents/PageControl (8.0.0) + - MaterialComponents/Palettes (8.0.0) + - MaterialComponents/private (8.0.0): + - MaterialComponents/private/Color (= 8.0.0) + - MaterialComponents/private/Icons (= 8.0.0) + - MaterialComponents/private/ThumbTrack (= 8.0.0) + - MaterialComponents/private/Color (8.0.0) + - MaterialComponents/private/Icons (8.0.0): + - MaterialComponents/private/Icons/Base (= 8.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 8.0.0) + - MaterialComponents/private/Icons/ic_check (= 8.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 8.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 8.0.0) + - MaterialComponents/private/Icons/ic_info (= 8.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 8.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 8.0.0) + - MaterialComponents/private/Icons/Base (8.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (7.0.0): + - MaterialComponents/private/Icons/ic_check (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (7.0.0): + - MaterialComponents/private/Icons/ic_check_circle (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (7.0.0): + - MaterialComponents/private/Icons/ic_info (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (7.0.0): + - MaterialComponents/private/Icons/ic_reorder (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (7.0.0): + - MaterialComponents/private/ThumbTrack (8.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (7.0.0): + - MaterialComponents/RobotoFontLoader (8.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (7.0.0) - - MaterialComponents/ShadowLayer (7.0.0) - - MaterialComponents/Slider (7.0.0): + - MaterialComponents/ShadowElevations (8.0.0) + - MaterialComponents/ShadowLayer (8.0.0) + - MaterialComponents/Slider (8.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (7.0.0) - - MaterialComponents/Switch (7.0.0): + - MaterialComponents/SpritedAnimationView (8.0.0) + - MaterialComponents/Switch (8.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (7.0.0) - - MaterialComponentsCatalog (7.0.0): + - MaterialComponents/Typography (8.0.0) + - MaterialComponentsCatalog (8.0.0): - MaterialComponents - - MaterialComponentsUnitTests (7.0.0): + - MaterialComponentsUnitTests (8.0.0): - MaterialComponents DEPENDENCIES: @@ -127,8 +127,8 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b - MaterialComponentsCatalog: 2e00536c71df5c61ea8e92a69dc8244a325f5b57 - MaterialComponentsUnitTests: 175a3adb1e4992f4de97b4a8ce4c537dd056427c + MaterialComponents: 90bd29126ba886836955104dde0826133b87b6bf + MaterialComponentsCatalog: 28ec795de4429c127bce24d528d0259fa902fe4d + MaterialComponentsUnitTests: 2d5883eb8da10c778cf81b55a24bc025b8c78a62 COCOAPODS: 0.39.0 diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock index 31412ae8887..b7975db0287 100644 --- a/demos/Pesto/Podfile.lock +++ b/demos/Pesto/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (7.0.0): - - MaterialComponents/AppBar (= 7.0.0) - - MaterialComponents/ButtonBar (= 7.0.0) - - MaterialComponents/Buttons (= 7.0.0) - - MaterialComponents/CollectionCells (= 7.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) - - MaterialComponents/Collections (= 7.0.0) - - MaterialComponents/FlexibleHeader (= 7.0.0) - - MaterialComponents/FontDiskLoader (= 7.0.0) - - MaterialComponents/HeaderStackView (= 7.0.0) - - MaterialComponents/Ink (= 7.0.0) - - MaterialComponents/NavigationBar (= 7.0.0) - - MaterialComponents/PageControl (= 7.0.0) - - MaterialComponents/Palettes (= 7.0.0) - - MaterialComponents/private (= 7.0.0) - - MaterialComponents/RobotoFontLoader (= 7.0.0) - - MaterialComponents/ShadowElevations (= 7.0.0) - - MaterialComponents/ShadowLayer (= 7.0.0) - - MaterialComponents/Slider (= 7.0.0) - - MaterialComponents/SpritedAnimationView (= 7.0.0) - - MaterialComponents/Switch (= 7.0.0) - - MaterialComponents/Typography (= 7.0.0) - - MaterialComponents/AppBar (7.0.0): + - MaterialComponents (8.0.0): + - MaterialComponents/AppBar (= 8.0.0) + - MaterialComponents/ButtonBar (= 8.0.0) + - MaterialComponents/Buttons (= 8.0.0) + - MaterialComponents/CollectionCells (= 8.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 8.0.0) + - MaterialComponents/Collections (= 8.0.0) + - MaterialComponents/FlexibleHeader (= 8.0.0) + - MaterialComponents/FontDiskLoader (= 8.0.0) + - MaterialComponents/HeaderStackView (= 8.0.0) + - MaterialComponents/Ink (= 8.0.0) + - MaterialComponents/NavigationBar (= 8.0.0) + - MaterialComponents/PageControl (= 8.0.0) + - MaterialComponents/Palettes (= 8.0.0) + - MaterialComponents/private (= 8.0.0) + - MaterialComponents/RobotoFontLoader (= 8.0.0) + - MaterialComponents/ShadowElevations (= 8.0.0) + - MaterialComponents/ShadowLayer (= 8.0.0) + - MaterialComponents/Slider (= 8.0.0) + - MaterialComponents/SpritedAnimationView (= 8.0.0) + - MaterialComponents/Switch (= 8.0.0) + - MaterialComponents/Typography (= 8.0.0) + - MaterialComponents/AppBar (8.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (7.0.0): + - MaterialComponents/ButtonBar (8.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (7.0.0): + - MaterialComponents/Buttons (8.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (7.0.0): + - MaterialComponents/CollectionCells (8.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,68 +46,68 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (7.0.0) - - MaterialComponents/Collections (7.0.0): + - MaterialComponents/CollectionLayoutAttributes (8.0.0) + - MaterialComponents/Collections (8.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (7.0.0) - - MaterialComponents/FontDiskLoader (7.0.0) - - MaterialComponents/HeaderStackView (7.0.0) - - MaterialComponents/Ink (7.0.0) - - MaterialComponents/NavigationBar (7.0.0): + - MaterialComponents/FlexibleHeader (8.0.0) + - MaterialComponents/FontDiskLoader (8.0.0) + - MaterialComponents/HeaderStackView (8.0.0) + - MaterialComponents/Ink (8.0.0) + - MaterialComponents/NavigationBar (8.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (7.0.0) - - MaterialComponents/Palettes (7.0.0) - - MaterialComponents/private (7.0.0): - - MaterialComponents/private/Color (= 7.0.0) - - MaterialComponents/private/Icons (= 7.0.0) - - MaterialComponents/private/ThumbTrack (= 7.0.0) - - MaterialComponents/private/Color (7.0.0) - - MaterialComponents/private/Icons (7.0.0): - - MaterialComponents/private/Icons/Base (= 7.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) - - MaterialComponents/private/Icons/ic_check (= 7.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) - - MaterialComponents/private/Icons/ic_info (= 7.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) - - MaterialComponents/private/Icons/Base (7.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): + - MaterialComponents/PageControl (8.0.0) + - MaterialComponents/Palettes (8.0.0) + - MaterialComponents/private (8.0.0): + - MaterialComponents/private/Color (= 8.0.0) + - MaterialComponents/private/Icons (= 8.0.0) + - MaterialComponents/private/ThumbTrack (= 8.0.0) + - MaterialComponents/private/Color (8.0.0) + - MaterialComponents/private/Icons (8.0.0): + - MaterialComponents/private/Icons/Base (= 8.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 8.0.0) + - MaterialComponents/private/Icons/ic_check (= 8.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 8.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 8.0.0) + - MaterialComponents/private/Icons/ic_info (= 8.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 8.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 8.0.0) + - MaterialComponents/private/Icons/Base (8.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (7.0.0): + - MaterialComponents/private/Icons/ic_check (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (7.0.0): + - MaterialComponents/private/Icons/ic_check_circle (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (7.0.0): + - MaterialComponents/private/Icons/ic_info (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (7.0.0): + - MaterialComponents/private/Icons/ic_reorder (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (7.0.0): + - MaterialComponents/private/ThumbTrack (8.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (7.0.0): + - MaterialComponents/RobotoFontLoader (8.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (7.0.0) - - MaterialComponents/ShadowLayer (7.0.0) - - MaterialComponents/Slider (7.0.0): + - MaterialComponents/ShadowElevations (8.0.0) + - MaterialComponents/ShadowLayer (8.0.0) + - MaterialComponents/Slider (8.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (7.0.0) - - MaterialComponents/Switch (7.0.0): + - MaterialComponents/SpritedAnimationView (8.0.0) + - MaterialComponents/Switch (8.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (7.0.0) + - MaterialComponents/Typography (8.0.0) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -117,6 +117,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b + MaterialComponents: 90bd29126ba886836955104dde0826133b87b6bf COCOAPODS: 0.39.0 diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock index 31412ae8887..b7975db0287 100644 --- a/demos/Shrine/Podfile.lock +++ b/demos/Shrine/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - MaterialComponents (7.0.0): - - MaterialComponents/AppBar (= 7.0.0) - - MaterialComponents/ButtonBar (= 7.0.0) - - MaterialComponents/Buttons (= 7.0.0) - - MaterialComponents/CollectionCells (= 7.0.0) - - MaterialComponents/CollectionLayoutAttributes (= 7.0.0) - - MaterialComponents/Collections (= 7.0.0) - - MaterialComponents/FlexibleHeader (= 7.0.0) - - MaterialComponents/FontDiskLoader (= 7.0.0) - - MaterialComponents/HeaderStackView (= 7.0.0) - - MaterialComponents/Ink (= 7.0.0) - - MaterialComponents/NavigationBar (= 7.0.0) - - MaterialComponents/PageControl (= 7.0.0) - - MaterialComponents/Palettes (= 7.0.0) - - MaterialComponents/private (= 7.0.0) - - MaterialComponents/RobotoFontLoader (= 7.0.0) - - MaterialComponents/ShadowElevations (= 7.0.0) - - MaterialComponents/ShadowLayer (= 7.0.0) - - MaterialComponents/Slider (= 7.0.0) - - MaterialComponents/SpritedAnimationView (= 7.0.0) - - MaterialComponents/Switch (= 7.0.0) - - MaterialComponents/Typography (= 7.0.0) - - MaterialComponents/AppBar (7.0.0): + - MaterialComponents (8.0.0): + - MaterialComponents/AppBar (= 8.0.0) + - MaterialComponents/ButtonBar (= 8.0.0) + - MaterialComponents/Buttons (= 8.0.0) + - MaterialComponents/CollectionCells (= 8.0.0) + - MaterialComponents/CollectionLayoutAttributes (= 8.0.0) + - MaterialComponents/Collections (= 8.0.0) + - MaterialComponents/FlexibleHeader (= 8.0.0) + - MaterialComponents/FontDiskLoader (= 8.0.0) + - MaterialComponents/HeaderStackView (= 8.0.0) + - MaterialComponents/Ink (= 8.0.0) + - MaterialComponents/NavigationBar (= 8.0.0) + - MaterialComponents/PageControl (= 8.0.0) + - MaterialComponents/Palettes (= 8.0.0) + - MaterialComponents/private (= 8.0.0) + - MaterialComponents/RobotoFontLoader (= 8.0.0) + - MaterialComponents/ShadowElevations (= 8.0.0) + - MaterialComponents/ShadowLayer (= 8.0.0) + - MaterialComponents/Slider (= 8.0.0) + - MaterialComponents/SpritedAnimationView (= 8.0.0) + - MaterialComponents/Switch (= 8.0.0) + - MaterialComponents/Typography (= 8.0.0) + - MaterialComponents/AppBar (8.0.0): - MaterialComponents/FlexibleHeader - MaterialComponents/HeaderStackView - MaterialComponents/NavigationBar @@ -29,14 +29,14 @@ PODS: - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/ButtonBar (7.0.0): + - MaterialComponents/ButtonBar (8.0.0): - MaterialComponents/Buttons - - MaterialComponents/Buttons (7.0.0): + - MaterialComponents/Buttons (8.0.0): - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/CollectionCells (7.0.0): + - MaterialComponents/CollectionCells (8.0.0): - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/private/Icons/ic_check @@ -46,68 +46,68 @@ PODS: - MaterialComponents/private/Icons/ic_radio_button_unchecked - MaterialComponents/private/Icons/ic_reorder - MaterialComponents/Typography - - MaterialComponents/CollectionLayoutAttributes (7.0.0) - - MaterialComponents/Collections (7.0.0): + - MaterialComponents/CollectionLayoutAttributes (8.0.0) + - MaterialComponents/Collections (8.0.0): - MaterialComponents/CollectionCells - MaterialComponents/CollectionLayoutAttributes - MaterialComponents/Ink - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - MaterialComponents/Typography - - MaterialComponents/FlexibleHeader (7.0.0) - - MaterialComponents/FontDiskLoader (7.0.0) - - MaterialComponents/HeaderStackView (7.0.0) - - MaterialComponents/Ink (7.0.0) - - MaterialComponents/NavigationBar (7.0.0): + - MaterialComponents/FlexibleHeader (8.0.0) + - MaterialComponents/FontDiskLoader (8.0.0) + - MaterialComponents/HeaderStackView (8.0.0) + - MaterialComponents/Ink (8.0.0) + - MaterialComponents/NavigationBar (8.0.0): - MaterialComponents/ButtonBar - MaterialComponents/Typography - - MaterialComponents/PageControl (7.0.0) - - MaterialComponents/Palettes (7.0.0) - - MaterialComponents/private (7.0.0): - - MaterialComponents/private/Color (= 7.0.0) - - MaterialComponents/private/Icons (= 7.0.0) - - MaterialComponents/private/ThumbTrack (= 7.0.0) - - MaterialComponents/private/Color (7.0.0) - - MaterialComponents/private/Icons (7.0.0): - - MaterialComponents/private/Icons/Base (= 7.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0) - - MaterialComponents/private/Icons/ic_check (= 7.0.0) - - MaterialComponents/private/Icons/ic_check_circle (= 7.0.0) - - MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0) - - MaterialComponents/private/Icons/ic_info (= 7.0.0) - - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0) - - MaterialComponents/private/Icons/ic_reorder (= 7.0.0) - - MaterialComponents/private/Icons/Base (7.0.0) - - MaterialComponents/private/Icons/ic_arrow_back (7.0.0): + - MaterialComponents/PageControl (8.0.0) + - MaterialComponents/Palettes (8.0.0) + - MaterialComponents/private (8.0.0): + - MaterialComponents/private/Color (= 8.0.0) + - MaterialComponents/private/Icons (= 8.0.0) + - MaterialComponents/private/ThumbTrack (= 8.0.0) + - MaterialComponents/private/Color (8.0.0) + - MaterialComponents/private/Icons (8.0.0): + - MaterialComponents/private/Icons/Base (= 8.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (= 8.0.0) + - MaterialComponents/private/Icons/ic_check (= 8.0.0) + - MaterialComponents/private/Icons/ic_check_circle (= 8.0.0) + - MaterialComponents/private/Icons/ic_chevron_right (= 8.0.0) + - MaterialComponents/private/Icons/ic_info (= 8.0.0) + - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 8.0.0) + - MaterialComponents/private/Icons/ic_reorder (= 8.0.0) + - MaterialComponents/private/Icons/Base (8.0.0) + - MaterialComponents/private/Icons/ic_arrow_back (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check (7.0.0): + - MaterialComponents/private/Icons/ic_check (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_check_circle (7.0.0): + - MaterialComponents/private/Icons/ic_check_circle (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_chevron_right (7.0.0): + - MaterialComponents/private/Icons/ic_chevron_right (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_info (7.0.0): + - MaterialComponents/private/Icons/ic_info (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0): + - MaterialComponents/private/Icons/ic_radio_button_unchecked (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/Icons/ic_reorder (7.0.0): + - MaterialComponents/private/Icons/ic_reorder (8.0.0): - MaterialComponents/private/Icons/Base - - MaterialComponents/private/ThumbTrack (7.0.0): + - MaterialComponents/private/ThumbTrack (8.0.0): - MaterialComponents/Ink - MaterialComponents/private/Color - MaterialComponents/ShadowElevations - MaterialComponents/ShadowLayer - - MaterialComponents/RobotoFontLoader (7.0.0): + - MaterialComponents/RobotoFontLoader (8.0.0): - MaterialComponents/FontDiskLoader - MaterialComponents/Typography - - MaterialComponents/ShadowElevations (7.0.0) - - MaterialComponents/ShadowLayer (7.0.0) - - MaterialComponents/Slider (7.0.0): + - MaterialComponents/ShadowElevations (8.0.0) + - MaterialComponents/ShadowLayer (8.0.0) + - MaterialComponents/Slider (8.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/SpritedAnimationView (7.0.0) - - MaterialComponents/Switch (7.0.0): + - MaterialComponents/SpritedAnimationView (8.0.0) + - MaterialComponents/Switch (8.0.0): - MaterialComponents/private/ThumbTrack - - MaterialComponents/Typography (7.0.0) + - MaterialComponents/Typography (8.0.0) DEPENDENCIES: - MaterialComponents (from `../../`) @@ -117,6 +117,6 @@ EXTERNAL SOURCES: :path: ../../ SPEC CHECKSUMS: - MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b + MaterialComponents: 90bd29126ba886836955104dde0826133b87b6bf COCOAPODS: 0.39.0 From 216914a10068d9c2c2aa6cc76865d55d59defc32 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Mon, 23 May 2016 12:17:14 -0400 Subject: [PATCH 20/22] Regenerate CHANGELOG.md API diffs with jverkoey/objc-diff fork. --- CHANGELOG.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf24314dbf5..3efb500587f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,18 +4,27 @@ Auto-generated by running: - scripts/api_diff -o 2153f8fa453ecec4dfe48a328e331846d5d37aac -n 98cd8f6c7ce0add90d76587c2f323e3cdd6f8e4a + scripts/api_diff -o 2153f8fa453ecec4dfe48a328e331846d5d37aac -n bbabb375953fbd01c3f818ac9092b55fe56dd9b9 -### ButtonBar +### AppBar -- [modified] [`MDCButtonBar (Builder)`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L177) +- [deleted] [`-[MDCAppBarContainerViewController headerViewController]`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/AppBar/src/MDCAppBarContainerViewController.h#L69) +- [deleted] [`MDCAppBarContainerViewController ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/AppBar/src/MDCAppBarContainerViewController.h#L66) -| From | To | Kind | -|:---- |:-- |:---- | -| `MDCButtonBar.h` | `private/MDCButtonBar+Private.h` | `header` | +### ButtonBar + +- [deleted] [`-[MDCButtonBar reloadButtonViews]`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L166) +- [deleted] [`MDCButtonBar ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L155) +- [deleted] [`MDCButtonBar.buttonItems`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L158) +- [deleted] [`MDCButtonBar.delegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L162) +- [moved] [`MDCButtonBar (Builder)`](https://github.com/google/material-components-ios/blob/bbabb375953fbd01c3f818ac9092b55fe56dd9b9/components/ButtonBar/src/MDCButtonBar.h#L177). +From *MDCButtonBar.h* to *private/MDCButtonBar+Private.h*. ### NavigationBar +- [deleted] [`MDCNavigationBar ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L94) +- [deleted] [`MDCNavigationBar.leftButtonBarDelegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L97) +- [deleted] [`MDCNavigationBar.rightButtonBarDelegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L101) - [deleted] [`MDCUINavigationItemKVO`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L91) ## Component changes From 8150284ad514b6e9241bbddac9e6cfc98b34e35b Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Mon, 23 May 2016 12:39:54 -0400 Subject: [PATCH 21/22] Add sha for when we ran objc-diff. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3efb500587f..e2814292275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## API diffs -Auto-generated by running: +Auto-generated by running the following while checked out at +`4bc99e8ad0fe0ac7e9acc044591a8581165fb5c2`: scripts/api_diff -o 2153f8fa453ecec4dfe48a328e331846d5d37aac -n bbabb375953fbd01c3f818ac9092b55fe56dd9b9 From e9987321f40d6d014b5fa8cc5e14fe78dc7cae89 Mon Sep 17 00:00:00 2001 From: randallli Date: Mon, 23 May 2016 12:48:10 -0400 Subject: [PATCH 22/22] reedited deleted changes to breaking changes --- CHANGELOG.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2814292275..7c02756740b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,16 +32,20 @@ From *MDCButtonBar.h* to *private/MDCButtonBar+Private.h*. ### AppBar -#### Changes +#### Breaking changes * [Remove deprecated headerViewController property from MDCAppBarContainerViewController.](https://github.com/google/material-components-ios/commit/dbfc6b783d40e229708af1ee956ded363f621601) (Jeff Verkoeyen) ### ButtonBar +#### Breaking changes + +* [Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen) + #### Changes * [Propagate the NavigationBar tint color to the bar button items.](https://github.com/google/material-components-ios/commit/39bda0a60728a5989971cb0a09ee8d40b7bd4f09) (Louis Romero) -* [Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen) + ### CollectionCells @@ -58,7 +62,7 @@ From *MDCButtonBar.h* to *private/MDCButtonBar+Private.h*. ### NavigationBar -#### Changes +#### Breaking changes * [[ButtonBar] Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen)