Merge branch 'release-candidate' into stable

material-components · Mar 4, 2021 · d1e70a4 · d1e70a4
2 parents c3cec9d + 43fad8d
commit d1e70a4
Show file tree

Hide file tree

Showing 108 changed files with 148 additions and 4,670 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+# 124.0.0
+
+In this release `MDCTextField` and its associated classes and protocols are deprecated. We also deleted the Pesto example application and cleaned up pre iOS 12 checks in the library.
+
+## Breaking changes
+
+`MDCTextField` and its associated classes and protocols are deprecated.
+
+## API changes
+
+ * All classes and protocols under in the `components/TextFields` folder are now deprecated.
+
+## Component changes
+
+### TextFields
+
+* [Deprecate MDCTextField and its associated classes/protocols](https://github.com/material-components/material-components-ios/commit/a29eb2c3c7408a891dadca4613e97ddc67bdbbf5) (Andrew Overton)
+
+## Multi-component changes
+
+* [Internal change](https://github.com/material-components/material-components-ios/commit/b64b0ec23150deef32205c38b0a274171639644b) (Jeff Verkoeyen)
+
+---
+
 # 123.0.0
 
 In this major release we have made the MDCBottomNavigationBarController class and its APIs only be available from iOS 12 and up.

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "123.0.0"
+  mdc.version      = "124.0.0"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   mdc.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/MaterialComponentsEarlGreyTests.podspec b/MaterialComponentsEarlGreyTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "123.0.0"
+  s.version      = "124.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components EarlGrey tests."
   s.description  = "This spec is made for use in the MDC Catalog."

diff --git a/MaterialComponentsExamples.podspec b/MaterialComponentsExamples.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsExamples"
-  s.version      = "123.0.0"
+  s.version      = "124.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components examples."
   s.description  = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

diff --git a/MaterialComponentsSnapshotTests.podspec b/MaterialComponentsSnapshotTests.podspec
@@ -53,7 +53,7 @@ end
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsSnapshotTests"
-  s.version      = "123.0.0"
+  s.version      = "124.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components snapshot tests."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-123.0.0
+124.0.0
diff --git a/catalog/MDCCatalog/Info.plist b/catalog/MDCCatalog/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>123.0.0</string>
+	<string>124.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>123.0.0</string>
+	<string>124.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

diff --git a/catalog/MDCDragons/Info.plist b/catalog/MDCDragons/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>123.0.0</string>
+	<string>124.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>123.0.0</string>
+	<string>124.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/catalog/MaterialCatalog/MaterialCatalog.podspec b/catalog/MaterialCatalog/MaterialCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "123.0.0"
+  s.version      = "124.0.0"
   s.summary      = "Helper Objective-C classes for the MDC catalog."
   s.description  = "This spec is made for use in the MDC Catalog."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/components/FeatureHighlight/src/MDCFeatureHighlightViewController.m b/components/FeatureHighlight/src/MDCFeatureHighlightViewController.m
@@ -65,10 +65,7 @@ - (void)viewDidLoad {
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   self.featureHighlightView.mdc_adjustsFontForContentSizeCategory =
       _mdc_adjustsFontForContentSizeCategory;
-  if (@available(iOS 10.0, *)) {
-    self.featureHighlightView.adjustsFontForContentSizeCategory =
-        _adjustsFontForContentSizeCategory;
-  }
+  self.featureHighlightView.adjustsFontForContentSizeCategory = _adjustsFontForContentSizeCategory;
   self.featureHighlightView.mdc_legacyFontScaling = _mdc_legacyFontScaling;
 
   __weak MDCFeatureHighlightViewController *weakSelf = self;

diff --git a/components/LibraryInfo/src/MDCLibraryInfo.m b/components/LibraryInfo/src/MDCLibraryInfo.m
@@ -19,7 +19,7 @@
 // This string is updated automatically as a part of the release process and should not be edited
 // manually. Do not rename this constant or change the formatting without updating the release
 // scripts.
-static NSString* const kMDCLibraryInfoVersionString = @"123.0.0";
+static NSString* const kMDCLibraryInfoVersionString = @"124.0.0";
 
 @implementation MDCLibraryInfo
 

diff --git a/components/LibraryInfo/tests/unit/LibraryInfoTests.m b/components/LibraryInfo/tests/unit/LibraryInfoTests.m
@@ -26,7 +26,7 @@ - (void)testVersionFormat {
   // Given
 
   // This regex pattern does the following:
-  // Accept: "123.0.0", etc.
+  // Accept: "124.0.0", etc.
   // Reject: "0.0.0", "1.2", "1", "-1.2.3", "Hi, I'm a version 1.2.3", "1.2.3 is my version", etc.
   //
   // Note the major version must be >= 1 since "0.0.0" is used as the version when something goes

diff --git a/components/List/examples/CollectionListCellExampleTypicalUse.m b/components/List/examples/CollectionListCellExampleTypicalUse.m
@@ -21,8 +21,6 @@
 static NSString *const kExampleDetailText =
     @"Pellentesque non quam ornare, porta urna sed, malesuada felis. Praesent at gravida felis, "
      "non facilisis enim. Proin dapibus laoreet lorem, in viverra leo dapibus a.";
-static const CGFloat kSmallestCellHeight = 40;
-static const CGFloat kSmallArbitraryCellWidth = 100;
 
 @implementation CollectionListCellExampleTypicalUse {
   NSMutableArray *_content;
@@ -35,11 +33,7 @@ - (instancetype)init {
   flowLayout.minimumInteritemSpacing = 0;
   flowLayout.minimumLineSpacing = 1;
   flowLayout.scrollDirection = UICollectionViewScrollDirectionVertical;
-  if (@available(iOS 10.0, *)) {
-    flowLayout.estimatedItemSize = UICollectionViewFlowLayoutAutomaticSize;
-  } else {
-    flowLayout.estimatedItemSize = CGSizeMake(kSmallArbitraryCellWidth, kSmallestCellHeight);
-  }
+  flowLayout.estimatedItemSize = UICollectionViewFlowLayoutAutomaticSize;
   return [self initWithCollectionViewLayout:flowLayout];
 }
 

diff --git a/components/Tabs/src/private/MDCItemBarCell.m b/components/Tabs/src/private/MDCItemBarCell.m
@@ -228,11 +228,9 @@ - (void)updateWithItem:(UITabBarItem *)item
   self.selectedImage = item.selectedImage;
   self.image = item.image;
   self.badgeValue = item.badgeValue;
-  if (@available(iOS 10.0, *)) {
-    if (item.badgeColor) {
-      self.style.badgeColor = item.badgeColor;
-      self.badge.badgeColor = item.badgeColor;
-    }
+  if (item.badgeColor) {
+    self.style.badgeColor = item.badgeColor;
+    self.badge.badgeColor = item.badgeColor;
   }
   self.accessibilityIdentifier = item.accessibilityIdentifier;
   self.accessibilityLabel = item.accessibilityLabel;

diff --git a/components/TextControls/examples/supplemental/MDCTextControlConfiguratorExample.m b/components/TextControls/examples/supplemental/MDCTextControlConfiguratorExample.m
@@ -131,23 +131,18 @@ - (void)decreaseContentSizeForChildViewController:(UIViewController *)childViewC
 
 - (void)setContentSizeCategory:(UIContentSizeCategory)contentSizeCategory
          onChildViewController:(UIViewController *)viewController {
-  if (@available(iOS 10.0, *)) {
-    UITraitCollection *contentSizeCategoryTraitCollection =
-        [UITraitCollection traitCollectionWithPreferredContentSizeCategory:contentSizeCategory];
-    UITraitCollection *currentTraitCollection = viewController.traitCollection;
-    NSArray *traitCollections = @[ currentTraitCollection, contentSizeCategoryTraitCollection ];
-    UITraitCollection *traitCollection =
-        [UITraitCollection traitCollectionWithTraitsFromCollections:traitCollections];
-    [self setOverrideTraitCollection:traitCollection forChildViewController:viewController];
-    [self.view setNeedsLayout];
-  }
+  UITraitCollection *contentSizeCategoryTraitCollection =
+      [UITraitCollection traitCollectionWithPreferredContentSizeCategory:contentSizeCategory];
+  UITraitCollection *currentTraitCollection = viewController.traitCollection;
+  NSArray *traitCollections = @[ currentTraitCollection, contentSizeCategoryTraitCollection ];
+  UITraitCollection *traitCollection =
+      [UITraitCollection traitCollectionWithTraitsFromCollections:traitCollections];
+  [self setOverrideTraitCollection:traitCollection forChildViewController:viewController];
+  [self.view setNeedsLayout];
 }
 
 - (UIContentSizeCategory)contentSizeCategoryForViewController:(UIViewController *)viewController {
-  if (@available(iOS 10.0, *)) {
-    return viewController.traitCollection.preferredContentSizeCategory;
-  }
-  return nil;
+  return viewController.traitCollection.preferredContentSizeCategory;
 }
 
 - (void)setContainerScheme:(id<MDCContainerScheming>)containerScheme {

diff --git a/components/TextControls/examples/supplemental/MDCTextControlContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlContentViewController.m
@@ -144,10 +144,7 @@ - (MDCButton *)createContentSizeButtonWithTitle:(NSString *)title selector:(SEL)
   [button addTarget:self action:selector forControlEvents:UIControlEventTouchUpInside];
   [button applyContainedThemeWithScheme:self.containerScheme];
   [button sizeToFit];
-  button.enabled = NO;
-  if (@available(iOS 10.0, *)) {
-    button.enabled = YES;
-  }
+  button.enabled = YES;
   return button;
 }
 

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextAreaContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlTextAreaContentViewController.m
@@ -147,20 +147,18 @@ - (void)resizeScrollViewSubviews {
 - (void)enforcePreferredFonts {
   [super enforcePreferredFonts];
 
-  if (@available(iOS 10.0, *)) {
-    [self.allTextAreas
-        enumerateObjectsUsingBlock:^(MDCBaseTextArea *textArea, NSUInteger idx, BOOL *stop) {
-          textArea.textView.adjustsFontForContentSizeCategory = YES;
-          textArea.textView.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody
-                                       compatibleWithTraitCollection:textArea.traitCollection];
-          textArea.leadingAssistiveLabel.font =
-              [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
-                  compatibleWithTraitCollection:textArea.traitCollection];
-          textArea.trailingAssistiveLabel.font =
-              [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
-                  compatibleWithTraitCollection:textArea.traitCollection];
-        }];
-  }
+  [self.allTextAreas
+      enumerateObjectsUsingBlock:^(MDCBaseTextArea *textArea, NSUInteger idx, BOOL *stop) {
+        textArea.textView.adjustsFontForContentSizeCategory = YES;
+        textArea.textView.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody
+                                     compatibleWithTraitCollection:textArea.traitCollection];
+        textArea.leadingAssistiveLabel.font =
+            [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
+                compatibleWithTraitCollection:textArea.traitCollection];
+        textArea.trailingAssistiveLabel.font =
+            [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
+                compatibleWithTraitCollection:textArea.traitCollection];
+      }];
 }
 
 - (void)handleResignFirstResponderTapped {

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextFieldContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlTextFieldContentViewController.m
@@ -172,20 +172,18 @@ - (void)resizeScrollViewSubviews {
 - (void)enforcePreferredFonts {
   [super enforcePreferredFonts];
 
-  if (@available(iOS 10.0, *)) {
-    [self.allTextFields
-        enumerateObjectsUsingBlock:^(MDCBaseTextField *textField, NSUInteger idx, BOOL *stop) {
-          textField.adjustsFontForContentSizeCategory = YES;
-          textField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody
-                               compatibleWithTraitCollection:textField.traitCollection];
-          textField.leadingAssistiveLabel.font =
-              [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
-                  compatibleWithTraitCollection:textField.traitCollection];
-          textField.trailingAssistiveLabel.font =
-              [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
-                  compatibleWithTraitCollection:textField.traitCollection];
-        }];
-  }
+  [self.allTextFields
+      enumerateObjectsUsingBlock:^(MDCBaseTextField *textField, NSUInteger idx, BOOL *stop) {
+        textField.adjustsFontForContentSizeCategory = YES;
+        textField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody
+                             compatibleWithTraitCollection:textField.traitCollection];
+        textField.leadingAssistiveLabel.font =
+            [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
+                compatibleWithTraitCollection:textField.traitCollection];
+        textField.trailingAssistiveLabel.font =
+            [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2
+                compatibleWithTraitCollection:textField.traitCollection];
+      }];
 }
 
 - (void)handleResignFirstResponderTapped {

diff --git a/components/TextControls/src/BaseTextAreas/MDCBaseTextArea.m b/components/TextControls/src/BaseTextAreas/MDCBaseTextArea.m
@@ -398,14 +398,10 @@ - (CGFloat)numberOfLinesOfVisibleText {
 #pragma mark Dynamic Type
 
 - (void)setAdjustsFontForContentSizeCategory:(BOOL)adjustsFontForContentSizeCategory {
-  if (@available(iOS 10.0, *)) {
-    _adjustsFontForContentSizeCategory = adjustsFontForContentSizeCategory;
-    self.textView.adjustsFontForContentSizeCategory = adjustsFontForContentSizeCategory;
-    self.leadingAssistiveLabel.adjustsFontForContentSizeCategory =
-        adjustsFontForContentSizeCategory;
-    self.trailingAssistiveLabel.adjustsFontForContentSizeCategory =
-        adjustsFontForContentSizeCategory;
-  }
+  _adjustsFontForContentSizeCategory = adjustsFontForContentSizeCategory;
+  self.textView.adjustsFontForContentSizeCategory = adjustsFontForContentSizeCategory;
+  self.leadingAssistiveLabel.adjustsFontForContentSizeCategory = adjustsFontForContentSizeCategory;
+  self.trailingAssistiveLabel.adjustsFontForContentSizeCategory = adjustsFontForContentSizeCategory;
 }
 
 #pragma mark MDCTextControlState

diff --git a/components/TextFields/src/MDCIntrinsicHeightTextView.h b/components/TextFields/src/MDCIntrinsicHeightTextView.h
@@ -22,6 +22,8 @@
  NOTE: UITextView is a subclass of UIScrollView. That's why it has a contentSize.
  */
 
-@interface MDCIntrinsicHeightTextView : UITextView
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @interface MDCIntrinsicHeightTextView : UITextView
 
 @end
diff --git a/components/TextFields/src/MDCMultilineTextField.h b/components/TextFields/src/MDCMultilineTextField.h
@@ -29,8 +29,10 @@
   Material Design themed mutiline text field (multiline text input).
   https://www.google.com/design/spec/components/text-fields.html#text-fields-multi-line-text-field
  */
-@interface MDCMultilineTextField
-    : UIView <MDCTextInput, MDCMultilineTextInput, MDCElevatable, MDCElevationOverriding>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @interface MDCMultilineTextField
+    : UIView<MDCTextInput, MDCMultilineTextInput, MDCElevatable, MDCElevationOverriding>
 
 /** A mirror of the same property that already exists on UITextField, UITextView, and UILabel. */
 @property(nonatomic, assign) BOOL adjustsFontForContentSizeCategory;

diff --git a/components/TextFields/src/MDCMultilineTextInputDelegate.h b/components/TextFields/src/MDCMultilineTextInputDelegate.h
@@ -19,7 +19,9 @@
 
 #import <UIKit/UIKit.h>
 
-@protocol MDCMultilineTextInputDelegate <NSObject>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @protocol MDCMultilineTextInputDelegate<NSObject>
 
 @optional
 

diff --git a/components/TextFields/src/MDCMultilineTextInputLayoutDelegate.h b/components/TextFields/src/MDCMultilineTextInputLayoutDelegate.h
@@ -16,7 +16,9 @@
 
 @protocol MDCMultilineTextInput;
 
-@protocol MDCMultilineTextInputLayoutDelegate <NSObject>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @protocol MDCMultilineTextInputLayoutDelegate<NSObject>
 
 @optional
 /**

diff --git a/components/TextFields/src/MDCTextField.h b/components/TextFields/src/MDCTextField.h
@@ -27,8 +27,10 @@ extern NSString *_Nonnull const MDCTextInputDidToggleEnabledNotification;
   Material Design compliant single-line text input.
   https://www.google.com/design/spec/components/text-fields.html#text-fields-single-line-text-field
  */
-@interface MDCTextField
-    : UITextField <MDCTextInput, MDCLeadingViewTextInput, MDCElevatable, MDCElevationOverriding>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @interface MDCTextField
+    : UITextField<MDCTextInput, MDCLeadingViewTextInput, MDCElevatable, MDCElevationOverriding>
 
 /** MDCTextField does not implement borders that conform to UITextBorderStyle. */
 @property(nonatomic, assign) UITextBorderStyle borderStyle NS_UNAVAILABLE;

diff --git a/components/TextFields/src/MDCTextFieldPositioningDelegate.h b/components/TextFields/src/MDCTextFieldPositioningDelegate.h
@@ -21,7 +21,9 @@
  Usually, these methods are direct mirrors of internal methods with the addition of a default value.
  */
 
-@protocol MDCTextInputPositioningDelegate <NSObject>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @protocol MDCTextInputPositioningDelegate<NSObject>
 
 @optional
 

diff --git a/components/TextFields/src/MDCTextInput.h b/components/TextFields/src/MDCTextInput.h
@@ -42,7 +42,9 @@ typedef NS_ENUM(NSUInteger, MDCTextInputTextInsetsMode) {
 @protocol MDCTextInputPositioningDelegate;
 
 /** Common API for Material Design compliant text inputs. */
-@protocol MDCTextInput <NSObject>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @protocol MDCTextInput<NSObject>
 
 /**
  The attributed text string of the placeholder label.
@@ -232,7 +234,9 @@ Common API for text inputs that support having a leading view.
 MDCTextField implements this protocol but MDCMultilineTextField does not because the designers
 determined multiline text fields should only have trailing views.
 */
-@protocol MDCLeadingViewTextInput <MDCTextInput>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @protocol MDCLeadingViewTextInput<MDCTextInput>
 
 /**
  An overlay view on the leading side.

diff --git a/components/TextFields/src/MDCTextInputBorderView.h b/components/TextFields/src/MDCTextInputBorderView.h
@@ -14,7 +14,9 @@
 
 #import <UIKit/UIKit.h>
 
-@interface MDCTextInputBorderView : UIView <NSCopying>
+__deprecated_msg(
+    "MDCTextField and its associated classes are deprecated. Please use TextControls instead.")
+    @interface MDCTextInputBorderView : UIView<NSCopying>
 
 /**
  The color of the area inside the border.