Textfield validation: save to settings if validation is OK

should improve crash recovery and lets the delegate indicate validation errors in real time;
.okWithReplacement validation results are immediately performed instead of waiting for focus loss;

Author: futuretap

.ruby-version

@@ -1 +1 @@
-3.3.2
+3.4.5

InAppSettingsKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name                  = 'InAppSettingsKit'
-	s.version               = '3.8.5'
+	s.version               = '3.8.6'
 	s.summary               = 'This iPhone framework allows settings to be in-app in addition to being in the Settings app.'
 
   s.description      = <<-DESC

InAppSettingsKitSampleApp/Classes/MainViewController.swift

@@ -75,9 +75,12 @@ extension MainViewController: IASKSettingsDelegate {
 								textField: IASKTextField,
 								previousValue: String?,
 								replacement: AutoreleasingUnsafeMutablePointer<NSString>?) -> IASKValidationResult {
-		guard let key = specifier.key else { return .ok }
+		guard let key = specifier.key,
+			  let newText = replacement?.pointee else {
+			return .ok
+		}
 		if key.starts(with: "RegexValidation") {
-			if textField.text == "" || textField.text?.range(of: #".+\@.+"#, options: .regularExpression) != nil {
+			if newText == "" || newText.range(of: #".+\@.+"#, options: .regularExpression).location != NSNotFound {
 				if #available(iOS 13.0, *) {
 					textField.textColor = .label
 				} else {
@@ -86,26 +89,26 @@ extension MainViewController: IASKSettingsDelegate {
 				return .ok
 			}
 			if key != "RegexValidation2" {
-				let myReplacement: String = ((previousValue?.lengthOfBytes(using: .utf8) ?? 0) > 0 ? previousValue : textField.text) ?? ""
+				let myReplacement: String = (previousValue?.lengthOfBytes(using: .utf8) ?? 0) > 0 ? previousValue ?? "" : newText as String
 				replacement?.pointee = myReplacement as NSString
 				return .failedWithShake
 			}
 			textField.textColor = .red
 			return .failed
-		} else if key == "account_name", let value = textField.text {
+		} else if key == "account_name" {
 			let regex = "^@?[\\w](?!.*?\\.{2})[\\w.]{1,28}[\\w]$"
-			if value.isEmpty {
-				return .okWithReplacement
-			} else if value == "@" {
+			if newText == "" {
+				return .ok
+			} else if newText == "@" {
 				replacement?.pointee = "" as NSString
 				return .failed
-			} else if value.range(of: regex, options: .regularExpression) == nil {
+			} else if newText.range(of: regex, options: .regularExpression).location == NSNotFound {
 				if let previousValue {
 					replacement?.pointee = previousValue as NSString
 					return .failedWithShake
 				}
-			} else if !value.hasPrefix("@") {
-				replacement?.pointee = "@\(value)" as NSString
+			} else if !newText.hasPrefix("@") {
+				replacement?.pointee = "@\(newText)" as NSString
 				return .okWithReplacement
 			}
 		}

Sources/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m

@@ -589,7 +589,6 @@ - (UITableViewCell*)tableView:(UITableView *)tableView newCellForSpecifier:(IASK
 	}
 	else if ([identifier hasPrefix:kIASKPSTextFieldSpecifier]) {
 		cell = [[IASKPSTextFieldSpecifierViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-		[((IASKPSTextFieldSpecifierViewCell*)cell).textField addTarget:self action:@selector(textChanged:) forControlEvents:UIControlEventEditingChanged];
 	}
 	else if ([identifier hasPrefix:kIASKTextViewSpecifier]) {
         cell = [[IASKTextViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
@@ -1181,17 +1180,32 @@ - (void)textFieldDidBeginEditing:(UITextField *)textField {
 	self.currentFirstResponder = textField;
 }
 
-- (void)textChanged:(IASKTextField*)textField {
+- (BOOL)textField:(IASKTextField*)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString*)replacementString {
+	NSString *newText = [textField.text stringByReplacingCharactersInRange:range withString:replacementString];
     // Wait with setting the property until editing ends for the addSpecifier of list groups or if a validation delegate is implemented
-    if ((!textField.specifier.isAddSpecifier && ![self.delegate respondsToSelector:@selector(settingsViewController:validateSpecifier:textField:previousValue:replacement:)]) ||
+	IASKValidationResult result = IASKValidationResultOk;
+	if ((!textField.specifier.isAddSpecifier) ||
 		(self.listParentViewController && [self.delegate respondsToSelector:@selector(settingsViewController:childPaneIsValidForSpecifier:contentDictionary:)]))
 	{
-		[self.settingsStore setObject:textField.text forSpecifier:textField.specifier];
-        NSDictionary *userInfo = textField.specifier.key && textField.text ? @{(id)textField.specifier.key : (NSString *)textField.text} : nil;
-        [NSNotificationCenter.defaultCenter postNotificationName:kIASKAppSettingChanged
-                                                          object:self
-                                                        userInfo:userInfo];
-    }
+		BOOL storeToSettings = YES;
+		if (!textField.specifier.isAddSpecifier && [self.delegate respondsToSelector:@selector(settingsViewController:validateSpecifier:textField:previousValue:replacement:)]) {
+			result = [self.delegate settingsViewController:self validateSpecifier:textField.specifier textField:textField previousValue:textField.text replacement:&newText];
+			if (result == IASKValidationResultOkWithReplacement) {
+				storeToSettings = NO;
+				textField.text = newText;
+			} else if (result != IASKValidationResultOk) {
+				storeToSettings = NO;
+			}
+		}
+		if (storeToSettings) {
+			[self.settingsStore setObject:newText forSpecifier:textField.specifier];
+			NSDictionary *userInfo = textField.specifier.key && newText ? @{(id)textField.specifier.key : newText} : nil;
+			[NSNotificationCenter.defaultCenter postNotificationName:kIASKAppSettingChanged
+															  object:self
+															userInfo:userInfo];
+		}
+	}
+	return result != IASKValidationResultOkWithReplacement;
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField{
@@ -1216,7 +1230,7 @@ - (void)textFieldDidEndEditing:(IASKTextField *)textField {
 	void (^restoreText)(void) = ^{
 		if (![textField.text isEqualToString:replacement]) {
 			textField.text = replacement;
-			[self textChanged:textField];
+			[self textField:textField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""];
 		}
 	};