Major changes to use DTCoreText

ilyi1116 · Jan 21, 2013 · fce1991 · fce1991
1 parent c559a3d
commit fce1991
Show file tree

Hide file tree

Showing 71 changed files with 855 additions and 4,620 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Libraries/DTCoreText"]
+	path = Libraries/DTCoreText
+	url = https://github.com/Cocoanetics/DTCoreText.git
diff --git a/Hackers.xcodeproj/project.pbxproj b/Hackers.xcodeproj/project.pbxproj
@@ -33,6 +33,10 @@
 		245F85CB166908FD000D3EE1 /* NSURLRequest+NNNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 245F85BB166908FD000D3EE1 /* NSURLRequest+NNNetwork.m */; };
 		245F85CF1669092B000D3EE1 /* SSKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 245F85CE1669092B000D3EE1 /* SSKeychain.m */; };
 		245F85D116690AE3000D3EE1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 245F85D016690AE3000D3EE1 /* Security.framework */; };
+		247A2D6416AC57DB00534229 /* libDTCoreText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 247A2D5016AC575000534229 /* libDTCoreText.a */; };
+		247A2D6816AC57DB00534229 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 247A2D6516AC57DB00534229 /* ImageIO.framework */; };
+		247A2D6916AC57DB00534229 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 247A2D6616AC57DB00534229 /* libxml2.dylib */; };
+		247A2D6A16AC57DB00534229 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 247A2D6716AC57DB00534229 /* MobileCoreServices.framework */; };
 		24972C9E1643BC3C00B4EFB4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24972C9D1643BC3C00B4EFB4 /* UIKit.framework */; };
 		24972CA01643BC3C00B4EFB4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24972C9F1643BC3C00B4EFB4 /* Foundation.framework */; };
 		24972CA21643BC3C00B4EFB4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24972CA11643BC3C00B4EFB4 /* CoreGraphics.framework */; };
@@ -102,6 +106,65 @@
 		DFCC5074B30047A392BC2180 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ECD4604DC1E846869F39B01C /* libPods.a */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		247A2D4B16AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1D6058910D05DD3D006BFB54;
+			remoteInfo = DemoApp;
+		};
+		247A2D4D16AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A70F119B14863198009202BF;
+			remoteInfo = "Static Framework";
+		};
+		247A2D4F16AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A70F11DE148632CD009202BF;
+			remoteInfo = "Static Library";
+		};
+		247A2D5116AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A788CA681486456100E1AFD9;
+			remoteInfo = UnitTest;
+		};
+		247A2D5316AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A7949A5814CC456000A8CCDE;
+			remoteInfo = MacUnitTest;
+		};
+		247A2D5516AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A7F7EFCD1573603100F5A4D0;
+			remoteInfo = "Static Library (no DTFoundation)";
+		};
+		247A2D5716AC575000534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = E2262DC61638331500BFDAD7;
+			remoteInfo = "Mac Framework";
+		};
+		247A2D6216AC579700534229 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = A70F11DD148632CD009202BF;
+			remoteInfo = "Static Library";
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
 		0A3F0AC425EC4C248CA0E46A /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; };
 		2402A6D5164D224100F637E5 /* WZCommentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WZCommentModel.h; sourceTree = "<group>"; };
@@ -151,6 +214,10 @@
 		245F85CD1669092B000D3EE1 /* SSKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSKeychain.h; sourceTree = "<group>"; };
 		245F85CE1669092B000D3EE1 /* SSKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSKeychain.m; sourceTree = "<group>"; };
 		245F85D016690AE3000D3EE1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		247A2D3816AC575000534229 /* DTCoreText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DTCoreText.xcodeproj; path = DTCoreText/DTCoreText.xcodeproj; sourceTree = "<group>"; };
+		247A2D6516AC57DB00534229 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
+		247A2D6616AC57DB00534229 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
+		247A2D6716AC57DB00534229 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		24972C991643BC3C00B4EFB4 /* Hackers.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hackers.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		24972C9D1643BC3C00B4EFB4 /* UIKit.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		24972C9F1643BC3C00B4EFB4 /* Foundation.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -267,10 +334,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				245F85D116690AE3000D3EE1 /* Security.framework in Frameworks */,
+				247A2D6816AC57DB00534229 /* ImageIO.framework in Frameworks */,
+				247A2D6916AC57DB00534229 /* libxml2.dylib in Frameworks */,
+				247A2D6A16AC57DB00534229 /* MobileCoreServices.framework in Frameworks */,
+				247A2D6416AC57DB00534229 /* libDTCoreText.a in Frameworks */,
 				249827561652A42E001C0ECF /* CoreText.framework in Frameworks */,
