Merge branch 'master' of https://github.com/nicolasgomollon/cheddar-ios

Conflicts: Classes/CDIEditTaskViewController.m
nickbabenko · Oct 1, 2012 · ca45054 · ca45054
2 parents f71f055 + 4f56407
commit ca45054
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/Classes/CDIAddTaskView.m b/Classes/CDIAddTaskView.m
@@ -119,7 +119,7 @@ - (id)initWithFrame:(CGRect)frame {
 		_textField.font = [UIFont cheddarFontOfSize:18.0f];
 
 		CDIKeyboardBar *keyboardBar = [[CDIKeyboardBar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, size.width, UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 54.0f : 36.0f)];
-		keyboardBar.textField = _textField;
+		keyboardBar.keyInputView = _textField;
 		_textField.inputAccessoryView = keyboardBar;
 		[self addSubview:_textField];
 

diff --git a/Classes/CDIEditTaskViewController.m b/Classes/CDIEditTaskViewController.m
@@ -8,6 +8,7 @@
 
 #import "CDIEditTaskViewController.h"
 #import "CDIMoveTaskView.h"
+#import "CDIKeyboardBar.h"
 #import "UIColor+CheddariOSAdditions.h"
 #import "UIFont+CheddariOSAdditions.h"
 
@@ -54,6 +55,10 @@ - (void)viewDidLoad {
 	_textView.returnKeyType = UIReturnKeyGo;
 	_textView.font = [UIFont cheddarFontOfSize:18.0f];
 	_textView.text = self.task.text;
+
+	CDIKeyboardBar *keyboardBar = [[CDIKeyboardBar alloc] initWithFrame:CGRectMake(0.0f, 0.0f, self.view.bounds.size.width, UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 54.0f : 36.0f)];
+	keyboardBar.keyInputView = _textView;
+	_textView.inputAccessoryView = keyboardBar;
 	[self.view addSubview:_textView];
 
 	_moveTaskView = [[CDIMoveTaskView alloc] init];

diff --git a/Classes/CDIKeyboardBar.h b/Classes/CDIKeyboardBar.h
@@ -8,7 +8,7 @@
 
 @interface CDIKeyboardBar : SSGradientView <UIInputViewAudioFeedback>
 
-@property (nonatomic, weak) UITextField *textField;
+@property (nonatomic, weak) id<UIKeyInput> keyInputView;
 
 + (NSArray *)characters;
 

diff --git a/Classes/CDIKeyboardBar.m b/Classes/CDIKeyboardBar.m
@@ -17,12 +17,12 @@ @implementation CDIKeyboardBar {
 	NSArray *_buttons;
 }
 
-@synthesize textField = _textField;
+@synthesize keyInputView = _keyInputView;
 
 #pragma mark - Class Methods
 
 + (NSArray *)characters {
-	return @[@"#", @"*", @"_", @"[", @"]", @"(", @")"];
+	return @[@"#", @"*", @"_", @"[", @"]", @"(", @")", @"`"];
 }
 
 
@@ -89,7 +89,7 @@ - (BOOL)enableInputClicksWhenVisible {
 
 - (void)_buttonPressed:(CDIKeyboardButton *)button {
 	[[UIDevice currentDevice] playInputClick];
-	[self.textField insertText:button.character];
+	[self.keyInputView insertText:button.character];
 }
 
 @end
diff --git a/Classes/CDIKeyboardButton.m b/Classes/CDIKeyboardButton.m
@@ -14,6 +14,8 @@ @implementation CDIKeyboardButton
 
 - (id)initWithCharacter:(NSString *)character {
 	if ((self = [super init])) {
+		self.contentMode = UIViewContentModeRedraw;
+
 		_character = character;
 
 		[self setTitle:character forState:UIControlStateNormal];

diff --git a/Resources/Cheddar-Info.plist b/Resources/Cheddar-Info.plist
@@ -28,7 +28,7 @@
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.nothingmagical.cheddar-ios</string>
+	<string>com.nothingmagical.cheddar-ios.dev</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>