From 64d68447647aec59c7239f94a6c65033463f50e9 Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Fri, 5 Jul 2019 10:34:10 +0900 Subject: [PATCH] removeNonASCII at AddRecipient, EditRecipient, KYC1, KYC2 --- GME Remit.xcodeproj/project.pbxproj | 4 ++++ GMERemittance/Extension/UITextField+Ext.swift | 17 +++++++++++++++++ .../View/kycForm1ViewController.swift | 17 ++++++++++++++++- .../View/kycForm2ViewController.swift | 18 ++++++++++++++++++ .../View/AddReciepientViewController.swift | 2 ++ .../View/EditReciepientViewController.swift | 2 ++ 6 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 GMERemittance/Extension/UITextField+Ext.swift diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 775c494a..985f79c7 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -198,6 +198,7 @@ 736A8C4A2277EB2A00337A50 /* BiometricAuthenticationNotificationViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3F2277EB2900337A50 /* BiometricAuthenticationNotificationViewInterface.swift */; }; 7384B28222CB377300DD04D9 /* GMEAlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7384B28022CB377300DD04D9 /* GMEAlertViewController.swift */; }; 7384B28322CB377300DD04D9 /* GMEAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7384B28122CB377300DD04D9 /* GMEAlertViewController.xib */; }; + 7388821922CDF20F00592960 /* UITextField+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7388821822CDF20F00592960 /* UITextField+Ext.swift */; }; 7389600A22C2F208003FEA90 /* TablePresenterModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73895FF722C2F208003FEA90 /* TablePresenterModuleInterface.swift */; }; 7389600B22C2F208003FEA90 /* TablePresenterServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73895FFB22C2F208003FEA90 /* TablePresenterServiceType.swift */; }; 7389600C22C2F208003FEA90 /* TablePresenterService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73895FFC22C2F208003FEA90 /* TablePresenterService.swift */; }; @@ -2359,6 +2360,7 @@ 736A8C3F2277EB2900337A50 /* BiometricAuthenticationNotificationViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationViewInterface.swift; sourceTree = ""; }; 7384B28022CB377300DD04D9 /* GMEAlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GMEAlertViewController.swift; sourceTree = ""; }; 7384B28122CB377300DD04D9 /* GMEAlertViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GMEAlertViewController.xib; sourceTree = ""; }; + 7388821822CDF20F00592960 /* UITextField+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Ext.swift"; sourceTree = ""; }; 73895FF722C2F208003FEA90 /* TablePresenterModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePresenterModuleInterface.swift; sourceTree = ""; }; 73895FFB22C2F208003FEA90 /* TablePresenterServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePresenterServiceType.swift; sourceTree = ""; }; 73895FFC22C2F208003FEA90 /* TablePresenterService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePresenterService.swift; sourceTree = ""; }; @@ -4495,6 +4497,7 @@ D95B7042213F9A2C0053CC3D /* CALayerExtension.swift */, D96BD1222164870C00DFE7D8 /* DateFormatterExtension.swift */, BE4B1C96227C926700E923E8 /* NSError+Ext.swift */, + 7388821822CDF20F00592960 /* UITextField+Ext.swift */, ); path = Extension; sourceTree = ""; @@ -13862,6 +13865,7 @@ D92E656A222620A0004D1B3D /* SendMoneyCodeInteractorIO.swift in Sources */, D950BEDE215496F6008367A1 /* HomeRemainingLimitTableViewCell.swift in Sources */, 73071ACC2296CF9B008840FD /* HotLineViewController.swift in Sources */, + 7388821922CDF20F00592960 /* UITextField+Ext.swift in Sources */, 731154CE227C430C00FEBF7F /* Branch.swift in Sources */, D922D98721351AAE00D43053 /* SendMoneyExchangeRateInteractorIO.swift in Sources */, 7389601122C2F208003FEA90 /* TablePresenterWireframe.swift in Sources */, diff --git a/GMERemittance/Extension/UITextField+Ext.swift b/GMERemittance/Extension/UITextField+Ext.swift new file mode 100644 index 00000000..ff729cc1 --- /dev/null +++ b/GMERemittance/Extension/UITextField+Ext.swift @@ -0,0 +1,17 @@ +// +// UITextField+Ext.swift +// GME Remit +// +// Created by InKwon Devik Kim on 04/07/2019. +// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import UIKit + +extension UITextField { + func removeNonASCII(){ + guard let inputText = text else { return } + + text = inputText.filter{$0.isASCII} + } +} diff --git a/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift b/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift index 1c30ceac..2f44f3d9 100644 --- a/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift +++ b/GMERemittance/Module/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift @@ -236,8 +236,9 @@ class KycForm1ViewController: UIViewController { self.setupDatePicker() self.setupEmail() configureLanguage() + removeNonASCII(textFields: [firstNameTextField, mobileNumberTextField, countryTextField, referralCodeTextField]) } - + private func configureLanguage() { self.headerTItleLabel.text = "personal_subtitle_text".localized() self.fullnameTitleLabel.text = StringConstants().fullname @@ -628,3 +629,17 @@ extension KycForm1ViewController: TablePresenterDelegate { } } + + +extension KycForm1ViewController { + private func removeNonASCII(textFields: [UITextField]) { + textFields.forEach { + $0.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged) + + } + } + + @objc private func editingChanged(_ textField: UITextField) { + textField.removeNonASCII() + } +} diff --git a/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift b/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift index 3dfd5dc6..27e156dd 100644 --- a/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift +++ b/GMERemittance/Module/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift @@ -254,6 +254,12 @@ class KycForm2ViewController: UIViewController { setupDelegates() setupHiddenFields() configureLanugage() + + removeNonASCII( + textFields: [ + accountNumberTextField, verificationIdTextField + ] + ) } private func configureLanugage() { @@ -607,3 +613,15 @@ extension KycForm2ViewController: TablePresenterDelegate { } } + +extension KycForm2ViewController { + private func removeNonASCII(textFields: [UITextField]) { + textFields.forEach { + $0.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged) + } + } + + @objc private func editingChanged(_ textField: UITextField) { + textField.removeNonASCII() + } +} diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift index bc78f21b..aa830ca9 100644 --- a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift +++ b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift @@ -222,6 +222,8 @@ class AddReciepientViewController: UIViewController { } @objc private func textFieldChanged(sender: UITextField) { + sender.removeNonASCII() + switch sender { case firstNameTextField: self.reciepient?.firstName = firstNameTextField.text! diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift index 8e8ec489..551c4ab7 100644 --- a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift +++ b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift @@ -207,6 +207,8 @@ class EditReciepientViewController: UIViewController { } @objc private func textFieldChanged(sender: UITextField) { + sender.removeNonASCII() + switch sender { case firstNameTextField: self.reciepient?.firstName = firstNameTextField.text!