Permalink
Browse files

[Broken] Move all of the UI files into the Three20UI lib dir.

  • Loading branch information...
jverkoey committed Apr 25, 2010
1 parent 2ea1718 commit 06d3f2974070144067aa6c63ef2803c503b75aa3
Showing 347 changed files with 3,066 additions and 60 deletions.
@@ -1024,7 +1024,6 @@
6E08B7881183B19A00DA1579 /* Network */,
BE1287F40F8969C100F65EA2 /* Style */,
EBAE96F110D1F58900F497CA /* UI */,
- EB9E6C7910B6A94700DE563C /* Tests */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
@@ -1842,6 +1841,7 @@
6E94C971117001C80012B12C /* Tab Bars */,
BED429440F97F7E50035B153 /* TTButtonBar.h */,
BED429410F97F7DB0035B153 /* TTButtonBar.m */,
+ EB9E6C7910B6A94700DE563C /* Tests */,
BEC171D3102A71EE006B431A /* TTPageControl.h */,
BEC171D1102A71CC006B431A /* TTPageControl.m */,
);
View
@@ -1,33 +0,0 @@
-//
-// Copyright 2009 Facebook
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-// Core
-#import "Three20/TTGlobalCore.h"
-#import "Three20/TTGlobalCoreLocale.h"
-#import "Three20/TTGlobalCorePaths.h"
-
-// UI
-#import "Three20/TTGlobalUI.h"
-#import "Three20/TTGlobalUINavigator.h"
-
-// Network
-#import "Three20/TTGlobalNetwork.h"
-
-// Style
-#import "Three20/TTGlobalStyle.h"
@@ -0,0 +1,23 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Style
+#import "Three20Style/Three20Style.h"
+
+// Additions
+#import "Three20Style/UIColorAdditions.h"
+#import "Three20Style/UIFontAdditions.h"
+#import "Three20Style/UIImageAdditions.h"
@@ -15,30 +15,80 @@
//
// Core
-#import "Three20/Three20Core.h"
+#import "Three20Core/Three20Core.h"
// Network
+#import "Three20Network/Three20Network.h"
-// - Global
-#import "Three20Network/TTGlobalNetwork.h"
-#import "Three20/TTURLRequestCachePolicy.h"
-
-// - Models
-#import "Three20/TTModel.h"
-#import "Three20/TTModelDelegate.h"
-#import "Three20/TTURLRequestModel.h"
-
-// - Requests
-#import "Three20Network/TTURLRequest.h"
-#import "Three20Network/TTURLRequestDelegate.h"
-
-// - Responses
-#import "Three20/TTURLResponse.h"
-#import "Three20/TTURLDataResponse.h"
-#import "Three20Network/TTURLImageResponse.h"
-#import "Three20/TTURLXMLResponse.h"
-
-// - Classes
-#import "Three20/TTUserInfo.h"
-#import "Three20/TTURLRequestQueue.h"
-#import "Three20Network/TTURLCache.h"
+// Style
+#import "Three20Style/TTGlobalStyle.h"
+#import "Three20Style/TTPosition.h"
+
+#import "Three20Style/TTDefaultStyleSheet.h"
+#import "Three20Style/TTLayout.h"
+#import "Three20Style/TTFlowLayout.h"
+#import "Three20Style/TTGridLayout.h"
+
+// Shapes
+#import "Three20Style/TTShape.h"
+#import "Three20Style/TTRectangleShape.h"
+#import "Three20Style/TTRoundedRectangleShape.h"
+#import "Three20Style/TTRoundedRightArrowShape.h"
+#import "Three20Style/TTRoundedLeftArrowShape.h"
+#import "Three20Style/TTSpeechBubbleShape.h"
+
+// Styles
+#import "Three20Style/TTStyle.h"
+#import "Three20Style/TTStyleDelegate.h"
+#import "Three20Style/TTStyleContext.h"
+#import "Three20Style/TTContentStyle.h"
+#import "Three20Style/TTPartStyle.h"
+#import "Three20Style/TTShapeStyle.h"
+#import "Three20Style/TTInsetStyle.h"
+#import "Three20Style/TTBoxStyle.h"
+#import "Three20Style/TTTextStyle.h"
+#import "Three20Style/TTImageStyle.h"
+#import "Three20Style/TTMaskStyle.h"
+#import "Three20Style/TTBlendStyle.h"
+#import "Three20Style/TTSolidFillStyle.h"
+#import "Three20Style/TTLinearGradientFillStyle.h"
+#import "Three20Style/TTReflectiveFillStyle.h"
+#import "Three20Style/TTShadowStyle.h"
+#import "Three20Style/TTInnerShadowStyle.h"
+#import "Three20Style/TTSolidBorderStyle.h"
+#import "Three20Style/TTHighlightBorderStyle.h"
+#import "Three20Style/TTFourBorderStyle.h"
+#import "Three20Style/TTBevelBorderStyle.h"
+#import "Three20Style/TTLinearGradientBorderStyle.h"
+
+#import "Three20Style/TTStyledText.h"
+#import "Three20Style/TTStyledTextDelegate.h"
+
+// Styled nodes
+#import "Three20Style/TTStyledNode.h"
+#import "Three20Style/TTStyledTextNode.h"
+#import "Three20Style/TTStyledElement.h"
+#import "Three20Style/TTStyledBlock.h"
+#import "Three20Style/TTStyledInline.h"
+#import "Three20Style/TTStyledInlineBlock.h"
+#import "Three20Style/TTStyledBoldNode.h"
+#import "Three20Style/TTStyledItalicNode.h"
+#import "Three20Style/TTStyledLinkNode.h"
+#import "Three20Style/TTStyledButtonNode.h"
+#import "Three20Style/TTStyledImageNode.h"
+#import "Three20Style/TTStyledLineBreakNode.h"
+
+// Styled frames
+#import "Three20Style/TTStyledFrame.h"
+#import "Three20Style/TTStyledBoxFrame.h"
+#import "Three20Style/TTStyledInlineFrame.h"
+#import "Three20Style/TTStyledTextFrame.h"
+#import "Three20Style/TTStyledImageFrame.h"
+
+#import "Three20Style/TTStyledTextParser.h"
+
+// Additions
+// TODO (jverkoey): Remove these additions after May 20, 2010.
+#import "Three20Style/UIColorAdditions.h"
+#import "Three20Style/UIFontAdditions.h"
+#import "Three20Style/UIImageAdditions.h"
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 6E6454901184D3BC00F08CB1 /* Three20Style+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E64548F1184D3BC00F08CB1 /* Three20Style+Additions.h */; };
6EE736C811849FAB00A35176 /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE7366C11849C5800A35176 /* libThree20Core.a */; };
6EE737441184A38F00A35176 /* TTBevelBorderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE737031184A38F00A35176 /* TTBevelBorderStyle.h */; settings = {ATTRIBUTES = (Public, ); }; };
6EE737451184A38F00A35176 /* TTBlendStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE737041184A38F00A35176 /* TTBlendStyle.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -200,6 +201,7 @@
/* Begin PBXFileReference section */
6E64543D1184BE1B00F08CB1 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Project.xcconfig; path = Configurations/Project.xcconfig; sourceTree = "<group>"; };
+ 6E64548F1184D3BC00F08CB1 /* Three20Style+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Three20Style+Additions.h"; path = "Headers/Three20Style+Additions.h"; sourceTree = "<group>"; };
6EE7363D11849AD500A35176 /* UnitTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "UnitTests-Info.plist"; path = "UnitTests/Resources/PropertyLists/UnitTests-Info.plist"; sourceTree = "<group>"; };
6EE7364B11849B3D00A35176 /* Library.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Library.xcconfig; path = Configurations/Library.xcconfig; sourceTree = "<group>"; };
6EE7364C11849B3D00A35176 /* UnitTests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = UnitTests.xcconfig; path = Configurations/UnitTests.xcconfig; sourceTree = "<group>"; };
@@ -363,6 +365,7 @@
isa = PBXGroup;
children = (
6EE738C11184AE4A00A35176 /* Three20Style.h */,
+ 6E64548F1184D3BC00F08CB1 /* Three20Style+Additions.h */,
6EE737001184A1D500A35176 /* Source */,
6E08B743118397FA00DA1579 /* Dependencies */,
6EE7364D11849B4200A35176 /* Configurations */,
@@ -779,6 +782,7 @@
6EE737831184A38F00A35176 /* UIFontAdditions.h in Headers */,
6EE737841184A38F00A35176 /* UIImageAdditions.h in Headers */,
6EE738C21184AE4A00A35176 /* Three20Style.h in Headers */,
+ 6E6454901184D3BC00F08CB1 /* Three20Style+Additions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -0,0 +1,21 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "../common/Configurations/Library.xcconfig"
+#include "../common/Configurations/Libraries.xcconfig"
+
+PRODUCT_NAME = Three20UI
+BUILD_LIBRARY_VERSION = 1.0
@@ -1,5 +1,5 @@
//
-// Copyright 2009 Facebook
+// Copyright 2009-2010 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
// limitations under the License.
//
-#import "Three20/TTGlobal.h"
+#include "../common/Configurations/Project.xcconfig"
@@ -0,0 +1,23 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "../common/Configurations/UnitTests.xcconfig"
+#include "../common/Configurations/Libraries.xcconfig"
+
+PRODUCT_NAME = UIUnitTests
+BUILD_BUNDLE_VERSION = 1.0
+
+OTHER_LDFLAGS = $(COMMON_LDFLAGS) $(UIKIT_FX) $(COREGRAPHICS_FX)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,31 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// UI
+#import "Three20UI/Three20UI.h"
+
+// Additions
+#import "Three20UI/UIViewAdditions.h"
+#import "Three20UI/UIViewControllerAdditions.h"
+#import "Three20UI/UINavigationControllerAdditions.h"
+#import "Three20UI/UINavigationControllerAdditions.h"
+#import "Three20UI/UITabBarControllerAdditions.h"
+#import "Three20UI/UITableViewAdditions.h"
+#import "Three20UI/UIWebViewAdditions.h"
+#import "Three20UI/UIToolbarAdditions.h"
+#import "Three20UI/UIWindowAdditions.h"
+#import "Three20UI/UINSStringAdditions.h"
+#import "Three20UI/UINSObjectAdditions.h"
Oops, something went wrong.

0 comments on commit 06d3f29

Please sign in to comment.