ShareKit disabled the auto cap and correction for all text fields. Th…

…is isn't helping for things like captions... but is for username and password fields. Add a new form field type that disables auto cap and correction. Use this in all the right places. Between this and the password type field, all the right fields disable auto correct and cap.
sibrus · Aug 8, 2011 · 1319600 · 1319600
1 parent 166be4c
commit 1319600
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/Classes/ShareKit/Core/Base Sharer Classes/SHKSharer.m b/Classes/ShareKit/Core/Base Sharer Classes/SHKSharer.m
@@ -418,7 +418,7 @@ - (NSArray *)authorizationFormFields
 + (NSArray *)authorizationFormFields
 {
 	return [NSArray arrayWithObjects:
-			[SHKFormFieldSettings label:SHKLocalizedString(@"Username") key:@"username" type:SHKFormFieldTypeText start:nil],
+			[SHKFormFieldSettings label:SHKLocalizedString(@"Username") key:@"username" type:SHKFormFieldTypeTextNoCorrect start:nil],
 			[SHKFormFieldSettings label:SHKLocalizedString(@"Password") key:@"password" type:SHKFormFieldTypePassword start:nil],			
 			nil];
 }

diff --git a/Classes/ShareKit/Sharers/Services/Evernote/SHKEvernote.m b/Classes/ShareKit/Sharers/Services/Evernote/SHKEvernote.m
@@ -57,7 +57,7 @@ + (BOOL)canShare {	return YES; }
 + (NSArray *)authorizationFormFields 
 {
 	return [NSArray arrayWithObjects:
-			[SHKFormFieldSettings label:@"Username" key:@"username" type:SHKFormFieldTypeText start:nil],
+			[SHKFormFieldSettings label:@"Username" key:@"username" type:SHKFormFieldTypeTextNoCorrect start:nil],
 			[SHKFormFieldSettings label:@"Password" key:@"password" type:SHKFormFieldTypePassword start:nil],			
 			nil];
 }

diff --git a/Classes/ShareKit/Sharers/Services/Google Reader/SHKGoogleReader.m b/Classes/ShareKit/Sharers/Services/Google Reader/SHKGoogleReader.m
@@ -79,7 +79,7 @@ + (NSString *)authorizationFormCaption
 + (NSArray *)authorizationFormFields
 {
 	return [NSArray arrayWithObjects:
-			[SHKFormFieldSettings label:SHKLocalizedString(@"Email") key:@"email" type:SHKFormFieldTypeText start:nil],
+			[SHKFormFieldSettings label:SHKLocalizedString(@"Email") key:@"email" type:SHKFormFieldTypeTextNoCorrect start:nil],
 			[SHKFormFieldSettings label:SHKLocalizedString(@"Password") key:@"password" type:SHKFormFieldTypePassword start:nil],			
 			nil];
 }

diff --git a/Classes/ShareKit/Sharers/Services/Tumblr/SHKTumblr.m b/Classes/ShareKit/Sharers/Services/Tumblr/SHKTumblr.m
@@ -114,7 +114,7 @@ - (NSArray *)authorizationFormFields{
 	return [NSArray arrayWithObjects:
 			[SHKFormFieldSettings label:SHKLocalizedString(@"Email")
                                     key:@"email"
-                                   type:SHKFormFieldTypeText
+                                   type:SHKFormFieldTypeTextNoCorrect
                                   start:nil],
 			[SHKFormFieldSettings label:SHKLocalizedString(@"Password")
                                     key:@"password"

diff --git a/Classes/ShareKit/Sharers/Services/Twitter/SHKTwitter.m b/Classes/ShareKit/Sharers/Services/Twitter/SHKTwitter.m
@@ -125,7 +125,7 @@ + (NSArray *)authorizationFormFields
 		return [super authorizationFormFields];
 
 	return [NSArray arrayWithObjects:
-			[SHKFormFieldSettings label:SHKLocalizedString(@"Username") key:@"username" type:SHKFormFieldTypeText start:nil],
+			[SHKFormFieldSettings label:SHKLocalizedString(@"Username") key:@"username" type:SHKFormFieldTypeTextNoCorrect start:nil],
 			[SHKFormFieldSettings label:SHKLocalizedString(@"Password") key:@"password" type:SHKFormFieldTypePassword start:nil],
 			[SHKFormFieldSettings label:SHKLocalizedString(@"Follow %@", SHKCONFIG(twitterUsername)) key:@"followMe" type:SHKFormFieldTypeSwitch start:SHKFormFieldSwitchOn],			
 			nil];

diff --git a/Classes/ShareKit/UI/SHKFormController.m b/Classes/ShareKit/UI/SHKFormController.m
@@ -101,7 +101,9 @@ - (void)addSection:(NSArray *)fields header:(NSString *)header footer:(NSString
 		for (SHKFormFieldSettings *field in fields)
 		{
 			// only use text field rows
-			if (field.type != SHKFormFieldTypeText && field.type != SHKFormFieldTypePassword)
+			if (field.type != SHKFormFieldTypeText && 
+				field.type != SHKFormFieldTypeTextNoCorrect &&
+				field.type != SHKFormFieldTypePassword)
 				continue;
 
 			size = [field.label sizeWithFont:[UIFont boldSystemFontOfSize:17]];

diff --git a/Classes/ShareKit/UI/SHKFormFieldCell.m b/Classes/ShareKit/UI/SHKFormFieldCell.m
@@ -57,8 +57,6 @@ - (UITextField *)getTextField
 		textField.returnKeyType = UIReturnKeyDone;
 		textField.font = [UIFont systemFontOfSize:17];
 		textField.textColor = [UIColor darkGrayColor];
-		textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
-		textField.autocorrectionType = UITextAutocorrectionTypeNo;
 		textField.delegate = form;
 		[self.contentView addSubview:textField];
 		[textField release];
@@ -72,10 +70,15 @@ - (void)layoutSubviews
 {
 	[super layoutSubviews];	
 
-	if (settings.type == SHKFormFieldTypeText || settings.type == SHKFormFieldTypePassword)
+	if (settings.type == SHKFormFieldTypeText || settings.type == SHKFormFieldTypeTextNoCorrect || settings.type == SHKFormFieldTypePassword)
 	{
 		self.textField.secureTextEntry = settings.type == SHKFormFieldTypePassword;
 
+		if(settings.type == SHKFormFieldTypePassword || settings.type == SHKFormFieldTypeTextNoCorrect){
+			textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+			textField.autocorrectionType = UITextAutocorrectionTypeNo;
+		}
+
 		textField.frame = CGRectMake(labelWidth + SHK_FORM_CELL_PAD_LEFT, 
 									 2 + round(self.contentView.bounds.size.height/2 - textField.bounds.size.height/2),
 									 self.contentView.bounds.size.width - SHK_FORM_CELL_PAD_RIGHT - SHK_FORM_CELL_PAD_LEFT - labelWidth,
@@ -140,6 +143,7 @@ - (void)setValue:(NSString *)value
 			break;
 
 		case SHKFormFieldTypeText:
+		case SHKFormFieldTypeTextNoCorrect:
 		case SHKFormFieldTypePassword:
 			textField.text = value;
 			break;

diff --git a/Classes/ShareKit/UI/SHKFormFieldSettings.h b/Classes/ShareKit/UI/SHKFormFieldSettings.h
@@ -30,6 +30,7 @@
 typedef enum 
 {
 	SHKFormFieldTypeText,
+	SHKFormFieldTypeTextNoCorrect,
 	SHKFormFieldTypePassword,
 	SHKFormFieldTypeSwitch
 } SHKFormFieldType;