Fix OTP autofill by using UITextField in FUICodeField #930
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| | @@ -25,49 +25,37 @@ | |
| | ||
| @interface FUICodeField () | ||
| | ||
| @property (nonatomic, readonly) IBInspectable NSString *placeholderChar; | ||
| | ||
| @end | ||
| | ||
| @implementation FUICodeField | ||
| | ||
| - (instancetype)initWithFrame:(CGRect)frame { | ||
| if (self = [super initWithFrame:frame]){ | ||
| [self commonInit]; | ||
| } | ||
| return self; | ||
| } | ||
| | ||
| - (nullable instancetype)initWithCoder:(NSCoder *)aDecoder { | ||
| if (self = [super initWithCoder:aDecoder]){ | ||
| [self commonInit]; | ||
| } | ||
| return self; | ||
| } | ||
| | ||
| - (void)commonInit { | ||
| // Initialization code | ||
| _codeEntry = [NSMutableString string]; | ||
| self.backgroundColor = UIColor.clearColor; | ||
| self.tintColor = UIColor.clearColor; | ||
| self.font = [UIFont fontWithName:@"Courier" size:40]; | ||
| self.textAlignment = NSTextAlignmentLeft; | ||
| UIView *paddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 20, self.bounds.size.height)]; | ||
| self.leftView = paddingView; | ||
| self.leftViewMode = UITextFieldViewModeAlways; | ||
| self.textContentType = UITextContentTypeOneTimeCode; | ||
| There was a problem hiding this comment. Please keep the There was a problem hiding this comment. I'll accept the PR as is and add this line manually since I want to get it into the next release. Thanks @akivab! | ||
| | ||
| // Default values | ||
| if (!self.codeLength) { | ||
| | @@ -76,11 +64,12 @@ - (void)setUpFromNib { | |
| _codeLength = MIN(self.codeLength, 12); | ||
| } | ||
| | ||
| if (!self.placeholderChar || !self.placeholderChar.length) { | ||
| _placeholderChar = @"-"; | ||
| } | ||
| | ||
| self.delegate = self; | ||
| [self updateText]; | ||
| } | ||
| | ||
| - (UIKeyboardType) keyboardType { | ||
| | @@ -91,38 +80,6 @@ - (UIKeyboardType) keyboardType { | |
| } | ||
| } | ||
| | ||
| - (BOOL)hasText { | ||
| return self.codeEntry.length > 0; | ||
| } | ||
| | @@ -131,63 +88,69 @@ - (void)insertText:(NSString *)theText { | |
| if (self.codeEntry.length >= self.codeLength){ | ||
| // UX: if code was submitted and there is an error message, | ||
| // typing a new number should clear the field and start over | ||
| [self updateText]; | ||
| return; | ||
| } | ||
| | ||
| [self.codeEntry appendString:theText]; | ||
| [self updateText]; | ||
| [self notifyEntryCompletion]; | ||
| } | ||
| | ||
| - (void)deleteBackward { | ||
| if (!self.codeEntry.length) { | ||
| return; | ||
| } | ||
| | ||
| NSRange theRange = NSMakeRange(self.codeEntry.length - 1, 1); | ||
| [self.codeEntry deleteCharactersInRange:theRange]; | ||
| [self updateText]; | ||
| [self notifyEntryCompletion]; | ||
| } | ||
| | ||
| - (void)clearCodeInput { | ||
| [self.codeEntry setString:@""]; | ||
| [self updateText]; | ||
| [self notifyEntryCompletion]; | ||
| } | ||
| | ||
| - (void)notifyEntryCompletion { | ||
| if (self.codeEntry.length >= self.codeLength) { | ||
| [self.codeDelegate entryIsCompletedWithCode:[self.codeEntry copy]]; | ||
| } else { | ||
| [self.codeDelegate entryIsIncomplete]; | ||
| } | ||
| } | ||
| | ||
| - (void)updateText { | ||
| NSString *code = [self.codeEntry copy]; | ||
| if (self.secureTextEntry) { | ||
| code = [[NSString string] stringByPaddingToLength:code.length | ||
| withString:@"\u2022" startingAtIndex:0]; | ||
| } | ||
| | ||
| NSInteger add = self.codeLength - code.length; | ||
| if (add > 0) { | ||
| NSString *pad = [[NSString string] stringByPaddingToLength:add | ||
| withString:self.placeholderChar | ||
| startingAtIndex:0]; | ||
| code = [code stringByAppendingString:pad]; | ||
| } | ||
| | ||
| NSMutableAttributedString *attributedString = | ||
| [[NSMutableAttributedString alloc] initWithString:code]; | ||
| [attributedString addAttribute:NSKernAttributeName value:@20 | ||
| range:NSMakeRange(0, attributedString.length - 1)]; | ||
| self.attributedText = attributedString; | ||
| } | ||
| | ||
| - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { | ||
| if (string.length == 0) { | ||
| [self deleteBackward]; | ||
| } else { | ||
| [self insertText:string]; | ||
| } | ||
| return false; | ||
| } | ||
| | ||
| @end | ||
| | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the cursor in UITextField made me increase the size of the area for the codeField in the FUIPhoneVerificationViewController.xib and add this space here