diff --git a/VENTokenField/VENToken.h b/VENTokenField/VENToken.h index 21768cb..e11a4e8 100644 --- a/VENTokenField/VENToken.h +++ b/VENTokenField/VENToken.h @@ -27,6 +27,7 @@ @property (assign, nonatomic) BOOL highlighted; @property (copy, nonatomic) void (^didTapTokenBlock) (void); @property (strong, nonatomic) UIColor *colorScheme; +@property (strong, nonatomic) UIFont *font; - (void)setTitleText:(NSString *)text; diff --git a/VENTokenField/VENToken.m b/VENTokenField/VENToken.m index 0b353ab..670c3e6 100644 --- a/VENTokenField/VENToken.m +++ b/VENTokenField/VENToken.m @@ -52,6 +52,7 @@ - (void)setTitleText:(NSString *)text { self.titleLabel.text = text; self.titleLabel.textColor = self.colorScheme; + self.titleLabel.font = self.font; [self.titleLabel sizeToFit]; self.frame = CGRectMake(CGRectGetMinX(self.frame), CGRectGetMinY(self.frame), CGRectGetMaxX(self.titleLabel.frame) + 3, CGRectGetHeight(self.frame)); [self.titleLabel sizeToFit]; @@ -73,6 +74,11 @@ - (void)setColorScheme:(UIColor *)colorScheme [self setHighlighted:_highlighted]; } +- (void)setFont:(UIFont *)font { + _font = font; + [self setTitleText:self.titleLabel.text]; +} + #pragma mark - Private diff --git a/VENTokenField/VENTokenField.h b/VENTokenField/VENTokenField.h index 73ea5dd..6b4dbb6 100644 --- a/VENTokenField/VENTokenField.h +++ b/VENTokenField/VENTokenField.h @@ -67,7 +67,9 @@ @property (assign, nonatomic) UIView *inputTextFieldAccessoryView; @property (strong, nonatomic) UIColor *toLabelTextColor; @property (strong, nonatomic) NSString *toLabelText; +@property (strong, nonatomic) UIFont *inputTextFieldFont; @property (strong, nonatomic) UIColor *inputTextFieldTextColor; +@property (strong, nonatomic) UIFont *tokenFont; @property (strong, nonatomic) UILabel *toLabel; diff --git a/VENTokenField/VENTokenField.m b/VENTokenField/VENTokenField.m index 63c63a6..f166840 100644 --- a/VENTokenField/VENTokenField.m +++ b/VENTokenField/VENTokenField.m @@ -93,6 +93,7 @@ - (void)setUpInit self.tokenPadding = VENTokenFieldDefaultTokenPadding; self.minInputWidth = VENTokenFieldDefaultMinInputWidth; self.colorScheme = [UIColor blueColor]; + self.tokenFont = [UIFont fontWithName:@"HelveticaNeue" size:15.5]; self.toLabelTextColor = [UIColor colorWithRed:112/255.0f green:124/255.0f blue:124/255.0f alpha:1.0f]; self.inputTextFieldTextColor = [UIColor colorWithRed:38/255.0f green:39/255.0f blue:41/255.0f alpha:1.0f]; @@ -129,6 +130,12 @@ -(void)setInputTextFieldAccessibilityLabel:(NSString *)inputTextFieldAccessibili self.inputTextField.accessibilityLabel = _inputTextFieldAccessibilityLabel; } +- (void)setInputTextFieldFont:(UIFont *)inputTextFieldFont +{ + _inputTextFieldFont = inputTextFieldFont; + self.inputTextField.font = inputTextFieldFont; +} + - (void)setInputTextFieldTextColor:(UIColor *)inputTextFieldTextColor { _inputTextFieldTextColor = inputTextFieldTextColor; @@ -157,6 +164,11 @@ - (void)setColorScheme:(UIColor *)color } } +- (void)setTokenFont:(UIFont *)tokenFont { + _tokenFont = tokenFont; + [self setNeedsLayout]; +} + - (void)setInputTextFieldAccessoryView:(UIView *)inputTextFieldAccessoryView { _inputTextFieldAccessoryView = inputTextFieldAccessoryView; @@ -298,6 +310,7 @@ - (void)layoutTokensWithCurrentX:(CGFloat *)currentX currentY:(CGFloat *)current for (NSUInteger i = 0; i < [self numberOfTokens]; i++) { NSString *title = [self titleForTokenAtIndex:i]; VENToken *token = [[VENToken alloc] init]; + token.font = self.tokenFont; __weak VENToken *weakToken = token; __weak VENTokenField *weakSelf = self; diff --git a/VENTokenFieldSample/Base.lproj/Main.storyboard b/VENTokenFieldSample/Base.lproj/Main.storyboard index 07f1261..cfbd531 100644 --- a/VENTokenFieldSample/Base.lproj/Main.storyboard +++ b/VENTokenFieldSample/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - - + + @@ -38,6 +38,20 @@ + + + + + + + + diff --git a/VENTokenFieldSample/ViewController.m b/VENTokenFieldSample/ViewController.m index 073f85f..6e08c2f 100644 --- a/VENTokenFieldSample/ViewController.m +++ b/VENTokenFieldSample/ViewController.m @@ -38,6 +38,16 @@ - (IBAction)didTapResignFirstResponderButton:(id)sender [self.tokenField resignFirstResponder]; } +- (IBAction)fontChanged:(UISwitch *)sender +{ + if (sender.isOn) { + self.tokenField.tokenFont = [UIFont fontWithName:@"HelveticaNeueBold" size:15.5]; + } + else { + self.tokenField.tokenFont = [UIFont fontWithName:@"HelveticaNeue" size:15.5]; + } +} + #pragma mark - VENTokenFieldDelegate