-				24EAA61C164967DF00105FE1 /* MessageUI.framework in Frameworks */,
 				24EAA60F1649647B00105FE1 /* QuartzCore.framework in Frameworks */,
+				245F85D116690AE3000D3EE1 /* Security.framework in Frameworks */,
+				24EAA61C164967DF00105FE1 /* MessageUI.framework in Frameworks */,
 				24EAA5E81647F0FE00105FE1 /* SystemConfiguration.framework in Frameworks */,
 				24972C9E1643BC3C00B4EFB4 /* UIKit.framework in Frameworks */,
 				24972CA01643BC3C00B4EFB4 /* Foundation.framework in Frameworks */,
@@ -362,6 +433,20 @@
 			path = SSKeychain;
 			sourceTree = "<group>";
 		};
+		247A2D3916AC575000534229 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				247A2D4C16AC575000534229 /* RTDemoApp.app */,
+				247A2D4E16AC575000534229 /* DTCoreText.framework */,
+				247A2D5016AC575000534229 /* libDTCoreText.a */,
+				247A2D5216AC575000534229 /* UnitTest.octest */,
+				247A2D5416AC575000534229 /* MacUnitTest.octest */,
+				247A2D5616AC575000534229 /* libDTCoreText_no_DTFoundation.a */,
+				247A2D5816AC575000534229 /* DTCoreText.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		24972C8E1643BC3C00B4EFB4 = {
 			isa = PBXGroup;
 			children = (
@@ -384,6 +469,9 @@
 		24972C9C1643BC3C00B4EFB4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				247A2D6516AC57DB00534229 /* ImageIO.framework */,
+				247A2D6616AC57DB00534229 /* libxml2.dylib */,
+				247A2D6716AC57DB00534229 /* MobileCoreServices.framework */,
 				245F85D016690AE3000D3EE1 /* Security.framework */,
 				249827551652A42E001C0ECF /* CoreText.framework */,
 				24EAA61B164967DF00105FE1 /* MessageUI.framework */,
@@ -437,6 +525,7 @@
 		24975A72164A88A5000143A1 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				247A2D3816AC575000534229 /* DTCoreText.xcodeproj */,
 				24C43FE916A44DCC00055D65 /* TUSafariActivity */,
 				24C43FCF16A447F800055D65 /* TSMiniWebBrowser */,
 				245F85CC1669090A000D3EE1 /* SSKeychain */,
@@ -646,6 +735,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				247A2D6316AC579700534229 /* PBXTargetDependency */,
 			);
 			name = Hackers;
 			productName = Hackers;
@@ -687,13 +777,71 @@
 			mainGroup = 24972C8E1643BC3C00B4EFB4;
 			productRefGroup = 24972C9A1643BC3C00B4EFB4 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 247A2D3916AC575000534229 /* Products */;
