Merge branch 'release-2.1.1'

material-components · Mar 23, 2016 · 8d9725c · 8d9725c
2 parents a7a91df + 630d3a9
commit 8d9725c
Show file tree

Hide file tree

Showing 56 changed files with 1,708 additions and 907 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,41 @@
 
 ##### Bug Fixes
 
+## 2.1.1
+
+##### Enhancements
+
+###### Code
+* [AppBar] Add App Bar builder API. (Jeff Verkoeyen)
+* [AppBar] Fix compiler warnings about formatting NSIntegers. (Adrian Secord)
+* [FlexibleHeader] MDCFlexibleHeaderViewController conforms to * UITableViewDelegate. (Jeff Verkoeyen)
+* [Ink] Updated the ink example to include smaller shapes. (Adrian Secord)
+* [Ink] Visual adjustments to ink ripple (Junius Gunaratne)
+* [NavigationBar] Add back button icon. (Jeff Verkoeyen)
+
+###### Examples
+* [Demos] Updates to header behavior and minor layout changes after UX review (* Junius Gunaratne)
+* [Pesto] Adding 'nonatomic' attribute to all delegates (Will Larche)
+* [Pesto] Corrections for build warnings (Will Larche)
+* [Pesto] making string and URL propertys 'copy' (Will Larche)
+* [Pesto] Style update: @property ivars (larche)
+* [Pesto] Update card zoom animation to be more Material Design like (Junius * Gunaratne)
+
+###### Docs and site
+* [Docs] Minor touchups to FlexibleHeader readme. (Jeff Verkoeyen)
+* [Docs] Minor updates to AppBar readme. (Jeff Verkoeyen)
+* [Docs] Updated community/README.md (Katy Kasmai)
+* [FlexibleHeader] README.md formatting. (Jason Striegel)
+* [Site] AppBar jump links to open in new tab. (Jason Striegel)
+* [Site] Buttons jump link formatting. (Jason Striegel)
+* [Site] Corrected links and formatting. (Jason Striegel)
+* [Site] Formatting markdown structure for site. (Jason Striegel)
+* [Site] Jump link styling for ButtonBar README. (Jason Striegel)
+* [Site] New formatting for Buttons documentation. (Jason Striegel)
+* [Site] Removing defunct placeholder documents. (Jason Striegel)
+* [Site] Replacing lorem with description content, where possible. (Jason * Striegel)
+* [Site] Update component landing page's nav list (Yiran Mao)
+
 ## 2.1.0
 
 ##### Enhancements

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -0,0 +1,6 @@
+Each contributor is responsible for adding their name or company name to the this file at the project’s root and maintaining the contact information.
+
+Contributors (name, company name):
+
+
+
diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "2.1.0"
+  s.version      = "2.1.1"
   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"
@@ -41,7 +41,12 @@ Pod::Spec.new do |s|
     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.resource_bundles = {
+      "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/Images.xcassets/*/*.png"]
+    }
+
     # Navigation bar contents
+    ss.dependency "MaterialComponents/Buttons"
     ss.dependency "MaterialComponents/HeaderStackView"
     ss.dependency "MaterialComponents/NavigationBar"
     ss.dependency "MaterialComponents/Typography"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "2.1.0"
+  s.version      = "2.1.1"
   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
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "2.1.0"
+  s.version      = "2.1.1"
   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
@@ -1,61 +1,62 @@
 PODS:
