Fix CR

Author: Денис Морозов

FTCTextEntryFormatting.xcodeproj/project.pbxproj

@@ -8,6 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		21591A1641163D3E4D1A1F34 /* FTCDigitsInputFilterTestCaseWithZeroMaxLength.m in Sources */ = {isa = PBXBuildFile; fileRef = F515E4501F5D58CD00AEEC8C /* FTCDigitsInputFilterTestCaseWithZeroMaxLength.m */; };
+		B10523501F84C4B6002B3F61 /* FTCDigitsInputFilterTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = B105234E1F84C497002B3F61 /* FTCDigitsInputFilterTestCase.m */; };
+		B10523531F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = B10523511F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.h */; };
+		B10523541F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = B10523521F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.m */; };
 		B1EBF8E71F2315F90014F4CB /* FTCTextEntryFormatting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1EBF8DD1F2315F90014F4CB /* FTCTextEntryFormatting.framework */; };
 		B1EBF9441F2316410014F4CB /* FTCNoFormattingFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = B1EBF9001F2316410014F4CB /* FTCNoFormattingFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B1EBF9451F2316410014F4CB /* FTCNoFormattingFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = B1EBF9011F2316410014F4CB /* FTCNoFormattingFormatter.m */; };
@@ -66,7 +69,6 @@
 		B1EBF9DF1F231C190014F4CB /* FTCPostfixFormatterTestCaseWithNotEmptyPostfix.m in Sources */ = {isa = PBXBuildFile; fileRef = B1EBF9D71F231C190014F4CB /* FTCPostfixFormatterTestCaseWithNotEmptyPostfix.m */; };
 		CCC1C0B14A2C0AF523465DB5 /* FTCMaskFormatterGenericConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = CCC1C3A298D5610F9EAECBC1 /* FTCMaskFormatterGenericConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CCC1CD063EECBF9CCDDE12F9 /* FTCMaskFormatterGenericConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC1CD7598485396BE2F9CEF /* FTCMaskFormatterGenericConfig.m */; };
