Skip to content

Commit

Permalink
Merge branch 'hotfix-1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@randallli
randallli committed Mar 7, 2016
2 parents 1827d1c + a18e9d3 commit ef50b77
Show file tree
Hide file tree
Showing 10 changed files with 173 additions and 176 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
##### Enhancements
##### Bug Fixes

## 1.0.1

##### Enhancements

* [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey)

## 1.0.0

##### Breaking
Expand Down
2 changes: 1 addition & 1 deletion MaterialComponents.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponents"
s.version = "1.0.0"
s.version = "1.0.1"
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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsCatalog"
s.version = "1.0.0"
s.version = "1.0.1"
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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MaterialComponentsUnitTests"
s.version = "1.0.0"
s.version = "1.0.1"
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
64 changes: 32 additions & 32 deletions build_tests/CocoapodsObjCApp/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
PODS:
- 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 (1.0.1):
- MaterialComponents/Buttons (= 1.0.1)
- MaterialComponents/FlexibleHeader (= 1.0.1)
- MaterialComponents/HeaderStackView (= 1.0.1)
- MaterialComponents/Ink (= 1.0.1)
- MaterialComponents/PageControl (= 1.0.1)
- MaterialComponents/private (= 1.0.1)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1)
- MaterialComponents/ShadowElevations (= 1.0.1)
- MaterialComponents/ShadowLayer (= 1.0.1)
- MaterialComponents/Slider (= 1.0.1)
- MaterialComponents/SpritedAnimationView (= 1.0.1)
- MaterialComponents/Switch (= 1.0.1)
- MaterialComponents/Typography (= 1.0.1)
- MaterialComponents/Buttons (1.0.1):
- 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/FlexibleHeader (1.0.1)
- MaterialComponents/HeaderStackView (1.0.1)
- MaterialComponents/Ink (1.0.1)
- MaterialComponents/PageControl (1.0.1)
- MaterialComponents/private (1.0.1):
- MaterialComponents/private/Color (= 1.0.1)
- MaterialComponents/private/ThumbTrack (= 1.0.1)
- MaterialComponents/private/Color (1.0.1)
- MaterialComponents/private/ThumbTrack (1.0.1):
- 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/ScrollViewDelegateMultiplexer (1.0.1)
- MaterialComponents/ShadowElevations (1.0.1)
- MaterialComponents/ShadowLayer (1.0.1)
- MaterialComponents/Slider (1.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/SpritedAnimationView (1.0.0)
- MaterialComponents/Switch (1.0.0):
- MaterialComponents/SpritedAnimationView (1.0.1)
- MaterialComponents/Switch (1.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (1.0.0)
- MaterialComponents/Typography (1.0.1)

DEPENDENCIES:
- MaterialComponents (from `../../`)
Expand All @@ -48,6 +48,6 @@ EXTERNAL SOURCES:
:path: ../../

SPEC CHECKSUMS:
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b

COCOAPODS: 0.39.0
64 changes: 32 additions & 32 deletions build_tests/CocoapodsSwiftApp/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
PODS:
- 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 (1.0.1):
- MaterialComponents/Buttons (= 1.0.1)
- MaterialComponents/FlexibleHeader (= 1.0.1)
- MaterialComponents/HeaderStackView (= 1.0.1)
- MaterialComponents/Ink (= 1.0.1)
- MaterialComponents/PageControl (= 1.0.1)
- MaterialComponents/private (= 1.0.1)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1)
- MaterialComponents/ShadowElevations (= 1.0.1)
- MaterialComponents/ShadowLayer (= 1.0.1)
- MaterialComponents/Slider (= 1.0.1)
- MaterialComponents/SpritedAnimationView (= 1.0.1)
- MaterialComponents/Switch (= 1.0.1)
- MaterialComponents/Typography (= 1.0.1)
- MaterialComponents/Buttons (1.0.1):
- 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/FlexibleHeader (1.0.1)
- MaterialComponents/HeaderStackView (1.0.1)
- MaterialComponents/Ink (1.0.1)
- MaterialComponents/PageControl (1.0.1)
- MaterialComponents/private (1.0.1):
- MaterialComponents/private/Color (= 1.0.1)
- MaterialComponents/private/ThumbTrack (= 1.0.1)
- MaterialComponents/private/Color (1.0.1)
- MaterialComponents/private/ThumbTrack (1.0.1):
- 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/ScrollViewDelegateMultiplexer (1.0.1)
- MaterialComponents/ShadowElevations (1.0.1)
- MaterialComponents/ShadowLayer (1.0.1)
- MaterialComponents/Slider (1.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/SpritedAnimationView (1.0.0)
- MaterialComponents/Switch (1.0.0):
- MaterialComponents/SpritedAnimationView (1.0.1)
- MaterialComponents/Switch (1.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (1.0.0)
- MaterialComponents/Typography (1.0.1)

DEPENDENCIES:
- MaterialComponents (from `../../`)
Expand All @@ -48,6 +48,6 @@ EXTERNAL SOURCES:
:path: ../../

SPEC CHECKSUMS:
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b

COCOAPODS: 0.39.0
72 changes: 36 additions & 36 deletions catalog/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
PODS:
- 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 (1.0.1):
- MaterialComponents/Buttons (= 1.0.1)
- MaterialComponents/FlexibleHeader (= 1.0.1)
- MaterialComponents/HeaderStackView (= 1.0.1)
- MaterialComponents/Ink (= 1.0.1)
- MaterialComponents/PageControl (= 1.0.1)
- MaterialComponents/private (= 1.0.1)
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1)
- MaterialComponents/ShadowElevations (= 1.0.1)
- MaterialComponents/ShadowLayer (= 1.0.1)
- MaterialComponents/Slider (= 1.0.1)
- MaterialComponents/SpritedAnimationView (= 1.0.1)
- MaterialComponents/Switch (= 1.0.1)
- MaterialComponents/Typography (= 1.0.1)
- MaterialComponents/Buttons (1.0.1):
- 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/FlexibleHeader (1.0.1)
- MaterialComponents/HeaderStackView (1.0.1)
- MaterialComponents/Ink (1.0.1)
- MaterialComponents/PageControl (1.0.1)
- MaterialComponents/private (1.0.1):
- MaterialComponents/private/Color (= 1.0.1)
- MaterialComponents/private/ThumbTrack (= 1.0.1)
- MaterialComponents/private/Color (1.0.1)
- MaterialComponents/private/ThumbTrack (1.0.1):
- 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/ScrollViewDelegateMultiplexer (1.0.1)
- MaterialComponents/ShadowElevations (1.0.1)
- MaterialComponents/ShadowLayer (1.0.1)
- MaterialComponents/Slider (1.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/SpritedAnimationView (1.0.0)
- MaterialComponents/Switch (1.0.0):
- MaterialComponents/SpritedAnimationView (1.0.1)
- MaterialComponents/Switch (1.0.1):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Typography (1.0.0)
- MaterialComponentsCatalog (1.0.0)
- MaterialComponentsUnitTests (1.0.0)
- MaterialComponents/Typography (1.0.1)
- MaterialComponentsCatalog (1.0.1)
- MaterialComponentsUnitTests (1.0.1)

DEPENDENCIES:
- MaterialComponents (from `../`)
Expand All @@ -56,8 +56,8 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
MaterialComponentsCatalog: 2f0e7bae9ebf7ba0dca2699996d4103a8224901f
MaterialComponentsUnitTests: 4fb216eb24e8b239d5fb2b874ad210460d322fd2
MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b
MaterialComponentsCatalog: 1083faa86271b7591e27f03a2cb2a0bbd20e9038
MaterialComponentsUnitTests: 48a654682f525dd89946bf82bc6d4fe5d8d6e7c0

COCOAPODS: 0.39.0
9 changes: 0 additions & 9 deletions components/Switch/src/MDCSwitch.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,6 @@ - (void)thumbTrack:(MDCThumbTrack *)thumbTrack willJumpToValue:(CGFloat)value {
[self updateAccessibilityValues];
}

/**
* Updates the accessibility value of the switch given a toggle state.
* @param toggleState A value for the state of the switch.
*/
- (void)updateAccessibilityValues {
// Set accessibility value similar to native UISwitch.
if (self.on) {
Expand All @@ -239,11 +235,6 @@ - (void)updateAccessibilityValues {
}
}

/**
* Returns the toggle state of the switch given a possible slider @c value on the @c thumbTrack.
* @param thumbTrack The contained @c MDCThumbTrack object.
* @param value The value of the slider in @c thumbTrack.
*/
- (BOOL)toggleStateFromThumbTrack:(MDCThumbTrack *)thumbTrack withValue:(CGFloat)value {
// TODO(ajsecord): When the track supports multiple discrete locations, get the location directly.
BOOL allSignsPointToYes = value >= (thumbTrack.minimumValue + thumbTrack.maximumValue) / 2;
Expand Down
Loading

0 comments on commit ef50b77

Please sign in to comment.