-  - MaterialComponents (2.1.0):
-    - MaterialComponents/AppBar (= 2.1.0)
-    - MaterialComponents/ButtonBar (= 2.1.0)
-    - MaterialComponents/Buttons (= 2.1.0)
-    - MaterialComponents/FlexibleHeader (= 2.1.0)
-    - MaterialComponents/HeaderStackView (= 2.1.0)
-    - MaterialComponents/Ink (= 2.1.0)
-    - MaterialComponents/NavigationBar (= 2.1.0)
-    - MaterialComponents/PageControl (= 2.1.0)
-    - MaterialComponents/private (= 2.1.0)
-    - MaterialComponents/ScrollViewDelegateMultiplexer (= 2.1.0)
-    - MaterialComponents/ShadowElevations (= 2.1.0)
-    - MaterialComponents/ShadowLayer (= 2.1.0)
-    - MaterialComponents/Slider (= 2.1.0)
-    - MaterialComponents/SpritedAnimationView (= 2.1.0)
-    - MaterialComponents/Switch (= 2.1.0)
-    - MaterialComponents/Typography (= 2.1.0)
-  - MaterialComponents/AppBar (2.1.0):
+  - MaterialComponents (2.1.1):
+    - MaterialComponents/AppBar (= 2.1.1)
+    - MaterialComponents/ButtonBar (= 2.1.1)
+    - MaterialComponents/Buttons (= 2.1.1)
+    - MaterialComponents/FlexibleHeader (= 2.1.1)
+    - MaterialComponents/HeaderStackView (= 2.1.1)
+    - MaterialComponents/Ink (= 2.1.1)
+    - MaterialComponents/NavigationBar (= 2.1.1)
+    - MaterialComponents/PageControl (= 2.1.1)
+    - MaterialComponents/private (= 2.1.1)
+    - MaterialComponents/ScrollViewDelegateMultiplexer (= 2.1.1)
+    - MaterialComponents/ShadowElevations (= 2.1.1)
+    - MaterialComponents/ShadowLayer (= 2.1.1)
+    - MaterialComponents/Slider (= 2.1.1)
+    - MaterialComponents/SpritedAnimationView (= 2.1.1)
+    - MaterialComponents/Switch (= 2.1.1)
+    - MaterialComponents/Typography (= 2.1.1)
+  - MaterialComponents/AppBar (2.1.1):
+    - MaterialComponents/Buttons
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (2.1.0)
-  - MaterialComponents/Buttons (2.1.0):
+  - MaterialComponents/ButtonBar (2.1.1)
+  - MaterialComponents/Buttons (2.1.1):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/FlexibleHeader (2.1.0)
-  - MaterialComponents/HeaderStackView (2.1.0)
-  - MaterialComponents/Ink (2.1.0)
-  - MaterialComponents/NavigationBar (2.1.0):
+  - MaterialComponents/FlexibleHeader (2.1.1)
+  - MaterialComponents/HeaderStackView (2.1.1)
+  - MaterialComponents/Ink (2.1.1)
+  - MaterialComponents/NavigationBar (2.1.1):
     - MaterialComponents/ButtonBar
     - MaterialComponents/Typography
-  - MaterialComponents/PageControl (2.1.0)
-  - MaterialComponents/private (2.1.0):
-    - MaterialComponents/private/Color (= 2.1.0)
-    - MaterialComponents/private/ThumbTrack (= 2.1.0)
-  - MaterialComponents/private/Color (2.1.0)
-  - MaterialComponents/private/ThumbTrack (2.1.0):
+  - MaterialComponents/PageControl (2.1.1)
+  - MaterialComponents/private (2.1.1):
+    - MaterialComponents/private/Color (= 2.1.1)
+    - MaterialComponents/private/ThumbTrack (= 2.1.1)
+  - MaterialComponents/private/Color (2.1.1)
+  - MaterialComponents/private/ThumbTrack (2.1.1):
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/ScrollViewDelegateMultiplexer (2.1.0)
-  - MaterialComponents/ShadowElevations (2.1.0)
-  - MaterialComponents/ShadowLayer (2.1.0)
-  - MaterialComponents/Slider (2.1.0):
+  - MaterialComponents/ScrollViewDelegateMultiplexer (2.1.1)
+  - MaterialComponents/ShadowElevations (2.1.1)
+  - MaterialComponents/ShadowLayer (2.1.1)
+  - MaterialComponents/Slider (2.1.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/SpritedAnimationView (2.1.0)
-  - MaterialComponents/Switch (2.1.0):
+  - MaterialComponents/SpritedAnimationView (2.1.1)
+  - MaterialComponents/Switch (2.1.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (2.1.0)
-  - MaterialComponentsCatalog (2.1.0):
+  - MaterialComponents/Typography (2.1.1)
+  - MaterialComponentsCatalog (2.1.1):
     - MaterialComponents
-  - MaterialComponentsUnitTests (2.1.0):
+  - MaterialComponentsUnitTests (2.1.1):
     - MaterialComponents
 
 DEPENDENCIES:
@@ -72,8 +73,8 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  MaterialComponents: 325e36b679b804988d7da12434215a760af85b06
-  MaterialComponentsCatalog: 324ac07746f6fbf8ff34af8d4a328a3dfd567b2d
-  MaterialComponentsUnitTests: 60c2725c7c58643b29b56af334a22da8646b7e47
+  MaterialComponents: c21320b6ac4b6d5da24ef63b4d1f575b0e2963bf
+  MaterialComponentsCatalog: f20a70ba3612ba3a449e6bc4bee8da4eef3a7885
+  MaterialComponentsUnitTests: a7f5e41c4e8a708fc315eeaeff0dc0f2da40299b
 
 COCOAPODS: 0.39.0