Compress new assets and add TextExpander. Fixes #10

masong2012 · Jul 28, 2012 · 41d62b7 · 41d62b7
1 parent da4e63b
commit 41d62b7
Show file tree

Hide file tree

Showing 20 changed files with 80 additions and 3 deletions.
diff --git a/Cheddar for iOS.xcodeproj/project.pbxproj b/Cheddar for iOS.xcodeproj/project.pbxproj
@@ -167,6 +167,8 @@
 		B2AD02EE15C475B100D9B909 /* nav-button-mini@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02EA15C475B100D9B909 /* nav-button-mini@2x.png */; };
 		B2AD02F015C47BF000D9B909 /* nav-background-mini.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02EF15C47BF000D9B909 /* nav-background-mini.png */; };
 		B2AD02F215C47E4300D9B909 /* nav-background-mini@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02F115C47E4300D9B909 /* nav-background-mini@2x.png */; };
+		B2AD02F415C482B200D9B909 /* TextExpander.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2AD02F315C482B200D9B909 /* TextExpander.framework */; };
+		B2AD031915C4896E00D9B909 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2AD031815C4896E00D9B909 /* AudioToolbox.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -436,13 +438,16 @@
 		B2AD02EA15C475B100D9B909 /* nav-button-mini@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-button-mini@2x.png"; sourceTree = "<group>"; };
 		B2AD02EF15C47BF000D9B909 /* nav-background-mini.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-background-mini.png"; sourceTree = "<group>"; };
 		B2AD02F115C47E4300D9B909 /* nav-background-mini@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-background-mini@2x.png"; sourceTree = "<group>"; };
+		B2AD02F315C482B200D9B909 /* TextExpander.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TextExpander.framework; sourceTree = "<group>"; };
+		B2AD031815C4896E00D9B909 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		B23FA752151FE0710069A0D1 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B2AD031915C4896E00D9B909 /* AudioToolbox.framework in Frameworks */,
 				B28FD2D115BF739300365CD6 /* libicucore.dylib in Frameworks */,
 				B208C1F715BF64630080705D /* MobileCoreServices.framework in Frameworks */,
 				B28FD2C815BF732F00365CD6 /* libsqlite3.dylib in Frameworks */,
@@ -461,6 +466,7 @@
 				B208C1FB15BF64630080705D /* UIKit.framework in Frameworks */,
 				B208C1EB15BF64630080705D /* libSSToolkit.a in Frameworks */,
 				B208C10115BF63E20080705D /* Crashlytics.framework in Frameworks */,
+				B2AD02F415C482B200D9B909 /* TextExpander.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -609,6 +615,7 @@
 				B208BECA15BF63E00080705D /* SSToolkit */,
 				B208BF7915BF63E00080705D /* TTTAttributedLabel */,
 				B208BE4315BF63E00080705D /* Crashlytics.framework */,
+				B2AD02F315C482B200D9B909 /* TextExpander.framework */,
 			);
 			path = Vendor;
 			sourceTree = "<group>";
@@ -673,6 +680,7 @@
 		B208C1FC15BF64690080705D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B2AD031815C4896E00D9B909 /* AudioToolbox.framework */,
 				B28FD2D015BF739300365CD6 /* libicucore.dylib */,
 				B28FD2C715BF732F00365CD6 /* libsqlite3.dylib */,
 				B28FD2C515BF732800365CD6 /* StoreKit.framework */,
@@ -1282,14 +1290,14 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/Vendor\"",
-					"\"$(SRCROOT)/Vendor/SSToolkit/Tests\"",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Other Sources/Cheddar-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/Vendor/SSToolkit\"",
 					"\"$(SRCROOT)/Vendor/Bully\"",
 					"\"$(SRCROOT)/Vendor/CheddarKit\"/**",
+					"\"$(SRCROOT)/Vendor/TextExpander.framework/Versions/A/Headers\"",
 				);
 				INFOPLIST_FILE = "Resources/Cheddar-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