+					ProjectRef = 247A2D3816AC575000534229 /* DTCoreText.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				24972C981643BC3C00B4EFB4 /* Hackers */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		247A2D4C16AC575000534229 /* RTDemoApp.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = RTDemoApp.app;
+			remoteRef = 247A2D4B16AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		247A2D4E16AC575000534229 /* DTCoreText.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = DTCoreText.framework;
+			remoteRef = 247A2D4D16AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		247A2D5016AC575000534229 /* libDTCoreText.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libDTCoreText.a;
+			remoteRef = 247A2D4F16AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		247A2D5216AC575000534229 /* UnitTest.octest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = UnitTest.octest;
+			remoteRef = 247A2D5116AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		247A2D5416AC575000534229 /* MacUnitTest.octest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = MacUnitTest.octest;
+			remoteRef = 247A2D5316AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		247A2D5616AC575000534229 /* libDTCoreText_no_DTFoundation.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libDTCoreText_no_DTFoundation.a;
+			remoteRef = 247A2D5516AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		247A2D5816AC575000534229 /* DTCoreText.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = DTCoreText.framework;
+			remoteRef = 247A2D5716AC575000534229 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		24972C971643BC3C00B4EFB4 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -814,6 +962,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		247A2D6316AC579700534229 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Static Library";
+			targetProxy = 247A2D6216AC579700534229 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		24972CA81643BC3C00B4EFB4 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
@@ -907,6 +1063,7 @@
 				GCC_PREFIX_HEADER = "Hackers/Hackers-Prefix.pch";
 				INFOPLIST_FILE = "Hackers/Hackers-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/**";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -919,6 +1076,7 @@
 				GCC_PREFIX_HEADER = "Hackers/Hackers-Prefix.pch";
 				INFOPLIST_FILE = "Hackers/Hackers-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/**";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;

diff --git a/Hackers.xcworkspace/xcuserdata/weiran.xcuserdatad/UserInterfaceState.xcuserstate b/Hackers.xcworkspace/xcuserdata/weiran.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Hackers.xcworkspace/xcuserdata/weiran.xcuserdatad/WorkspaceSettings.xcsettings b/Hackers.xcworkspace/xcuserdata/weiran.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataCustomLocation</key>
+	<string>DerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>WorkspaceRelativePath</string>
+	<key>IssueFilterStyle</key>
+	<string>ShowActiveSchemeOnly</string>
+	<key>LiveSourceIssuesEnabled</key>
+	<true/>
+	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<true/>
+	<key>SnapshotLocationStyle</key>
+	<string>Default</string>
+</dict>
+</plist>
diff --git a/Hackers.xcworkspace/xcuserdata/weiran.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/Hackers.xcworkspace/xcuserdata/weiran.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -21,11 +21,11 @@
          ignoreCount = "0"
          continueAfterRunningActions = "No"
          filePath = "Hackers/WZCommentsViewController.m"
-         timestampString = "379885020.839372"
+         timestampString = "380399849.836444"
          startingColumnNumber = "9223372036854775807"
          endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "39"
-         endingLineNumber = "39"
+         startingLineNumber = "38"
+         endingLineNumber = "38"
          landmarkName = "-fetchComments"
          landmarkType = "5">
       </FileBreakpoint>
@@ -34,27 +34,14 @@
          ignoreCount = "0"
          continueAfterRunningActions = "No"
          filePath = "Hackers/WZCommentsViewController.m"
-         timestampString = "379936459.072323"
+         timestampString = "380402958.814795"
          startingColumnNumber = "9223372036854775807"
          endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "179"
-         endingLineNumber = "179"
+         startingLineNumber = "176"
+         endingLineNumber = "176"
          landmarkName = "-selectedCommentAtIndexPath:"
          landmarkType = "5">
       </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "No"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "Hackers/WZCommentsViewController.m"
-         timestampString = "379936459.072323"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "80"
-         endingLineNumber = "80"
-         landmarkName = "-tableView:cellForRowAtIndexPath:"
-         landmarkType = "5">
-      </FileBreakpoint>
       <FileBreakpoint
          shouldBeEnabled = "No"
          ignoreCount = "0"
@@ -133,6 +120,19 @@
          landmarkName = "-actionButtonClicked:"
          landmarkType = "5">
       </FileBreakpoint>
+      <FileBreakpoint
+         shouldBeEnabled = "No"
+         ignoreCount = "0"
+         continueAfterRunningActions = "No"
+         filePath = "Libraries/DTCoreText/Core/Source/DTAttributedTextContentView.m"
+         timestampString = "380401943.231523"
+         startingColumnNumber = "9223372036854775807"
+         endingColumnNumber = "9223372036854775807"
+         startingLineNumber = "444"
+         endingLineNumber = "444"
+         landmarkName = "-suggestedFrameSizeToFitEntireStringConstraintedToWidth:"
+         landmarkType = "5">
+      </FileBreakpoint>
    </FileBreakpoints>
    <SymbolicBreakpoints>
       <SymbolicBreakpoint