Skip to content
This repository was archived by the owner on Dec 11, 2025. It is now read-only.

Commit ef50b77

Browse files
randalllirandallli
committed
Merge branch 'hotfix-1.0.1'
2 parents 1827d1c + a18e9d3 commit ef50b77

File tree

10 files changed

+173
-176
lines changed

10 files changed

+173
-176
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
##### Enhancements
55
##### Bug Fixes
66

7+
## 1.0.1
8+
9+
##### Enhancements
10+
11+
* [Switch] Removed internal docs that were pretending to be public docs. [Jeff Verkoeyen](https://github.com/jverkoey)
12+
713
## 1.0.0
814

915
##### Breaking

‎MaterialComponents.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponents"
3-
s.version = "1.0.0"
3+
s.version = "1.0.1"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎MaterialComponentsCatalog.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponentsCatalog"
3-
s.version = "1.0.0"
3+
s.version = "1.0.1"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎MaterialComponentsUnitTests.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponentsUnitTests"
3-
s.version = "1.0.0"
3+
s.version = "1.0.1"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎build_tests/CocoapodsObjCApp/Podfile.lock‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
PODS:
2-
- MaterialComponents (1.0.0):
3-
- MaterialComponents/Buttons (= 1.0.0)
4-
- MaterialComponents/FlexibleHeader (= 1.0.0)
5-
- MaterialComponents/HeaderStackView (= 1.0.0)
6-
- MaterialComponents/Ink (= 1.0.0)
7-
- MaterialComponents/PageControl (= 1.0.0)
8-
- MaterialComponents/private (= 1.0.0)
9-
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
10-
- MaterialComponents/ShadowElevations (= 1.0.0)
11-
- MaterialComponents/ShadowLayer (= 1.0.0)
12-
- MaterialComponents/Slider (= 1.0.0)
13-
- MaterialComponents/SpritedAnimationView (= 1.0.0)
14-
- MaterialComponents/Switch (= 1.0.0)
15-
- MaterialComponents/Typography (= 1.0.0)
16-
- MaterialComponents/Buttons (1.0.0):
2+
- MaterialComponents (1.0.1):
3+
- MaterialComponents/Buttons (= 1.0.1)
4+
- MaterialComponents/FlexibleHeader (= 1.0.1)
5+
- MaterialComponents/HeaderStackView (= 1.0.1)
6+
- MaterialComponents/Ink (= 1.0.1)
7+
- MaterialComponents/PageControl (= 1.0.1)
8+
- MaterialComponents/private (= 1.0.1)
9+
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1)
10+
- MaterialComponents/ShadowElevations (= 1.0.1)
11+
- MaterialComponents/ShadowLayer (= 1.0.1)
12+
- MaterialComponents/Slider (= 1.0.1)
13+
- MaterialComponents/SpritedAnimationView (= 1.0.1)
14+
- MaterialComponents/Switch (= 1.0.1)
15+
- MaterialComponents/Typography (= 1.0.1)
16+
- MaterialComponents/Buttons (1.0.1):
1717
- MaterialComponents/Ink
1818
- MaterialComponents/ShadowElevations
1919
- MaterialComponents/ShadowLayer
2020
- MaterialComponents/Typography
21-
- MaterialComponents/FlexibleHeader (1.0.0)
22-
- MaterialComponents/HeaderStackView (1.0.0)
23-
- MaterialComponents/Ink (1.0.0)
24-
- MaterialComponents/PageControl (1.0.0)
25-
- MaterialComponents/private (1.0.0):
26-
- MaterialComponents/private/Color (= 1.0.0)
27-
- MaterialComponents/private/ThumbTrack (= 1.0.0)
28-
- MaterialComponents/private/Color (1.0.0)
29-
- MaterialComponents/private/ThumbTrack (1.0.0):
21+
- MaterialComponents/FlexibleHeader (1.0.1)
22+
- MaterialComponents/HeaderStackView (1.0.1)
23+
- MaterialComponents/Ink (1.0.1)
24+
- MaterialComponents/PageControl (1.0.1)
25+
- MaterialComponents/private (1.0.1):
26+
- MaterialComponents/private/Color (= 1.0.1)
27+
- MaterialComponents/private/ThumbTrack (= 1.0.1)
28+
- MaterialComponents/private/Color (1.0.1)
29+
- MaterialComponents/private/ThumbTrack (1.0.1):
3030
- MaterialComponents/private/Color
3131
- MaterialComponents/ShadowElevations
3232
- MaterialComponents/ShadowLayer
33-
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
34-
- MaterialComponents/ShadowElevations (1.0.0)
35-
- MaterialComponents/ShadowLayer (1.0.0)
36-
- MaterialComponents/Slider (1.0.0):
33+
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1)
34+
- MaterialComponents/ShadowElevations (1.0.1)
35+
- MaterialComponents/ShadowLayer (1.0.1)
36+
- MaterialComponents/Slider (1.0.1):
3737
- MaterialComponents/private/ThumbTrack
38-
- MaterialComponents/SpritedAnimationView (1.0.0)
39-
- MaterialComponents/Switch (1.0.0):
38+
- MaterialComponents/SpritedAnimationView (1.0.1)
39+
- MaterialComponents/Switch (1.0.1):
4040
- MaterialComponents/private/ThumbTrack
41-
- MaterialComponents/Typography (1.0.0)
41+
- MaterialComponents/Typography (1.0.1)
4242

