Merge branch 'release-candidate' into stable

material-components · Jul 6, 2020 · 6710c3d · 6710c3d
2 parents 50a0d4c + 6a6231c
commit 6710c3d
Show file tree

Hide file tree

Showing 58 changed files with 1,624 additions and 1,049 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,59 @@
+# 110.2.0
+
+In this minor release, we annotated several APIs as to be deprecated in BottomNavigation, Chips, Dialogs, FlexibleHeader, and NavigationBar. We also made improvements and bug fixes to Dialogs, NavigationDrawer, and TextControls.
+
+## Component changes
+
+### BottomNavigation
+
+* [Mark more apis as to-be-deprecated.](https://github.com/material-components/material-components-ios/commit/2a912f3ee648d83d9088a63543fd212545381f37) (Jeff Verkoeyen)
+
+### Chips
+
+* [Mark more apis as to-be-deprecated.](https://github.com/material-components/material-components-ios/commit/f8435a54150e0803aad5c9a97d67aa6150510bd2) (Jeff Verkoeyen)
+
+### Dialogs
+
+* [Add title icon examples](https://github.com/material-components/material-components-ios/commit/d220234cef63e1a1926d1b8e55cada34ac4bedb8) (Galia Kaufman)
+* [Adding dynamic type to accessory view examples](https://github.com/material-components/material-components-ios/commit/6f1b595d0db35bb7f552beb1d1a2453bbf5c18ba) (Galia Kaufman)
+* [Fix position of leading/trailing actions in vertical layout](https://github.com/material-components/material-components-ios/commit/58c4a0e4e60402df7463d40a136ae0db719d18ea) (Galia Kaufman)
+* [Fix title icon resize on orientation change](https://github.com/material-components/material-components-ios/commit/74cf7203562fe684824c63fd088c5be0d8b5447e) (Galia Kaufman)
+* [Fixing alignment examples.](https://github.com/material-components/material-components-ios/commit/6b124ad79532c1593f2a1d15112edfc511862b03) (Galia Kaufman)
+* [Mark more apis as to-be-deprecated.](https://github.com/material-components/material-components-ios/commit/c16f0de9ab9b6f413a3eedde8b752180fca5a82e) (Jeff Verkoeyen)
+* [Merge typical use examples](https://github.com/material-components/material-components-ios/commit/80685a5a0064e958174bece3575b1a886ae55a18) (Galia Kaufman)
+* [Moving attributed message example out from accessory view examples](https://github.com/material-components/material-components-ios/commit/97b1a1f6ce9f114a8685ea805b616cee3a1e878c) (Galia Kaufman)
+* [Testing trailing actions in reversed vertical order](https://github.com/material-components/material-components-ios/commit/8bf81b7d0a0fdcf6cdb135b97a6d3999463730e6) (Galia Kaufman)
+* [Use API_AVAILABLE instead of `#if defined (__IPHONE_10_0)` etc](https://github.com/material-components/material-components-ios/commit/679abbe6701c321f481b15134964d38e3ae2551f) (Andrew Overton)
+
+### FlexibleHeader
+
+* [Respect UIRefreshControl in tracked scroll view in flexible header.](https://github.com/material-components/material-components-ios/commit/8bd70a377ee4f5cd1044f308a3521b1a2aa52f33) (Nobody)
+
+### NavigationBar
+
+* [Mark more apis as to-be-deprecated.](https://github.com/material-components/material-components-ios/commit/b380dc58972adeb19b0e2d89cbc05016d4a02655) (Jeff Verkoeyen)
+
+### NavigationDrawer
+
+* [Fix bug where MDCBottomDrawerContainerViewController has the size of the screen instead of the window when in iPad Slide Over.](https://github.com/material-components/material-components-ios/commit/29a39ea375bcdaddcac5b5da1daed803be18cb69) (Nobody)
+* [Update the MDCBottomDrawerViewController MDC themer to use dynamic colors.](https://github.com/material-components/material-components-ios/commit/ae438a451db4d051ddce50be520ea80ab67bc811) (Jake Rockland)
+
+### TextControls
+
+* [Make text areas respond to width changes](https://github.com/material-components/material-components-ios/commit/2675070cd5dbfaabe4af22f73117011bcc932ab6) (Andrew Overton)
+* [Make text areas shorter when there is no floating label](https://github.com/material-components/material-components-ios/commit/cfd9b3ff560a6c75643f2d8c2c5748982ca3e9df) (Andrew Overton)
+
+### private/Math
+
+* [Mark MDCVisibleAreaInsetsForMinimumTappability deprecated.](https://github.com/material-components/material-components-ios/commit/a95c7968c80496e854d3490ecf69480583bef352) (Wenyu Zhang)
+
+## Multi-component changes
+
+* [Internal change](https://github.com/material-components/material-components-ios/commit/45ef431efa2898cb63ba237a73e3a70618db7cb6) (Wenyu Zhang)
+* [Mark more apis as to-be-deprecated.](https://github.com/material-components/material-components-ios/commit/d0809e93bf13eb0a74313a50d91263fe4f23b6b4) (Jeff Verkoeyen)
+
+---
+
 # 110.1.0
 
 In this minor release, we deprecated `visibleAreaInsets` from `MDCChipView` and added `centerVisibleArea` API. We annotated several APIs as to be deprecated in Buttons. Ripple support is added to CollectionCells and Collections as well.

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      = "110.1.0"
+  mdc.version      = "110.2.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/MaterialComponentsBeta.podspec b/MaterialComponentsBeta.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponentsBeta"
-  mdc.version      = "110.1.0"
+  mdc.version      = "110.2.0"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone alpha UI libraries that are not yet guaranteed to be ready for general production use. Use with caution."
   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      = "110.1.0"
+  s.version      = "110.2.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      = "110.1.0"
+  s.version      = "110.2.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      = "110.1.0"
+  s.version      = "110.2.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 @@
-110.1.0
+110.2.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>110.1.0</string>
+	<string>110.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>110.1.0</string>
+	<string>110.2.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>110.1.0</string>
+	<string>110.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>110.1.0</string>
+	<string>110.2.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      = "110.1.0"
+  s.version      = "110.2.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/BottomNavigation/src/MDCBottomNavigationBar.h b/components/BottomNavigation/src/MDCBottomNavigationBar.h
@@ -212,18 +212,6 @@ typedef NS_ENUM(NSInteger, MDCBottomNavigationBarAlignment) {
  */
 @property(nonatomic, assign) NSInteger titlesNumberOfLines;
 
-/**
- By setting this property to @c YES, the Ripple component will be used instead of Ink
- to display visual feedback to the user.
-
- @note This property will eventually be enabled by default, deprecated, and then deleted as part
- of our migration to Ripple. Learn more at
- https://github.com/material-components/material-components-ios/tree/develop/components/Ink#migration-guide-ink-to-ripple
-
- Defaults to NO.
- */
-@property(nonatomic, assign) BOOL enableRippleBehavior;
-
 /**
 A block that is invoked when the @c MDCBottomNavigationBar receives a call to @c
 traitCollectionDidChange:. The block is called after the call to the superclass.
@@ -239,11 +227,6 @@ traitCollectionDidChange:. The block is called after the call to the superclass.
  */
 - (nullable UIView *)viewForItem:(nonnull UITabBarItem *)item;
 
-@end
-
-/** APIs that are deprecated. No new code should rely on these APIs. */
-@interface MDCBottomNavigationBar (Deprecated)
-
 /**
  Flag to allow clients to gradually correct the size/position of the Bottom Navigation bar relative
  to the safe area on iOS 11+.
@@ -258,6 +241,23 @@ traitCollectionDidChange:. The block is called after the call to the superclass.
 
 @end
 
+/** APIs that are deprecated. No new code should rely on these APIs. */
+@interface MDCBottomNavigationBar (ToBeDeprecated)
+
+/**
+ By setting this property to @c YES, the Ripple component will be used instead of Ink
+ to display visual feedback to the user.
+
+ @note This property will eventually be enabled by default, deprecated, and then deleted as part
+ of our migration to Ripple. Learn more at
+ https://github.com/material-components/material-components-ios/tree/develop/components/Ink#migration-guide-ink-to-ripple
+
+ Defaults to NO.
+ */
+@property(nonatomic, assign) BOOL enableRippleBehavior;
+
+@end
+
 #if MDC_AVAILABLE_SDK_IOS(13_0)
 /**
  This component supports UIKit's Large Content Viewer. It is recommended that images associated with

diff --git a/components/BottomNavigation/src/MDCBottomNavigationBar.m b/components/BottomNavigation/src/MDCBottomNavigationBar.m
@@ -50,9 +50,6 @@
 @interface MDCBottomNavigationBar () <MDCInkTouchControllerDelegate,
                                       MDCRippleTouchControllerDelegate>
 
-// Declared in MDCBottomNavigationBar (ToBeDeprecated)
-@property(nonatomic, assign) BOOL sizeThatFitsIncludesSafeArea;
-
 @property(nonatomic, assign) BOOL itemsDistributed;
 @property(nonatomic, readonly) BOOL isTitleBelowIcon;
 @property(nonatomic, assign) CGFloat maxLandscapeClusterContainerWidth;
@@ -65,6 +62,7 @@ @interface MDCBottomNavigationBar () <MDCInkTouchControllerDelegate,
 @property(nonatomic, strong) NSMutableArray *inkControllers;
 @property(nonatomic) BOOL shouldPretendToBeATabBar;
 @property(nonatomic, strong) UILayoutGuide *barItemsLayoutGuide NS_AVAILABLE_IOS(9_0);
+@property(nonatomic, assign) BOOL enableRippleBehavior;
 
 #if MDC_AVAILABLE_SDK_IOS(13_0)
 /**

diff --git a/components/Chips/src/MDCChipView.h b/components/Chips/src/MDCChipView.h
@@ -111,14 +111,6 @@
  */
 @property(nonatomic, strong, nullable) UIFont *titleFont UI_APPEARANCE_SELECTOR;
 
-/*
- This property determines if an @c MDCChipView should use the @c MDCRippleView behavior or not.
- By setting this property to @c YES, @c MDCStatefulRippleView is used to provide the user visual
- touch feedback, instead of the legacy @c MDCInkView.
- @note Defaults to @c NO.
- */
-@property(nonatomic, assign) BOOL enableRippleBehavior;
-
 /**
  Enabling the selection of the Chip on tap (when RippleBehavior is enabled).
  When rippleAllowsSelection is enabled, tapping a chip automatically toggles the chip's selected
@@ -159,20 +151,6 @@
 @property(nonatomic, readwrite, setter=mdc_setAdjustsFontForContentSizeCategory:)
     BOOL mdc_adjustsFontForContentSizeCategory UI_APPEARANCE_SELECTOR;
 
-/**
- Affects the fallback behavior for when a scaled font is not provided.
-
- If enabled, the font size will adjust even if a scaled font has not been provided for
- a given UIFont property on this component.
-
- If disabled, the font size will only be adjusted if a scaled font has been provided.
- This behavior most closely matches UIKit's.
-
- Default value is YES, but this flag will eventually default to NO and then be deprecated
- and deleted.
- */
-@property(nonatomic, assign) BOOL adjustsFontForContentSizeCategoryWhenScaledFontIsUnavailable;
-
 /**
  The minimum dimensions of the Chip. A non-positive value for either height or width is equivalent
  to no minimum for that dimension.
@@ -358,3 +336,29 @@ of the chip.
     __attribute__((deprecated("Consider using centerVisibleArea to adjust visible area.")));
 
 @end
+
+@interface MDCChipView (ToBeDeprecated)
+
+/*
+ This property determines if an @c MDCChipView should use the @c MDCRippleView behavior or not.
+ By setting this property to @c YES, @c MDCStatefulRippleView is used to provide the user visual
+ touch feedback, instead of the legacy @c MDCInkView.
+ @note Defaults to @c NO.
+ */
+@property(nonatomic, assign) BOOL enableRippleBehavior;
+
+/**
+ Affects the fallback behavior for when a scaled font is not provided.
+
+ If enabled, the font size will adjust even if a scaled font has not been provided for
+ a given UIFont property on this component.
+
+ If disabled, the font size will only be adjusted if a scaled font has been provided.
+ This behavior most closely matches UIKit's.
+
+ Default value is YES, but this flag will eventually default to NO and then be deprecated
+ and deleted.
+ */
+@property(nonatomic, assign) BOOL adjustsFontForContentSizeCategoryWhenScaledFontIsUnavailable;
+
+@end
diff --git a/components/Chips/src/MDCChipView.m b/components/Chips/src/MDCChipView.m
@@ -115,6 +115,8 @@ @interface MDCChipView ()
 @property(nonatomic, strong) MDCInkView *inkView;
 @property(nonatomic, strong) MDCStatefulRippleView *rippleView;
 @property(nonatomic, readonly) CGFloat pixelScale;
+@property(nonatomic, assign) BOOL enableRippleBehavior;
+@property(nonatomic, assign) BOOL adjustsFontForContentSizeCategoryWhenScaledFontIsUnavailable;
 @property(nonatomic, assign) UIEdgeInsets currentVisibleAreaInsets;
 @property(nonatomic, assign) CGFloat currentCornerRadius;
 @end