rollback/blackout of D85: Add MDCButton

Author: randallli

Catalog.xcworkspace/contents.xcworkspacedata

@@ -1,6 +1,5 @@
 PODS:
   - material-components-ios (0.1.0):
-    - material-components-ios/Buttons (= 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,11 +9,6 @@ PODS:
     - material-components-ios/Slider (= 0.1.0)
     - material-components-ios/SpritedAnimationView (= 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/Ink (0.1.0)
   - material-components-ios/PageControl (0.1.0)
   - material-components-ios/private (0.1.0):
@@ -40,6 +34,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: 6cf6a59e466857e0c2caef944a9f26e78806050c
+  material-components-ios: 90b3d23cebcb2913875bbab015605ebe103b5ab1
 
 COCOAPODS: 0.39.0

build_tests/CocoapodsObjCApp/Podfile.lock

@@ -1,6 +1,5 @@
 PODS:
   - material-components-ios (0.1.0):
-    - material-components-ios/Buttons (= 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,11 +9,6 @@ PODS:
     - material-components-ios/Slider (= 0.1.0)
     - material-components-ios/SpritedAnimationView (= 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/Ink (0.1.0)
   - material-components-ios/PageControl (0.1.0)
   - material-components-ios/private (0.1.0):
@@ -40,6 +34,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: 6cf6a59e466857e0c2caef944a9f26e78806050c
+  material-components-ios: 90b3d23cebcb2913875bbab015605ebe103b5ab1
 
 COCOAPODS: 0.39.0

build_tests/CocoapodsSwiftApp/Podfile.lock

@@ -16,23 +16,21 @@
 
 #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 <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)];
@@ -47,12 +45,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 MDCScrollViewDelegateMultiplexer.");
+    @"Expecting to find a valid object for slider.");
 
 #pragma mark ShadowLayer
 
@@ -61,7 +59,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
 
@@ -71,9 +69,6 @@ - (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,8 +54,5 @@ 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");
-
   }
 }