4343
DEPENDENCIES:
4444
- MaterialComponents (from `../../`)
@@ -48,6 +48,6 @@ EXTERNAL SOURCES:
4848
:path: ../../
4949

5050
SPEC CHECKSUMS:
51-
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
51+
MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b
5252

5353
COCOAPODS: 0.39.0

‎build_tests/CocoapodsSwiftApp/Podfile.lock‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
PODS:
2-
- MaterialComponents (1.0.0):
3-
- MaterialComponents/Buttons (= 1.0.0)
4-
- MaterialComponents/FlexibleHeader (= 1.0.0)
5-
- MaterialComponents/HeaderStackView (= 1.0.0)
6-
- MaterialComponents/Ink (= 1.0.0)
7-
- MaterialComponents/PageControl (= 1.0.0)
8-
- MaterialComponents/private (= 1.0.0)
9-
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
10-
- MaterialComponents/ShadowElevations (= 1.0.0)
11-
- MaterialComponents/ShadowLayer (= 1.0.0)
12-
- MaterialComponents/Slider (= 1.0.0)
13-
- MaterialComponents/SpritedAnimationView (= 1.0.0)
14-
- MaterialComponents/Switch (= 1.0.0)
15-
- MaterialComponents/Typography (= 1.0.0)
16-
- MaterialComponents/Buttons (1.0.0):
2+
- MaterialComponents (1.0.1):
3+
- MaterialComponents/Buttons (= 1.0.1)
4+
- MaterialComponents/FlexibleHeader (= 1.0.1)
5+
- MaterialComponents/HeaderStackView (= 1.0.1)
6+
- MaterialComponents/Ink (= 1.0.1)
7+
- MaterialComponents/PageControl (= 1.0.1)
8+
- MaterialComponents/private (= 1.0.1)
9+
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1)
10+
- MaterialComponents/ShadowElevations (= 1.0.1)
11+
- MaterialComponents/ShadowLayer (= 1.0.1)
12+
- MaterialComponents/Slider (= 1.0.1)
13+
- MaterialComponents/SpritedAnimationView (= 1.0.1)
14+
- MaterialComponents/Switch (= 1.0.1)
15+
- MaterialComponents/Typography (= 1.0.1)
16+
- MaterialComponents/Buttons (1.0.1):
1717
- MaterialComponents/Ink
1818
- MaterialComponents/ShadowElevations
1919
- MaterialComponents/ShadowLayer
2020
- MaterialComponents/Typography
21-
- MaterialComponents/FlexibleHeader (1.0.0)
22-
- MaterialComponents/HeaderStackView (1.0.0)
23-
- MaterialComponents/Ink (1.0.0)
24-
- MaterialComponents/PageControl (1.0.0)
25-
- MaterialComponents/private (1.0.0):
26-
- MaterialComponents/private/Color (= 1.0.0)
27-
- MaterialComponents/private/ThumbTrack (= 1.0.0)
28-
- MaterialComponents/private/Color (1.0.0)
29-
- MaterialComponents/private/ThumbTrack (1.0.0):
21+
- MaterialComponents/FlexibleHeader (1.0.1)
22+
- MaterialComponents/HeaderStackView (1.0.1)
23+
- MaterialComponents/Ink (1.0.1)
24+
- MaterialComponents/PageControl (1.0.1)
25+
- MaterialComponents/private (1.0.1):
26+
- MaterialComponents/private/Color (= 1.0.1)
27+
- MaterialComponents/private/ThumbTrack (= 1.0.1)
28+
- MaterialComponents/private/Color (1.0.1)
29+
- MaterialComponents/private/ThumbTrack (1.0.1):
3030
- MaterialComponents/private/Color
3131
- MaterialComponents/ShadowElevations
3232
- MaterialComponents/ShadowLayer
33-
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
34-
- MaterialComponents/ShadowElevations (1.0.0)
35-
- MaterialComponents/ShadowLayer (1.0.0)
36-
- MaterialComponents/Slider (1.0.0):
33+
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1)
34+
- MaterialComponents/ShadowElevations (1.0.1)
35+
- MaterialComponents/ShadowLayer (1.0.1)
36+
- MaterialComponents/Slider (1.0.1):
3737
- MaterialComponents/private/ThumbTrack
38-
- MaterialComponents/SpritedAnimationView (1.0.0)
39-
- MaterialComponents/Switch (1.0.0):
38+
- MaterialComponents/SpritedAnimationView (1.0.1)
39+
- MaterialComponents/Switch (1.0.1):
4040
- MaterialComponents/private/ThumbTrack
41-
- MaterialComponents/Typography (1.0.0)
41+
- MaterialComponents/Typography (1.0.1)
4242

