diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index e4207f01..9bdac733 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -16728,7 +16728,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 5QB497ZAGT; ENABLE_BITCODE = NO; @@ -16743,7 +16743,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 2.9.1; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.gme.gmeremit; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -16763,7 +16763,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 5QB497ZAGT; ENABLE_BITCODE = NO; @@ -16779,7 +16779,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 2.9.1; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.gme.gmeremit; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/GME Remit/Extensions/UITextField+Ext.swift b/GME Remit/Extensions/UITextField+Ext.swift index 40a914c3..1ff30914 100644 --- a/GME Remit/Extensions/UITextField+Ext.swift +++ b/GME Remit/Extensions/UITextField+Ext.swift @@ -11,6 +11,7 @@ import RxSwift import RxCocoa public enum GMEKeyboardType: String { + case uppercaseAlphabet = "UA" case alphabet = "A" case alphabetNumberic = "AN" case alphabetNumbericSpecial = "ANS" @@ -23,6 +24,7 @@ extension UITextField { let extractText: String? switch type { + case .uppercaseAlphabet: extractText = text?.uppercased().extract(regex: "[A-Z\\s]") case .alphabet: extractText = text?.extract(regex: "[A-Za-z\\s]") case .alphabetNumberic: extractText = text?.extract(regex: "[A-Z0-9a-z\\s]") case .alphabetNumbericSpecial: extractText = text?.filter { $0.isASCII } diff --git a/GME Remit/Modules/ManageAgreement/User Interface/Presenter/ManageAgreementPresenter.swift b/GME Remit/Modules/ManageAgreement/User Interface/Presenter/ManageAgreementPresenter.swift index 59269392..16f04232 100644 --- a/GME Remit/Modules/ManageAgreement/User Interface/Presenter/ManageAgreementPresenter.swift +++ b/GME Remit/Modules/ManageAgreement/User Interface/Presenter/ManageAgreementPresenter.swift @@ -42,7 +42,8 @@ class ManageAgreementPresenter: ViewModelType { input.submit.withLatestFrom(input.agreement) {$1} .asObservable().subscribe(onNext: {[weak self] in - self?.interactor?.agreement($0) + self?.progressLinker.onNext(true) + self?.interactor?.agreement($0) }).disposed(by: disposeBag) return Output( @@ -61,6 +62,7 @@ extension ManageAgreementPresenter: ManageAgreementInteractorOutput { } func resultAgreement() { + progressLinker.onNext(false) wireframe?.goNewRegistration() } diff --git a/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard b/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard index 25c62f52..8123b289 100644 --- a/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard +++ b/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard @@ -35,18 +35,18 @@ - + -