Skip to content
This repository has been archived by the owner on Feb 1, 2019. It is now read-only.

Commit

Permalink
Merge pull request #684 from facebook/development
Browse files Browse the repository at this point in the history 
Three20 1.0.9
  • Loading branch information
@jwang
jwang committed Sep 13, 2011
2 parents 0e27b65 + ba3f8f2 commit f4f9bc6
Show file tree
Hide file tree
Showing 114 changed files with 2,523 additions and 2,497 deletions.
Binary file added Icon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 0 additions & 30 deletions samples/Style/TTCSSStyleSheets/TTCSSStyleSheets.xcodeproj/project.pbxproj
View file
Expand Up @@ -33,20 +33,6 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
187835D313D5F7C2004600D3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E3793D711B9B59D0011C497 /* Three20Network.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 662D81EF12630516005851C2;
remoteInfo = "Three20Network-Xcode3.2.5";
};
187835D513D5F7C2004600D3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E3793D711B9B59D0011C497 /* Three20Network.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 662D81B2126304EB005851C2;
remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5";
};
6E036BCC11B38E520025E8EE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E036BC711B38E520025E8EE /* extThree20CSSStyle.xcodeproj */;
Expand Down Expand Up @@ -369,9 +355,7 @@
isa = PBXGroup;
children = (
6E3793EF11B9B59D0011C497 /* libThree20Network.a */,
187835D413D5F7C2004600D3 /* libThree20Network-Xcode3.2.5.a */,
6E3793F111B9B59D0011C497 /* NetworkUnitTests.octest */,
187835D613D5F7C2004600D3 /* NetworkUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -562,20 +546,6 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
187835D413D5F7C2004600D3 /* libThree20Network-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20Network-Xcode3.2.5.a";
remoteRef = 187835D313D5F7C2004600D3 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
187835D613D5F7C2004600D3 /* NetworkUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "NetworkUnitTests-Xcode3.2.5.octest";
remoteRef = 187835D513D5F7C2004600D3 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
6E036BCD11B38E520025E8EE /* libextThree20CSSStyle.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down
16 changes: 16 additions & 0 deletions samples/TTCatalog/Classes/ButtonTestController.m
View file
Expand Up @@ -78,6 +78,18 @@ - (TTStyle*)dropButton:(UIControlState)state {
}
}

- (TTStyle*)remoteAvatarButton:(UIControlState)state {
if (state == UIControlStateHighlighted) {
return [TTSolidFillStyle styleWithColor:[UIColor whiteColor] next:nil];
} else {
return [TTImageStyle styleWithImageURL:nil
defaultImage:[UIImage imageNamed:@"defaultPerson.png"]
contentMode:UIViewContentModeCenter
size:CGSizeMake(50, 50)
next:nil];
}
}

@end

@implementation ButtonTestController
Expand Down Expand Up @@ -142,6 +154,9 @@ - (void)loadView {
scrollView.delaysContentTouches = NO;
self.view = scrollView;

TTButton* remoteAvatarButton = [TTButton buttonWithStyle:@"remoteAvatarButton:"];
[remoteAvatarButton setImage:@"url" forState:UIControlStateNormal];

NSArray* buttons = [NSArray arrayWithObjects:
[TTButton buttonWithStyle:@"toolbarButton:" title:@"Toolbar Button"],
[TTButton buttonWithStyle:@"toolbarRoundButton:" title:@"Round Button"],
Expand All @@ -152,6 +167,7 @@ - (void)loadView {
[TTButton buttonWithStyle:@"blueToolbarButton:" title:@"Blue Button"],
[TTButton buttonWithStyle:@"embossedButton:" title:@"Embossed Button"],
[TTButton buttonWithStyle:@"dropButton:" title:@"Shadow Button"],
remoteAvatarButton,
nil];

for (TTButton* button in buttons) {
Expand Down
2 changes: 1 addition & 1 deletion samples/TTCatalog/Classes/StyleTestController.m
View file
Expand Up @@ -157,7 +157,7 @@ - (void)loadView {

nil];

CGFloat padding = 10;
CGFloat padding = 10.0f;
CGFloat viewWidth = scrollView.width/2 - padding*2;
CGFloat viewHeight = TT_ROW_HEIGHT;

Expand Down
214 changes: 2 additions & 212 deletions samples/TTNavigatorDemo/TTNavigatorDemo.xcodeproj/project.pbxproj
View file
Expand Up @@ -30,104 +30,6 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
66D12A7F1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957011B9B7560011C497 /* Three20Core.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6650CAA21262F6E2003FF804;
remoteInfo = "Three20Core-Xcode3.2.5";
};
66D12A831274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957011B9B7560011C497 /* Three20Core.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 664961641262EE5000C2C80E;
remoteInfo = "Three20CoreUnitTests-Xcode3.2.5";
};
66D12A8C1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957311B9B7560011C497 /* Three20Network.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 662D81EF12630516005851C2;
remoteInfo = "Three20Network-Xcode3.2.5";
};
66D12A901274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957311B9B7560011C497 /* Three20Network.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 662D81B2126304EB005851C2;
remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5";
};
66D12A991274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957611B9B7560011C497 /* Three20Style.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 66C16BE912639E2700A7825A;
remoteInfo = "Three20Style-Xcode3.2.5";
};
66D12A9D1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957611B9B7560011C497 /* Three20Style.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 66C16C0112639E4500A7825A;
remoteInfo = "Three20StyleUnitTests-Xcode3.2.5";
};
66D12AA61274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957911B9B7560011C497 /* Three20UICommon.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 665A53761264D54B0032D0BE;
remoteInfo = "Three20UICommon-Xcode3.2.5";
};
66D12AAA1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957911B9B7560011C497 /* Three20UICommon.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 665A53891264D54B0032D0BE;
remoteInfo = "Three20UICommonUnitTests-Xcode3.2.5";
};
66D12AB31274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957C11B9B7560011C497 /* Three20UINavigator.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 665A54521264DAF70032D0BE;
remoteInfo = "Three20UINavigator-Xcode3.2.5";
};
66D12AB71274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957C11B9B7560011C497 /* Three20UINavigator.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 665A54681264DAF70032D0BE;
remoteInfo = "Three20UINavigatorUnitTests-Xcode3.2.5";
};
66D12AC01274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957F11B9B7560011C497 /* Three20UI.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 66FC2BC81264E3A400F56B19;
remoteInfo = "Three20UI-Xcode3.2.5";
};
66D12AC41274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957F11B9B7560011C497 /* Three20UI.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 66FC2BE61264E3A500F56B19;
remoteInfo = "Three20UIUnitTests-Xcode3.2.5";
};
66D12ACD1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E7F9900118E396F00443B46 /* Three20.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 665A55DE126521740032D0BE;
remoteInfo = "Three20-Xcode3.2.5";
};
66D12AD11274CB1D00E567B4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E7F9900118E396F00443B46 /* Three20.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 665A55FB126521740032D0BE;
remoteInfo = "Three20UnitTests-Xcode3.2.5";
};
6E37958411B9B7560011C497 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957011B9B7560011C497 /* Three20Core.xcodeproj */;
Expand Down Expand Up @@ -406,9 +308,7 @@
isa = PBXGroup;
children = (
6E37958511B9B7560011C497 /* libThree20Core.a */,
66D12A801274CB1D00E567B4 /* libThree20Core-Xcode3.2.5.a */,
6E37958711B9B7560011C497 /* CoreUnitTests.octest */,
66D12A841274CB1D00E567B4 /* CoreUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -417,9 +317,7 @@
isa = PBXGroup;
children = (
6E37958B11B9B7560011C497 /* libThree20Network.a */,
66D12A8D1274CB1D00E567B4 /* libThree20Network-Xcode3.2.5.a */,
6E37958D11B9B7560011C497 /* NetworkUnitTests.octest */,
66D12A911274CB1D00E567B4 /* NetworkUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -428,9 +326,7 @@
isa = PBXGroup;
children = (
6E37959111B9B7560011C497 /* libThree20Style.a */,
66D12A9A1274CB1D00E567B4 /* libThree20Style-Xcode3.2.5.a */,
6E37959311B9B7560011C497 /* StyleUnitTests.octest */,
66D12A9E1274CB1D00E567B4 /* StyleUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -439,9 +335,7 @@
isa = PBXGroup;
children = (
6E37959711B9B7560011C497 /* libThree20UICommon.a */,
66D12AA71274CB1D00E567B4 /* libThree20UICommon-Xcode3.2.5.a */,
6E37959911B9B7560011C497 /* UICommonUnitTests.octest */,
66D12AAB1274CB1D00E567B4 /* UICommonUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -450,9 +344,7 @@
isa = PBXGroup;
children = (
6E37959D11B9B7560011C497 /* libThree20UINavigator.a */,
66D12AB41274CB1D00E567B4 /* libThree20UINavigator-Xcode3.2.5.a */,
6E37959F11B9B7560011C497 /* UINavigatorUnitTests.octest */,
66D12AB81274CB1D00E567B4 /* UINavigatorUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -461,9 +353,7 @@
isa = PBXGroup;
children = (
6E3795A311B9B7560011C497 /* libThree20UI.a */,
66D12AC11274CB1D00E567B4 /* libThree20UI-Xcode3.2.5.a */,
6E3795A511B9B7560011C497 /* UIUnitTests.octest */,
66D12AC51274CB1D00E567B4 /* UIUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -497,9 +387,7 @@
isa = PBXGroup;
children = (
6E7F9906118E396F00443B46 /* libThree20.a */,
66D12ACE1274CB1D00E567B4 /* libThree20-Xcode3.2.5.a */,
6E7F9908118E396F00443B46 /* Three20UnitTests.octest */,
66D12AD21274CB1D00E567B4 /* Three20UnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -587,104 +475,6 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
66D12A801274CB1D00E567B4 /* libThree20Core-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20Core-Xcode3.2.5.a";
remoteRef = 66D12A7F1274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12A841274CB1D00E567B4 /* CoreUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "CoreUnitTests-Xcode3.2.5.octest";
remoteRef = 66D12A831274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12A8D1274CB1D00E567B4 /* libThree20Network-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20Network-Xcode3.2.5.a";
remoteRef = 66D12A8C1274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12A911274CB1D00E567B4 /* NetworkUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "NetworkUnitTests-Xcode3.2.5.octest";
remoteRef = 66D12A901274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12A9A1274CB1D00E567B4 /* libThree20Style-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20Style-Xcode3.2.5.a";
remoteRef = 66D12A991274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12A9E1274CB1D00E567B4 /* StyleUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "StyleUnitTests-Xcode3.2.5.octest";
remoteRef = 66D12A9D1274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AA71274CB1D00E567B4 /* libThree20UICommon-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20UICommon-Xcode3.2.5.a";
remoteRef = 66D12AA61274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AAB1274CB1D00E567B4 /* UICommonUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "UICommonUnitTests-Xcode3.2.5.octest";
remoteRef = 66D12AAA1274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AB41274CB1D00E567B4 /* libThree20UINavigator-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20UINavigator-Xcode3.2.5.a";
remoteRef = 66D12AB31274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AB81274CB1D00E567B4 /* UINavigatorUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "UINavigatorUnitTests-Xcode3.2.5.octest";
remoteRef = 66D12AB71274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AC11274CB1D00E567B4 /* libThree20UI-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20UI-Xcode3.2.5.a";
remoteRef = 66D12AC01274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AC51274CB1D00E567B4 /* UIUnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "UIUnitTests-Xcode3.2.5.octest";
remoteRef = 66D12AC41274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12ACE1274CB1D00E567B4 /* libThree20-Xcode3.2.5.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libThree20-Xcode3.2.5.a";
remoteRef = 66D12ACD1274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66D12AD21274CB1D00E567B4 /* Three20UnitTests-Xcode3.2.5.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Three20UnitTests-Xcode3.2.5.octest";
remoteRef = 66D12AD11274CB1D00E567B4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
6E37958511B9B7560011C497 /* libThree20Core.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -862,7 +652,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
INFOPLIST_FILE = Info.plist;
SDKROOT = iphoneos4.1;
SDKROOT = iphoneos;
};
name = Debug;
};
Expand All @@ -872,7 +662,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
INFOPLIST_FILE = Info.plist;
SDKROOT = iphoneos4.1;
SDKROOT = iphoneos;
};
name = Release;
};
Expand Down
Binary file modified src/Three20.bundle/images/photoDefault.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Three20.bundle/images/photoDefault@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f4f9bc6

Please sign in to comment.