@@ -1316,14 +1324,14 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/Vendor\"",
-					"\"$(SRCROOT)/Vendor/SSToolkit/Tests\"",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Other Sources/Cheddar-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
 					"\"$(SRCROOT)/Vendor/SSToolkit\"",
 					"\"$(SRCROOT)/Vendor/Bully\"",
 					"\"$(SRCROOT)/Vendor/CheddarKit\"/**",
+					"\"$(SRCROOT)/Vendor/TextExpander.framework/Versions/A/Headers\"",
 				);
 				INFOPLIST_FILE = "Resources/Cheddar-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;

diff --git a/Classes/CDIAddTaskView.m b/Classes/CDIAddTaskView.m
@@ -12,8 +12,10 @@
 #import "UIColor+CheddariOSAdditions.h"
 #import "UIFont+CheddariOSAdditions.h"
 #import "UIButton+CheddariOSAdditions.h"
+#import "SMTEDelegateController.h"
 
 @interface CDIAddTaskView () <UITextFieldDelegate>
+@property (nonatomic, strong) SMTEDelegateController *textExpander;
 - (void)_closeTag;
 @end
 
@@ -23,6 +25,7 @@ @implementation CDIAddTaskView {
 	CDITagView *_tagView;
 }
 
+@synthesize textExpander = _textExpander;
 @synthesize delegate = _delegate;
 @synthesize textField = _textField;
 @synthesize shadowView = _shadowView;
@@ -55,6 +58,13 @@ + (CGFloat)margin {
 }
 
 
