Merge branch 'release-candidate'

material-components · Jun 1, 2016 · dc74cd2 · dc74cd2
2 parents 0c97c7e + 4afea7d
commit dc74cd2
Show file tree

Hide file tree

Showing 35 changed files with 1,502 additions and 3,138 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 10.0.0
+
+## Infrastructure
+
+Material Components iOS now [requires Cocoapods 1.0.0](https://groups.google.com/d/topic/material-components-ios-discuss/FnipGJXMeww/discussion).
+
+## API diffs
+
+Auto-generated by running:
+
+    scripts/api_diff -o 0c97c7e25888d9da312c8610e21aa635cf9fb395 -n 1fc92b09a8539cf235667c4b2fb83c0f52578d65
+
+### RobotoFontLoader
+
+- [deleted] [`-[MDCRobotoFontLoader init]`](https://github.com/google/material-components-ios/blob/0c97c7e25888d9da312c8610e21aa635cf9fb395/components/RobotoFontLoader/src/MDCRobotoFontLoader.h#L33)
+
 # 9.0.0
 
 ## API diffs
@@ -29,6 +45,58 @@ Auto-generated by running:
 - [protocols changed] [`MDCNavigationBar`](https://github.com/google/material-components-ios/blob/636df09ea57a7cdefdacad3f53277c76df968f72/components/NavigationBar/src/MDCNavigationBar.h#L46).
 Removed *MDCUINavigationItemObservables*.
 
+## Component changes
+
+### ButtonBar
+
+#### Changes
+
+* [Hotfix for release.](https://github.com/google/material-components-ios/commit/20bcf06d714d45c270fe857a670102ea1085bfeb) (Louis Romero)
+* [MDCButtonBar default layout direction is based on the system's.](https://github.com/google/material-components-ios/commit/fa171656af0fe8dbacf50808dc88fa4fd2e705d4) (Louis Romero)
+* [Re-add previous enum values.](https://github.com/google/material-components-ios/commit/8ce80041a41e3f4c7f1ea43f96a3bd192e11dd96) (Ian Gordon)
+* [Reload the buttons when the tintColor changes.](https://github.com/google/material-components-ios/commit/0ca536cf6c4af594cdaaa8196338fe40596b9404) (Louis Romero)
+* [[ButtonBar]? Layout bar button items based on the layout position.](https://github.com/google/material-components-ios/commit/56561b40b60ff3c0ea33801b5445c0eaab0f9600) (Louis Romero)
+
+### CollectionCells
+
+#### Changes
+
+* [Fixes reused cells that don't reset their title label frame.](https://github.com/google/material-components-ios/commit/79a2054da1346bcc35eb29e23c85bb500ce1860c) (Chris Cox)
+
+### Collections
+
+#### Changes
+
+* [Modify the structure of collection document in preparation for the secondary navigation.](https://github.com/google/material-components-ios/commit/5bac0c81f3c68795a4e699826b4de0f4aac399da) (Yiran Mao)
+
+### FlexibleHeader
+
+#### Changes
+
+* [Always update _lastContentOffset when we call fhv_updateLayout.](https://github.com/google/material-components-ios/commit/636df09ea57a7cdefdacad3f53277c76df968f72) (Jeff Verkoeyen)
+* [Standardize all shift accumulator variable names.](https://github.com/google/material-components-ios/commit/bb49bb4265ab3772d5312490df9867baf4c73000) (Jeff Verkoeyen)
+
+### FontDiskLoader
+
+#### Changes
+
+* [Added isEqual and hash logic](https://github.com/google/material-components-ios/commit/425a61fe40f5367a6548042af1109951463f41f7) (randallli)
+
+### HeaderStackView
+
+#### Changes
+
+* [[NavigationBar] Use leading/trailing wording in NavigationBar.](https://github.com/google/material-components-ios/commit/e413820f83ce05f0e32e4a6e5daf97ae06e80070) (Louis Romero)
+
+### NavigationBar
+
+#### Changes
+
+* [Hotfix for release.](https://github.com/google/material-components-ios/commit/20bcf06d714d45c270fe857a670102ea1085bfeb) (Louis Romero)
+* [Use leading/trailing wording in NavigationBar.](https://github.com/google/material-components-ios/commit/6a5153e1a83c7effe22eb926a71324ce77949449) (Louis Romero)
+* [Use leading/trailing wording in NavigationBar.](https://github.com/google/material-components-ios/commit/e413820f83ce05f0e32e4a6e5daf97ae06e80070) (Louis Romero)
+* [[ButtonBar]? Layout bar button items based on the layout position.](https://github.com/google/material-components-ios/commit/56561b40b60ff3c0ea33801b5445c0eaab0f9600) (Louis Romero)
+
 # 8.0.0
 
 ## API diffs

diff --git 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      = "9.0.0"
+  s.version      = "10.0.0"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
   s.subspec "AppBar" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     # Navigation bar contents
     ss.dependency "MaterialComponents/HeaderStackView"
@@ -59,7 +59,7 @@ Pod::Spec.new do |s|
   s.subspec "Buttons" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     ss.dependency "MaterialComponents/Ink"
     ss.dependency "MaterialComponents/ShadowElevations"
@@ -70,15 +70,15 @@ Pod::Spec.new do |s|
   s.subspec "ButtonBar" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     ss.dependency "MaterialComponents/Buttons"
   end
 
   s.subspec "CollectionCells" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     ss.dependency "MaterialComponents/CollectionLayoutAttributes"
     ss.dependency "MaterialComponents/Ink"
@@ -94,13 +94,13 @@ Pod::Spec.new do |s|
   s.subspec "CollectionLayoutAttributes" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Collections" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
     ss.resource_bundles = {
       "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
     }
@@ -116,33 +116,33 @@ Pod::Spec.new do |s|
   s.subspec "FlexibleHeader" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "FontDiskLoader" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     ss.framework = "CoreText"
   end
 
   s.subspec "HeaderStackView" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Ink" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "NavigationBar" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     ss.dependency "MaterialComponents/ButtonBar"
     ss.dependency "MaterialComponents/Typography"
@@ -151,7 +151,7 @@ Pod::Spec.new do |s|
   s.subspec "PageControl" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
     ss.resource_bundles = {
       "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
     }
@@ -160,13 +160,13 @@ 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}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "RobotoFontLoader" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     # Only if you have a resource bundle
     ss.resource_bundles = {
@@ -180,33 +180,33 @@ Pod::Spec.new do |s|
   s.subspec "ShadowElevations" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "ShadowLayer" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Slider" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     ss.dependency "MaterialComponents/private/ThumbTrack"
   end
 
   s.subspec "SpritedAnimationView" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "Switch" do |ss|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
-    ss.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
     ss.resource_bundles = {
       "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
     }
@@ -217,24 +217,26 @@ Pod::Spec.new do |s|
   s.subspec "Typography" 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.header_mappings_dir = "components/#{ss.base_name}/src/*"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   end
 
   s.subspec "private" do |pss|
 
+    # Pull in icon dependencies
     # The implementation of this method is generated by running scripts/sync_icons.sh
+    # and defined in scripts/generated/icons.rb
     registerIcons(pss)
 
     pss.subspec "Color" do |ss|
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}"
-      ss.header_mappings_dir = "components/private/#{ss.base_name}/src/*"
+      ss.header_mappings_dir = "components/private/#{ss.base_name}/src"
     end
 
     pss.subspec "ThumbTrack" do |ss|
       ss.public_header_files = "components/private/#{ss.base_name}/src/*.h"
       ss.source_files = "components/private/#{ss.base_name}/src/*.{h,m}"
-      ss.header_mappings_dir = "components/private/#{ss.base_name}/src/*"
+      ss.header_mappings_dir = "components/private/#{ss.base_name}/src"
 
       ss.dependency "MaterialComponents/Ink"
       ss.dependency "MaterialComponents/ShadowElevations"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "9.0.0"
+  s.version      = "10.0.0"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
@@ -11,4 +11,5 @@ Pod::Spec.new do |s|
   s.source_files = 'components/*/examples/*.{h,m,swift}', 'components/*/examples/supplemental/*.{h,m,swift}'
   s.resources = ['components/*/examples/resources/*']
   s.dependency 'MaterialComponents'
+  s.public_header_files = 'components/*/examples/*.h', 'components/*/examples/supplemental/*.h'
 end
diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "9.0.0"
+  s.version      = "10.0.0"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/README.md b/README.md
@@ -54,7 +54,11 @@ to your target in your Podfile:
 ~~~ ruby
 target "MyApp" do
   ...
-  pod 'MaterialComponents'
+  # Until Material Components iOS is public:
+  pod 'MaterialComponents', :git => 'https://github.com/google/material-components-ios.git'
+
+  # After Material Components iOS is public:
+  # pod 'MaterialComponents'
 end
 ~~~
 

diff --git a/catalog/CatalogByConvention/src/CBCNodeViewController.m b/catalog/CatalogByConvention/src/CBCNodeViewController.m
@@ -35,11 +35,6 @@ - (instancetype)initWithTitle:(NSString *)title {
   return self;
 }
 
-- (instancetype)init {
-  [self doesNotRecognizeSelector:_cmd];
-  return nil;
-}
-
 - (NSComparisonResult)compare:(CBCNode *)otherObject {
   return [self.title compare:otherObject.title];
 }
@@ -98,11 +93,6 @@ - (instancetype)initWithNode:(CBCNode *)node {
   return self;
 }
 
-- (instancetype)initWithStyle:(UITableViewStyle)style {
-  [self doesNotRecognizeSelector:_cmd];
-  return nil;
-}
-
 - (void)viewDidLoad {
   [super viewDidLoad];