-		F5859D5F1F5E4E1D00607B61 /* FTCDigitsInputFilterTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = F5859D5E1F5E4E1D00607B61 /* FTCDigitsInputFilterTestCase.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -80,6 +82,9 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		B105234E1F84C497002B3F61 /* FTCDigitsInputFilterTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FTCDigitsInputFilterTestCase.m; path = InputFilter/FTCDigitsInputFilterTestCase.m; sourceTree = "<group>"; };
+		B10523511F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTCTextEntryFormattingConfigFactory.h; sourceTree = "<group>"; };
+		B10523521F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTCTextEntryFormattingConfigFactory.m; sourceTree = "<group>"; };
 		B1370D1E1F4E849800E8EBA3 /* FTCTextEntryFormatting-prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FTCTextEntryFormatting-prefix.pch"; sourceTree = "<group>"; };
 		B1EBF8DD1F2315F90014F4CB /* FTCTextEntryFormatting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FTCTextEntryFormatting.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B1EBF8E61F2315F90014F4CB /* FTCTextEntryFormattingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FTCTextEntryFormattingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -144,7 +149,6 @@
 		CCC1C3A298D5610F9EAECBC1 /* FTCMaskFormatterGenericConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTCMaskFormatterGenericConfig.h; sourceTree = "<group>"; };
 		CCC1CD7598485396BE2F9CEF /* FTCMaskFormatterGenericConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTCMaskFormatterGenericConfig.m; sourceTree = "<group>"; };
 		F515E4501F5D58CD00AEEC8C /* FTCDigitsInputFilterTestCaseWithZeroMaxLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FTCDigitsInputFilterTestCaseWithZeroMaxLength.m; path = InputFilter/FTCDigitsInputFilterTestCaseWithZeroMaxLength.m; sourceTree = "<group>"; };
-		F5859D5E1F5E4E1D00607B61 /* FTCDigitsInputFilterTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FTCDigitsInputFilterTestCase.m; path = FormatCoordinator/FTCDigitsInputFilterTestCase.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -201,6 +205,8 @@
 		B1EBF8FB1F2316410014F4CB /* Src */ = {
 			isa = PBXGroup;
 			children = (
+				B10523511F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.h */,
+				B10523521F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.m */,
 				B1EBF8FE1F2316410014F4CB /* Core */,
 				B1EBF92D1F2316410014F4CB /* Money */,
 				B1EBF93C1F2316410014F4CB /* Tools */,
@@ -375,7 +381,7 @@
 		F515E4521F5D58D200AEEC8C /* InputFilter */ = {
 			isa = PBXGroup;
 			children = (
-				F5859D5E1F5E4E1D00607B61 /* FTCDigitsInputFilterTestCase.m */,
+				B105234E1F84C497002B3F61 /* FTCDigitsInputFilterTestCase.m */,
 				F515E4501F5D58CD00AEEC8C /* FTCDigitsInputFilterTestCaseWithZeroMaxLength.m */,
 			);
 			name = InputFilter;
@@ -390,6 +396,7 @@
 			files = (
 				B1EBF9751F2316410014F4CB /* FTCMoneyEntryNotEditingInputFilter.h in Headers */,
 				B1EBF9731F2316410014F4CB /* FTCMoneyEntryNotEditingFormatter.h in Headers */,
+				B10523531F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.h in Headers */,
 				B1EBF9551F2316410014F4CB /* FTCFilteredString.h in Headers */,
 				B1EBF9711F2316410014F4CB /* FTCMoneyEntryFormatUtils.h in Headers */,
 				B1EBF94C1F2316410014F4CB /* FTCTextEntry.h in Headers */,
@@ -523,6 +530,7 @@
 				B1EBF9561F2316410014F4CB /* FTCFilteredString.m in Sources */,
 				B1EBF95C1F2316410014F4CB /* FTCLimitedLengthInputFilter.m in Sources */,
 				B1EBF9501F2316410014F4CB /* FTCTextEntryFormatCoordinatorHelper.m in Sources */,
+				B10523541F84C655002B3F61 /* FTCTextEntryFormattingConfigFactory.m in Sources */,
 				B1EBF9451F2316410014F4CB /* FTCNoFormattingFormatter.m in Sources */,
 				B1EBF96C1F2316410014F4CB /* FTCIntegralMoneyAmountEntryNotEditingInputFilter.m in Sources */,
 				B1EBF9481F2316410014F4CB /* FTCMaskFormatter.m in Sources */,
@@ -549,7 +557,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B1EBF9DA1F231C190014F4CB /* FTCMaskFormatterTestCase.m in Sources */,
-				F5859D5F1F5E4E1D00607B61 /* FTCDigitsInputFilterTestCase.m in Sources */,
+				B10523501F84C4B6002B3F61 /* FTCDigitsInputFilterTestCase.m in Sources */,
 				B1EBF9DE1F231C190014F4CB /* FTCPostfixFormatterTestCaseWithNilPostfix.m in Sources */,
 				B1EBF9DF1F231C190014F4CB /* FTCPostfixFormatterTestCaseWithNotEmptyPostfix.m in Sources */,
 				B1EBF9DD1F231C190014F4CB /* FTCPostfixFormatterTestCaseWithEmptyPostfix.m in Sources */,

Src/Core/Formatting/MaskFormatter/FTCMaskFormatterGenericConfig.h

@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readwrite) BOOL cutTail; // default NO
 
-- (instancetype)initWithFormat:(NSString *)format NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithMask:(NSString *)mask maskCharacter:(NSString *)maskCharacter NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;
 

Src/Core/Formatting/MaskFormatter/FTCMaskFormatterGenericConfig.m

@@ -26,15 +26,15 @@ @implementation FTCMaskFormatterGenericConfig
 @synthesize maskCharacter = _maskCharacter;
 @synthesize countMaskCharacters = _countMaskCharacters;
 
-- (instancetype)initWithFormat:(NSString *)format
+- (instancetype)initWithMask:(NSString *)mask maskCharacter:(NSString *)maskCharacter
 {
-	assert( nil != format );
-	assert( format.length > 1 );
+	assert( nil != mask );
+	assert( maskCharacter.length == 1 );
 
 	self = [super init];
 
-	_mask = [format substringFromIndex:1];
-	_maskCharacter = [format characterAtIndex:0];
+	_mask = mask;
+	_maskCharacter = [maskCharacter characterAtIndex:0];
 	_cutTail = NO;
 
 	NSUInteger countMaskCharacters = 0;

Src/FTCTextEntryFormattingConfigFactory.h

@@ -9,9 +9,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FTCTextEntryFormattingConfigFactory : NSObject
 
-+ (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithFormat:(NSString *)format NS_SWIFT_NAME( mobilePhoneConfig(with:) );
 + (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask
-                                                   maskChar:(unichar)maskChar NS_SWIFT_NAME( mobilePhoneConfig(with:maskChar:) );
+                                                   maskChar:(NSString *)maskChar NS_SWIFT_NAME( mobilePhoneConfig(with:maskChar:) );
 
 + (FTCTextEntryFormattingConfig *)moneyConfigWithCurrency:(nullable NSString *)currency
                                              onlyIntegral:(BOOL)onlyIntegral NS_SWIFT_NAME( moneyConfig(with:onlyIntegral:) );

Src/FTCTextEntryFormattingConfigFactory.m

@@ -17,9 +17,9 @@
 
 @implementation FTCTextEntryFormattingConfigFactory
 
-+ (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithFormat:(NSString *)format
++ (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask maskChar:(NSString *)maskChar
 {
-	__auto_type maskConfig = [[FTCMaskFormatterGenericConfig alloc] initWithFormat:format];
+	__auto_type maskConfig = [[FTCMaskFormatterGenericConfig alloc] initWithMask:mask maskCharacter:maskChar];
 
 	__auto_type maskFormatter = [[FTCMaskFormatter alloc] initWithConfig:maskConfig];
 	__auto_type inputFilter = [[FTCDigitsValueFilter alloc] initWithMaxLength:maskConfig.countMaskCharacters];
@@ -34,12 +34,6 @@ + (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithFormat:(NSString *)format
 	return formattingConfig;
 }
 
-+ (FTCTextEntryFormattingConfig *)mobilePhoneConfigWithMask:(NSString *)mask
-                                                   maskChar:(unichar)maskChar
-{
-	return [self mobilePhoneConfigWithFormat:[NSString stringWithFormat:@"%c%@", maskChar, mask]];
-}
-
 + (FTCTextEntryFormattingConfig *)moneyConfigWithCurrency:(nullable NSString *)currency onlyIntegral:(BOOL)onlyIntegral
 {
 	__auto_type formattingConfig = [[FTCTextEntryFormattingConfig alloc] init];

UnitTests/Formatters/FTCMaskFormatter/FTCMaskFormatterTestCase.m

@@ -35,12 +35,12 @@ - (void)setUp
 {
 	[super setUp];
 
-	FTCMaskFormatterGenericConfig *configWithCutTail = [[FTCMaskFormatterGenericConfig alloc] initWithFormat:@"__ _ _ _ _"];
+	FTCMaskFormatterGenericConfig *configWithCutTail = [[FTCMaskFormatterGenericConfig alloc] initWithMask:@"_ _ _ _ _" maskCharacter:@"_"];
 	configWithCutTail.cutTail = YES;
 
 	formatterWithCutTail = [[FTCMaskFormatter alloc] initWithConfig:configWithCutTail];
 
-	FTCMaskFormatterGenericConfig *configWithoutCutTail = [[FTCMaskFormatterGenericConfig alloc] initWithFormat:@"__ _ _ _ _"];
+	FTCMaskFormatterGenericConfig *configWithoutCutTail = [[FTCMaskFormatterGenericConfig alloc] initWithMask:@"_ _ _ _ _" maskCharacter:@"_"];
 	configWithoutCutTail.cutTail = NO;
 
 	formatterWithoutCutTail = [[FTCMaskFormatter alloc] initWithConfig:configWithoutCutTail];