Skip to content
This repository was archived by the owner on Sep 27, 2022. It is now read-only.

Commit 64fdf43

Browse files
brianjmoorebrianjmoore
authored
Merge pull request #5 from brianjmoore/feature-tabs-examples
Split Tabs examples into 2 and updated organization inside them
2 parents 0cfab98 + 2f1bcf2 commit 64fdf43

File tree

10 files changed

+543
-299
lines changed

10 files changed

+543
-299
lines changed

‎catalog/MDCCatalog.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@
531531
);
532532
runOnlyForDeploymentPostprocessing = 0;
533533
shellPath = /bin/sh;
534-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
534+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
535535
showEnvVarsInLog = 0;
536536
};
537537
A7D47BD9A3C62120038127E5 /* [CP] Copy Pods Resources */ = {
@@ -561,7 +561,7 @@
561561
);
562562
runOnlyForDeploymentPostprocessing = 0;
563563
shellPath = /bin/sh;
564-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
564+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
565565
showEnvVarsInLog = 0;
566566
};
567567
/* End PBXShellScriptBuildPhase section */

‎catalog/MDCUnitTests.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
);
155155
runOnlyForDeploymentPostprocessing = 0;
156156
shellPath = /bin/sh;
157-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
157+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
158158
showEnvVarsInLog = 0;
159159
};
160160
AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */ = {

‎catalog/Podfile.lock‎

Lines changed: 98 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
PODS:
22
- CatalogByConvention (1.0.1)
33
- EarlGrey (1.3.0)
4-
- MaterialComponents (15.0.0):
5-
- MaterialComponents/ActivityIndicator (= 15.0.0)
6-
- MaterialComponents/AnimationTiming (= 15.0.0)
7-
- MaterialComponents/AppBar (= 15.0.0)
8-
- MaterialComponents/ButtonBar (= 15.0.0)
9-
- MaterialComponents/Buttons (= 15.0.0)
10-
- MaterialComponents/CollectionCells (= 15.0.0)
11-
- MaterialComponents/CollectionLayoutAttributes (= 15.0.0)
12-
- MaterialComponents/Collections (= 15.0.0)
13-
- MaterialComponents/Dialogs (= 15.0.0)
14-
- MaterialComponents/FlexibleHeader (= 15.0.0)
15-
- MaterialComponents/FontDiskLoader (= 15.0.0)
16-
- MaterialComponents/HeaderStackView (= 15.0.0)
17-
- MaterialComponents/Ink (= 15.0.0)
18-
- MaterialComponents/NavigationBar (= 15.0.0)
19-
- MaterialComponents/OverlayWindow (= 15.0.0)
20-
- MaterialComponents/PageControl (= 15.0.0)
21-
- MaterialComponents/Palettes (= 15.0.0)
22-
- MaterialComponents/private (= 15.0.0)
23-
- MaterialComponents/ProgressView (= 15.0.0)
24-
- MaterialComponents/RobotoFontLoader (= 15.0.0)
25-
- MaterialComponents/ShadowElevations (= 15.0.0)
26-
- MaterialComponents/ShadowLayer (= 15.0.0)
27-
- MaterialComponents/Slider (= 15.0.0)
28-
- MaterialComponents/Snackbar (= 15.0.0)
29-
- MaterialComponents/SpritedAnimationView (= 15.0.0)
30-
- MaterialComponents/Switch (= 15.0.0)
31-
- MaterialComponents/Tabs (= 15.0.0)
32-
- MaterialComponents/Typography (= 15.0.0)
33-
- MaterialComponents/ActivityIndicator (15.0.0):
4+
- MaterialComponents (16.2.0):
5+
- MaterialComponents/ActivityIndicator (= 16.2.0)
6+
- MaterialComponents/AnimationTiming (= 16.2.0)
7+
- MaterialComponents/AppBar (= 16.2.0)
8+
- MaterialComponents/ButtonBar (= 16.2.0)
9+
- MaterialComponents/Buttons (= 16.2.0)
10+
- MaterialComponents/CollectionCells (= 16.2.0)
11+
- MaterialComponents/CollectionLayoutAttributes (= 16.2.0)
12+
- MaterialComponents/Collections (= 16.2.0)
13+
- MaterialComponents/Dialogs (= 16.2.0)
14+
- MaterialComponents/FeatureHighlight (= 16.2.0)
15+
- MaterialComponents/FlexibleHeader (= 16.2.0)
16+
- MaterialComponents/FontDiskLoader (= 16.2.0)
17+
- MaterialComponents/HeaderStackView (= 16.2.0)
18+
- MaterialComponents/Ink (= 16.2.0)
19+
- MaterialComponents/NavigationBar (= 16.2.0)
20+
- MaterialComponents/OverlayWindow (= 16.2.0)
21+
- MaterialComponents/PageControl (= 16.2.0)
22+
- MaterialComponents/Palettes (= 16.2.0)
23+
- MaterialComponents/private (= 16.2.0)
24+
- MaterialComponents/ProgressView (= 16.2.0)
25+
- MaterialComponents/RobotoFontLoader (= 16.2.0)
26+
- MaterialComponents/ShadowElevations (= 16.2.0)
27+
- MaterialComponents/ShadowLayer (= 16.2.0)
28+
- MaterialComponents/Slider (= 16.2.0)
29+
- MaterialComponents/Snackbar (= 16.2.0)
30+
- MaterialComponents/SpritedAnimationView (= 16.2.0)
31+
- MaterialComponents/Switch (= 16.2.0)
32+
- MaterialComponents/Tabs (= 16.2.0)
33+
- MaterialComponents/Typography (= 16.2.0)
34+
- MaterialComponents/ActivityIndicator (16.2.0):
3435
- MaterialComponents/private/RTL
35-
- MaterialComponents/AnimationTiming (15.0.0)
36-
- MaterialComponents/AppBar (15.0.0):
36+
- MaterialComponents/AnimationTiming (16.2.0)
37+
- MaterialComponents/AppBar (16.2.0):
3738
- MaterialComponents/FlexibleHeader
3839
- MaterialComponents/HeaderStackView
3940
- MaterialComponents/NavigationBar
@@ -42,16 +43,16 @@ PODS:
4243
- MaterialComponents/ShadowElevations
4344
- MaterialComponents/ShadowLayer
4445
- MaterialComponents/Typography
45-
- MaterialComponents/ButtonBar (15.0.0):
46+
- MaterialComponents/ButtonBar (16.2.0):
4647
- MaterialComponents/Buttons
4748
- MaterialComponents/private/RTL
48-
- MaterialComponents/Buttons (15.0.0):
49+
- MaterialComponents/Buttons (16.2.0):
4950
- MaterialComponents/Ink
5051
- MaterialComponents/ShadowElevations
5152
- MaterialComponents/ShadowLayer
5253
- MaterialComponents/Typography
5354
- MDFTextAccessibility
54-
- MaterialComponents/CollectionCells (15.0.0):
55+
- MaterialComponents/CollectionCells (16.2.0):
5556
- MaterialComponents/CollectionLayoutAttributes
5657
- MaterialComponents/Ink
5758
- MaterialComponents/private/Icons/ic_check
@@ -62,100 +63,103 @@ PODS:
6263
- MaterialComponents/private/Icons/ic_reorder
6364
- MaterialComponents/private/RTL
6465
- MaterialComponents/Typography
65-
- MaterialComponents/CollectionLayoutAttributes (15.0.0)
66-
- MaterialComponents/Collections (15.0.0):
66+
- MaterialComponents/CollectionLayoutAttributes (16.2.0)
67+
- MaterialComponents/Collections (16.2.0):
6768
- MaterialComponents/CollectionCells
6869
- MaterialComponents/CollectionLayoutAttributes
6970
- MaterialComponents/Ink
7071
- MaterialComponents/ShadowElevations
7172
- MaterialComponents/ShadowLayer
7273
- MaterialComponents/Typography
73-
- MaterialComponents/Dialogs (15.0.0):
74+
- MaterialComponents/Dialogs (16.2.0):
7475
- MaterialComponents/Buttons
7576
- MaterialComponents/private/KeyboardWatcher
7677
- MaterialComponents/ShadowElevations
7778
- MaterialComponents/ShadowLayer
78-
- MaterialComponents/FlexibleHeader (15.0.0):
79+
- MaterialComponents/FeatureHighlight (16.2.0):
80+
- MaterialComponents/Typography
81+
- MDFTextAccessibility
82+
- MaterialComponents/FlexibleHeader (16.2.0):
7983
- MDFTextAccessibility
80-
- MaterialComponents/FontDiskLoader (15.0.0)
81-
- MaterialComponents/HeaderStackView (15.0.0)
82-
- MaterialComponents/Ink (15.0.0)
83-
- MaterialComponents/NavigationBar (15.0.0):
84+
- MaterialComponents/FontDiskLoader (16.2.0)
85+
- MaterialComponents/HeaderStackView (16.2.0)
86+
- MaterialComponents/Ink (16.2.0)
87+
- MaterialComponents/NavigationBar (16.2.0):
8488
- MaterialComponents/ButtonBar
8589
- MaterialComponents/private/RTL
8690
- MaterialComponents/Typography
87-
- MaterialComponents/OverlayWindow (15.0.0)
88-
- MaterialComponents/PageControl (15.0.0)
89-
- MaterialComponents/Palettes (15.0.0)
90-
- MaterialComponents/private (15.0.0):
91-
- MaterialComponents/private/Color (= 15.0.0)
92-
- MaterialComponents/private/Icons (= 15.0.0)
93-
- MaterialComponents/private/KeyboardWatcher (= 15.0.0)
94-
- MaterialComponents/private/Overlay (= 15.0.0)
95-
- MaterialComponents/private/RTL (= 15.0.0)
96-
- MaterialComponents/private/ThumbTrack (= 15.0.0)
97-
- MaterialComponents/private/Color (15.0.0)
98-
- MaterialComponents/private/Icons (15.0.0):
99-
- MaterialComponents/private/Icons/Base (= 15.0.0)
100-
- MaterialComponents/private/Icons/ic_arrow_back (= 15.0.0)
101-
- MaterialComponents/private/Icons/ic_check (= 15.0.0)
102-
- MaterialComponents/private/Icons/ic_check_circle (= 15.0.0)
103-
- MaterialComponents/private/Icons/ic_chevron_right (= 15.0.0)
104-
- MaterialComponents/private/Icons/ic_info (= 15.0.0)
105-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.0.0)
106-
- MaterialComponents/private/Icons/ic_reorder (= 15.0.0)
107-
- MaterialComponents/private/Icons/Base (15.0.0)
108-
- MaterialComponents/private/Icons/ic_arrow_back (15.0.0):
91+
- MaterialComponents/OverlayWindow (16.2.0)
92+
- MaterialComponents/PageControl (16.2.0)
93+
- MaterialComponents/Palettes (16.2.0)
94+
- MaterialComponents/private (16.2.0):
95+
- MaterialComponents/private/Color (= 16.2.0)
96+
- MaterialComponents/private/Icons (= 16.2.0)
97+
- MaterialComponents/private/KeyboardWatcher (= 16.2.0)
98+
- MaterialComponents/private/Overlay (= 16.2.0)
99+
- MaterialComponents/private/RTL (= 16.2.0)
100+
- MaterialComponents/private/ThumbTrack (= 16.2.0)
101+
- MaterialComponents/private/Color (16.2.0)
102+
- MaterialComponents/private/Icons (16.2.0):
103+
- MaterialComponents/private/Icons/Base (= 16.2.0)
104+
- MaterialComponents/private/Icons/ic_arrow_back (= 16.2.0)
105+
- MaterialComponents/private/Icons/ic_check (= 16.2.0)
106+
- MaterialComponents/private/Icons/ic_check_circle (= 16.2.0)
107+
- MaterialComponents/private/Icons/ic_chevron_right (= 16.2.0)
108+
- MaterialComponents/private/Icons/ic_info (= 16.2.0)
109+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.2.0)
110+
- MaterialComponents/private/Icons/ic_reorder (= 16.2.0)
111+
- MaterialComponents/private/Icons/Base (16.2.0)
112+
- MaterialComponents/private/Icons/ic_arrow_back (16.2.0):
109113
- MaterialComponents/private/Icons/Base
110-
- MaterialComponents/private/Icons/ic_check (15.0.0):
114+
- MaterialComponents/private/Icons/ic_check (16.2.0):
111115
- MaterialComponents/private/Icons/Base
112-
- MaterialComponents/private/Icons/ic_check_circle (15.0.0):
116+
- MaterialComponents/private/Icons/ic_check_circle (16.2.0):
113117
- MaterialComponents/private/Icons/Base
114-
- MaterialComponents/private/Icons/ic_chevron_right (15.0.0):
118+
- MaterialComponents/private/Icons/ic_chevron_right (16.2.0):
115119
- MaterialComponents/private/Icons/Base
116-
- MaterialComponents/private/Icons/ic_info (15.0.0):
120+
- MaterialComponents/private/Icons/ic_info (16.2.0):
117121
- MaterialComponents/private/Icons/Base
118-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.0.0):
122+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.2.0):
119123
- MaterialComponents/private/Icons/Base
120-
- MaterialComponents/private/Icons/ic_reorder (15.0.0):
124+
- MaterialComponents/private/Icons/ic_reorder (16.2.0):
121125
- MaterialComponents/private/Icons/Base
122-
- MaterialComponents/private/KeyboardWatcher (15.0.0)
123-
- MaterialComponents/private/Overlay (15.0.0)
124-
- MaterialComponents/private/RTL (15.0.0)
125-
- MaterialComponents/private/ThumbTrack (15.0.0):
126+
- MaterialComponents/private/KeyboardWatcher (16.2.0)
127+
- MaterialComponents/private/Overlay (16.2.0)
128+
- MaterialComponents/private/RTL (16.2.0)
129+
- MaterialComponents/private/ThumbTrack (16.2.0):
126130
- MaterialComponents/Ink
127131
- MaterialComponents/private/Color
128132
- MaterialComponents/ShadowElevations
129133
- MaterialComponents/ShadowLayer
130134
- MaterialComponents/Typography
131-
- MaterialComponents/ProgressView (15.0.0):
135+
- MaterialComponents/ProgressView (16.2.0):
132136
- MaterialComponents/private/RTL
133-
- MaterialComponents/RobotoFontLoader (15.0.0):
137+
- MaterialComponents/RobotoFontLoader (16.2.0):
134138
- MaterialComponents/FontDiskLoader
135139
- MaterialComponents/Typography
136-
- MaterialComponents/ShadowElevations (15.0.0)
137-
- MaterialComponents/ShadowLayer (15.0.0)
138-
- MaterialComponents/Slider (15.0.0):
140+
- MaterialComponents/ShadowElevations (16.2.0)
141+
- MaterialComponents/ShadowLayer (16.2.0)
142+
- MaterialComponents/Slider (16.2.0):
139143
- MaterialComponents/private/ThumbTrack
140-
- MaterialComponents/Snackbar (15.0.0):
144+
- MaterialComponents/Snackbar (16.2.0):
141145
- MaterialComponents/AnimationTiming
142146
- MaterialComponents/Buttons
143147
- MaterialComponents/OverlayWindow
144148
- MaterialComponents/private/KeyboardWatcher
145149
- MaterialComponents/private/Overlay
146-
- MaterialComponents/SpritedAnimationView (15.0.0)
147-
- MaterialComponents/Switch (15.0.0):
150+
- MaterialComponents/SpritedAnimationView (16.2.0)
151+
- MaterialComponents/Switch (16.2.0):
148152
- MaterialComponents/private/RTL
149153
- MaterialComponents/private/ThumbTrack
150-
- MaterialComponents/Tabs (15.0.0):
154+
- MaterialComponents/Tabs (16.2.0):
151155
- MaterialComponents/AnimationTiming
152156
- MaterialComponents/Ink
153157
- MaterialComponents/private/RTL
154158
- MaterialComponents/Typography
155-
- MaterialComponents/Typography (15.0.0)
156-
- MaterialComponentsCatalog (15.0.0):
159+
- MaterialComponents/Typography (16.2.0)
160+
- MaterialComponentsCatalog (16.2.0):
157161
- MaterialComponents
158-
- MaterialComponentsUnitTests (15.0.0):
162+
- MaterialComponentsUnitTests (16.2.0):
159163
- MaterialComponents
160164
- MDFTextAccessibility
161165
- MDFTextAccessibility (1.1.1)
@@ -169,20 +173,20 @@ DEPENDENCIES:
169173

170174
EXTERNAL SOURCES:
171175
MaterialComponents:
172-
:path: "../"
176+
:path: ../
173177
MaterialComponentsCatalog:
174-
:path: "../"
178+
:path: ../
175179
MaterialComponentsUnitTests:
176-
:path: "../"
180+
:path: ../
177181

178182
SPEC CHECKSUMS:
179183
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
180184
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
181-
MaterialComponents: 2e546055134c272f6cc6d26ab4ea697611c94a8b
182-
MaterialComponentsCatalog: fe35be22863a94075d9c25b205dead8df53df0ae
183-
MaterialComponentsUnitTests: 5eca3cb1a741ab815a1f820f88119f90696fbdcb
185+
MaterialComponents: b479d5f003974327f58e03f940764179a9b41580
186+
MaterialComponentsCatalog: c66a111e2a412232c67b36b333c14f6cf746dcf5
187+
MaterialComponentsUnitTests: 9bdcf1262f7a911c832b1b9787133480f52015f4
184188
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
185189

186190
PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01
187191

188-
COCOAPODS: 1.0.1
192+
COCOAPODS: 1.1.1

0 commit comments

Comments
 (0)