Merge pull request objcio#2 from macguru/master

A few minor changes to bring the code up to date with the article.
CloudMetal · Oct 12, 2013 · 5ebb2cd · 5ebb2cd
2 parents 688b6ac + 4f0600b
commit 5ebb2cd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/TextKitDemo/Base.lproj/Main.storyboard b/TextKitDemo/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="13A584" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="8YX-ce-x5E">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="8YX-ce-x5E">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
     </dependencies>
@@ -59,9 +59,9 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="firstContainerView" destination="ZV7-VL-Kd8" id="j7g-8S-IGf"/>
-                        <outlet property="secondContainerView" destination="auf-0B-h3H" id="tBy-kC-6fx"/>
-                        <outlet property="singleTextView" destination="JYe-Ji-kZb" id="H38-cm-duT"/>
+                        <outlet property="originalTextView" destination="JYe-Ji-kZb" id="azn-Os-b6F"/>
+                        <outlet property="otherContainerView" destination="ZV7-VL-Kd8" id="rhr-Lz-U9r"/>
+                        <outlet property="thirdContainerView" destination="auf-0B-h3H" id="dEJ-jx-kgm"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ceL-7Y-pUS" userLabel="First Responder" sceneMemberID="firstResponder"/>

diff --git a/TextKitDemo/Configuration/TKDConfigurationViewController.h b/TextKitDemo/Configuration/TKDConfigurationViewController.h
@@ -10,10 +10,10 @@
 
 @interface TKDConfigurationViewController : UIViewController
 
-@property (weak, nonatomic) IBOutlet UITextView *singleTextView;
+@property (weak, nonatomic) IBOutlet UITextView *originalTextView;
 
-@property (weak, nonatomic) IBOutlet UIView *firstContainerView;
-@property (weak, nonatomic) IBOutlet UIView *secondContainerView;
+@property (weak, nonatomic) IBOutlet UIView *otherContainerView;
+@property (weak, nonatomic) IBOutlet UIView *thirdContainerView;
 
 - (IBAction)endEditing:(UIBarButtonItem *)sender;
 

diff --git a/TextKitDemo/Configuration/TKDConfigurationViewController.m b/TextKitDemo/Configuration/TKDConfigurationViewController.m
@@ -10,8 +10,8 @@
 
 @interface TKDConfigurationViewController ()
 
-@property (weak, nonatomic) UITextView *firstTextView;
-@property (weak, nonatomic) UITextView *secondTextView;
+@property (weak, nonatomic) UITextView *otherTextView;
+@property (weak, nonatomic) UITextView *thirdTextView;
 
 @end
 
@@ -22,39 +22,39 @@ - (void)viewDidLoad
 	[super viewDidLoad];
 
 	// Load text
-	NSTextStorage *upperTextStorage = self.singleTextView.textStorage;
-	[upperTextStorage replaceCharactersInRange:NSMakeRange(0, 0) withString:[NSString stringWithContentsOfURL:[NSBundle.mainBundle URLForResource:@"lorem" withExtension:@"txt"] usedEncoding:NULL error:NULL]];
+	NSTextStorage *sharedTextStorage = self.originalTextView.textStorage;
+	[sharedTextStorage replaceCharactersInRange:NSMakeRange(0, 0) withString:[NSString stringWithContentsOfURL:[NSBundle.mainBundle URLForResource:@"lorem" withExtension:@"txt"] usedEncoding:NULL error:NULL]];
 
 
 	// Create a new text view on the original text storage
-	NSLayoutManager *lowerLayoutManager = [NSLayoutManager new];
-	[upperTextStorage addLayoutManager: lowerLayoutManager];
+	NSLayoutManager *otherLayoutManager = [NSLayoutManager new];
+	[sharedTextStorage addLayoutManager: otherLayoutManager];
 
-	NSTextContainer *firstTextContainer = [NSTextContainer new];
-	[lowerLayoutManager addTextContainer: firstTextContainer];
+	NSTextContainer *otherTextContainer = [NSTextContainer new];
+	[otherLayoutManager addTextContainer: otherTextContainer];
 
-	UITextView *firstTextView = [[UITextView alloc] initWithFrame:self.firstContainerView.bounds textContainer:firstTextContainer];
-	firstTextView.backgroundColor = self.firstContainerView.backgroundColor;
-	firstTextView.translatesAutoresizingMaskIntoConstraints = YES;
-	firstTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	UITextView *otherTextView = [[UITextView alloc] initWithFrame:self.otherContainerView.bounds textContainer:otherTextContainer];
+	otherTextView.backgroundColor = self.otherContainerView.backgroundColor;
+	otherTextView.translatesAutoresizingMaskIntoConstraints = YES;
+	otherTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
-	firstTextView.scrollEnabled = NO;
+	otherTextView.scrollEnabled = NO;
 
-	[self.firstContainerView addSubview: firstTextView];
-	self.firstTextView = firstTextView;
+	[self.otherContainerView addSubview: otherTextView];
+	self.otherTextView = otherTextView;
 
 
 	// Create a second text view on the new layout manager text storage
-	NSTextContainer *secondTextContainer = [NSTextContainer new];
-	[lowerLayoutManager addTextContainer: secondTextContainer];
+	NSTextContainer *thirdTextContainer = [NSTextContainer new];
+	[otherLayoutManager addTextContainer: thirdTextContainer];
 
-	UITextView *secondTextView = [[UITextView alloc] initWithFrame:self.secondContainerView.bounds textContainer:secondTextContainer];
-	secondTextView.backgroundColor = self.secondContainerView.backgroundColor;
-	secondTextView.translatesAutoresizingMaskIntoConstraints = YES;
-	secondTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	UITextView *thirdTextView = [[UITextView alloc] initWithFrame:self.thirdContainerView.bounds textContainer:thirdTextContainer];
+	thirdTextView.backgroundColor = self.thirdContainerView.backgroundColor;
+	thirdTextView.translatesAutoresizingMaskIntoConstraints = YES;
+	thirdTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
-	[self.secondContainerView addSubview: secondTextView];
-	self.secondTextView = secondTextView;
+	[self.thirdContainerView addSubview: thirdTextView];
+	self.thirdTextView = thirdTextView;
 }
 
 - (IBAction)endEditing:(UIBarButtonItem *)sender

diff --git a/TextKitDemo/Highlighting/TKDHighlightingTextStorage.m b/TextKitDemo/Highlighting/TKDHighlightingTextStorage.m
@@ -11,15 +11,15 @@
 
 @implementation TKDHighlightingTextStorage
 {
-	NSTextStorage *_imp;
+	NSMutableAttributedString *_imp;
 }
 
 - (id)init
 {
 	self = [super init];
 
 	if (self) {
-		_imp = [NSTextStorage new];
+		_imp = [NSMutableAttributedString new];
 	}
 
 	return self;