Skip to content

Commit

Permalink
Fixed a build error that tripped because a variable was named wrong o…
Browse files Browse the repository at this point in the history 
…n accident
  • Loading branch information
@brandonemrich
brandonemrich committed Aug 24, 2010
1 parent dbb13c1 commit de6c409
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 73 deletions.
4 changes: 2 additions & 2 deletions Classes/ZIStoreButton.m
View file
Expand Up @@ -116,8 +116,8 @@ - (void) setSelected:(BOOL)selected {
animation.fillMode = kCAFillModeForwards;
animation.delegate = self;

[gradientLayer layoutIfNeeded];
[gradientLayer addAnimation:animation forKey:@"changeToBlue"];
[innerLayer3 layoutIfNeeded];
[innerLayer3 addAnimation:animation forKey:@"changeToBlue"];

for (CALayer *la in self.layer.sublayers) {
CGRect cr = la.bounds;
Expand Down
52 changes: 25 additions & 27 deletions ZIStoreButtonDemo.xcodeproj/brandon.mode1v3
View file
Expand Up @@ -272,8 +272,6 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>5</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
Expand All @@ -297,7 +295,7 @@
<real>223</real>
</array>
<key>RubberWindowFrame</key>
<string>1046 250 1290 959 0 0 2560 1418 </string>
<string>59 265 1290 959 0 0 2560 1418 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
Expand All @@ -315,27 +313,27 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>ZIStoreButtonDemoViewController.m</string>
<string>ZIStoreButton.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>ZIStoreButtonDemoViewController.m</string>
<string>ZIStoreButton.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>CABF71FB1223EDB400227AD3</string>
<string>CABF72671223FAF200227AD3</string>
<key>history</key>
<array>
<string>CAFFD36411F884B30097DE9A</string>
<string>CAFFD36511F884B30097DE9A</string>
<string>CAFFD36711F884B30097DE9A</string>
<string>CAFFD36811F884B30097DE9A</string>
<string>CA18DF1512236D5C0038778B</string>
<string>CA18DF1D12238BF60038778B</string>
<string>CABF723C1223F64400227AD3</string>
<string>CABF723D1223F64400227AD3</string>
<string>CABF725F1223FAE200227AD3</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -349,7 +347,7 @@
<key>Frame</key>
<string>{{0, 0}, {1045, 913}}</string>
<key>RubberWindowFrame</key>
<string>1046 250 1290 959 0 0 2560 1418 </string>
<string>59 265 1290 959 0 0 2560 1418 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
Expand All @@ -369,7 +367,7 @@
<key>Frame</key>
<string>{{0, 918}, {1045, 0}}</string>
<key>RubberWindowFrame</key>
<string>1046 250 1290 959 0 0 2560 1418 </string>
<string>59 265 1290 959 0 0 2560 1418 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
Expand All @@ -393,9 +391,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>CABF71FC1223EDB400227AD3</string>
<string>CABF72681223FAF200227AD3</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>CABF71FD1223EDB400227AD3</string>
<string>CABF72691223FAF200227AD3</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
Expand Down Expand Up @@ -537,7 +535,7 @@
<string>/Users/brandon/Documents/StoreButton/ZIStoreButton/ZIStoreButtonDemo.xcodeproj</string>
</array>
<key>WindowString</key>
<string>1046 250 1290 959 0 0 2560 1418 </string>
<string>59 265 1290 959 0 0 2560 1418 </string>
<key>WindowToolsV3</key>
<array>
<dict>
Expand Down Expand Up @@ -614,7 +612,7 @@
<key>TableOfContents</key>
<array>
<string>CABCFBEF11F6742100D7D98A</string>
<string>CABF71FE1223EDB400227AD3</string>
<string>CABF726A1223FAF200227AD3</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
Expand Down Expand Up @@ -658,8 +656,8 @@
<string>yes</string>
<key>sizes</key>
<array>
<string>{{0, 0}, {316, 198}}</string>
<string>{{316, 0}, {378, 198}}</string>
<string>{{0, 0}, {316, 201}}</string>
<string>{{316, 0}, {378, 201}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
Expand All @@ -674,8 +672,8 @@
<string>yes</string>
<key>sizes</key>
<array>
<string>{{0, 0}, {694, 198}}</string>
<string>{{0, 198}, {694, 183}}</string>
<string>{{0, 0}, {694, 201}}</string>
<string>{{0, 201}, {694, 180}}</string>
</array>
</dict>
</dict>
Expand Down Expand Up @@ -708,7 +706,7 @@
<real>148</real>
</array>
<key>Frame</key>
<string>{{316, 0}, {378, 198}}</string>
<string>{{316, 0}, {378, 201}}</string>
<key>RubberWindowFrame</key>
<string>1104 774 694 422 0 0 2560 1418 </string>
</dict>
Expand Down Expand Up @@ -736,13 +734,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>CAFFD2FD11F87EAF0097DE9A</string>
<string>CABF724E1223FAB400227AD3</string>
<string>1C162984064C10D400B95A72</string>
<string>CAFFD2FE11F87EAF0097DE9A</string>
<string>CAFFD2FF11F87EAF0097DE9A</string>
<string>CAFFD30011F87EAF0097DE9A</string>
<string>CAFFD30111F87EAF0097DE9A</string>
<string>CAFFD30211F87EAF0097DE9A</string>
<string>CABF724F1223FAB400227AD3</string>
<string>CABF72501223FAB400227AD3</string>
<string>CABF72511223FAB400227AD3</string>
<string>CABF72521223FAB400227AD3</string>
<string>CABF72531223FAB400227AD3</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
Expand Down Expand Up @@ -904,7 +902,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>CAFFD30311F87EAF0097DE9A</string>
<string>CABF72541223FAB400227AD3</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
Expand Down
85 changes: 42 additions & 43 deletions ZIStoreButtonDemo.xcodeproj/brandon.pbxuser
View file
Expand Up @@ -33,13 +33,13 @@
sepNavFolds = "{\n c = (\n {\n r = \"{2522, 1009}\";\n s = 0;\n },\n {\n r = \"{3628, 115}\";\n s = 0;\n },\n {\n r = \"{3780, 155}\";\n s = 0;\n },\n {\n r = \"{3962, 83}\";\n s = 0;\n },\n {\n r = \"{4066, 22}\";\n s = 0;\n }\n );\n r = \"{0, 4096}\";\n s = 0;\n}";
sepNavIntBoundsRect = "{{0, 0}, {1698, 929}}";
sepNavSelRange = "{1448, 0}";
sepNavVisRange = "{0, 2691}";
sepNavVisRange = "{41, 2671}";
};
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
activeBuildConfigurationName = Debug;
activeExecutable = CABCFBDD11F671D900D7D98A /* ZIStoreButtonDemo */;
activeSDKPreference = iphonesimulator4.0;
activeSDKPreference = iphonesimulator4.1;
activeTarget = 1D6058900D05DD3D006BFB54 /* ZIStoreButtonDemo */;
addToTargets = (
1D6058900D05DD3D006BFB54 /* ZIStoreButtonDemo */,
Expand Down Expand Up @@ -73,16 +73,16 @@
PBXFileDataSource_Target_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 304344499;
PBXWorkspaceStateSaveDate = 304344499;
PBXPerProjectTemplateStateSaveDate = 304347886;
PBXWorkspaceStateSaveDate = 304347886;
};
perUserProjectItems = {
CA18DF1512236D5C0038778B = CA18DF1512236D5C0038778B /* PBXTextBookmark */;
CA18DF1612236D5C0038778B = CA18DF1612236D5C0038778B /* PBXTextBookmark */;
CA18DF1D12238BF60038778B = CA18DF1D12238BF60038778B /* PBXTextBookmark */;
CABF71FB1223EDB400227AD3 /* PBXTextBookmark */ = CABF71FB1223EDB400227AD3 /* PBXTextBookmark */;
CABF723C1223F64400227AD3 = CABF723C1223F64400227AD3 /* PBXTextBookmark */;
CABF723D1223F64400227AD3 = CABF723D1223F64400227AD3 /* PBXTextBookmark */;
CABF725F1223FAE200227AD3 = CABF725F1223FAE200227AD3 /* PBXTextBookmark */;
CABF72671223FAF200227AD3 /* PBXTextBookmark */ = CABF72671223FAF200227AD3 /* PBXTextBookmark */;
CAFFD36411F884B30097DE9A = CAFFD36411F884B30097DE9A /* PBXTextBookmark */;
CAFFD36511F884B30097DE9A = CAFFD36511F884B30097DE9A /* PBXTextBookmark */;
CAFFD36711F884B30097DE9A = CAFFD36711F884B30097DE9A /* PBXTextBookmark */;
CAFFD36811F884B30097DE9A = CAFFD36811F884B30097DE9A /* PBXTextBookmark */;
};
Expand All @@ -100,26 +100,6 @@
vrLen = 1130;
vrLoc = 0;
};
CA18DF1612236D5C0038778B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* ZIStoreButtonDemoViewController.m */;
name = "ZIStoreButtonDemoViewController.m: 22";
rLen = 0;
rLoc = 704;
rType = 0;
vrLen = 4041;
vrLoc = 0;
};
CA18DF1D12238BF60038778B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* ZIStoreButtonDemoViewController.m */;
name = "ZIStoreButtonDemoViewController.m: 47";
rLen = 0;
rLoc = 1448;
rType = 0;
vrLen = 4049;
vrLoc = 0;
};
CABCFBDD11F671D900D7D98A /* ZIStoreButtonDemo */ = {
isa = PBXExecutable;
activeArgIndices = (
Expand Down Expand Up @@ -175,40 +155,59 @@
};
CABCFBEB11F6725800D7D98A /* ZIStoreButton.m */ = {
uiCtxt = {
sepNavFolds = "{\n c = (\n {\n r = \"{3771, 2332}\";\n s = 0;\n },\n {\n r = \"{6149, 51}\";\n s = 0;\n },\n {\n r = \"{6241, 118}\";\n s = 0;\n },\n {\n r = \"{6437, 35}\";\n s = 0;\n },\n {\n r = \"{6493, 22}\";\n s = 0;\n }\n );\n r = \"{0, 6524}\";\n s = 0;\n}";
sepNavIntBoundsRect = "{{0, 0}, {1236, 1012}}";
sepNavSelRange = "{145, 0}";
sepNavVisRange = "{0, 3658}";
sepNavIntBoundsRect = "{{0, 0}, {1236, 1859}}";
sepNavSelRange = "{6032, 0}";
sepNavVisRange = "{3734, 2467}";
};
};
CABF71FB1223EDB400227AD3 /* PBXTextBookmark */ = {
CABF723C1223F64400227AD3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* ZIStoreButtonDemoViewController.m */;
name = "ZIStoreButtonDemoViewController.m: 47";
rLen = 0;
rLoc = 1448;
rType = 0;
vrLen = 4049;
vrLoc = 0;
vrLen = 4050;
vrLoc = 41;
};
CAFFD36411F884B30097DE9A /* PBXTextBookmark */ = {
CABF723D1223F64400227AD3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = CABCFBEB11F6725800D7D98A /* ZIStoreButton.m */;
name = "ZIStoreButton.m: 8";
fRef = CABCFBEA11F6725800D7D98A /* ZIStoreButton.h */;
name = "ZIStoreButton.h: 8";
rLen = 0;
rLoc = 145;
rType = 0;
vrLen = 3658;
vrLen = 892;
vrLoc = 0;
};
CAFFD36511F884B30097DE9A /* PBXTextBookmark */ = {
CABF725F1223FAE200227AD3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = CABCFBEA11F6725800D7D98A /* ZIStoreButton.h */;
name = "ZIStoreButton.h: 8";
fRef = CABCFBEB11F6725800D7D98A /* ZIStoreButton.m */;
name = "ZIStoreButton.m: 158";
rLen = 0;
rLoc = 6147;
rType = 0;
vrLen = 2467;
vrLoc = 3734;
};
CABF72671223FAF200227AD3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = CABCFBEB11F6725800D7D98A /* ZIStoreButton.m */;
name = "ZIStoreButton.m: 151";
rLen = 0;
rLoc = 6032;
rType = 0;
vrLen = 2467;
vrLoc = 3734;
};
CAFFD36411F884B30097DE9A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = CABCFBEB11F6725800D7D98A /* ZIStoreButton.m */;
name = "ZIStoreButton.m: 8";
rLen = 0;
rLoc = 145;
rType = 0;
vrLen = 892;
vrLen = 3658;
vrLoc = 0;
};
CAFFD36711F884B30097DE9A /* PBXTextBookmark */ = {
Expand Down
2 changes: 1 addition & 1 deletion ZIStoreButtonDemo.xcodeproj/project.pbxproj
View file
Expand Up @@ -223,7 +223,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = iphoneos4.0;
SDKROOT = iphoneos4.1;
};
name = Debug;
};
Expand Down

0 comments on commit de6c409

Please sign in to comment.