Merge branch 'release-0.2.0'

Author: ajsecord

.arcconfig

@@ -1,5 +1,7 @@
 {
   "load": ["clang-format-linter"],
   "phabricator.uri" : "http://codereview.cc/",
-  "repository.callsign" : "MDC"
+  "repository.callsign" : "MDC",
+  "arc.land.onto.default" : "develop",
+  "git.default-relative-commit" : "origin/develop"
 }

CHANGELOG.md

@@ -0,0 +1,42 @@
+## Master
+
+##### Breaking
+
+##### Enhancements
+
+##### Bug Fixes
+
+## 0.2.0
+
+##### Enhancements
+
+* [MDCButton] Component added. [Randall Li](https://github.com/randallli), [Adrian Secord](https://github.com/ajsecord)
+* [MDCSlider] Add support for interface builder to MDCSlider. [Ian Gordon](https://github.com/ianegordon)
+* [MDCFlexibleHeader] Add contentView and custom shadow layers. [Junius Gunaratne](https://github.com/jgunaratne)
+* [MDCSwitch] Autolayout demo app. [Ian Gordon](https://github.com/ianegordon)
+* [MDCFlexibleHeader] Component added. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [Catalog] Add "catalog by convention" experiment. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [MDCSwitch] Switch from IBInspectable to UI_APPEARANCE_SELECTOR. [Ian Gordon](https://github.com/ianegordon)
+
+##### Bug Fixes
+
+* [CocoaPods] Remove private_header_files from podspec. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [Pesto] Fixes to Pesto example app. [Junius Gunaratne](https://github.com/jgunaratne)
+* [MDCInk] Update background opacity timing to match web implementation of ink. [Junius Gunaratne](https://github.com/jgunaratne)
+* [MDCInk] Darken default ink to 12% opacity. [Adrian Secord](https://github.com/ajsecord)
+* [MDCInk] Make sure completion block is fired after ink animation completes [Junius Gunaratne](https://github.com/jgunaratne)
+
+## x.x.x
+
+This is a template. When cutting a new release, rename "master" to the release number and create a
+new, empty "Master" section.
+
+##### Breaking
+
+##### Enhancements
+
+##### Bug Fixes
+
+* This is a template description
+[person responsible](https://github.com/...)
+[#xxx](github.com/google/material-components-ios/issues/xxx)

Catalog.xcworkspace/contents.xcworkspacedata

@@ -1,5 +1,7 @@
 PODS:
   - material-components-ios (0.1.0):
+    - material-components-ios/Buttons (= 0.1.0)
+    - material-components-ios/FlexibleHeader (= 0.1.0)
     - material-components-ios/Ink (= 0.1.0)
     - material-components-ios/PageControl (= 0.1.0)
     - material-components-ios/private (= 0.1.0)
@@ -10,6 +12,12 @@ PODS:
     - material-components-ios/SpritedAnimationView (= 0.1.0)
     - material-components-ios/Switch (= 0.1.0)
     - material-components-ios/Typography (= 0.1.0)
+  - material-components-ios/Buttons (0.1.0):
+    - material-components-ios/Ink
+    - material-components-ios/ShadowElevations
+    - material-components-ios/ShadowLayer
+    - material-components-ios/Typography
+  - material-components-ios/FlexibleHeader (0.1.0)
   - material-components-ios/Ink (0.1.0)
   - material-components-ios/PageControl (0.1.0)
   - material-components-ios/private (0.1.0):
@@ -38,6 +46,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: b1e1bc101fe89ed301cdfeb479597d90b1fcf911
+  material-components-ios: ceb1a78b45aa87ce45d8d52eff3451392e57a920
 
 COCOAPODS: 0.39.0

build_tests/CocoapodsObjCApp/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - material-components-ios (0.1.0):
+    - material-components-ios/Buttons (= 0.1.0)
+    - material-components-ios/FlexibleHeader (= 0.1.0)
     - material-components-ios/Ink (= 0.1.0)
     - material-components-ios/PageControl (= 0.1.0)
     - material-components-ios/private (= 0.1.0)
@@ -10,6 +12,12 @@ PODS:
     - material-components-ios/SpritedAnimationView (= 0.1.0)
     - material-components-ios/Switch (= 0.1.0)
     - material-components-ios/Typography (= 0.1.0)
+  - material-components-ios/Buttons (0.1.0):
+    - material-components-ios/Ink
+    - material-components-ios/ShadowElevations
+    - material-components-ios/ShadowLayer
+    - material-components-ios/Typography
+  - material-components-ios/FlexibleHeader (0.1.0)
   - material-components-ios/Ink (0.1.0)
   - material-components-ios/PageControl (0.1.0)
   - material-components-ios/private (0.1.0):
@@ -38,6 +46,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: b1e1bc101fe89ed301cdfeb479597d90b1fcf911
+  material-components-ios: ceb1a78b45aa87ce45d8d52eff3451392e57a920
 
 COCOAPODS: 0.39.0

build_tests/CocoapodsSwiftApp/Podfile.lock

@@ -16,21 +16,23 @@
 
 #import "MDCBuildTestViewController.h"
 
+#import <MaterialButtons.h>
+#import <MaterialInk.h>
 #import <MaterialPageControl.h>
-#import <MaterialSlider.h>
 #import <MaterialScrollViewDelegateMultiplexer.h>
+#import <MaterialShadowElevations.h>
 #import <MaterialShadowLayer.h>
+#import <MaterialSlider.h>
 #import <MaterialSpritedAnimationView.h>
 #import <MaterialTypography.h>
-#import <MaterialInk.h>
 
 @implementation MDCBuildTestViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.view.backgroundColor = [UIColor whiteColor];
 
-  // Testing build and linking so all we need to do is touch the component objects.
+// Testing build and linking so all we need to do is touch the component objects.
 #pragma mark Slider
 
   MDCSlider *slider = [[MDCSlider alloc] initWithFrame:CGRectMake(0, 0, 100, 27)];
@@ -45,12 +47,12 @@ - (void)viewDidLoad {
 #pragma mark Ink
 
   NSAssert([[MDCInkTouchController alloc] initWithView:self.view],
-    @"Expecting to find a valid object for MDCInkTouchController.");
+           @"Expecting to find a valid object for MDCInkTouchController.");
 
 #pragma mark ScrollViewDelegateMultiplexer
 
   NSAssert([[MDCScrollViewDelegateMultiplexer alloc] init],
-    @"Expecting to find a valid object for slider.");
+           @"Expecting to find a valid object for MDCScrollViewDelegateMultiplexer.");
 
 #pragma mark ShadowLayer
 
@@ -59,7 +61,7 @@ - (void)viewDidLoad {
 #pragma mark SpritedAnimation
 
   NSAssert([[MDCSpritedAnimationView alloc] init],
-    @"Expecting to find a valid object for MDCSpritedAnimationView.");
+           @"Expecting to find a valid object for MDCSpritedAnimationView.");
 
 #pragma mark PageControl
 
@@ -69,6 +71,9 @@ - (void)viewDidLoad {
   pageControl.center = CGPointMake(100, 145);
   NSAssert(pageControl, @"Expecting to find a valid object for MDCPageControl.");
 
+#pragma mark Buttons
+
+  NSAssert([[MDCButton alloc] init], @"Expecting to find a valid object for MDCButton.");
 }
 
 @end

build_tests/classes/objective_c/MDCBuildTestViewController.m

@@ -54,5 +54,8 @@ class MDCBuildTestViewController: UIViewController {
     pageControl.center = CGPointMake(100, 145);
     assert(pageControl.isKindOfClass(MDCPageControl), "Expecting to find a valid object for MDCSpritedAnimationView");
 
+    // MARK: Buttons
+    assert(MDCButton.init().isKindOfClass(MDCButton), "Expecting to find a valid object for MDCButton");
+
   }
 }