+#pragma mark - NSObject
+
+- (void)dealloc {
+	[[NSNotificationCenter defaultCenter] removeObserver:self.textExpander];
+}
+
+
 #pragma mark - UIView
 
 - (id)initWithFrame:(CGRect)frame {
@@ -117,6 +127,13 @@ - (id)initWithFrame:(CGRect)frame {
 							  nil];
 		_shadowView.alpha = 0.0f;
 		[self addSubview:_shadowView];
+
+		if ([SMTEDelegateController isTextExpanderTouchInstalled]) {
+			self.textExpander = [[SMTEDelegateController alloc] init];
+			self.textExpander.nextDelegate = self;
+			_textField.delegate = self.textExpander;
+			[[NSNotificationCenter defaultCenter] addObserver:self.textExpander selector:@selector(willEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
+		}
 	}
 	return self;
 }

diff --git a/Classes/CDIListsViewController.m b/Classes/CDIListsViewController.m
@@ -16,6 +16,7 @@
 #import "CDIUpgradeViewController.h"
 #import "CDINoListsView.h"
 #import "CDIAddListTableViewCell.h"
+#import "SMTEDelegateController.h"
 #import <SSToolkit/UIScrollView+SSToolkitAdditions.h>
 
 #ifdef CHEDDAR_USE_PASSWORD_FLOW
@@ -25,6 +26,7 @@
 #endif
 
 @interface CDIListsViewController ()
+@property (nonatomic, strong) SMTEDelegateController *textExpander;
 - (void)_listUpdated:(NSNotification *)notification;
 - (void)_currentUserDidChange:(NSNotification *)notification;
 - (void)_createList:(id)sender;
@@ -40,6 +42,18 @@ @implementation CDIListsViewController {
 }
 
 
+@synthesize textExpander = _textExpander;
+
+
+#pragma mark - NSObject
+
+- (void)dealloc {
+	if (self.textExpander) {
+		[[NSNotificationCenter defaultCenter] removeObserver:self.textExpander];
+	}
+}
+
+
 #pragma mark - UIViewController
 
 - (void)viewDidLoad {
@@ -60,6 +74,12 @@ - (void)viewDidLoad {
 
 	_checkForOneList = YES;
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_currentUserDidChange:) name:kCDKCurrentUserChangedNotificationName object:nil];
+
+	if ([SMTEDelegateController isTextExpanderTouchInstalled]) {
+		self.textExpander = [[SMTEDelegateController alloc] init];
+		self.textExpander.nextDelegate = self;
+		[[NSNotificationCenter defaultCenter] addObserver:self.textExpander selector:@selector(willEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
+	}
 }
 
 
@@ -348,7 +368,13 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 		CDIAddListTableViewCell *cell = (CDIAddListTableViewCell *)[tableView dequeueReusableCellWithIdentifier:addCellIdentifier];
 		if (!cell) {
 			cell = [[CDIAddListTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:addCellIdentifier];
-			cell.textField.delegate = self;
+
+			if (self.textExpander) {
+				cell.textField.delegate = self.textExpander;
+			} else {
+				cell.textField.delegate = self;
+			}
+
 			[cell.closeButton addTarget:self action:@selector(_cancelAddingList:) forControlEvents:UIControlEventTouchUpInside];
 		}
 		[cell.textField becomeFirstResponder];

diff --git a/Resources/Images/nav-back-mini-highlighted.png b/Resources/Images/nav-back-mini-highlighted.png
diff --git a/Resources/Images/nav-back-mini-highlighted@2x.png b/Resources/Images/nav-back-mini-highlighted@2x.png
diff --git a/Resources/Images/nav-back-mini.png b/Resources/Images/nav-back-mini.png
diff --git a/Resources/Images/nav-back-mini@2x.png b/Resources/Images/nav-back-mini@2x.png
diff --git a/Resources/Images/nav-background-mini.png b/Resources/Images/nav-background-mini.png
diff --git a/Resources/Images/nav-background-mini@2x.png b/Resources/Images/nav-background-mini@2x.png
diff --git a/Resources/Images/nav-button-mini-highlighted.png b/Resources/Images/nav-button-mini-highlighted.png
diff --git a/Resources/Images/nav-button-mini-highlighted@2x.png b/Resources/Images/nav-button-mini-highlighted@2x.png
diff --git a/Resources/Images/nav-button-mini.png b/Resources/Images/nav-button-mini.png
diff --git a/Resources/Images/nav-button-mini@2x.png b/Resources/Images/nav-button-mini@2x.png
diff --git a/Vendor/TextExpander.framework/Headers b/Vendor/TextExpander.framework/Headers
@@ -0,0 +1 @@
+Versions/Current/Headers
diff --git a/Vendor/TextExpander.framework/Resources b/Vendor/TextExpander.framework/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
diff --git a/Vendor/TextExpander.framework/TextExpander b/Vendor/TextExpander.framework/TextExpander
@@ -0,0 +1 @@
+Versions/Current/TextExpander
diff --git a/Vendor/TextExpander.framework/Versions/A/Headers/SMTEDelegateController.h b/Vendor/TextExpander.framework/Versions/A/Headers/SMTEDelegateController.h
@@ -0,0 +1,22 @@
+//
+//  SMTEDelegateController.h
+//  teiphone
+//
+//  Created by Greg Scown on 8/24/09.
+//  Copyright 2009-2010 SmileOnMyMac. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SMTEDelegateController : NSObject <UITextViewDelegate, UITextFieldDelegate, UIScrollViewDelegate, UIWebViewDelegate, UISearchBarDelegate> {
+}
+@property (nonatomic, assign) id nextDelegate;
+@property (nonatomic, assign) BOOL provideUndoSupport; // Default: YES
+
++ (BOOL)isTextExpanderTouchInstalled;
++ (BOOL)snippetsAreShared;
++ (void)setExpansionEnabled:(BOOL)expansionEnabled;
+- (void)resetKeyLog;
+- (void)willEnterForeground;
+
+@end
diff --git a/Vendor/TextExpander.framework/Versions/A/Resources/Info.plist b/Vendor/TextExpander.framework/Versions/A/Resources/Info.plist
diff --git a/Vendor/TextExpander.framework/Versions/A/TextExpander b/Vendor/TextExpander.framework/Versions/A/TextExpander
diff --git a/Vendor/TextExpander.framework/Versions/Current b/Vendor/TextExpander.framework/Versions/Current
@@ -0,0 +1 @@
+A