Merge branch 'release-candidate'

Author: ajsecord

CHANGELOG.md

@@ -1,3 +1,52 @@
+# 16.2.0
+
+## API diffs
+
+### FeatureHighlight 
+
+* [FeatureHighlight](https://github.com/google/material-components-ios/commit/d4806473e49e65f0e9cc52139e39c3f1eba4f499) is a new component that lets you highlight a particular feature of your interface to the user.
+
+## Component changes
+
+### AppBar
+
+#### Changes
+
+* [Ensure typical use examples match for Objective C and Swift (#815)](https://github.com/google/material-components-ios/commit/09fb272376e814677f2936651906fd764618ea05) (Junius Gunaratne)
+
+### CollectionCells
+
+#### Changes
+
+* [Align text labels frames to the upper pixel.](https://github.com/google/material-components-ios/commit/5a1a23d3c69c1c652b317219e1bb51d163000d4d) (Louis Romero)
+* [Show/hide the editing box as entering/leaving edit](https://github.com/google/material-components-ios/commit/12206c44e72bd133f77a8d7373614f19cc73ec88) (Louis Romero)
+
+### Collections
+
+#### Changes
+
+* [Fix -[MDCCollectionViewFlowLayout updateCellStateMaskWithAttribute:] (#732)](https://github.com/google/material-components-ios/commit/f2b93ae1119b28ee0685b780ccdd7e2a8044da2d) (Jackie Quinn)
+
+### FeatureHighlight
+
+#### Changes
+
+* [MDCFeatureHighlightViewController implementation (#765)](https://github.com/google/material-components-ios/commit/d4806473e49e65f0e9cc52139e39c3f1eba4f499) (Sam Morrison)
+* [Minor feature highlight fixes (#814)](https://github.com/google/material-components-ios/commit/b1c814d038b2cccaed76a7048deac1ae3771d7cd) (Sam Morrison)
+
+### NavigationBar
+
+#### Changes
+
+* [Setting default state of textAlignment (#817)](https://github.com/google/material-components-ios/commit/9e947eba06b09ab8ad901af9d2a8001fac824daf) (Randall Li)
+* [[Navigation Bar] Fixed text alignment in a better way that accepts the pre iOS8 default. (#820)](https://github.com/google/material-components-ios/commit/328631c19a2b89b0f4d8c11c24796ad0963976ee) (Randall Li)
+
+### Switch
+
+#### Changes
+
+* [Added haptic feedback to MDCSwitch (#812)](https://github.com/google/material-components-ios/commit/6aae38dfa70db77929ef2952ff3b8fce3caea60b) (Adrian Secord)
+
 # 16.1.0
 
 ## Component changes

MaterialComponents.podspec

@@ -2,12 +2,12 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "16.1.0"
+  s.version      = "16.2.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"
   s.license      = "Apache 2.0"
-  s.source       = { :git => "https://github.com/google/material-components-ios.git", :tag => s.version.to_s }
+  s.source       = { :git => "https://github.com/google/material-components-ios.git", :tag => "v#{s.version}" }
   s.platform     = :ios
   s.requires_arc = true
 
@@ -21,8 +21,8 @@ Pod::Spec.new do |s|
   #
   # ## Optional properties
   #
-  # resource_bundles     => If your component has a bundle, add a dictionary mapping from the bundle
-  #                         name to the bundle path.
+  # resources    		 => If your component has a bundle, add a dictionary mapping from the bundle
+  #                         name to the bundle path. NOTE: Do not use resource_bundle property.
   #
   # # Template subspec
   #
@@ -32,9 +32,8 @@ Pod::Spec.new do |s|
   #    ss.header_mappings_dir = "components/#{ss.base_name}/src"
   #
   #    # Only if you have a resource bundle
-  #    ss.resource_bundles = {
-  #      "Material#{ss.base_name}" => ["components/#{ss.base_name}/Material#{ss.base_name}.bundle/*"]
-  #    }
+  #    ss.resources = ["components/#{ss.base_name}/Material#{ss.base_name}.bundle"]
+  #    
   #  end
   #
 
@@ -128,9 +127,7 @@ Pod::Spec.new do |s|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
-    ss.resource_bundles = {
-      "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
-    }
+    ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
 
     ss.framework = "CoreGraphics", "QuartzCore"
 
@@ -154,6 +151,15 @@ Pod::Spec.new do |s|
     ss.dependency "MaterialComponents/private/KeyboardWatcher"
   end
 
+  s.subspec "FeatureHighlight" do |ss|
+    ss.ios.deployment_target = '7.0'
+    ss.public_header_files = "components/#{ss.base_name}/src/*.h"
+    ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
+    ss.header_mappings_dir = "components/#{ss.base_name}/src"
+    ss.dependency "MaterialComponents/Typography"
+    ss.dependency "MDFTextAccessibility"
+  end
+
   s.subspec "FlexibleHeader" do |ss|
     ss.ios.deployment_target = '7.0'
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
@@ -208,9 +214,7 @@ Pod::Spec.new do |s|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
-    ss.resource_bundles = {
-      "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
-    }
+    ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
   end
 
   s.subspec "Palettes" do |ss|
@@ -236,9 +240,7 @@ Pod::Spec.new do |s|
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
 
     # Only if you have a resource bundle
-    ss.resource_bundles = {
-      "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
-    }
+    ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
 
     ss.dependency "MaterialComponents/FontDiskLoader"
     ss.dependency "MaterialComponents/Typography"
@@ -292,9 +294,7 @@ Pod::Spec.new do |s|
     ss.public_header_files = "components/#{ss.base_name}/src/*.h"
     ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
     ss.header_mappings_dir = "components/#{ss.base_name}/src"
-    ss.resource_bundles = {
-      "Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
-    }
+    ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
 
     ss.dependency "MaterialComponents/private/ThumbTrack"
     ss.dependency "MaterialComponents/private/RTL"

MaterialComponentsCatalog.podspec

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

MaterialComponentsUnitTests.podspec

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

README.md

@@ -115,8 +115,8 @@ Choose from Objective-C or Swift:
 
 #### Swift
 
-~~~swift
-import MaterialComponents
+~~~ swift
+import MaterialComponents.MaterialButtons
 
 class MDCBuildTestViewController: UIViewController {
 

catalog/MDCCatalog.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		403860EF1D24328A00FB8216 /* MDCCatalogTileDataDialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = 403860EE1D24328A00FB8216 /* MDCCatalogTileDataDialogs.m */; };
 		5D090E571C9AEB8D0061344A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5D090E341C9AEB8C0061344A /* Localizable.strings */; };
 		5D2B1DB2BD8D444E630A80AC /* EarlGrey.framework in EarlGrey Copy Files */ = {isa = PBXBuildFile; fileRef = E94681B7591B9CD40924C92C /* EarlGrey.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		645594551D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m in Sources */ = {isa = PBXBuildFile; fileRef = 645594541D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m */; };
 		664524B71C6BA62A001ADBF8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664524B61C6BA62A001ADBF8 /* AppDelegate.swift */; };
 		664524B91C6BA62A001ADBF8 /* MDCNodeListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664524B81C6BA62A001ADBF8 /* MDCNodeListViewController.swift */; };
 		664524BE1C6BA62A001ADBF8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 664524BD1C6BA62A001ADBF8 /* Assets.xcassets */; };
@@ -119,6 +120,8 @@
 		5D090E541C9AEB8D0061344A /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5D090E551C9AEB8D0061344A /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5D090E561C9AEB8D0061344A /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
+		645594531D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MDCCatalogTileDataFeatureHighlight.h; sourceTree = "<group>"; };
+		645594541D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MDCCatalogTileDataFeatureHighlight.m; sourceTree = "<group>"; };
 		664524B31C6BA62A001ADBF8 /* MDCCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MDCCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		664524B61C6BA62A001ADBF8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		664524B81C6BA62A001ADBF8 /* MDCNodeListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MDCNodeListViewController.swift; sourceTree = "<group>"; };
@@ -289,6 +292,8 @@
 				DE7A17C41CCAC1EA00B66230 /* MDCCatalogTileDataCollections.m */,
 				403860ED1D24328A00FB8216 /* MDCCatalogTileDataDialogs.h */,
 				403860EE1D24328A00FB8216 /* MDCCatalogTileDataDialogs.m */,
+				645594531D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.h */,
+				645594541D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m */,
 				DE19446F1CBD9E40009E0321 /* MDCCatalogTileDataFlexibleHeader.h */,
 				DE1944701CBD9E40009E0321 /* MDCCatalogTileDataFlexibleHeader.m */,
 				DE1944711CBD9E40009E0321 /* MDCCatalogTileDataHeaderStackView.h */,
@@ -575,6 +580,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				DE1944901CBD9E40009E0321 /* MDCCatalogTileDataShadowLayer.m in Sources */,
+				645594551D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m in Sources */,
 				DE1944911CBD9E40009E0321 /* MDCCatalogTileDataSlider.m in Sources */,
 				DE19448E1CBD9E40009E0321 /* MDCCatalogTileDataNavigationBar.m in Sources */,
 				DE19448F1CBD9E40009E0321 /* MDCCatalogTileDataPageControl.m in Sources */,

catalog/MDCCatalog/MDCCatalogTileDataFeatureHighlight.h

@@ -0,0 +1,23 @@
+/*
+ Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "MDCCatalogTileData.h"
+
+@interface MDCCatalogTileDataFeatureHighlight : MDCCatalogTileData
+
++ (UIImage *)drawTileImage:(CGRect)frame;
+
+@end

catalog/MDCCatalog/MDCCatalogTileDataFeatureHighlight.m

@@ -0,0 +1,26 @@
+/*
+ Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "MDCCatalogTileDataFeatureHighlight.h"
+
+@implementation MDCCatalogTileDataFeatureHighlight
+
++ (UIImage *)drawTileImage:(CGRect)frame {
+  return [self drawImageWithFrame:frame drawBlock:^(CGRect blockFrame) {
+  }];
+}
+
+@end

catalog/MDCCatalog/MDCCatalogTileView.swift

@@ -82,6 +82,8 @@ class MDCCatalogTileView: UIView {
       newImage = MDCCatalogTileDataButtons.drawTileImage(centeredFrame)
     case "Collections":
       newImage = MDCCatalogTileDataCollections.drawTileImage(centeredFrame)
+    case "Feature Highlight":
+      newImage = MDCCatalogTileDataFeatureHighlight.drawTileImage(centeredFrame)
     case "Flexible Header":
       newImage = MDCCatalogTileDataFlexibleHeader.drawTileImage(centeredFrame)
     case "Header Stack View":

catalog/MDCCatalog/MDCCatalogTiles.h

@@ -20,6 +20,7 @@
 #import "MDCCatalogTileDataButtonBar.h"
 #import "MDCCatalogTileDataButtons.h"
 #import "MDCCatalogTileDataCollections.h"
+#import "MDCCatalogTileDataFeatureHighlight.h"
 #import "MDCCatalogTileDataFlexibleHeader.h"
 #import "MDCCatalogTileDataHeaderStackView.h"
 #import "MDCCatalogTileDataInk.h"