Merge branch 'release-candidate'

material-components · Sep 15, 2016 · 5269221 · 5269221
2 parents fb77a97 + 3ee0649
commit 5269221
Show file tree

Hide file tree

Showing 30 changed files with 956 additions and 1,172 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,69 @@
+# 13.4.0 
+
+## API diffs
+
+Auto-generated by running:
+
+    scripts/api_diff -o fb77a9716a80ba4ee2a9f92a81a89335570366e3 -n 8fa99ffb150b99597f19783d54203ff77a4219d2
+
+### FontDiskLoader
+
+- [deprecated] [`-[MDCFontDiskLoader initWithName:URL:]`](https://github.com/google/material-components-ios/blob/8fa99ffb150b99597f19783d54203ff77a4219d2/components/FontDiskLoader/src/MDCFontDiskLoader.h#L99).
+*Use initWithFontName:fontURL: instead.*
+- [deprecated] [`-[MDCFontDiskLoader registerFont]`](https://github.com/google/material-components-ios/blob/8fa99ffb150b99597f19783d54203ff77a4219d2/components/FontDiskLoader/src/MDCFontDiskLoader.h#L107).
+*Use load instead.*
+- [deprecated] [`-[MDCFontDiskLoader setFontName:]`](https://github.com/google/material-components-ios/blob/8fa99ffb150b99597f19783d54203ff77a4219d2/components/FontDiskLoader/src/MDCFontDiskLoader.h#L123).
+*Create a new instance if you need to specifiy a different font name.*
+- [deprecated] [`-[MDCFontDiskLoader unregisterFont]`](https://github.com/google/material-components-ios/blob/8fa99ffb150b99597f19783d54203ff77a4219d2/components/FontDiskLoader/src/MDCFontDiskLoader.h#L110).
+*Use unload instead.*
+- [deprecated] [`MDCFontDiskLoader.hasFailedRegistration`](https://github.com/google/material-components-ios/blob/8fa99ffb150b99597f19783d54203ff77a4219d2/components/FontDiskLoader/src/MDCFontDiskLoader.h#L117).
+*Use loadFailed instead.*
+- [deprecated] [`MDCFontDiskLoader.isRegistered`](https://github.com/google/material-components-ios/blob/8fa99ffb150b99597f19783d54203ff77a4219d2/components/FontDiskLoader/src/MDCFontDiskLoader.h#L113).
+*Use loaded instead.*
+
+## Component changes
+
+### AppBar
+
+#### Changes
+
+* [Removed reference to deleted MDCAppBarParenting.](https://github.com/google/material-components-ios/commit/80d36a3500ecab7ab45e94fb7405069460cd6692) (Adrian Secord)
+* [[MDCAppBar | MDCDialog | MDCInk] Nullability Clashing](https://github.com/google/material-components-ios/commit/7633f1e4307d36c32afc62e866f9e40765a81fc3) (Sean O'Shea)
+
+### Dialogs
+
+#### Changes
+
+* [Correct analyzer and compiler warnings.](https://github.com/google/material-components-ios/commit/4a0986a38919dc2a030cc451da490359721837d5) (Ian Gordon)
+* [[MDCAppBar | MDCDialog | MDCInk] Nullability Clashing](https://github.com/google/material-components-ios/commit/7633f1e4307d36c32afc62e866f9e40765a81fc3) (Sean O'Shea)
+
+### FontDiskLoader
+
+#### Changes
+
+* [Fixed readme reference to new initializer](https://github.com/google/material-components-ios/commit/d973f1b86dbbf1f2dfb5f37fe2a0445fd70402fa) (randallli)
+* [[FontDiskLoader]? Marked API deprecated that we were planing on deprecating from previous readbility change](https://github.com/google/material-components-ios/commit/a58c236f831ef151c0eafd47dd9bac8684f28fdb) (randallli)
+
+### Ink
+
+#### Changes
+
+* [[MDCAppBar | MDCDialog | MDCInk] Nullability Clashing](https://github.com/google/material-components-ios/commit/7633f1e4307d36c32afc62e866f9e40765a81fc3) (Sean O'Shea)
+* [[MDCInkTouchController] Improve comments to clarify method and protocol behavior](https://github.com/google/material-components-ios/commit/51ced6a4a2fc663516b6581e81a4351344e0dace) (Junius Gunaratne)
+
+### Slider
+
+#### Changes
+
+* [Changed clamping behaviour of the min setter to mutate the max instead of clamping to its value.](https://github.com/google/material-components-ios/commit/f3288569659d85a41e939005cac40915ffece286) (randallli)
+
+### Switch
+
+#### Changes
+
+* [Remove SKDisplayLinkInterface left over in MDCSwitch stress test](https://github.com/google/material-components-ios/commit/f19a6c92a1c59c846a191f08fd587aebf099d596) (Sam Morrison)
+* [Stress test for MDCSwitch](https://github.com/google/material-components-ios/commit/63d907e24ea53a4e31ac668b0ac982ab83868311) (Sam Morrison)
+
 # 13.3.0 
 
 ## API diffs

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "13.3.0"
+  s.version      = "13.4.0"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "13.3.0"
+  s.version      = "13.4.0"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "13.3.0"
+  s.version      = "13.4.0"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,37 +1,37 @@
 PODS:
   - CatalogByConvention (1.0.1)
-  - MaterialComponents (13.3.0):
-    - MaterialComponents/ActivityIndicator (= 13.3.0)
-    - MaterialComponents/AnimationTiming (= 13.3.0)
-    - MaterialComponents/AppBar (= 13.3.0)
-    - MaterialComponents/ButtonBar (= 13.3.0)
-    - MaterialComponents/Buttons (= 13.3.0)
-    - MaterialComponents/CollectionCells (= 13.3.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 13.3.0)
-    - MaterialComponents/Collections (= 13.3.0)
-    - MaterialComponents/Dialogs (= 13.3.0)
-    - MaterialComponents/FlexibleHeader (= 13.3.0)
-    - MaterialComponents/FontDiskLoader (= 13.3.0)
-    - MaterialComponents/HeaderStackView (= 13.3.0)
-    - MaterialComponents/Ink (= 13.3.0)
-    - MaterialComponents/NavigationBar (= 13.3.0)
-    - MaterialComponents/OverlayWindow (= 13.3.0)
-    - MaterialComponents/PageControl (= 13.3.0)
-    - MaterialComponents/Palettes (= 13.3.0)
-    - MaterialComponents/private (= 13.3.0)
-    - MaterialComponents/ProgressView (= 13.3.0)
-    - MaterialComponents/RobotoFontLoader (= 13.3.0)
-    - MaterialComponents/ShadowElevations (= 13.3.0)
-    - MaterialComponents/ShadowLayer (= 13.3.0)
-    - MaterialComponents/Slider (= 13.3.0)
-    - MaterialComponents/Snackbar (= 13.3.0)
-    - MaterialComponents/SpritedAnimationView (= 13.3.0)
-    - MaterialComponents/Switch (= 13.3.0)
-    - MaterialComponents/Typography (= 13.3.0)
-  - MaterialComponents/ActivityIndicator (13.3.0):
+  - MaterialComponents (13.4.0):
+    - MaterialComponents/ActivityIndicator (= 13.4.0)
+    - MaterialComponents/AnimationTiming (= 13.4.0)
+    - MaterialComponents/AppBar (= 13.4.0)
+    - MaterialComponents/ButtonBar (= 13.4.0)
+    - MaterialComponents/Buttons (= 13.4.0)
+    - MaterialComponents/CollectionCells (= 13.4.0)
+    - MaterialComponents/CollectionLayoutAttributes (= 13.4.0)
+    - MaterialComponents/Collections (= 13.4.0)
+    - MaterialComponents/Dialogs (= 13.4.0)
+    - MaterialComponents/FlexibleHeader (= 13.4.0)
+    - MaterialComponents/FontDiskLoader (= 13.4.0)
+    - MaterialComponents/HeaderStackView (= 13.4.0)
+    - MaterialComponents/Ink (= 13.4.0)
+    - MaterialComponents/NavigationBar (= 13.4.0)
+    - MaterialComponents/OverlayWindow (= 13.4.0)
+    - MaterialComponents/PageControl (= 13.4.0)
+    - MaterialComponents/Palettes (= 13.4.0)
+    - MaterialComponents/private (= 13.4.0)
+    - MaterialComponents/ProgressView (= 13.4.0)
+    - MaterialComponents/RobotoFontLoader (= 13.4.0)
+    - MaterialComponents/ShadowElevations (= 13.4.0)
+    - MaterialComponents/ShadowLayer (= 13.4.0)
+    - MaterialComponents/Slider (= 13.4.0)
+    - MaterialComponents/Snackbar (= 13.4.0)
+    - MaterialComponents/SpritedAnimationView (= 13.4.0)
+    - MaterialComponents/Switch (= 13.4.0)
+    - MaterialComponents/Typography (= 13.4.0)
+  - MaterialComponents/ActivityIndicator (13.4.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/AnimationTiming (13.3.0)
-  - MaterialComponents/AppBar (13.3.0):
+  - MaterialComponents/AnimationTiming (13.4.0)
+  - MaterialComponents/AppBar (13.4.0):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -40,15 +40,15 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (13.3.0):
+  - MaterialComponents/ButtonBar (13.4.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (13.3.0):
+  - MaterialComponents/Buttons (13.4.0):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionCells (13.3.0):
+  - MaterialComponents/CollectionCells (13.4.0):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -59,95 +59,95 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (13.3.0)
-  - MaterialComponents/Collections (13.3.0):
+  - MaterialComponents/CollectionLayoutAttributes (13.4.0)
+  - MaterialComponents/Collections (13.4.0):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (13.3.0):
+  - MaterialComponents/Dialogs (13.4.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FlexibleHeader (13.3.0):
+  - MaterialComponents/FlexibleHeader (13.4.0):
     - MDFTextAccessibility (~> 1.1)
-  - MaterialComponents/FontDiskLoader (13.3.0)
-  - MaterialComponents/HeaderStackView (13.3.0)
-  - MaterialComponents/Ink (13.3.0)
-  - MaterialComponents/NavigationBar (13.3.0):
+  - MaterialComponents/FontDiskLoader (13.4.0)
+  - MaterialComponents/HeaderStackView (13.4.0)
+  - MaterialComponents/Ink (13.4.0)
+  - MaterialComponents/NavigationBar (13.4.0):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (13.3.0)
-  - MaterialComponents/PageControl (13.3.0)
-  - MaterialComponents/Palettes (13.3.0)
-  - MaterialComponents/private (13.3.0):
-    - MaterialComponents/private/Color (= 13.3.0)
-    - MaterialComponents/private/Icons (= 13.3.0)
-    - MaterialComponents/private/KeyboardWatcher (= 13.3.0)
-    - MaterialComponents/private/Overlay (= 13.3.0)
-    - MaterialComponents/private/RTL (= 13.3.0)
-    - MaterialComponents/private/ThumbTrack (= 13.3.0)
-  - MaterialComponents/private/Color (13.3.0)
-  - MaterialComponents/private/Icons (13.3.0):
-    - MaterialComponents/private/Icons/Base (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_check (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_info (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 13.3.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 13.3.0)
-  - MaterialComponents/private/Icons/Base (13.3.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (13.3.0):
+  - MaterialComponents/OverlayWindow (13.4.0)
+  - MaterialComponents/PageControl (13.4.0)
+  - MaterialComponents/Palettes (13.4.0)
+  - MaterialComponents/private (13.4.0):
+    - MaterialComponents/private/Color (= 13.4.0)
+    - MaterialComponents/private/Icons (= 13.4.0)
+    - MaterialComponents/private/KeyboardWatcher (= 13.4.0)
+    - MaterialComponents/private/Overlay (= 13.4.0)
+    - MaterialComponents/private/RTL (= 13.4.0)
+    - MaterialComponents/private/ThumbTrack (= 13.4.0)
+  - MaterialComponents/private/Color (13.4.0)
+  - MaterialComponents/private/Icons (13.4.0):
+    - MaterialComponents/private/Icons/Base (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_check (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_check_circle (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_info (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 13.4.0)
+    - MaterialComponents/private/Icons/ic_reorder (= 13.4.0)
+  - MaterialComponents/private/Icons/Base (13.4.0)
+  - MaterialComponents/private/Icons/ic_arrow_back (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (13.3.0):
+  - MaterialComponents/private/Icons/ic_check (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (13.3.0):
+  - MaterialComponents/private/Icons/ic_check_circle (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (13.3.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (13.3.0):
+  - MaterialComponents/private/Icons/ic_info (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (13.3.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (13.3.0):
+  - MaterialComponents/private/Icons/ic_reorder (13.4.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (13.3.0)
-  - MaterialComponents/private/Overlay (13.3.0)
-  - MaterialComponents/private/RTL (13.3.0)
-  - MaterialComponents/private/ThumbTrack (13.3.0):
+  - MaterialComponents/private/KeyboardWatcher (13.4.0)
+  - MaterialComponents/private/Overlay (13.4.0)
+  - MaterialComponents/private/RTL (13.4.0)
+  - MaterialComponents/private/ThumbTrack (13.4.0):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ProgressView (13.3.0):
+  - MaterialComponents/ProgressView (13.4.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/RobotoFontLoader (13.3.0):
+  - MaterialComponents/RobotoFontLoader (13.4.0):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (13.3.0)
-  - MaterialComponents/ShadowLayer (13.3.0)
-  - MaterialComponents/Slider (13.3.0):
+  - MaterialComponents/ShadowElevations (13.4.0)
+  - MaterialComponents/ShadowLayer (13.4.0)
+  - MaterialComponents/Slider (13.4.0):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (13.3.0):
+  - MaterialComponents/Snackbar (13.4.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (13.3.0)
-  - MaterialComponents/Switch (13.3.0):
+  - MaterialComponents/SpritedAnimationView (13.4.0)
+  - MaterialComponents/Switch (13.4.0):
     - MaterialComponents/private/RTL
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (13.3.0)
-  - MaterialComponentsCatalog (13.3.0):
+  - MaterialComponents/Typography (13.4.0)
+  - MaterialComponentsCatalog (13.4.0):
     - MaterialComponents
-  - MaterialComponentsUnitTests (13.3.0):
+  - MaterialComponentsUnitTests (13.4.0):
     - MaterialComponents
     - MDFTextAccessibility
   - MDFTextAccessibility (1.1.1)
@@ -168,9 +168,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
-  MaterialComponents: 1fb1653f0b31daf3ffcd9b33c1e9a52fd255e33d
-  MaterialComponentsCatalog: ded2f704154658eddd4f689e2f2ea7d6c7c58e98
-  MaterialComponentsUnitTests: 04c8c7f41277deaa468a39136745f3ece45e47ed
+  MaterialComponents: 1b7ff584a0dbdf9c99856d06beca85373209bc49
+  MaterialComponentsCatalog: a1d2732055be3d6259c24f6954a2014ada38c570
+  MaterialComponentsUnitTests: 59c656fa442ecd8819e9d62e3cfff4a9336a67d1
   MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
 
 PODFILE CHECKSUM: d8e6d6aab517ce9f15b570bd45e131bbde872b51

diff --git a/components/AppBar/README.md b/components/AppBar/README.md
@@ -25,7 +25,6 @@ navigation experience.
 <ul class="icon-list">
   <li class="icon-link"><a href="https://material-ext.appspot.com/mdc-ios-preview/components/AppBar/apidocs/Classes/MDCAppBar.html">MDCAppBar</a></li>
   <li class="icon-link"><a href="https://material-ext.appspot.com/mdc-ios-preview/components/AppBar/apidocs/Classes/MDCAppBarContainerViewController.html">MDCAppBarContainerViewController</a></li>
-  <li class="icon-link"><a href="https://material-ext.appspot.com/mdc-ios-preview/components/AppBar/apidocs/Protocols/MDCAppBarParenting.html">MDCAppBarParenting</a></li>
 </ul>
 
 - - -

diff --git a/components/AppBar/src/MDCAppBarContainerViewController.h b/components/AppBar/src/MDCAppBarContainerViewController.h
@@ -51,8 +51,8 @@
 
 - (nonnull instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
                                  bundle:(nullable NSBundle *)nibBundleOrNil NS_UNAVAILABLE;
-- (nullable instancetype)initWithCoder:(nonnull NSCoder *)aDecoder NS_UNAVAILABLE;
-- (nullable instancetype)init NS_UNAVAILABLE;
+- (nonnull instancetype)initWithCoder:(nonnull NSCoder *)aDecoder NS_UNAVAILABLE;
+- (nonnull instancetype)init NS_UNAVAILABLE;
 
 /** The App Bar views that will be presented in front of the contentViewController's view. */
 @property(nonatomic, strong, nonnull, readonly) MDCAppBar *appBar;

diff --git a/components/Dialogs/src/MDCAlertController.h b/components/Dialogs/src/MDCAlertController.h
@@ -90,7 +90,8 @@
 @property(nonatomic, nullable, copy) NSString *message;
 
 /** MDCAlertController handles its own transitioning delegate. */
-- (void)setTransitioningDelegate:(_Nullable id)transitioningDelegate NS_UNAVAILABLE;
+- (void)setTransitioningDelegate:
+        (_Nullable id<UIViewControllerTransitioningDelegate>)transitioningDelegate NS_UNAVAILABLE;
 
 /** MDCAlertController.modalPresentationStyle is always UIModalPresentationCustom. */
 - (void)setModalPresentationStyle:(UIModalPresentationStyle)modalPresentationStyle NS_UNAVAILABLE;
@@ -118,7 +119,7 @@ typedef void (^MDCActionHandler)(MDCAlertAction *_Nonnull action);
                                 handler:(__nullable MDCActionHandler)handler;
 
 /** Alert actions must be created with actionWithTitle:handler: */
-- (nullable instancetype)init NS_UNAVAILABLE;
+- (nonnull instancetype)init NS_UNAVAILABLE;
 
 /**
  Title of the button shown on the alert dialog.