Merge branch 'release-1.0.0'

CHANGELOG.md

@@ -1,11 +1,37 @@
-## Master
+## In progress since last release
+
+##### Breaking
+##### Enhancements
+##### Bug Fixes
+
+## 1.0.0
 
 ##### Breaking
 
+* [MDCFlexibleHeaderView] Removed `shadowIntensity` property, use setShadowLayer:intensityDidChangeBlock: instead. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [MDCInkTouchControllerDelegate] Renamed `inkTouchControllerShouldProcessInkTouches:` to `inkTouchController:shouldProcessInkTouchesAtTouchLocation:`. [Chris Cox](https://github.com/chriscox)
+
+##### Deprecations
+
+* MDCFlexibleHeaderParentViewController, +[MDCFlexibleHeaderViewController addToParent], and
+  -[MDCFlexibleHeaderViewController addFlexibleHeaderViewToParentViewControllerView]. These APIs
+  are being deprecated in favor of the eventual equivalent AppBar convenience APIs. In the meantime
+  the FlexibleHeader will need to be instantiated and configured like a typical UIViewController.
+
 ##### Enhancements
 
+* [MDCFlexibleHeaderView] Added setShadowLayer:intensityDidChangeBlock:. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [MDCHeaderStackView] Added MDCHeaderStackView. [Jeff Verkoeyen](https://github.com/jverkoey)
+* [MDCSlider] Changed default color. [Randall Li](https://github.com/randallli)
+* [MDCSlider] Readme.md copy edits. [Randall Li](https://github.com/randallli)
+* [MDCSwitch] Readme.md copy edits. [Randall Li](https://github.com/randallli)
+* [MDCTypograpy:example] Refactored to be compatible with catalog by convention [Randall Li](https://github.com/randallli)
+* [Shrine] First pass at a new Swift demo app, "Shrine". [Junius Gunaratne](https://github.com/jgunaratne)
+
 ##### Bug Fixes
 
+* Fixed issue where MDCShadowLayer would ghost behind the MDCFlexibleHeaderView. [Jeff Verkoeyen](https://github.com/jverkoey)
+
 ## 0.2.1
 
 ##### Bug Fixes

material-components-ios.podspec → MaterialComponents.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
-  s.name         = "material-components-ios"
-  s.version      = "0.2.1"
+  s.name         = "MaterialComponents"
+  s.version      = "1.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"
@@ -42,10 +42,10 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'components/Buttons/src/*.h'
     ss.source_files = 'components/Buttons/src/*.{h,m}', 'components/Buttons/src/Private/*.{h,m}'
     ss.header_mappings_dir = 'components/Buttons/src/*'
-    ss.dependency 'material-components-ios/Ink'
-    ss.dependency 'material-components-ios/ShadowElevations'
-    ss.dependency 'material-components-ios/ShadowLayer'
-    ss.dependency 'material-components-ios/Typography'
+    ss.dependency 'MaterialComponents/Ink'
+    ss.dependency 'MaterialComponents/ShadowElevations'
+    ss.dependency 'MaterialComponents/ShadowLayer'
+    ss.dependency 'MaterialComponents/Typography'
   end
 
   s.subspec 'FlexibleHeader' do |ss|
@@ -54,6 +54,12 @@ Pod::Spec.new do |s|
     ss.header_mappings_dir = 'components/FlexibleHeader/src/*'
   end
 
+  s.subspec 'HeaderStackView' do |ss|
+    ss.public_header_files = 'components/HeaderStackView/src/*.h'
+    ss.source_files = 'components/HeaderStackView/src/*.{h,m}'
+    ss.header_mappings_dir = 'components/HeaderStackView/src/*'
+  end
+
   s.subspec 'Ink' do |ss|
     ss.public_header_files = 'components/Ink/src/*.h'
     ss.source_files = 'components/Ink/src/*.{h,m}', 'components/Ink/src/private/*.{h,m}'
@@ -88,7 +94,7 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'components/Slider/src/*.h'
     ss.source_files = 'components/Slider/src/*.{h,m}', 'components/Slider/src/private/*.{h,m}'
     ss.header_mappings_dir = 'components/Slider/src/*'
-    ss.dependency 'material-components-ios/private/ThumbTrack'
+    ss.dependency 'MaterialComponents/private/ThumbTrack'
   end
 
   s.subspec 'SpritedAnimationView' do |ss|
@@ -104,7 +110,7 @@ Pod::Spec.new do |s|
     ss.resource_bundles = {
       'MaterialSwitch' => ['components/Switch/src/MaterialSwitch.bundle/*']
     }
-    ss.dependency 'material-components-ios/private/ThumbTrack'
+    ss.dependency 'MaterialComponents/private/ThumbTrack'
   end
 
   s.subspec 'Typography' do |ss|
@@ -129,9 +135,9 @@ Pod::Spec.new do |s|
       ss.public_header_files = 'components/private/ThumbTrack/src/*.h'
       ss.source_files = 'components/private/ThumbTrack/src/*.{h,m}'
       ss.header_mappings_dir = 'components/private/ThumbTrack/src/*'
-      ss.dependency 'material-components-ios/ShadowElevations'
-      ss.dependency 'material-components-ios/ShadowLayer'
-      ss.dependency 'material-components-ios/private/Color'
+      ss.dependency 'MaterialComponents/ShadowElevations'
+      ss.dependency 'MaterialComponents/ShadowLayer'
+      ss.dependency 'MaterialComponents/private/Color'
     end
 
   end

material-components-ios-catalog.podspec → MaterialComponentsCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
-  s.name         = "material-components-ios-catalog"
-  s.version      = "0.2.1"
+  s.name         = "MaterialComponentsCatalog"
+  s.version      = "1.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"

MaterialComponentsUnitTests.podspec

@@ -0,0 +1,13 @@
+Pod::Spec.new do |s|
+  s.name         = "MaterialComponentsUnitTests"
+  s.version      = "1.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"
+  s.license      = 'Apache 2.0'
+  s.source       = { :git => "https://github.com/google/material-components-ios.git", :tag => s.version.to_s }
+  s.platform     = :ios, '7.0'
+  s.requires_arc = true
+  s.source_files = 'components/*/tests/unit/*.{h,m,swift}'
+  s.framework    = 'XCTest'
+end

build_tests/CocoapodsObjCApp/Podfile

@@ -1 +1 @@
-pod 'material-components-ios', :path => '../../'
+pod 'MaterialComponents', :path => '../../'

build_tests/CocoapodsObjCApp/Podfile.lock

@@ -1,51 +1,53 @@
 PODS:
-  - material-components-ios (0.2.1):
-    - material-components-ios/Buttons (= 0.2.1)
-    - material-components-ios/FlexibleHeader (= 0.2.1)
-    - material-components-ios/Ink (= 0.2.1)
-    - material-components-ios/PageControl (= 0.2.1)
-    - material-components-ios/private (= 0.2.1)
-    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
-    - material-components-ios/ShadowElevations (= 0.2.1)
-    - material-components-ios/ShadowLayer (= 0.2.1)
-    - material-components-ios/Slider (= 0.2.1)
-    - material-components-ios/SpritedAnimationView (= 0.2.1)
-    - material-components-ios/Switch (= 0.2.1)
-    - material-components-ios/Typography (= 0.2.1)
-  - material-components-ios/Buttons (0.2.1):
-    - material-components-ios/Ink
-    - material-components-ios/ShadowElevations
-    - material-components-ios/ShadowLayer
-    - material-components-ios/Typography
-  - material-components-ios/FlexibleHeader (0.2.1)
-  - material-components-ios/Ink (0.2.1)
-  - material-components-ios/PageControl (0.2.1)
-  - material-components-ios/private (0.2.1):
-    - material-components-ios/private/Color (= 0.2.1)
-    - material-components-ios/private/ThumbTrack (= 0.2.1)
-  - material-components-ios/private/Color (0.2.1)
-  - material-components-ios/private/ThumbTrack (0.2.1):
-    - material-components-ios/private/Color
-    - material-components-ios/ShadowElevations
-    - material-components-ios/ShadowLayer
-  - material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
-  - material-components-ios/ShadowElevations (0.2.1)
-  - material-components-ios/ShadowLayer (0.2.1)
-  - material-components-ios/Slider (0.2.1):
-    - material-components-ios/private/ThumbTrack
-  - material-components-ios/SpritedAnimationView (0.2.1)
-  - material-components-ios/Switch (0.2.1):
-    - material-components-ios/private/ThumbTrack
-  - material-components-ios/Typography (0.2.1)
+  - MaterialComponents (1.0.0):
+    - MaterialComponents/Buttons (= 1.0.0)
+    - MaterialComponents/FlexibleHeader (= 1.0.0)
+    - MaterialComponents/HeaderStackView (= 1.0.0)
+    - MaterialComponents/Ink (= 1.0.0)
+    - MaterialComponents/PageControl (= 1.0.0)
+    - MaterialComponents/private (= 1.0.0)
+    - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
+    - MaterialComponents/ShadowElevations (= 1.0.0)
+    - MaterialComponents/ShadowLayer (= 1.0.0)
+    - MaterialComponents/Slider (= 1.0.0)
+    - MaterialComponents/SpritedAnimationView (= 1.0.0)
+    - MaterialComponents/Switch (= 1.0.0)
+    - MaterialComponents/Typography (= 1.0.0)
+  - MaterialComponents/Buttons (1.0.0):
+    - MaterialComponents/Ink
+    - MaterialComponents/ShadowElevations
+    - MaterialComponents/ShadowLayer
+    - MaterialComponents/Typography
+  - MaterialComponents/FlexibleHeader (1.0.0)
+  - MaterialComponents/HeaderStackView (1.0.0)
+  - MaterialComponents/Ink (1.0.0)
+  - MaterialComponents/PageControl (1.0.0)
+  - MaterialComponents/private (1.0.0):
+    - MaterialComponents/private/Color (= 1.0.0)
+    - MaterialComponents/private/ThumbTrack (= 1.0.0)
+  - MaterialComponents/private/Color (1.0.0)
+  - MaterialComponents/private/ThumbTrack (1.0.0):
+    - MaterialComponents/private/Color
+    - MaterialComponents/ShadowElevations
+    - MaterialComponents/ShadowLayer
+  - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
+  - MaterialComponents/ShadowElevations (1.0.0)
+  - MaterialComponents/ShadowLayer (1.0.0)
+  - MaterialComponents/Slider (1.0.0):
+    - MaterialComponents/private/ThumbTrack
+  - MaterialComponents/SpritedAnimationView (1.0.0)
+  - MaterialComponents/Switch (1.0.0):
+    - MaterialComponents/private/ThumbTrack
+  - MaterialComponents/Typography (1.0.0)
 
 DEPENDENCIES:
-  - material-components-ios (from `../../`)
+  - MaterialComponents (from `../../`)
 
 EXTERNAL SOURCES:
-  material-components-ios:
+  MaterialComponents:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
+  MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
 
 COCOAPODS: 0.39.0

build_tests/CocoapodsSwiftApp/Podfile

@@ -1,3 +1,3 @@
-pod 'material-components-ios', :path => '../../'
+pod ‘MaterialComponents’, :path => '../../'
 
 use_frameworks!

build_tests/CocoapodsSwiftApp/Podfile.lock

@@ -1,51 +1,53 @@
 PODS:
-  - material-components-ios (0.2.1):
-    - material-components-ios/Buttons (= 0.2.1)
-    - material-components-ios/FlexibleHeader (= 0.2.1)
-    - material-components-ios/Ink (= 0.2.1)
-    - material-components-ios/PageControl (= 0.2.1)
-    - material-components-ios/private (= 0.2.1)
-    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
-    - material-components-ios/ShadowElevations (= 0.2.1)
-    - material-components-ios/ShadowLayer (= 0.2.1)
-    - material-components-ios/Slider (= 0.2.1)
-    - material-components-ios/SpritedAnimationView (= 0.2.1)
-    - material-components-ios/Switch (= 0.2.1)
-    - material-components-ios/Typography (= 0.2.1)
-  - material-components-ios/Buttons (0.2.1):
-    - material-components-ios/Ink
-    - material-components-ios/ShadowElevations
-    - material-components-ios/ShadowLayer
-    - material-components-ios/Typography
-  - material-components-ios/FlexibleHeader (0.2.1)
-  - material-components-ios/Ink (0.2.1)
-  - material-components-ios/PageControl (0.2.1)
-  - material-components-ios/private (0.2.1):
-    - material-components-ios/private/Color (= 0.2.1)
-    - material-components-ios/private/ThumbTrack (= 0.2.1)
-  - material-components-ios/private/Color (0.2.1)
-  - material-components-ios/private/ThumbTrack (0.2.1):
-    - material-components-ios/private/Color
-    - material-components-ios/ShadowElevations
-    - material-components-ios/ShadowLayer
-  - material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
-  - material-components-ios/ShadowElevations (0.2.1)
-  - material-components-ios/ShadowLayer (0.2.1)
-  - material-components-ios/Slider (0.2.1):
-    - material-components-ios/private/ThumbTrack
-  - material-components-ios/SpritedAnimationView (0.2.1)
-  - material-components-ios/Switch (0.2.1):
-    - material-components-ios/private/ThumbTrack
-  - material-components-ios/Typography (0.2.1)
+  - MaterialComponents (1.0.0):
+    - MaterialComponents/Buttons (= 1.0.0)
+    - MaterialComponents/FlexibleHeader (= 1.0.0)
+    - MaterialComponents/HeaderStackView (= 1.0.0)
+    - MaterialComponents/Ink (= 1.0.0)
+    - MaterialComponents/PageControl (= 1.0.0)
+    - MaterialComponents/private (= 1.0.0)
+    - MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
+    - MaterialComponents/ShadowElevations (= 1.0.0)
+    - MaterialComponents/ShadowLayer (= 1.0.0)
+    - MaterialComponents/Slider (= 1.0.0)
+    - MaterialComponents/SpritedAnimationView (= 1.0.0)
+    - MaterialComponents/Switch (= 1.0.0)
+    - MaterialComponents/Typography (= 1.0.0)
+  - MaterialComponents/Buttons (1.0.0):
+    - MaterialComponents/Ink
+    - MaterialComponents/ShadowElevations
+    - MaterialComponents/ShadowLayer
+    - MaterialComponents/Typography
+  - MaterialComponents/FlexibleHeader (1.0.0)
+  - MaterialComponents/HeaderStackView (1.0.0)
+  - MaterialComponents/Ink (1.0.0)
+  - MaterialComponents/PageControl (1.0.0)
+  - MaterialComponents/private (1.0.0):
+    - MaterialComponents/private/Color (= 1.0.0)
+    - MaterialComponents/private/ThumbTrack (= 1.0.0)
+  - MaterialComponents/private/Color (1.0.0)
+  - MaterialComponents/private/ThumbTrack (1.0.0):
+    - MaterialComponents/private/Color
+    - MaterialComponents/ShadowElevations
+    - MaterialComponents/ShadowLayer
+  - MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
+  - MaterialComponents/ShadowElevations (1.0.0)
+  - MaterialComponents/ShadowLayer (1.0.0)
+  - MaterialComponents/Slider (1.0.0):
+    - MaterialComponents/private/ThumbTrack
+  - MaterialComponents/SpritedAnimationView (1.0.0)
+  - MaterialComponents/Switch (1.0.0):
+    - MaterialComponents/private/ThumbTrack
+  - MaterialComponents/Typography (1.0.0)
 
 DEPENDENCIES:
-  - material-components-ios (from `../../`)
+  - MaterialComponents (from `../../`)
 
 EXTERNAL SOURCES:
-  material-components-ios:
+  MaterialComponents:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
+  MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
 
 COCOAPODS: 0.39.0

build_tests/classes/swift/MDCBuildTestViewController.swift

@@ -16,7 +16,7 @@ limitations under the License.
 
 import UIKit
 
-import material_components_ios
+import MaterialComponents
 
 class MDCBuildTestViewController: UIViewController {