Merge branch 'release-candidate' into stable

Author: bryanoltman

CHANGELOG.md

@@ -1,3 +1,44 @@
+# 115.0.0
+
+In this major release, we deprecated the Ink component in favor of Ripple and deleted the
+deprecated `fontSize` property from the ThumbTrack component.
+
+## Breaking changes
+
+The `fontSize` property of ThumbTrack is now deleted. Please use the `font` property instead.
+
+## New deprecations
+
+The Ink component has been deprecated. Please use Ripple instead.
+
+## Component changes
+
+### BottomNavigation
+
+* [Remove pre-iOS 10 handling for voiceover now that components support iOS 10+](https://github.com/material-components/material-components-ios/commit/01b1cbaa6621bafda648716f0e9074315cfcc0f3) (Alyssa Weiss)
+
+### Collections
+
+* [Silence warnings when including a header with a method that uses deprecated declarations.](https://github.com/material-components/material-components-ios/commit/21d67fef12496fa026e32d1b203e15464b7e5378) (Nobody)
+
+### Dialogs
+
+* [Issue:- We currently disable tap for message text view.](https://github.com/material-components/material-components-ios/commit/6e42102550f3ca3aff560951b037d3fe8a30cf7c) (Nobody)
+
+### TextControls
+
+* [Improve TextControls test coverage](https://github.com/material-components/material-components-ios/commit/9d12dc1f981b317877bf713b1ed906b9363cfb19) (Andrew Overton)
+
+### private/ThumbTrack
+
+* [Delete deprecated fontSize property.](https://github.com/material-components/material-components-ios/commit/959e66d5aea00e0aa124b5ac604c29856b6c4905) (Wenyu Zhang)
+
+## Multi-component changes
+
+* [Official deprecation of Ink.](https://github.com/material-components/material-components-ios/commit/8d7bc88a110d1c0ad0e2a14c6c4f106d5fd91d3e) (Yarden Eitan)
+
+---
+
 # 114.0.0
 
 In this major release we have updated BottomNavigation safe area calculations and removed the deprecated `sizeThatFitsIncludesSafeArea` API, including a minor bug fix for Dialogs.

MaterialComponents.podspec

@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "114.0.0"
+  mdc.version      = "115.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"
@@ -313,9 +313,6 @@ Pod::Spec.new do |mdc|
       "components/#{component.base_name}/src/MDCBottomNavigationBarController.*",
       "components/#{component.base_name}/src/MaterialBottomNavigation+BottomNavigationController.h"
     ]
-    component.resources = [
-      "components/#{component.base_name}/src/Material#{component.base_name}.bundle"
-    ]
 
     component.dependency "MDFInternationalization"
     component.dependency "MaterialComponents/Availability"

MaterialComponentsEarlGreyTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "114.0.0"
+  s.version      = "115.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."

MaterialComponentsExamples.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsExamples"
-  s.version      = "114.0.0"
+  s.version      = "115.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."

MaterialComponentsSnapshotTests.podspec

@@ -53,7 +53,7 @@ end
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsSnapshotTests"
-  s.version      = "114.0.0"
+  s.version      = "115.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"

VERSION

@@ -1 +1 @@
-114.0.0
+115.0.0

catalog/MDCCatalog/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>114.0.0</string>
+	<string>115.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>114.0.0</string>
+	<string>115.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

catalog/MDCDragons/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>114.0.0</string>
+	<string>115.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>114.0.0</string>
+	<string>115.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

catalog/MaterialCatalog/MaterialCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "114.0.0"
+  s.version      = "115.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"

components/BottomNavigation/src/MDCBottomNavigationBar.m

@@ -20,8 +20,6 @@
 
 #import "private/MDCBottomNavigationBar+Private.h"
 #import "private/MDCBottomNavigationItemView.h"
-#import "private/MaterialBottomNavigationStrings.h"
-#import "private/MaterialBottomNavigationStrings_table.h"
 #import "MaterialAvailability.h"
 #import "MDCBottomNavigationBarDelegate.h"
 #import "MaterialPalettes.h"
@@ -61,7 +59,6 @@ @interface MDCBottomNavigationBar () <MDCInkTouchControllerDelegate,
 @property(nonatomic, strong) UIVisualEffectView *blurEffectView;
 @property(nonatomic, strong) UIView *itemsLayoutView;
 @property(nonatomic, strong) NSMutableArray *inkControllers;
-@property(nonatomic) BOOL shouldPretendToBeATabBar;
 @property(nonatomic, strong) UILayoutGuide *barItemsLayoutGuide NS_AVAILABLE_IOS(9_0);
 @property(nonatomic, assign) BOOL enableRippleBehavior;
 
@@ -146,19 +143,7 @@ - (void)commonMDCBottomNavigationBarInit {
   _itemsLayoutView.clipsToBounds = NO;
   [_barView addSubview:_itemsLayoutView];
 
-#if MDC_AVAILABLE_SDK_IOS(10_0)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
-#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
-  if (&UIAccessibilityTraitTabBar != NULL) {
-    _itemsLayoutView.accessibilityTraits = UIAccessibilityTraitTabBar;
-  } else {
-    _shouldPretendToBeATabBar = YES;
-  }
-#pragma clang diagnostic pop
-#else
-  _shouldPretendToBeATabBar = YES;
-#endif  // MDC_AVAILABLE_SDK_IOS(10_0)
+  _itemsLayoutView.accessibilityTraits = UIAccessibilityTraitTabBar;
   _elevation = MDCShadowElevationBottomNavigationBar;
   [(MDCShadowLayer *)self.layer setElevation:_elevation];
   UIColor *defaultShadowColor = UIColor.blackColor;
@@ -582,26 +567,14 @@ - (void)setItems:(NSArray<UITabBarItem *> *)items {
     itemView.titlePositionAdjustment = item.titlePositionAdjustment;
     itemView.badgeColor = self.itemBadgeBackgroundColor;
     itemView.badgeTextColor = self.itemBadgeTextColor;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     MDCInkTouchController *controller = [[MDCInkTouchController alloc] initWithView:itemView];
+#pragma clang diagnostic pop
     controller.delegate = self;
     [self.inkControllers addObject:controller];
     itemView.rippleTouchController.delegate = self;
 
-    if (self.shouldPretendToBeATabBar) {
-      NSString *key = kMaterialBottomNavigationStringTable
-          [kStr_MaterialBottomNavigationItemCountAccessibilityHint];
-      NSString *itemOfTotalString = NSLocalizedStringFromTableInBundle(
-          key, kMaterialBottomNavigationStringsTableName, [[self class] bundle], kOfString);
-      NSString *localizedPosition =
-          [NSString localizedStringWithFormat:itemOfTotalString, (i + 1), (int)items.count];
-      // Allow a custom `accessibilityHint` to be assigned even if "faking" a tab bar is enabled.
-      if (itemView.button.accessibilityHint.length) {
-        itemView.button.accessibilityHint =
-            [NSString stringWithFormat:@"%@. %@", localizedPosition, itemView.accessibilityHint];
-      } else {
-        itemView.button.accessibilityHint = localizedPosition;
-      }
-    }
     if (item.image) {
       itemView.image = item.image;
     }
@@ -852,6 +825,8 @@ + (NSString *)bundlePathWithName:(NSString *)bundleName {
 
 #pragma mark - MDCInkTouchControllerDelegate methods
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (MDCInkView *)inkTouchController:(MDCInkTouchController *)inkTouchController
             inkViewAtTouchLocation:(CGPoint)location {
   if ([inkTouchController.view isKindOfClass:[MDCBottomNavigationItemView class]]) {
@@ -867,6 +842,7 @@ - (BOOL)inkTouchController:(MDCInkTouchController *)inkTouchController
   }
   return YES;
 }
+#pragma clang diagnostic pop
 
 #pragma mark - MDCRippleTouchControllerDelegate methods