From 4c6979d88c1a98931a6f3175247c9d60331e47f6 Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Wed, 4 Dec 2019 15:01:29 +0900 Subject: [PATCH] add step4, step5 --- GME Remit.xcodeproj/project.pbxproj | 216 +++++++++++++ GME Remit/.DS_Store | Bin 6148 -> 6148 bytes .../View/NewRegister.storyboard | 303 +++++++++++++----- .../Wireframe/NewRegisterWireframe.swift | 38 ++- .../View/NewRegisterStep2.storyboard | 2 +- .../View/NewRegisterStep2ViewController.swift | 2 +- .../View/NewRegisterStep3.storyboard | 4 +- .../View/NewRegisterStep3ViewController.swift | 5 +- .../NewRegisterStep4Interactor.swift | 30 ++ .../NewRegisterStep4InteractorIO.swift | 15 + .../Service/NewRegisterStep4Service.swift | 13 + .../Service/NewRegisterStep4ServiceType.swift | 11 + .../Presenter/NewRegisterStep4Presenter.swift | 39 +++ .../View/NewRegisterStep4.storyboard | 128 ++++++++ .../View/NewRegisterStep4ViewController.swift | 79 +++++ .../Wireframe/NewRegisterStep4Wireframe.swift | 42 +++ .../NewRegisterStep4WireframeInput.swift | 13 + .../NewRegisterStep5Interactor.swift | 30 ++ .../NewRegisterStep5InteractorIO.swift | 15 + .../Service/NewRegisterStep5Service.swift | 13 + .../Service/NewRegisterStep5ServiceType.swift | 11 + .../Presenter/NewRegisterStep5Presenter.swift | 39 +++ .../View/NewRegisterStep5.storyboard | 194 +++++++++++ .../View/NewRegisterStep5ViewController.swift | 84 +++++ .../Wireframe/NewRegisterStep5Wireframe.swift | 42 +++ .../NewRegisterStep5WireframeInput.swift | 13 + .../View/InboundPennyTestSubmit.storyboard | 2 +- 27 files changed, 1288 insertions(+), 95 deletions(-) create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/Application Logic/Interactor/NewRegisterStep4Interactor.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/Application Logic/Interactor/NewRegisterStep4InteractorIO.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/Application Logic/Service/NewRegisterStep4Service.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/Application Logic/Service/NewRegisterStep4ServiceType.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/User Interface/Presenter/NewRegisterStep4Presenter.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/User Interface/View/NewRegisterStep4.storyboard create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/User Interface/View/NewRegisterStep4ViewController.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/User Interface/Wireframe/NewRegisterStep4Wireframe.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep4/User Interface/Wireframe/NewRegisterStep4WireframeInput.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/Application Logic/Interactor/NewRegisterStep5Interactor.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/Application Logic/Interactor/NewRegisterStep5InteractorIO.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/Application Logic/Service/NewRegisterStep5Service.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/Application Logic/Service/NewRegisterStep5ServiceType.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/User Interface/Presenter/NewRegisterStep5Presenter.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/User Interface/View/NewRegisterStep5.storyboard create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/User Interface/View/NewRegisterStep5ViewController.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/User Interface/Wireframe/NewRegisterStep5Wireframe.swift create mode 100644 GME Remit/Modules/RegisterModules/NewRegisterStep5/User Interface/Wireframe/NewRegisterStep5WireframeInput.swift diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 7395470a..e0031da6 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -554,6 +554,24 @@ 73EC6C18236984B200060448 /* InternationalTopupWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73EC6C0E236984B100060448 /* InternationalTopupWireframeInput.swift */; }; 73EC6C19236984B200060448 /* InternationalTopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73EC6C10236984B100060448 /* InternationalTopupViewController.swift */; }; 73EC6C1A236984B200060448 /* InternationalTopup.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73EC6C11236984B100060448 /* InternationalTopup.storyboard */; }; + 73F77275239749DF00E22A82 /* NewRegisterStep4ServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F77267239749DF00E22A82 /* NewRegisterStep4ServiceType.swift */; }; + 73F77276239749DF00E22A82 /* NewRegisterStep4Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F77268239749DF00E22A82 /* NewRegisterStep4Service.swift */; }; + 73F77277239749DF00E22A82 /* NewRegisterStep4InteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7726A239749DF00E22A82 /* NewRegisterStep4InteractorIO.swift */; }; + 73F77278239749DF00E22A82 /* NewRegisterStep4Interactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7726B239749DF00E22A82 /* NewRegisterStep4Interactor.swift */; }; + 73F77279239749DF00E22A82 /* NewRegisterStep4Presenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7726E239749DF00E22A82 /* NewRegisterStep4Presenter.swift */; }; + 73F7727A239749DF00E22A82 /* NewRegisterStep4Wireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F77270239749DF00E22A82 /* NewRegisterStep4Wireframe.swift */; }; + 73F7727B239749DF00E22A82 /* NewRegisterStep4WireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F77271239749DF00E22A82 /* NewRegisterStep4WireframeInput.swift */; }; + 73F7727C239749DF00E22A82 /* NewRegisterStep4ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F77273239749DF00E22A82 /* NewRegisterStep4ViewController.swift */; }; + 73F7727D239749DF00E22A82 /* NewRegisterStep4.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73F77274239749DF00E22A82 /* NewRegisterStep4.storyboard */; }; + 73F7729223976CC800E22A82 /* NewRegisterStep5ServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728423976CC800E22A82 /* NewRegisterStep5ServiceType.swift */; }; + 73F7729323976CC800E22A82 /* NewRegisterStep5Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728523976CC800E22A82 /* NewRegisterStep5Service.swift */; }; + 73F7729423976CC800E22A82 /* NewRegisterStep5InteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728723976CC800E22A82 /* NewRegisterStep5InteractorIO.swift */; }; + 73F7729523976CC800E22A82 /* NewRegisterStep5Interactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728823976CC800E22A82 /* NewRegisterStep5Interactor.swift */; }; + 73F7729623976CC800E22A82 /* NewRegisterStep5Presenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728B23976CC800E22A82 /* NewRegisterStep5Presenter.swift */; }; + 73F7729723976CC800E22A82 /* NewRegisterStep5Wireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728D23976CC800E22A82 /* NewRegisterStep5Wireframe.swift */; }; + 73F7729823976CC800E22A82 /* NewRegisterStep5WireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7728E23976CC800E22A82 /* NewRegisterStep5WireframeInput.swift */; }; + 73F7729923976CC800E22A82 /* NewRegisterStep5.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73F7729023976CC800E22A82 /* NewRegisterStep5.storyboard */; }; + 73F7729A23976CC800E22A82 /* NewRegisterStep5ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F7729123976CC800E22A82 /* NewRegisterStep5ViewController.swift */; }; 73FDCE1D225C167700CC6912 /* KeyChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73FDCE1C225C167700CC6912 /* KeyChain.swift */; }; 73FE8837228A4A8C00A5EB56 /* OrderHistoryModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73FE8824228A4A8C00A5EB56 /* OrderHistoryModuleInterface.swift */; }; 73FE8838228A4A8C00A5EB56 /* OrderHistoryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73FE8828228A4A8C00A5EB56 /* OrderHistoryService.swift */; }; @@ -2948,6 +2966,24 @@ 73EC6C0E236984B100060448 /* InternationalTopupWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InternationalTopupWireframeInput.swift; sourceTree = ""; }; 73EC6C10236984B100060448 /* InternationalTopupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InternationalTopupViewController.swift; sourceTree = ""; }; 73EC6C11236984B100060448 /* InternationalTopup.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = InternationalTopup.storyboard; sourceTree = ""; }; + 73F77267239749DF00E22A82 /* NewRegisterStep4ServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4ServiceType.swift; sourceTree = ""; }; + 73F77268239749DF00E22A82 /* NewRegisterStep4Service.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4Service.swift; sourceTree = ""; }; + 73F7726A239749DF00E22A82 /* NewRegisterStep4InteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4InteractorIO.swift; sourceTree = ""; }; + 73F7726B239749DF00E22A82 /* NewRegisterStep4Interactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4Interactor.swift; sourceTree = ""; }; + 73F7726E239749DF00E22A82 /* NewRegisterStep4Presenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4Presenter.swift; sourceTree = ""; }; + 73F77270239749DF00E22A82 /* NewRegisterStep4Wireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4Wireframe.swift; sourceTree = ""; }; + 73F77271239749DF00E22A82 /* NewRegisterStep4WireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4WireframeInput.swift; sourceTree = ""; }; + 73F77273239749DF00E22A82 /* NewRegisterStep4ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep4ViewController.swift; sourceTree = ""; }; + 73F77274239749DF00E22A82 /* NewRegisterStep4.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NewRegisterStep4.storyboard; sourceTree = ""; }; + 73F7728423976CC800E22A82 /* NewRegisterStep5ServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5ServiceType.swift; sourceTree = ""; }; + 73F7728523976CC800E22A82 /* NewRegisterStep5Service.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5Service.swift; sourceTree = ""; }; + 73F7728723976CC800E22A82 /* NewRegisterStep5InteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5InteractorIO.swift; sourceTree = ""; }; + 73F7728823976CC800E22A82 /* NewRegisterStep5Interactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5Interactor.swift; sourceTree = ""; }; + 73F7728B23976CC800E22A82 /* NewRegisterStep5Presenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5Presenter.swift; sourceTree = ""; }; + 73F7728D23976CC800E22A82 /* NewRegisterStep5Wireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5Wireframe.swift; sourceTree = ""; }; + 73F7728E23976CC800E22A82 /* NewRegisterStep5WireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5WireframeInput.swift; sourceTree = ""; }; + 73F7729023976CC800E22A82 /* NewRegisterStep5.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NewRegisterStep5.storyboard; sourceTree = ""; }; + 73F7729123976CC800E22A82 /* NewRegisterStep5ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep5ViewController.swift; sourceTree = ""; }; 73FDCE1C225C167700CC6912 /* KeyChain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyChain.swift; sourceTree = ""; }; 73FE8824228A4A8C00A5EB56 /* OrderHistoryModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryModuleInterface.swift; sourceTree = ""; }; 73FE8828228A4A8C00A5EB56 /* OrderHistoryService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderHistoryService.swift; sourceTree = ""; }; @@ -5869,6 +5905,8 @@ 735F68E62394CD6B00A2DBC8 /* NewRegisterStep1 */, 737FB6592395EF3500EA4AED /* NewRegisterStep2 */, 737FB6762396363000EA4AED /* NewRegisterStep3 */, + 73F77263239749DF00E22A82 /* NewRegisterStep4 */, + 73F7728023976CC800E22A82 /* NewRegisterStep5 */, D96A4FE12146625C00CFD507 /* Register */, 04E36E0421AE585100783685 /* PennyTestSubmit */, 043770D221AD04240005B22D /* PennyTest */, @@ -8630,6 +8668,166 @@ path = LocalTopup; sourceTree = ""; }; + 73F77263239749DF00E22A82 /* NewRegisterStep4 */ = { + isa = PBXGroup; + children = ( + 73F77264239749DF00E22A82 /* Application Logic */, + 73F7726C239749DF00E22A82 /* User Interface */, + ); + path = NewRegisterStep4; + sourceTree = ""; + }; + 73F77264239749DF00E22A82 /* Application Logic */ = { + isa = PBXGroup; + children = ( + 73F77265239749DF00E22A82 /* Model */, + 73F77266239749DF00E22A82 /* Service */, + 73F77269239749DF00E22A82 /* Interactor */, + ); + path = "Application Logic"; + sourceTree = ""; + }; + 73F77265239749DF00E22A82 /* Model */ = { + isa = PBXGroup; + children = ( + ); + path = Model; + sourceTree = ""; + }; + 73F77266239749DF00E22A82 /* Service */ = { + isa = PBXGroup; + children = ( + 73F77267239749DF00E22A82 /* NewRegisterStep4ServiceType.swift */, + 73F77268239749DF00E22A82 /* NewRegisterStep4Service.swift */, + ); + path = Service; + sourceTree = ""; + }; + 73F77269239749DF00E22A82 /* Interactor */ = { + isa = PBXGroup; + children = ( + 73F7726A239749DF00E22A82 /* NewRegisterStep4InteractorIO.swift */, + 73F7726B239749DF00E22A82 /* NewRegisterStep4Interactor.swift */, + ); + path = Interactor; + sourceTree = ""; + }; + 73F7726C239749DF00E22A82 /* User Interface */ = { + isa = PBXGroup; + children = ( + 73F7726D239749DF00E22A82 /* Presenter */, + 73F7726F239749DF00E22A82 /* Wireframe */, + 73F77272239749DF00E22A82 /* View */, + ); + path = "User Interface"; + sourceTree = ""; + }; + 73F7726D239749DF00E22A82 /* Presenter */ = { + isa = PBXGroup; + children = ( + 73F7726E239749DF00E22A82 /* NewRegisterStep4Presenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + 73F7726F239749DF00E22A82 /* Wireframe */ = { + isa = PBXGroup; + children = ( + 73F77270239749DF00E22A82 /* NewRegisterStep4Wireframe.swift */, + 73F77271239749DF00E22A82 /* NewRegisterStep4WireframeInput.swift */, + ); + path = Wireframe; + sourceTree = ""; + }; + 73F77272239749DF00E22A82 /* View */ = { + isa = PBXGroup; + children = ( + 73F77273239749DF00E22A82 /* NewRegisterStep4ViewController.swift */, + 73F77274239749DF00E22A82 /* NewRegisterStep4.storyboard */, + ); + path = View; + sourceTree = ""; + }; + 73F7728023976CC800E22A82 /* NewRegisterStep5 */ = { + isa = PBXGroup; + children = ( + 73F7728123976CC800E22A82 /* Application Logic */, + 73F7728923976CC800E22A82 /* User Interface */, + ); + path = NewRegisterStep5; + sourceTree = ""; + }; + 73F7728123976CC800E22A82 /* Application Logic */ = { + isa = PBXGroup; + children = ( + 73F7728223976CC800E22A82 /* Model */, + 73F7728323976CC800E22A82 /* Service */, + 73F7728623976CC800E22A82 /* Interactor */, + ); + path = "Application Logic"; + sourceTree = ""; + }; + 73F7728223976CC800E22A82 /* Model */ = { + isa = PBXGroup; + children = ( + ); + path = Model; + sourceTree = ""; + }; + 73F7728323976CC800E22A82 /* Service */ = { + isa = PBXGroup; + children = ( + 73F7728423976CC800E22A82 /* NewRegisterStep5ServiceType.swift */, + 73F7728523976CC800E22A82 /* NewRegisterStep5Service.swift */, + ); + path = Service; + sourceTree = ""; + }; + 73F7728623976CC800E22A82 /* Interactor */ = { + isa = PBXGroup; + children = ( + 73F7728723976CC800E22A82 /* NewRegisterStep5InteractorIO.swift */, + 73F7728823976CC800E22A82 /* NewRegisterStep5Interactor.swift */, + ); + path = Interactor; + sourceTree = ""; + }; + 73F7728923976CC800E22A82 /* User Interface */ = { + isa = PBXGroup; + children = ( + 73F7728A23976CC800E22A82 /* Presenter */, + 73F7728C23976CC800E22A82 /* Wireframe */, + 73F7728F23976CC800E22A82 /* View */, + ); + path = "User Interface"; + sourceTree = ""; + }; + 73F7728A23976CC800E22A82 /* Presenter */ = { + isa = PBXGroup; + children = ( + 73F7728B23976CC800E22A82 /* NewRegisterStep5Presenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + 73F7728C23976CC800E22A82 /* Wireframe */ = { + isa = PBXGroup; + children = ( + 73F7728D23976CC800E22A82 /* NewRegisterStep5Wireframe.swift */, + 73F7728E23976CC800E22A82 /* NewRegisterStep5WireframeInput.swift */, + ); + path = Wireframe; + sourceTree = ""; + }; + 73F7728F23976CC800E22A82 /* View */ = { + isa = PBXGroup; + children = ( + 73F7729023976CC800E22A82 /* NewRegisterStep5.storyboard */, + 73F7729123976CC800E22A82 /* NewRegisterStep5ViewController.swift */, + ); + path = View; + sourceTree = ""; + }; 73F7C592234C4FCB00176856 /* PowerCallModules */ = { isa = PBXGroup; children = ( @@ -13938,6 +14136,7 @@ D93C28A122000D640079BF03 /* iPad_transkey_alnum_cap_20.png in Resources */, D93C2BA622000D660079BF03 /* transkey_input_eng_7.png in Resources */, D93C2AF822000D650079BF03 /* transkey_navi_next_indonesian.png in Resources */, + 73F7729923976CC800E22A82 /* NewRegisterStep5.storyboard in Resources */, D93C276222000D630079BF03 /* iPhone_transkey_alnum_eng_1.png in Resources */, D93C284122000D640079BF03 /* iPad_transkey_all_delete.png in Resources */, D93C26D522000D630079BF03 /* iPhone_transkey_landscape_alnum_cmd_4_atm.png in Resources */, @@ -14610,6 +14809,7 @@ D93C297322000D650079BF03 /* iPhone_transkey_landscape_number_cmd_10_japanese_down.png in Resources */, D93C2B2C22000D650079BF03 /* iPad_transkey_landscape_number_cmd_2_indonesian_down.png in Resources */, D93C26EF22000D630079BF03 /* iPhone_transkey_landscape_alnum_cap_18.png in Resources */, + 73F7727D239749DF00E22A82 /* NewRegisterStep4.storyboard in Resources */, D93C284322000D640079BF03 /* iPad_transkey_number_key_8.png in Resources */, D93C29CF22000D650079BF03 /* iPhone_transkey_number_cmd_10_thai.png in Resources */, D93C279222000D630079BF03 /* iPhone_transkey_alnum_sym_12.png in Resources */, @@ -15576,6 +15776,7 @@ 730D788B227A94E1007E517E /* RewardServiceType.swift in Sources */, 73A621662330AD20000FFB5B /* RecentHistoriesWireframe.swift in Sources */, 730197A122535135001954AB /* kycForm3ModuleInterface.swift in Sources */, + 73F7727A239749DF00E22A82 /* NewRegisterStep4Wireframe.swift in Sources */, 9FD260F81FD00458007A511D /* AppDelegate.swift in Sources */, D903113E214786EA00AD5BA9 /* ForgotPasswordService.swift in Sources */, 7301979222535135001954AB /* KycWireframeInput.swift in Sources */, @@ -15590,6 +15791,7 @@ 73B4C8C022A5F2440078D495 /* SelectCouponInteractor.swift in Sources */, 7389600C22C2F208003FEA90 /* TablePresenterService.swift in Sources */, D903113C214786EA00AD5BA9 /* ForgotPasswordModuleInterface.swift in Sources */, + 73F77275239749DF00E22A82 /* NewRegisterStep4ServiceType.swift in Sources */, 730D78BD227A94F2007E517E /* SearchAddressViewInterface.swift in Sources */, 736A8C462277EB2A00337A50 /* BiometricNotificationWireframeInput.swift in Sources */, BEC9B003224FC49C00A2DA06 /* BiometricAuthenticationWireframeInput.swift in Sources */, @@ -15762,7 +15964,9 @@ D903113F214786EA00AD5BA9 /* ForgotPasswordInteractor.swift in Sources */, 73157BA422DC1EEC009B836F /* PopupNotificationViewController.swift in Sources */, D962230C212BD7A100B7A115 /* Array+Ext.swift in Sources */, + 73F7727C239749DF00E22A82 /* NewRegisterStep4ViewController.swift in Sources */, 73157B9B22DC1EEC009B836F /* PopupNotificationModuleInterface.swift in Sources */, + 73F7729623976CC800E22A82 /* NewRegisterStep5Presenter.swift in Sources */, D96848CE212D419400EF12B1 /* ApiServiceType.swift in Sources */, 737FB68B2396363100EA4AED /* NewRegisterStep3Interactor.swift in Sources */, 043770EA21AD04240005B22D /* PennyTestInteractor.swift in Sources */, @@ -15788,6 +15992,7 @@ 736A8C432277EB2A00337A50 /* BiometricNotificationInteractor.swift in Sources */, D95B5E3921311057000C0B33 /* GmeContactsModuleInterface.swift in Sources */, 7313872322E68F4C0095ACEB /* ScrollableSegmentedControl.swift in Sources */, + 73F7729223976CC800E22A82 /* NewRegisterStep5ServiceType.swift in Sources */, 73AEFF712334A13100A967FB /* TransactionHistoryGroupServiceType.swift in Sources */, 733A3B9B23554DAF00E6B87E /* RechargePaymentPresenter.swift in Sources */, D922D98921351AAE00D43053 /* SendMoneyExchangeRatePresenter.swift in Sources */, @@ -15842,6 +16047,7 @@ BEC9AFFF224FC49C00A2DA06 /* BiometricAuthenticationInteractorIO.swift in Sources */, 73185314230E19DD00BA9AE3 /* ValidateAccountRequest.swift in Sources */, D9B7ADF32130048E009B0564 /* ExchangeRatesInteractorIO.swift in Sources */, + 73F7727B239749DF00E22A82 /* NewRegisterStep4WireframeInput.swift in Sources */, 73911157237A6DB400697D27 /* InboundAccountsServiceType.swift in Sources */, 73B6D6922306430200A0CB6E /* FetchRecipientsModel.swift in Sources */, D922D98421351AAE00D43053 /* SendMoneyExchangeRateModuleInterface.swift in Sources */, @@ -15861,6 +16067,7 @@ 73B4C8C122A5F2440078D495 /* SelectCouponPresenter.swift in Sources */, D922D9662135145F00D43053 /* SendMoneyParentInteractorIO.swift in Sources */, D92B802B2140C3CB00A25B26 /* MainWireframeInput.swift in Sources */, + 73F7729A23976CC800E22A82 /* NewRegisterStep5ViewController.swift in Sources */, 9FA00FBE1FEE69AF0049753E /* UIView+Ext.swift in Sources */, 730D78B5227A94F2007E517E /* JusoContainer.swift in Sources */, 739045B82378FC9500CD5D8A /* AddInboundAccountWireframe.swift in Sources */, @@ -15930,6 +16137,7 @@ D950BEDA21549242008367A1 /* HomeViewController.swift in Sources */, FF6E7D9821BF951D00A003B9 /* AppUpdateWireframeInput.swift in Sources */, D96A4FDE21460B4A00CFD507 /* SplashScreenViewController.swift in Sources */, + 73F7729523976CC800E22A82 /* NewRegisterStep5Interactor.swift in Sources */, D9DC107921639078008F3C51 /* MessageComposeServiceType.swift in Sources */, 73911179237AA3C300697D27 /* InboundPennyTestSubmitService.swift in Sources */, D92B80252140C3CB00A25B26 /* MainModuleInterface.swift in Sources */, @@ -15951,6 +16159,7 @@ 73A6213E2330742C000FFB5B /* DomesticRemitWireframeInputOutput.swift in Sources */, 734BF6872353F7D8004E8D60 /* PhoneCardRechargeWireframe.swift in Sources */, 73469F982293C1B00062946B /* SelectPaymentModuleInterface.swift in Sources */, + 73F7729723976CC800E22A82 /* NewRegisterStep5Wireframe.swift in Sources */, 042E6EFD203EAF95004667A1 /* SideMenuViewController.swift in Sources */, 73AEFF792334A13100A967FB /* TransactionHistoryGroupViewModel.swift in Sources */, 731B2832238BAC5600B392A5 /* DeleteInbound.swift in Sources */, @@ -15973,6 +16182,7 @@ 735F68F82394CD6B00A2DBC8 /* NewRegisterStep1ServiceType.swift in Sources */, 735F68FE2394CD6B00A2DBC8 /* NewRegisterStep1WireframeInput.swift in Sources */, 738714B5237CE86E0038FCB1 /* InboundReceiptInteractor.swift in Sources */, + 73F77278239749DF00E22A82 /* NewRegisterStep4Interactor.swift in Sources */, D922D9692135145F00D43053 /* SendMoneyParentWireframeInput.swift in Sources */, D946719821426DFB003924DB /* LoginInteractor.swift in Sources */, 04546C4120329A36007EFE15 /* AboutGMEViewController.swift in Sources */, @@ -15998,6 +16208,7 @@ 7391117F237AA3C300697D27 /* InboundPennyTestSubmitWireframeInput.swift in Sources */, 73549BB8236FDD5600AD75D2 /* RechargeHistoryWireframe.swift in Sources */, D922D9652135145F00D43053 /* SendMoneyParentInteractor.swift in Sources */, + 73F7729423976CC800E22A82 /* NewRegisterStep5InteractorIO.swift in Sources */, 73157BA222DC1EEC009B836F /* PopupNotificationWireframeInput.swift in Sources */, 73071ACB2296CF9B008840FD /* HotLineWireframe.swift in Sources */, 7301978F22535135001954AB /* KycInteractorIO.swift in Sources */, @@ -16009,6 +16220,7 @@ 730197AB22535135001954AB /* kycForm3ViewController.swift in Sources */, 73976D202331B4F4003CF5E1 /* UIImageView+Ext.swift in Sources */, 0496B84F1FE7DFCD0044810E /* String+Ext.swift in Sources */, + 73F7729323976CC800E22A82 /* NewRegisterStep5Service.swift in Sources */, 735F68E32394A76800A2DBC8 /* NewRegisterViewController.swift in Sources */, D9B7ADF52130048E009B0564 /* ExchangeRatesPresenter.swift in Sources */, 73A6E20422CEE51600E9BC68 /* BadgeLabel.swift in Sources */, @@ -16109,6 +16321,7 @@ D950BED421549242008367A1 /* HomeInteractorIO.swift in Sources */, 73FE8840228A4A8C00A5EB56 /* OrderHistoryViewController.swift in Sources */, D922D98D21351AAE00D43053 /* SendMoneyExchangeRateViewInterface.swift in Sources */, + 73F77276239749DF00E22A82 /* NewRegisterStep4Service.swift in Sources */, 73195AB622FD14D500151434 /* SetupRecipientInteractor.swift in Sources */, 7389600A22C2F208003FEA90 /* TablePresenterModuleInterface.swift in Sources */, 733D910222EEB658006B5E80 /* kycForm1WireframeOutput.swift in Sources */, @@ -16197,6 +16410,7 @@ 739A7785228BB2B40018A1A9 /* DetailOrderInteractorIO.swift in Sources */, 73B6D68A2306406D00A0CB6E /* AgentModel.swift in Sources */, 73EC6C16236984B200060448 /* InternationalTopupPresenter.swift in Sources */, + 73F77277239749DF00E22A82 /* NewRegisterStep4InteractorIO.swift in Sources */, 730D78B7227A94F2007E517E /* SearchAddressService.swift in Sources */, D92B80272140C3CB00A25B26 /* MainServiceType.swift in Sources */, 73549BB6236FDD5600AD75D2 /* RechargeHistoryPresenter.swift in Sources */, @@ -16216,6 +16430,7 @@ 73BCCDD3228993040057B161 /* RewardGroupInteractorIO.swift in Sources */, D95B7047213FB5F10053CC3D /* WebLinksViewController.swift in Sources */, 73071AAB2296BE6C008840FD /* HotLine.swift in Sources */, + 73F7729823976CC800E22A82 /* NewRegisterStep5WireframeInput.swift in Sources */, 73071AC82296CF9B008840FD /* HotLineInteractor.swift in Sources */, 738714BB237CE86E0038FCB1 /* InboundReceiptViewController.swift in Sources */, D92E656A222620A0004D1B3D /* SendMoneyCodeInteractorIO.swift in Sources */, @@ -16281,6 +16496,7 @@ 73195AB822FD14D500151434 /* SetupRecipientWireframe.swift in Sources */, D9DC108021639078008F3C51 /* MessageComposeViewController.swift in Sources */, 7301979D22535135001954AB /* kycForm1WireframeInput.swift in Sources */, + 73F77279239749DF00E22A82 /* NewRegisterStep4Presenter.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/GME Remit/.DS_Store b/GME Remit/.DS_Store index 1238ee753deda59f0add562e28e47c21a2d593c1..25f2c32f3c1bc6e55ae7611b7684211c9ac9b1c1 100644 GIT binary patch delta 43 zcmZoMXfc@J&&a(oU^g=(_hcTHHL{3)OlDzo+WeBmoM|&V$6tN`AubH^ delta 31 ncmZoMXfc@J&&ahgU^g=(*JK`+H=FOXYA{V~c)ppP<1aq|sfY_R diff --git a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegister.storyboard b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegister.storyboard index 3c6b35c9..5af3a11a 100644 --- a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegister.storyboard +++ b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegister.storyboard @@ -1,6 +1,6 @@ - + @@ -12,6 +12,9 @@ SanFranciscoDisplay-Medium + + SanFranciscoDisplay-Regular + @@ -19,94 +22,219 @@ - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + @@ -125,20 +253,27 @@ + + + - + - + + + + + - + @@ -146,7 +281,7 @@ - + @@ -170,9 +305,15 @@ + + + + + + diff --git a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift index ade772c3..4a232d77 100644 --- a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift +++ b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift @@ -14,6 +14,11 @@ class NewRegisterWireframe { weak var view: UIViewController! private var stepper: BehaviorSubject? + private var step1VC: UIViewController! + private var step2VC: UIViewController! + private var step3VC: UIViewController! + private var step4VC: UIViewController! + private var step5VC: UIViewController! } extension NewRegisterWireframe: NewRegisterWireframeInput { @@ -21,6 +26,12 @@ extension NewRegisterWireframe: NewRegisterWireframeInput { var storyboardName: String {return "NewRegister"} func getMainView() -> UIViewController { + step1VC = NewRegisterStep1Wireframe().getMainView(with: self) + step2VC = NewRegisterStep2Wireframe().getMainView(with: self) + step3VC = NewRegisterStep3Wireframe().getMainView(with: self) + step4VC = NewRegisterStep4Wireframe().getMainView(with: self) + step5VC = NewRegisterStep5Wireframe().getMainView(with: self) + let service = NewRegisterService() let interactor = NewRegisterInteractor(service: service) let presenter = NewRegisterPresenter() @@ -40,15 +51,26 @@ extension NewRegisterWireframe: NewRegisterWireframeInput { func moveStep(to step: NewRegisterViewController.Step) { switch step { - case .first: - let step1 = NewRegisterStep1Wireframe().getMainView(with: self) - move(step1) - case .second: - let step2 = NewRegisterStep2Wireframe().getMainView(with: self) - move(step2) + case .first: move(step1VC) + case .second: move(step2VC) + case .third: move(step3VC) + case .fourth: move(step4VC) + case .fifth: move(step5VC) case .finish: - let step3 = NewRegisterStep3Wireframe().getMainView(with: self) - move(step3) + let message = """ +Thank you for registering for GME. +We are verifying your information. + +Once approved, you will receive SMS. +""" + view.alertWithOk( + type: .success, + message: message, + title: "Success", + okTitle: "Ok" + ) {[weak self] in + self?.view.navigationController?.popToRootViewController(animated: false) + } } } diff --git a/GME Remit/Modules/RegisterModules/NewRegisterStep2/User Interface/View/NewRegisterStep2.storyboard b/GME Remit/Modules/RegisterModules/NewRegisterStep2/User Interface/View/NewRegisterStep2.storyboard index a685a857..5b5a0ec5 100644 --- a/GME Remit/Modules/RegisterModules/NewRegisterStep2/User Interface/View/NewRegisterStep2.storyboard +++ b/GME Remit/Modules/RegisterModules/NewRegisterStep2/User Interface/View/NewRegisterStep2.storyboard @@ -199,7 +199,7 @@ -