4343
DEPENDENCIES:
4444
- MaterialComponents (from `../../`)
@@ -48,6 +48,6 @@ EXTERNAL SOURCES:
4848
:path: ../../
4949

5050
SPEC CHECKSUMS:
51-
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
51+
MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b
5252

5353
COCOAPODS: 0.39.0

‎catalog/Podfile.lock‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
PODS:
2-
- MaterialComponents (1.0.0):
3-
- MaterialComponents/Buttons (= 1.0.0)
4-
- MaterialComponents/FlexibleHeader (= 1.0.0)
5-
- MaterialComponents/HeaderStackView (= 1.0.0)
6-
- MaterialComponents/Ink (= 1.0.0)
7-
- MaterialComponents/PageControl (= 1.0.0)
8-
- MaterialComponents/private (= 1.0.0)
9-
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
10-
- MaterialComponents/ShadowElevations (= 1.0.0)
11-
- MaterialComponents/ShadowLayer (= 1.0.0)
12-
- MaterialComponents/Slider (= 1.0.0)
13-
- MaterialComponents/SpritedAnimationView (= 1.0.0)
14-
- MaterialComponents/Switch (= 1.0.0)
15-
- MaterialComponents/Typography (= 1.0.0)
16-
- MaterialComponents/Buttons (1.0.0):
2+
- MaterialComponents (1.0.1):
3+
- MaterialComponents/Buttons (= 1.0.1)
4+
- MaterialComponents/FlexibleHeader (= 1.0.1)
5+
- MaterialComponents/HeaderStackView (= 1.0.1)
6+
- MaterialComponents/Ink (= 1.0.1)
7+
- MaterialComponents/PageControl (= 1.0.1)
8+
- MaterialComponents/private (= 1.0.1)
9+
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.1)
10+
- MaterialComponents/ShadowElevations (= 1.0.1)
11+
- MaterialComponents/ShadowLayer (= 1.0.1)
12+
- MaterialComponents/Slider (= 1.0.1)
13+
- MaterialComponents/SpritedAnimationView (= 1.0.1)
14+
- MaterialComponents/Switch (= 1.0.1)
15+
- MaterialComponents/Typography (= 1.0.1)
16+
- MaterialComponents/Buttons (1.0.1):
1717
- MaterialComponents/Ink
1818
- MaterialComponents/ShadowElevations
1919
- MaterialComponents/ShadowLayer
2020
- MaterialComponents/Typography
21-
- MaterialComponents/FlexibleHeader (1.0.0)
22-
- MaterialComponents/HeaderStackView (1.0.0)
23-
- MaterialComponents/Ink (1.0.0)
24-
- MaterialComponents/PageControl (1.0.0)
25-
- MaterialComponents/private (1.0.0):
26-
- MaterialComponents/private/Color (= 1.0.0)
27-
- MaterialComponents/private/ThumbTrack (= 1.0.0)
28-
- MaterialComponents/private/Color (1.0.0)
29-
- MaterialComponents/private/ThumbTrack (1.0.0):
21+
- MaterialComponents/FlexibleHeader (1.0.1)
22+
- MaterialComponents/HeaderStackView (1.0.1)
23+
- MaterialComponents/Ink (1.0.1)
24+
- MaterialComponents/PageControl (1.0.1)
25+
- MaterialComponents/private (1.0.1):
26+
- MaterialComponents/private/Color (= 1.0.1)
27+
- MaterialComponents/private/ThumbTrack (= 1.0.1)
28+
- MaterialComponents/private/Color (1.0.1)
29+
- MaterialComponents/private/ThumbTrack (1.0.1):
3030
- MaterialComponents/private/Color
3131
- MaterialComponents/ShadowElevations
3232
- MaterialComponents/ShadowLayer
33-
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
34-
- MaterialComponents/ShadowElevations (1.0.0)
35-
- MaterialComponents/ShadowLayer (1.0.0)
36-
- MaterialComponents/Slider (1.0.0):
33+
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.1)
34+
- MaterialComponents/ShadowElevations (1.0.1)
35+
- MaterialComponents/ShadowLayer (1.0.1)
36+
- MaterialComponents/Slider (1.0.1):
3737
- MaterialComponents/private/ThumbTrack
38-
- MaterialComponents/SpritedAnimationView (1.0.0)
39-
- MaterialComponents/Switch (1.0.0):
38+
- MaterialComponents/SpritedAnimationView (1.0.1)
39+
- MaterialComponents/Switch (1.0.1):
4040
- MaterialComponents/private/ThumbTrack
41-
- MaterialComponents/Typography (1.0.0)
42-
- MaterialComponentsCatalog (1.0.0)
43-
- MaterialComponentsUnitTests (1.0.0)
41+
- MaterialComponents/Typography (1.0.1)
42+
- MaterialComponentsCatalog (1.0.1)
43+
- MaterialComponentsUnitTests (1.0.1)
4444

