Skip to content

Commit

Permalink
Merge branch 'release-candidate'
Browse files Browse the repository at this point in the history
  • Loading branch information
randallli committed May 23, 2016
2 parents 2153f8f + e998732 commit cdbe7e4
Show file tree
Hide file tree
Showing 28 changed files with 389 additions and 353 deletions.
68 changes: 68 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,71 @@
# 8.0.0

## API diffs

Auto-generated by running the following while checked out at
`4bc99e8ad0fe0ac7e9acc044591a8581165fb5c2`:

scripts/api_diff -o 2153f8fa453ecec4dfe48a328e331846d5d37aac -n bbabb375953fbd01c3f818ac9092b55fe56dd9b9

### AppBar

- [deleted] [`-[MDCAppBarContainerViewController headerViewController]`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/AppBar/src/MDCAppBarContainerViewController.h#L69)
- [deleted] [`MDCAppBarContainerViewController ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/AppBar/src/MDCAppBarContainerViewController.h#L66)

### ButtonBar

- [deleted] [`-[MDCButtonBar reloadButtonViews]`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L166)
- [deleted] [`MDCButtonBar ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L155)
- [deleted] [`MDCButtonBar.buttonItems`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L158)
- [deleted] [`MDCButtonBar.delegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L162)
- [moved] [`MDCButtonBar (Builder)`](https://github.com/google/material-components-ios/blob/bbabb375953fbd01c3f818ac9092b55fe56dd9b9/components/ButtonBar/src/MDCButtonBar.h#L177).
From *MDCButtonBar.h* to *private/MDCButtonBar+Private.h*.

### NavigationBar

- [deleted] [`MDCNavigationBar ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L94)
- [deleted] [`MDCNavigationBar.leftButtonBarDelegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L97)
- [deleted] [`MDCNavigationBar.rightButtonBarDelegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L101)
- [deleted] [`MDCUINavigationItemKVO`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L91)

## Component changes

### AppBar

#### Breaking changes

* [Remove deprecated headerViewController property from MDCAppBarContainerViewController.](https://github.com/google/material-components-ios/commit/dbfc6b783d40e229708af1ee956ded363f621601) (Jeff Verkoeyen)

### ButtonBar

#### Breaking changes

* [Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen)

#### Changes

* [Propagate the NavigationBar tint color to the bar button items.](https://github.com/google/material-components-ios/commit/39bda0a60728a5989971cb0a09ee8d40b7bd4f09) (Louis Romero)


### CollectionCells

#### Changes

* [[Collections|CollectionCells] Updates outdated comments referring to style/editing manager.](https://github.com/google/material-components-ios/commit/120030631e3a695559a49100e62cb7a88502cb3b) (Chris Cox)

### Collections

#### Changes

* [Adds border to editing action bar](https://github.com/google/material-components-ios/commit/3e7ce26bacd4ee94177bf3daab0c03d2281a6723) (Chris Cox)
* [[Collections|CollectionCells] Updates outdated comments referring to style/editing manager.](https://github.com/google/material-components-ios/commit/120030631e3a695559a49100e62cb7a88502cb3b) (Chris Cox)

### NavigationBar

#### Breaking changes

* [[ButtonBar] Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen)

# 7.0.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 = "7.0.0"
s.version = "8.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 = "7.0.0"
s.version = "8.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 = "7.0.0"
s.version = "8.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
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ Material Components’ visual style is based on the
[material design](http://www.google.com/design/spec/material-design/introduction.html)
specification, developed by a team of iOS engineers and UX designers at Google.

## Catalog

Catalog is a demonstration application that showcases the Material Components.

### If you haven't checked out the repo yet:

~~~ bash
pod try MaterialComponents
~~~

### If you have checked out the repo:

~~~ bash
pod install --project-directory=catalog/ --no-repo-update
~~~

## Quickstart

### 1. Install CocoaPods
Expand Down
7 changes: 6 additions & 1 deletion catalog/MDCCatalog/MDCNodeListViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class NodeViewTableViewDemoCell: UITableViewCell {
super.init(coder: coder)!
}

override func prepareForReuse() {
super.prepareForReuse()
textLabel!.textColor = UIColor.blackColor()
imageView!.image = UIImage(named: "Demo")
}
}

class MDCNodeListViewController: CBCNodeListViewController {
Expand Down Expand Up @@ -166,7 +171,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
textView.frame = CGRectMake(20,
40,
tableView.frame.size.width - 40,
(MDCTypography.captionFont().lineHeight) * 3)
ceil(MDCTypography.captionFont().lineHeight * 3))
textView.autoresizingMask = .FlexibleWidth
textView.contentInset = UIEdgeInsetsMake(-8, -5, -8, -5)
textView.editable = false
Expand Down
140 changes: 70 additions & 70 deletions catalog/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
PODS:
- MaterialComponents (7.0.0):
- MaterialComponents/AppBar (= 7.0.0)
- MaterialComponents/ButtonBar (= 7.0.0)
- MaterialComponents/Buttons (= 7.0.0)
- MaterialComponents/CollectionCells (= 7.0.0)
- MaterialComponents/CollectionLayoutAttributes (= 7.0.0)
- MaterialComponents/Collections (= 7.0.0)
- MaterialComponents/FlexibleHeader (= 7.0.0)
- MaterialComponents/FontDiskLoader (= 7.0.0)
- MaterialComponents/HeaderStackView (= 7.0.0)
- MaterialComponents/Ink (= 7.0.0)
- MaterialComponents/NavigationBar (= 7.0.0)
- MaterialComponents/PageControl (= 7.0.0)
- MaterialComponents/Palettes (= 7.0.0)
- MaterialComponents/private (= 7.0.0)
- MaterialComponents/RobotoFontLoader (= 7.0.0)
- MaterialComponents/ShadowElevations (= 7.0.0)
- MaterialComponents/ShadowLayer (= 7.0.0)
- MaterialComponents/Slider (= 7.0.0)
- MaterialComponents/SpritedAnimationView (= 7.0.0)
- MaterialComponents/Switch (= 7.0.0)
- MaterialComponents/Typography (= 7.0.0)
- MaterialComponents/AppBar (7.0.0):
- MaterialComponents (8.0.0):
- MaterialComponents/AppBar (= 8.0.0)
- MaterialComponents/ButtonBar (= 8.0.0)
- MaterialComponents/Buttons (= 8.0.0)
- MaterialComponents/CollectionCells (= 8.0.0)
- MaterialComponents/CollectionLayoutAttributes (= 8.0.0)
- MaterialComponents/Collections (= 8.0.0)
- MaterialComponents/FlexibleHeader (= 8.0.0)
- MaterialComponents/FontDiskLoader (= 8.0.0)
- MaterialComponents/HeaderStackView (= 8.0.0)
- MaterialComponents/Ink (= 8.0.0)
- MaterialComponents/NavigationBar (= 8.0.0)
- MaterialComponents/PageControl (= 8.0.0)
- MaterialComponents/Palettes (= 8.0.0)
- MaterialComponents/private (= 8.0.0)
- MaterialComponents/RobotoFontLoader (= 8.0.0)
- MaterialComponents/ShadowElevations (= 8.0.0)
- MaterialComponents/ShadowLayer (= 8.0.0)
- MaterialComponents/Slider (= 8.0.0)
- MaterialComponents/SpritedAnimationView (= 8.0.0)
- MaterialComponents/Switch (= 8.0.0)
- MaterialComponents/Typography (= 8.0.0)
- MaterialComponents/AppBar (8.0.0):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
- MaterialComponents/private/Icons/ic_arrow_back
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (7.0.0):
- MaterialComponents/ButtonBar (8.0.0):
- MaterialComponents/Buttons
- MaterialComponents/Buttons (7.0.0):
- MaterialComponents/Buttons (8.0.0):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/CollectionCells (7.0.0):
- MaterialComponents/CollectionCells (8.0.0):
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/private/Icons/ic_check
Expand All @@ -46,71 +46,71 @@ PODS:
- MaterialComponents/private/Icons/ic_radio_button_unchecked
- MaterialComponents/private/Icons/ic_reorder
- MaterialComponents/Typography
- MaterialComponents/CollectionLayoutAttributes (7.0.0)
- MaterialComponents/Collections (7.0.0):
- MaterialComponents/CollectionLayoutAttributes (8.0.0)
- MaterialComponents/Collections (8.0.0):
- MaterialComponents/CollectionCells
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/FlexibleHeader (7.0.0)
- MaterialComponents/FontDiskLoader (7.0.0)
- MaterialComponents/HeaderStackView (7.0.0)
- MaterialComponents/Ink (7.0.0)
- MaterialComponents/NavigationBar (7.0.0):
- MaterialComponents/FlexibleHeader (8.0.0)
- MaterialComponents/FontDiskLoader (8.0.0)
- MaterialComponents/HeaderStackView (8.0.0)
- MaterialComponents/Ink (8.0.0)
- MaterialComponents/NavigationBar (8.0.0):
- MaterialComponents/ButtonBar
- MaterialComponents/Typography
- MaterialComponents/PageControl (7.0.0)
- MaterialComponents/Palettes (7.0.0)
- MaterialComponents/private (7.0.0):
- MaterialComponents/private/Color (= 7.0.0)
- MaterialComponents/private/Icons (= 7.0.0)
- MaterialComponents/private/ThumbTrack (= 7.0.0)
- MaterialComponents/private/Color (7.0.0)
- MaterialComponents/private/Icons (7.0.0):
- MaterialComponents/private/Icons/Base (= 7.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0)
- MaterialComponents/private/Icons/ic_check (= 7.0.0)
- MaterialComponents/private/Icons/ic_check_circle (= 7.0.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0)
- MaterialComponents/private/Icons/ic_info (= 7.0.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0)
- MaterialComponents/private/Icons/ic_reorder (= 7.0.0)
- MaterialComponents/private/Icons/Base (7.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (7.0.0):
- MaterialComponents/PageControl (8.0.0)
- MaterialComponents/Palettes (8.0.0)
- MaterialComponents/private (8.0.0):
- MaterialComponents/private/Color (= 8.0.0)
- MaterialComponents/private/Icons (= 8.0.0)
- MaterialComponents/private/ThumbTrack (= 8.0.0)
- MaterialComponents/private/Color (8.0.0)
- MaterialComponents/private/Icons (8.0.0):
- MaterialComponents/private/Icons/Base (= 8.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 8.0.0)
- MaterialComponents/private/Icons/ic_check (= 8.0.0)
- MaterialComponents/private/Icons/ic_check_circle (= 8.0.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 8.0.0)
- MaterialComponents/private/Icons/ic_info (= 8.0.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 8.0.0)
- MaterialComponents/private/Icons/ic_reorder (= 8.0.0)
- MaterialComponents/private/Icons/Base (8.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check (7.0.0):
- MaterialComponents/private/Icons/ic_check (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check_circle (7.0.0):
- MaterialComponents/private/Icons/ic_check_circle (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_chevron_right (7.0.0):
- MaterialComponents/private/Icons/ic_chevron_right (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_info (7.0.0):
- MaterialComponents/private/Icons/ic_info (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0):
- MaterialComponents/private/Icons/ic_radio_button_unchecked (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_reorder (7.0.0):
- MaterialComponents/private/Icons/ic_reorder (8.0.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/ThumbTrack (7.0.0):
- MaterialComponents/private/ThumbTrack (8.0.0):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/RobotoFontLoader (7.0.0):
- MaterialComponents/RobotoFontLoader (8.0.0):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ShadowElevations (7.0.0)
- MaterialComponents/ShadowLayer (7.0.0)
- MaterialComponents/Slider (7.0.0):
- MaterialComponents/ShadowElevations (8.0.0)
- MaterialComponents/ShadowLayer (8.0.0)
- MaterialComponents/Slider (8.0.0):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/SpritedAnimationView (7.0.0)
- MaterialComponents/Switch (7.0.0):
- MaterialComponents/SpritedAnimationView (8.0.0)
- MaterialComponents/Switch (8.0.0):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (7.0.0)
- MaterialComponentsCatalog (7.0.0):
- MaterialComponents/Typography (8.0.0)
- MaterialComponentsCatalog (8.0.0):
- MaterialComponents
- MaterialComponentsUnitTests (7.0.0):
- MaterialComponentsUnitTests (8.0.0):
- MaterialComponents

DEPENDENCIES:
Expand All @@ -127,8 +127,8 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b
MaterialComponentsCatalog: 2e00536c71df5c61ea8e92a69dc8244a325f5b57
MaterialComponentsUnitTests: 175a3adb1e4992f4de97b4a8ce4c537dd056427c
MaterialComponents: 90bd29126ba886836955104dde0826133b87b6bf
MaterialComponentsCatalog: 28ec795de4429c127bce24d528d0259fa902fe4d
MaterialComponentsUnitTests: 2d5883eb8da10c778cf81b55a24bc025b8c78a62

COCOAPODS: 0.39.0
10 changes: 0 additions & 10 deletions components/AppBar/src/MDCAppBarContainerViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,3 @@
@property(nonatomic, strong, nonnull, readonly) UIViewController *contentViewController;

@end

// clang-format off
@interface MDCAppBarContainerViewController ()

/** @see appBar.headerViewController */
- (nonnull MDCFlexibleHeaderViewController *)headerViewController
__deprecated_msg("Use appBar.headerViewController instead.");

@end
// clang-format on
6 changes: 0 additions & 6 deletions components/AppBar/src/MDCAppBarContainerViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,4 @@ - (UIStatusBarStyle)preferredStatusBarStyle {
return self.appBar.headerViewController.preferredStatusBarStyle;
}

#pragma mark - Public

- (MDCFlexibleHeaderViewController *)headerViewController {
return self.appBar.headerViewController;
}

@end
36 changes: 0 additions & 36 deletions components/ButtonBar/src/MDCButtonBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,39 +150,3 @@ typedef NS_OPTIONS(NSUInteger, MDCBarButtonItemLayoutHints) {
layoutHints:(MDCBarButtonItemLayoutHints)layoutHints;

@end

// clang-format off
@interface MDCButtonBar ()

/** @see items */
@property(nonatomic, copy) NSArray *buttonItems
__deprecated_msg("Use items instead.");

/** The delegate creates button views from UIBarButtonItem instances. */
@property(nonatomic, weak) id<MDCButtonBarDelegate> delegate
__deprecated_msg("This API will be removed in an upcoming release. It now has a default value.");

/** Tells the receiver to rebuild its button views. */
- (void)reloadButtonViews
__deprecated_msg("This API will be removed in an upcoming release.");

@end

/**
Target selector for buttons created from UIBarButtonItems.
See the MDCButtonBarDelegate documentation for more details on how this method
should be used.
*/
@interface MDCButtonBar (Builder)

/**
Finds the corresponding UIBarButtonItem and calls its target/action with the item as the first
parameter.
*/
- (void)didTapButton:(UIButton *)button event:(UIEvent *)event
__deprecated_msg("This API will be removed in an upcoming release.");

@end

// clang-format on
Loading

0 comments on commit cdbe7e4

Please sign in to comment.