Merge pull request #3 from mrhard4/master

dmoroz0v · web-flow · commit 27d9a5b58d14 · 2018-02-14T19:03:42.000+07:00
Cut tail mode + fix warnings
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ class EntryViewController: UIViewController
 
 		self.textFieldFormatCoordinator = FTCTextFieldFormatCoordinator(textField: self.textField)
 
-		let formattingConfig = FTCTextEntryFormattingConfigFactory.mobilePhoneConfig(withFormat: "+7 (___) ___-__-__",
+		let formattingConfig = FTCTextEntryFormattingConfigFactory.mobilePhoneConfig(with: "+7 (___) ___-__-__",
 		                                                                             maskChar: "_")
 		self.textFieldFormatCoordinator.apply(formattingConfig: formattingConfig)
 	}
diff --git a/Src/Core/FTCTextEntryFormatCoordinatorHelper.m b/Src/Core/FTCTextEntryFormatCoordinatorHelper.m
@@ -79,40 +79,40 @@ - (NSString *)formattedValue
 
 - (void)beginEditing
 {
-	[self handleValueChange:^
+	[self handleValueChange:^(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry)
 	{
-		[formatCoordinator beginEditing];
-		entryUI.text = formatCoordinator.formattedValue;
-		entryUI.selectedTextRange = formatCoordinator.currentSelectionRangeInFormattedValue;
+		[coordinator beginEditing];
+		entry.text = coordinator.formattedValue;
+		entry.selectedTextRange = coordinator.currentSelectionRangeInFormattedValue;
 	}];
 }
 
 - (void)changeCharactersInRange:(NSRange)range replacement:(NSString *)replacement
 {
-	[self handleValueChange:^
+	[self handleValueChange:^(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry)
 	{
-		[formatCoordinator userReplacedInFormattedValueSubstringAtRange:range withString:replacement];
-		entryUI.text = formatCoordinator.formattedValue;
-		entryUI.selectedTextRange = formatCoordinator.currentSelectionRangeInFormattedValue;
+		[coordinator userReplacedInFormattedValueSubstringAtRange:range withString:replacement];
+		entry.text = coordinator.formattedValue;
+		entry.selectedTextRange = coordinator.currentSelectionRangeInFormattedValue;
 	}];
 }
 
 - (void)endEditing
 {
-	[self handleValueChange:^
+	[self handleValueChange:^(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry)
 	{
-		[formatCoordinator endEditing];
-		entryUI.text = formatCoordinator.formattedValue;
+		[coordinator endEditing];
+		entry.text = coordinator.formattedValue;
 	}];
 }
 
-- (void)handleValueChange:(void(^)(void))valueChange
+- (void)handleValueChange:(void(^)(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry))valueChange
 {
 	NSString *initialValue = formatCoordinator.rawValue;
 
 	if( NULL != valueChange )
 	{
-		valueChange();
+		valueChange(formatCoordinator, entryUI);
 	}
 
 	if( NULL == _didChangeValueHandler )
diff --git a/Src/Core/Formatting/MaskFormatter/FTCMaskFormatter.m b/Src/Core/Formatting/MaskFormatter/FTCMaskFormatter.m
@@ -48,11 +48,18 @@ - (NSString *)formattedFromRaw:(NSString *)rawValue
 {
 	NSString * const mask = config.mask;
 
+	if( (FTCMaskFormatterConfigTailModeCutAndForceHead == config.tailMode) && (rawValue.length == 0) )
+	{
+		NSString *maskCharacterString = [FTCTextEntryFormattingStringUtils stringWithCharacter:config.maskCharacter];
+		return [config.mask substringToIndex:[config.mask rangeOfString:maskCharacterString].location];
+	}
+
 	NSMutableString *formattedValue = [[NSMutableString alloc] initWithCapacity:mask.length];
 
 	for( NSUInteger indexInFormat = 0, indexInRawValue = 0; indexInFormat < mask.length; ++indexInFormat )
 	{
-		if( config.cutTail && indexInRawValue == rawValue.length )
+		if( ((FTCMaskFormatterConfigTailModeCutAndForceHead == config.tailMode) || (FTCMaskFormatterConfigTailModeCut == config.tailMode))
+				&& indexInRawValue == rawValue.length )
 		{
 			break;
 		}
diff --git a/Src/Core/Formatting/MaskFormatter/FTCMaskFormatterConfig.h b/Src/Core/Formatting/MaskFormatter/FTCMaskFormatterConfig.h
@@ -20,12 +20,19 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSInteger, FTCMaskFormatterConfigTailMode)
+{
+    FTCMaskFormatterConfigTailModeNone = 0,
+    FTCMaskFormatterConfigTailModeCut,
+    FTCMaskFormatterConfigTailModeCutAndForceHead
+};
+
 @protocol FTCMaskFormatterConfig<NSObject>
 
 @property (nonatomic, readonly) NSString *mask;
 @property (nonatomic, readonly) unichar maskCharacter;
 @property (nonatomic, readonly) NSUInteger countMaskCharacters;
-@property (nonatomic, readonly) BOOL cutTail;
+@property (nonatomic, readonly) FTCMaskFormatterConfigTailMode tailMode;
 
 @end
 
diff --git a/Src/Core/Formatting/MaskFormatter/FTCMaskFormatterGenericConfig.h b/Src/Core/Formatting/MaskFormatter/FTCMaskFormatterGenericConfig.h
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FTCMaskFormatterGenericConfig : NSObject<FTCMaskFormatterConfig>
 
-@property (nonatomic, readwrite) BOOL cutTail; // default NO
+@property (nonatomic, readwrite) FTCMaskFormatterConfigTailMode tailMode; // default FTCMaskFormatterConfigTailModeNone
 
 - (instancetype)initWithMask:(NSString *)mask maskCharacter:(NSString *)maskCharacter NS_DESIGNATED_INITIALIZER;
 
diff --git a/Src/Core/Formatting/MaskFormatter/FTCMaskFormatterGenericConfig.m b/Src/Core/Formatting/MaskFormatter/FTCMaskFormatterGenericConfig.m
@@ -35,7 +35,7 @@ - (instancetype)initWithMask:(NSString *)mask maskCharacter:(NSString *)maskChar
 
 	_mask = mask;
 	_maskCharacter = [maskCharacter characterAtIndex:0];
-	_cutTail = NO;
+	_tailMode = FTCMaskFormatterConfigTailModeNone;
 
 	NSUInteger countMaskCharacters = 0;
 	for( NSUInteger i = 0; i < _mask.length; ++i )
diff --git a/Src/FTCTextEntryFormattingConfigFactory.h b/Src/FTCTextEntryFormattingConfigFactory.h
@@ -18,6 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#import "FTCTextEntryFormatting.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class FTCTextEntryFormattingConfig;
@@ -26,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask
                                                    maskChar:(NSString *)maskChar NS_SWIFT_NAME( mobilePhoneConfig(with:maskChar:) );
++ (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask
+                                                   maskChar:(NSString *)maskChar
+                                                   tailMode:(FTCMaskFormatterConfigTailMode)tailMode NS_SWIFT_NAME( mobilePhoneConfig(with:maskChar:tailMode:) );
 
 + (FTCTextEntryFormattingConfig *)moneyConfigWithCurrency:(nullable NSString *)currency
                                              onlyIntegral:(BOOL)onlyIntegral NS_SWIFT_NAME( moneyConfig(with:onlyIntegral:) );
diff --git a/Src/FTCTextEntryFormattingConfigFactory.m b/Src/FTCTextEntryFormattingConfigFactory.m
@@ -33,14 +33,26 @@
 @implementation FTCTextEntryFormattingConfigFactory
 
 + (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask maskChar:(NSString *)maskChar
+{
+	return [self mobilePhoneConfigWithMask:mask maskChar:maskChar tailMode:FTCMaskFormatterConfigTailModeNone];
+}
+
++ (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask maskChar:(NSString *)maskChar tailMode:(FTCMaskFormatterConfigTailMode)tailMode
 {
 	__auto_type maskConfig = [[FTCMaskFormatterGenericConfig alloc] initWithMask:mask maskCharacter:maskChar];
+	maskConfig.tailMode = tailMode;
 
 	__auto_type maskFormatter = [[FTCMaskFormatter alloc] initWithConfig:maskConfig];
 	__auto_type inputFilter = [[FTCDigitsValueFilter alloc] initWithMaxLength:maskConfig.countMaskCharacters];
 
-	return [[FTCTextEntryFormattingConfig alloc] initWithFormatter:maskFormatter
-													   inputFilter:inputFilter];
+	__auto_type formattingConfig = [[FTCTextEntryFormattingConfig alloc] init];
+
+	formattingConfig.editingInputFilter = inputFilter;
+	formattingConfig.editingFormatter = maskFormatter;
+	formattingConfig.notEditingInputFilter = inputFilter;
+	formattingConfig.notEditingFormatter = maskFormatter;
+
+	return formattingConfig;
 }
 
 + (FTCTextEntryFormattingConfig *)moneyConfigWithCurrency:(nullable NSString *)currency onlyIntegral:(BOOL)onlyIntegral

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class EntryViewController: UIViewController`
`28`	`28`
`29`	`29`	`self.textFieldFormatCoordinator = FTCTextFieldFormatCoordinator(textField: self.textField)`
`30`	`30`
`31`		`- let formattingConfig = FTCTextEntryFormattingConfigFactory.mobilePhoneConfig(withFormat: "+7 (___) ___-__-__",`
	`31`	`+ let formattingConfig = FTCTextEntryFormattingConfigFactory.mobilePhoneConfig(with: "+7 (___) ___-__-__",`
`32`	`32`	`maskChar: "_")`
`33`	`33`	`self.textFieldFormatCoordinator.apply(formattingConfig: formattingConfig)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,40 +79,40 @@ - (NSString *)formattedValue`
`79`	`79`
`80`	`80`	`- (void)beginEditing`
`81`	`81`	`{`
`82`		`- [self handleValueChange:^`
	`82`	`+ [self handleValueChange:^(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry)`
`83`	`83`	`{`
`84`		`- [formatCoordinator beginEditing];`
`85`		`- entryUI.text = formatCoordinator.formattedValue;`
`86`		`- entryUI.selectedTextRange = formatCoordinator.currentSelectionRangeInFormattedValue;`
	`84`	`+ [coordinator beginEditing];`
	`85`	`+ entry.text = coordinator.formattedValue;`
	`86`	`+ entry.selectedTextRange = coordinator.currentSelectionRangeInFormattedValue;`
`87`	`87`	`}];`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`- (void)changeCharactersInRange:(NSRange)range replacement:(NSString *)replacement`
`91`	`91`	`{`
`92`		`- [self handleValueChange:^`
	`92`	`+ [self handleValueChange:^(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry)`
`93`	`93`	`{`
`94`		`- [formatCoordinator userReplacedInFormattedValueSubstringAtRange:range withString:replacement];`
`95`		`- entryUI.text = formatCoordinator.formattedValue;`
`96`		`- entryUI.selectedTextRange = formatCoordinator.currentSelectionRangeInFormattedValue;`
	`94`	`+ [coordinator userReplacedInFormattedValueSubstringAtRange:range withString:replacement];`
	`95`	`+ entry.text = coordinator.formattedValue;`
	`96`	`+ entry.selectedTextRange = coordinator.currentSelectionRangeInFormattedValue;`
`97`	`97`	`}];`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`- (void)endEditing`
`101`	`101`	`{`
`102`		`- [self handleValueChange:^`
	`102`	`+ [self handleValueChange:^(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry)`
`103`	`103`	`{`
`104`		`- [formatCoordinator endEditing];`
`105`		`- entryUI.text = formatCoordinator.formattedValue;`
	`104`	`+ [coordinator endEditing];`
	`105`	`+ entry.text = coordinator.formattedValue;`
`106`	`106`	`}];`
`107`	`107`	`}`
`108`	`108`
`109`		`-- (void)handleValueChange:(void(^)(void))valueChange`
	`109`	`+- (void)handleValueChange:(void(^)(FTCTextEntryFormatCoordinator *coordinator, id<FTCTextEntry> entry))valueChange`
`110`	`110`	`{`
`111`	`111`	`NSString *initialValue = formatCoordinator.rawValue;`
`112`	`112`
`113`	`113`	`if( NULL != valueChange )`
`114`	`114`	`{`
`115`		`- valueChange();`
	`115`	`+ valueChange(formatCoordinator, entryUI);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if( NULL == _didChangeValueHandler )`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,18 @@ - (NSString )formattedFromRaw:(NSString )rawValue`
`48`	`48`	`{`
`49`	`49`	`NSString * const mask = config.mask;`
`50`	`50`
	`51`	`+ if( (FTCMaskFormatterConfigTailModeCutAndForceHead == config.tailMode) && (rawValue.length == 0) )`
	`52`	`+ {`
	`53`	`+ NSString *maskCharacterString = [FTCTextEntryFormattingStringUtils stringWithCharacter:config.maskCharacter];`
	`54`	`+ return [config.mask substringToIndex:[config.mask rangeOfString:maskCharacterString].location];`
	`55`	`+ }`
	`56`	`+`
`51`	`57`	`NSMutableString *formattedValue = [[NSMutableString alloc] initWithCapacity:mask.length];`
`52`	`58`
`53`	`59`	`for( NSUInteger indexInFormat = 0, indexInRawValue = 0; indexInFormat < mask.length; ++indexInFormat )`
`54`	`60`	`{`
`55`		`- if( config.cutTail && indexInRawValue == rawValue.length )`
	`61`	`+ if( ((FTCMaskFormatterConfigTailModeCutAndForceHead == config.tailMode) \|\| (FTCMaskFormatterConfigTailModeCut == config.tailMode))`
	`62`	`+ && indexInRawValue == rawValue.length )`
`56`	`63`	`{`
`57`	`64`	`break;`
`58`	`65`	`}`