4545
DEPENDENCIES:
4646
- MaterialComponents (from `../`)
@@ -56,8 +56,8 @@ EXTERNAL SOURCES:
5656
:path: ../
5757

5858
SPEC CHECKSUMS:
59-
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
60-
MaterialComponentsCatalog: 2f0e7bae9ebf7ba0dca2699996d4103a8224901f
61-
MaterialComponentsUnitTests: 4fb216eb24e8b239d5fb2b874ad210460d322fd2
59+
MaterialComponents: 32b38943bbc69bb9c623f211ba46473e1d4c945b
60+
MaterialComponentsCatalog: 1083faa86271b7591e27f03a2cb2a0bbd20e9038
61+
MaterialComponentsUnitTests: 48a654682f525dd89946bf82bc6d4fe5d8d6e7c0
6262

6363
COCOAPODS: 0.39.0

‎components/Switch/src/MDCSwitch.m‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,6 @@ - (void)thumbTrack:(MDCThumbTrack *)thumbTrack willJumpToValue:(CGFloat)value {
218218
[self updateAccessibilityValues];
219219
}
220220

221-
/**
222-
* Updates the accessibility value of the switch given a toggle state.
223-
* @param toggleState A value for the state of the switch.
224-
*/
225221
- (void)updateAccessibilityValues {
226222
// Set accessibility value similar to native UISwitch.
227223
if (self.on) {
@@ -239,11 +235,6 @@ - (void)updateAccessibilityValues {
239235
}
240236
}
241237

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

0 commit comments

Comments
 (0)