Skip to content

Commit

Permalink
Merge branch 'release-candidate'
Browse files Browse the repository at this point in the history
  • Loading branch information
ShepJGoogle committed Oct 24, 2016
2 parents 4dd600a + e1efdea commit 544552f
Show file tree
Hide file tree
Showing 27 changed files with 712 additions and 397 deletions.
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
# 16.0.0

## API diffs

### InkTouchController

- [deleted] [`MDCInkTouchController.inkView`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Ink/src/MDCInkTouchController.h#L119)

## Component changes

### AppBar

#### Changes

* [Let the content view controller decide orientation](https://github.com/google/material-components-ios/commit/1a3069ff8de8eb406c037a1ff6738093c57efeee) (Louis Romero)

### Dialogs

#### Changes

* [Documentation Updates](https://github.com/google/material-components-ios/commit/f1b983465f304efc52d8c792af19b76d88a4a7b2) (Ian Gordon)

### Ink

#### Changes

* [Remove deprecated inkView property](https://github.com/google/material-components-ios/commit/2ce6d648292b8dcae90241a5c39405bfa368e1e4) (Junius Gunaratne)
* [define UIGestureRecognizerStateRecognized (#751)](https://github.com/google/material-components-ios/commit/4873362130f5d5c1893383dd9f6bfc71506dbbd9) (Junius Gunaratne)

### ShadowElevations

#### Changes

* [Documentation Updates](https://github.com/google/material-components-ios/commit/f1b983465f304efc52d8c792af19b76d88a4a7b2) (Ian Gordon)

### ShadowLayer

#### Changes

* [Documentation Updates](https://github.com/google/material-components-ios/commit/f1b983465f304efc52d8c792af19b76d88a4a7b2) (Ian Gordon)

### Switch

#### Changes

* [Update colours of MDCSwitch when changing tint color. (#758)](https://github.com/google/material-components-ios/commit/6f7b4ebf2b8c0225f02ef27779c204cc181d3abb) (Sylvain Defresne)
* [[MDCSwitch] Update objective-c example to match swift (#777)](https://github.com/google/material-components-ios/commit/ceeba259683892b63c474c6d51f86ee20aae0e07) (Chuck Hays)



# 15.2.0

## API diffs
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponents.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'

Pod::Spec.new do |s|
s.name = "MaterialComponents"
s.version = "15.2.0"
s.version = "16.0.0"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsCatalog.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsCatalog"
s.version = "15.2.0"
s.version = "16.0.0"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponentsUnitTests.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsUnitTests"
s.version = "15.2.0"
s.version = "16.0.0"
s.authors = { 'Apple platform engineering at Google' => '[email protected]' }
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
s.homepage = "https://github.com/google/material-components-ios"
Expand Down
3 changes: 3 additions & 0 deletions catalog/MDCCatalog.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@
};
664524B21C6BA62A001ADBF8 = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = EQHXZ8M8AV;
LastSwiftMigration = 0800;
};
};
Expand Down Expand Up @@ -785,6 +786,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
INFOPLIST_FILE = MDCCatalog/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
Expand All @@ -802,6 +804,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
INFOPLIST_FILE = MDCCatalog/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
Expand Down
194 changes: 97 additions & 97 deletions catalog/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
PODS:
- CatalogByConvention (1.0.1)
- EarlGrey (1.3.0)
- MaterialComponents (15.2.0):
- MaterialComponents/ActivityIndicator (= 15.2.0)
- MaterialComponents/AnimationTiming (= 15.2.0)
- MaterialComponents/AppBar (= 15.2.0)
- MaterialComponents/ButtonBar (= 15.2.0)
- MaterialComponents/Buttons (= 15.2.0)
- MaterialComponents/CollectionCells (= 15.2.0)
- MaterialComponents/CollectionLayoutAttributes (= 15.2.0)
- MaterialComponents/Collections (= 15.2.0)
- MaterialComponents/Dialogs (= 15.2.0)
- MaterialComponents/FlexibleHeader (= 15.2.0)
- MaterialComponents/FontDiskLoader (= 15.2.0)
- MaterialComponents/HeaderStackView (= 15.2.0)
- MaterialComponents/Ink (= 15.2.0)
- MaterialComponents/NavigationBar (= 15.2.0)
- MaterialComponents/OverlayWindow (= 15.2.0)
- MaterialComponents/PageControl (= 15.2.0)
- MaterialComponents/Palettes (= 15.2.0)
- MaterialComponents/private (= 15.2.0)
- MaterialComponents/ProgressView (= 15.2.0)
- MaterialComponents/RobotoFontLoader (= 15.2.0)
- MaterialComponents/ShadowElevations (= 15.2.0)
- MaterialComponents/ShadowLayer (= 15.2.0)
- MaterialComponents/Slider (= 15.2.0)
- MaterialComponents/Snackbar (= 15.2.0)
- MaterialComponents/SpritedAnimationView (= 15.2.0)
- MaterialComponents/Switch (= 15.2.0)
- MaterialComponents/Typography (= 15.2.0)
- MaterialComponents/ActivityIndicator (15.2.0):
- CatalogByConvention (2.0.0)
- EarlGrey (1.4.0)
- MaterialComponents (16.0.0):
- MaterialComponents/ActivityIndicator (= 16.0.0)
- MaterialComponents/AnimationTiming (= 16.0.0)
- MaterialComponents/AppBar (= 16.0.0)
- MaterialComponents/ButtonBar (= 16.0.0)
- MaterialComponents/Buttons (= 16.0.0)
- MaterialComponents/CollectionCells (= 16.0.0)
- MaterialComponents/CollectionLayoutAttributes (= 16.0.0)
- MaterialComponents/Collections (= 16.0.0)
- MaterialComponents/Dialogs (= 16.0.0)
- MaterialComponents/FlexibleHeader (= 16.0.0)
- MaterialComponents/FontDiskLoader (= 16.0.0)
- MaterialComponents/HeaderStackView (= 16.0.0)
- MaterialComponents/Ink (= 16.0.0)
- MaterialComponents/NavigationBar (= 16.0.0)
- MaterialComponents/OverlayWindow (= 16.0.0)
- MaterialComponents/PageControl (= 16.0.0)
- MaterialComponents/Palettes (= 16.0.0)
- MaterialComponents/private (= 16.0.0)
- MaterialComponents/ProgressView (= 16.0.0)
- MaterialComponents/RobotoFontLoader (= 16.0.0)
- MaterialComponents/ShadowElevations (= 16.0.0)
- MaterialComponents/ShadowLayer (= 16.0.0)
- MaterialComponents/Slider (= 16.0.0)
- MaterialComponents/Snackbar (= 16.0.0)
- MaterialComponents/SpritedAnimationView (= 16.0.0)
- MaterialComponents/Switch (= 16.0.0)
- MaterialComponents/Typography (= 16.0.0)
- MaterialComponents/ActivityIndicator (16.0.0):
- MaterialComponents/private/RTL
- MaterialComponents/AnimationTiming (15.2.0)
- MaterialComponents/AppBar (15.2.0):
- MaterialComponents/AnimationTiming (16.0.0)
- MaterialComponents/AppBar (16.0.0):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
Expand All @@ -41,16 +41,16 @@ PODS:
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (15.2.0):
- MaterialComponents/ButtonBar (16.0.0):
- MaterialComponents/Buttons
- MaterialComponents/private/RTL
- MaterialComponents/Buttons (15.2.0):
- MaterialComponents/Buttons (16.0.0):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MDFTextAccessibility
- MaterialComponents/CollectionCells (15.2.0):
- MaterialComponents/CollectionCells (16.0.0):
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/private/Icons/ic_check
Expand All @@ -61,98 +61,98 @@ PODS:
- MaterialComponents/private/Icons/ic_reorder
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/CollectionLayoutAttributes (15.2.0)
- MaterialComponents/Collections (15.2.0):
- MaterialComponents/CollectionLayoutAttributes (16.0.0)
- MaterialComponents/Collections (16.0.0):
- MaterialComponents/CollectionCells
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/Dialogs (15.2.0):
- MaterialComponents/Dialogs (16.0.0):
- MaterialComponents/Buttons
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/FlexibleHeader (15.2.0):
- MaterialComponents/FlexibleHeader (16.0.0):
- MDFTextAccessibility
- MaterialComponents/FontDiskLoader (15.2.0)
- MaterialComponents/HeaderStackView (15.2.0)
- MaterialComponents/Ink (15.2.0)
- MaterialComponents/NavigationBar (15.2.0):
- MaterialComponents/FontDiskLoader (16.0.0)
- MaterialComponents/HeaderStackView (16.0.0)
- MaterialComponents/Ink (16.0.0)
- MaterialComponents/NavigationBar (16.0.0):
- MaterialComponents/ButtonBar
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/OverlayWindow (15.2.0)
- MaterialComponents/PageControl (15.2.0)
- MaterialComponents/Palettes (15.2.0)
- MaterialComponents/private (15.2.0):
- MaterialComponents/private/Color (= 15.2.0)
- MaterialComponents/private/Icons (= 15.2.0)
- MaterialComponents/private/KeyboardWatcher (= 15.2.0)
- MaterialComponents/private/Overlay (= 15.2.0)
- MaterialComponents/private/RTL (= 15.2.0)
- MaterialComponents/private/ThumbTrack (= 15.2.0)
- MaterialComponents/private/Color (15.2.0)
- MaterialComponents/private/Icons (15.2.0):
- MaterialComponents/private/Icons/Base (= 15.2.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 15.2.0)
- MaterialComponents/private/Icons/ic_check (= 15.2.0)
- MaterialComponents/private/Icons/ic_check_circle (= 15.2.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 15.2.0)
- MaterialComponents/private/Icons/ic_info (= 15.2.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.2.0)
- MaterialComponents/private/Icons/ic_reorder (= 15.2.0)
- MaterialComponents/private/Icons/Base (15.2.0)
- MaterialComponents/private/Icons/ic_arrow_back (15.2.0):
- MaterialComponents/OverlayWindow (16.0.0)
- MaterialComponents/PageControl (16.0.0)
- MaterialComponents/Palettes (16.0.0)
- MaterialComponents/private (16.0.0):
- MaterialComponents/private/Color (= 16.0.0)
- MaterialComponents/private/Icons (= 16.0.0)
- MaterialComponents/private/KeyboardWatcher (= 16.0.0)
- MaterialComponents/private/Overlay (= 16.0.0)
- MaterialComponents/private/RTL (= 16.0.0)
- MaterialComponents/private/ThumbTrack (= 16.0.0)
- MaterialComponents/private/Color (16.0.0)
- MaterialComponents/private/Icons (16.0.0):
- MaterialComponents/private/Icons/Base (= 16.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 16.0.0)
- MaterialComponents/private/Icons/ic_check (= 16.0.0)
- MaterialComponents/private/Icons/ic_check_circle (= 16.0.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 16.0.0)
- MaterialComponents/private/Icons/ic_info (= 16.0.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.0.0)
- MaterialComponents/private/Icons/ic_reorder (= 16.0.0)
- MaterialComponents/private/Icons/Base (16.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check (15.2.0):
- MaterialComponents/private/Icons/ic_check (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check_circle (15.2.0):
- MaterialComponents/private/Icons/ic_check_circle (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_chevron_right (15.2.0):
- MaterialComponents/private/Icons/ic_chevron_right (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_info (15.2.0):
- MaterialComponents/private/Icons/ic_info (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.2.0):
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_reorder (15.2.0):
- MaterialComponents/private/Icons/ic_reorder (16.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/KeyboardWatcher (15.2.0)
- MaterialComponents/private/Overlay (15.2.0)
- MaterialComponents/private/RTL (15.2.0)
- MaterialComponents/private/ThumbTrack (15.2.0):
- MaterialComponents/private/KeyboardWatcher (16.0.0)
- MaterialComponents/private/Overlay (16.0.0)
- MaterialComponents/private/RTL (16.0.0)
- MaterialComponents/private/ThumbTrack (16.0.0):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ProgressView (15.2.0):
- MaterialComponents/ProgressView (16.0.0):
- MaterialComponents/private/RTL
- MaterialComponents/RobotoFontLoader (15.2.0):
- MaterialComponents/RobotoFontLoader (16.0.0):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ShadowElevations (15.2.0)
- MaterialComponents/ShadowLayer (15.2.0)
- MaterialComponents/Slider (15.2.0):
- MaterialComponents/ShadowElevations (16.0.0)
- MaterialComponents/ShadowLayer (16.0.0)
- MaterialComponents/Slider (16.0.0):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Snackbar (15.2.0):
- MaterialComponents/Snackbar (16.0.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Buttons
- MaterialComponents/OverlayWindow
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/private/Overlay
- MaterialComponents/SpritedAnimationView (15.2.0)
- MaterialComponents/Switch (15.2.0):
- MaterialComponents/SpritedAnimationView (16.0.0)
- MaterialComponents/Switch (16.0.0):
- MaterialComponents/private/RTL
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (15.2.0)
- MaterialComponentsCatalog (15.2.0):
- MaterialComponents/Typography (16.0.0)
- MaterialComponentsCatalog (16.0.0):
- MaterialComponents
- MaterialComponentsUnitTests (15.2.0):
- MaterialComponentsUnitTests (16.0.0):
- MaterialComponents
- MDFTextAccessibility
- MDFTextAccessibility (1.1.1)
- MDFTextAccessibility (1.1.3)

DEPENDENCIES:
- CatalogByConvention
Expand All @@ -163,19 +163,19 @@ DEPENDENCIES:

EXTERNAL SOURCES:
MaterialComponents:
:path: "../"
:path: ../
MaterialComponentsCatalog:
:path: "../"
:path: ../
MaterialComponentsUnitTests:
:path: "../"
:path: ../

SPEC CHECKSUMS:
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
MaterialComponents: afa91c7e2ac6b4de1406035a86dd26fb178a9243
MaterialComponentsCatalog: 9ac9cbaa764b3f5b2e19900ff5e01cbcdadca924
MaterialComponentsUnitTests: d960a72b969898af51f42a8f8bd312e88f327374
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
EarlGrey: 763d04569f96d910cf17e4fe5aa0d3842e07c0b4
MaterialComponents: 9e8475453d0e5e0da7af16e79f5ba89e1f85cf96
MaterialComponentsCatalog: 3ac8085dae5ca469f9b94e15f3ea0d2b33dc3456
MaterialComponentsUnitTests: c2cd169967f28fe46e851f31a0c1eda37a3d1531
MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601

PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

Expand Down
12 changes: 12 additions & 0 deletions components/AppBar/src/MDCAppBarContainerViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,16 @@ - (UIStatusBarStyle)preferredStatusBarStyle {
return self.appBar.headerViewController.preferredStatusBarStyle;
}

- (BOOL)shouldAutorotate {
return self.contentViewController.shouldAutorotate;
}

- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
return self.contentViewController.supportedInterfaceOrientations;
}

- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
return self.contentViewController.preferredInterfaceOrientationForPresentation;
}

@end
Loading

0 comments on commit 544552f

Please sign in to comment.