From 5f0edbb47ed5661fbe751cca929d8e25d5c67709 Mon Sep 17 00:00:00 2001 From: Mars Shen Date: Fri, 20 May 2016 21:45:28 -0500 Subject: [PATCH] Fix multiple decimal separator issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix multiple decimal separator issue, now user can not input number like '123.123.123' or '123.123 × 123.32.32' --- VENCalculatorInputView/VENCalculatorInputTextField.m | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/VENCalculatorInputView/VENCalculatorInputTextField.m b/VENCalculatorInputView/VENCalculatorInputTextField.m index 2ee8afa..4a625a7 100644 --- a/VENCalculatorInputView/VENCalculatorInputTextField.m +++ b/VENCalculatorInputView/VENCalculatorInputTextField.m @@ -84,6 +84,17 @@ - (void)calculatorInputView:(VENCalculatorInputView *)inputView didTapKey:(NSStr if ([secondToLastCharacterString isEqualToString:[self decimalSeparator]]) { self.text = subString; } + if([subString rangeOfString:@"+"].location != NSNotFound || + [subString rangeOfString:@"−"].location != NSNotFound || + [subString rangeOfString:@"×"].location != NSNotFound || + [subString rangeOfString:@"÷"].location != NSNotFound + ){ + if([[subString componentsSeparatedByString:[self decimalSeparator]] count] > 2){ + self.text = subString; + } + }else if ([subString rangeOfString:[self decimalSeparator]].location != NSNotFound){ + self.text = subString; + } } }