diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index c9e767e8..7395470a 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -354,6 +354,15 @@ 737FB6712395EF3500EA4AED /* NewRegisterStep2WireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB6672395EF3500EA4AED /* NewRegisterStep2WireframeInput.swift */; }; 737FB6722395EF3500EA4AED /* NewRegisterStep2.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 737FB6692395EF3500EA4AED /* NewRegisterStep2.storyboard */; }; 737FB6732395EF3500EA4AED /* NewRegisterStep2ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB66A2395EF3500EA4AED /* NewRegisterStep2ViewController.swift */; }; + 737FB6882396363100EA4AED /* NewRegisterStep3Service.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB67A2396363000EA4AED /* NewRegisterStep3Service.swift */; }; + 737FB6892396363100EA4AED /* NewRegisterStep3ServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB67B2396363000EA4AED /* NewRegisterStep3ServiceType.swift */; }; + 737FB68A2396363100EA4AED /* NewRegisterStep3InteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB67D2396363000EA4AED /* NewRegisterStep3InteractorIO.swift */; }; + 737FB68B2396363100EA4AED /* NewRegisterStep3Interactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB67E2396363000EA4AED /* NewRegisterStep3Interactor.swift */; }; + 737FB68C2396363100EA4AED /* NewRegisterStep3Presenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB6812396363000EA4AED /* NewRegisterStep3Presenter.swift */; }; + 737FB68D2396363100EA4AED /* NewRegisterStep3Wireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB6832396363000EA4AED /* NewRegisterStep3Wireframe.swift */; }; + 737FB68E2396363100EA4AED /* NewRegisterStep3WireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB6842396363000EA4AED /* NewRegisterStep3WireframeInput.swift */; }; + 737FB68F2396363100EA4AED /* NewRegisterStep3.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 737FB6862396363000EA4AED /* NewRegisterStep3.storyboard */; }; + 737FB6902396363100EA4AED /* NewRegisterStep3ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 737FB6872396363000EA4AED /* NewRegisterStep3ViewController.swift */; }; 7383F43622DEB864003D6393 /* GMEDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7383F43522DEB864003D6393 /* GMEDB.swift */; }; 7383F43822DEB87D003D6393 /* DatabaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7383F43722DEB87D003D6393 /* DatabaseTest.swift */; }; 7383F43E22DF15B8003D6393 /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7383F43D22DF15B8003D6393 /* UserDefaultsWrapper.swift */; }; @@ -2736,6 +2745,15 @@ 737FB6672395EF3500EA4AED /* NewRegisterStep2WireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep2WireframeInput.swift; sourceTree = ""; }; 737FB6692395EF3500EA4AED /* NewRegisterStep2.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NewRegisterStep2.storyboard; sourceTree = ""; }; 737FB66A2395EF3500EA4AED /* NewRegisterStep2ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep2ViewController.swift; sourceTree = ""; }; + 737FB67A2396363000EA4AED /* NewRegisterStep3Service.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3Service.swift; sourceTree = ""; }; + 737FB67B2396363000EA4AED /* NewRegisterStep3ServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3ServiceType.swift; sourceTree = ""; }; + 737FB67D2396363000EA4AED /* NewRegisterStep3InteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3InteractorIO.swift; sourceTree = ""; }; + 737FB67E2396363000EA4AED /* NewRegisterStep3Interactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3Interactor.swift; sourceTree = ""; }; + 737FB6812396363000EA4AED /* NewRegisterStep3Presenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3Presenter.swift; sourceTree = ""; }; + 737FB6832396363000EA4AED /* NewRegisterStep3Wireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3Wireframe.swift; sourceTree = ""; }; + 737FB6842396363000EA4AED /* NewRegisterStep3WireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3WireframeInput.swift; sourceTree = ""; }; + 737FB6862396363000EA4AED /* NewRegisterStep3.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NewRegisterStep3.storyboard; sourceTree = ""; }; + 737FB6872396363000EA4AED /* NewRegisterStep3ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewRegisterStep3ViewController.swift; sourceTree = ""; }; 7383F43522DEB864003D6393 /* GMEDB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GMEDB.swift; sourceTree = ""; }; 7383F43722DEB87D003D6393 /* DatabaseTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseTest.swift; sourceTree = ""; }; 7383F43D22DF15B8003D6393 /* UserDefaultsWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsWrapper.swift; sourceTree = ""; }; @@ -5850,6 +5868,7 @@ 735F68C92394A76800A2DBC8 /* NewRegister */, 735F68E62394CD6B00A2DBC8 /* NewRegisterStep1 */, 737FB6592395EF3500EA4AED /* NewRegisterStep2 */, + 737FB6762396363000EA4AED /* NewRegisterStep3 */, D96A4FE12146625C00CFD507 /* Register */, 04E36E0421AE585100783685 /* PennyTestSubmit */, 043770D221AD04240005B22D /* PennyTest */, @@ -7133,6 +7152,86 @@ path = View; sourceTree = ""; }; + 737FB6762396363000EA4AED /* NewRegisterStep3 */ = { + isa = PBXGroup; + children = ( + 737FB6772396363000EA4AED /* Application Logic */, + 737FB67F2396363000EA4AED /* User Interface */, + ); + path = NewRegisterStep3; + sourceTree = ""; + }; + 737FB6772396363000EA4AED /* Application Logic */ = { + isa = PBXGroup; + children = ( + 737FB6782396363000EA4AED /* Model */, + 737FB6792396363000EA4AED /* Service */, + 737FB67C2396363000EA4AED /* Interactor */, + ); + path = "Application Logic"; + sourceTree = ""; + }; + 737FB6782396363000EA4AED /* Model */ = { + isa = PBXGroup; + children = ( + ); + path = Model; + sourceTree = ""; + }; + 737FB6792396363000EA4AED /* Service */ = { + isa = PBXGroup; + children = ( + 737FB67A2396363000EA4AED /* NewRegisterStep3Service.swift */, + 737FB67B2396363000EA4AED /* NewRegisterStep3ServiceType.swift */, + ); + path = Service; + sourceTree = ""; + }; + 737FB67C2396363000EA4AED /* Interactor */ = { + isa = PBXGroup; + children = ( + 737FB67D2396363000EA4AED /* NewRegisterStep3InteractorIO.swift */, + 737FB67E2396363000EA4AED /* NewRegisterStep3Interactor.swift */, + ); + path = Interactor; + sourceTree = ""; + }; + 737FB67F2396363000EA4AED /* User Interface */ = { + isa = PBXGroup; + children = ( + 737FB6802396363000EA4AED /* Presenter */, + 737FB6822396363000EA4AED /* Wireframe */, + 737FB6852396363000EA4AED /* View */, + ); + path = "User Interface"; + sourceTree = ""; + }; + 737FB6802396363000EA4AED /* Presenter */ = { + isa = PBXGroup; + children = ( + 737FB6812396363000EA4AED /* NewRegisterStep3Presenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + 737FB6822396363000EA4AED /* Wireframe */ = { + isa = PBXGroup; + children = ( + 737FB6832396363000EA4AED /* NewRegisterStep3Wireframe.swift */, + 737FB6842396363000EA4AED /* NewRegisterStep3WireframeInput.swift */, + ); + path = Wireframe; + sourceTree = ""; + }; + 737FB6852396363000EA4AED /* View */ = { + isa = PBXGroup; + children = ( + 737FB6862396363000EA4AED /* NewRegisterStep3.storyboard */, + 737FB6872396363000EA4AED /* NewRegisterStep3ViewController.swift */, + ); + path = View; + sourceTree = ""; + }; 7383F43422DEB864003D6393 /* Database */ = { isa = PBXGroup; children = ( @@ -14489,6 +14588,7 @@ D93C279922000D630079BF03 /* iPhone_transkey_alnum_sym_17.png in Resources */, D93C288022000D640079BF03 /* iPad_transkey_alnum_key_13.png in Resources */, D93C26E422000D630079BF03 /* iPhone_transkey_landscape_number_cmd_0_2_down.png in Resources */, + 737FB68F2396363100EA4AED /* NewRegisterStep3.storyboard in Resources */, D93C274422000D630079BF03 /* iPhone_transkey_number_cmd_0_2.png in Resources */, D93C2A2C22000D650079BF03 /* iPhone_transkey_alnum_cmd_8_english.png in Resources */, D93C271722000D630079BF03 /* iPhone_transkey_alnum_dummy_0.png in Resources */, @@ -15664,6 +15764,7 @@ D962230C212BD7A100B7A115 /* Array+Ext.swift in Sources */, 73157B9B22DC1EEC009B836F /* PopupNotificationModuleInterface.swift in Sources */, D96848CE212D419400EF12B1 /* ApiServiceType.swift in Sources */, + 737FB68B2396363100EA4AED /* NewRegisterStep3Interactor.swift in Sources */, 043770EA21AD04240005B22D /* PennyTestInteractor.swift in Sources */, 73B4C8BC22A5F2440078D495 /* SelectCouponModuleInterface.swift in Sources */, D92E656B222620A0004D1B3D /* SendMoneyCodeInteractor.swift in Sources */, @@ -15678,6 +15779,7 @@ BEC9B000224FC49C00A2DA06 /* BiometricAuthenticationInteractor.swift in Sources */, D945F11D213E1D5100A24824 /* SendMoneyReceiptModuleInterface.swift in Sources */, 73195B3522FD5BC600151434 /* APIRouter.swift in Sources */, + 737FB68E2396363100EA4AED /* NewRegisterStep3WireframeInput.swift in Sources */, 73A6E20222CEE51600E9BC68 /* BadgeAppearance.swift in Sources */, 738B3E4C233B56C6000EA5E5 /* UISearchBar+Ext.swift in Sources */, D97785AA215DD04400754079 /* TransactionHistoryTableViewCell.swift in Sources */, @@ -15701,6 +15803,7 @@ D9DAFE2521352F3300483E71 /* SenMoneyPaymentModeRecipientViewModel.swift in Sources */, 7389601022C2F208003FEA90 /* TablePresenterWireframeInput.swift in Sources */, 733E8F8F23580BE00050E499 /* RechargeReceiptInteractorIO.swift in Sources */, + 737FB6882396363100EA4AED /* NewRegisterStep3Service.swift in Sources */, D95B5E4021311057000C0B33 /* GmeContactsWireframe.swift in Sources */, BEC9B005224FC49C00A2DA06 /* BiometricAuthenticationViewController.swift in Sources */, 0496B84E1FE7DFCD0044810E /* UIViewController+Ext.swift in Sources */, @@ -15886,6 +15989,7 @@ 73AEFF762334A13100A967FB /* TransactionHistoryGroupWireframeInputOutput.swift in Sources */, 739045D7237921D500CD5D8A /* ManageAccountGroupInteractorIO.swift in Sources */, 734BF6882353F7D8004E8D60 /* PhoneCardRechargeWireframeInputOutput.swift in Sources */, + 737FB6892396363100EA4AED /* NewRegisterStep3ServiceType.swift in Sources */, 73A621642330AD20000FFB5B /* RecentHistoriesPresenter.swift in Sources */, 738714B3237CE86E0038FCB1 /* InboundReceiptService.swift in Sources */, 73210DA722FBE73100715D6C /* RecipientsWireframe.swift in Sources */, @@ -15927,6 +16031,7 @@ D945F129213E4A9D00A24824 /* SendMoneyReciept.swift in Sources */, 733E8F9323580BE00050E499 /* RechargeReceiptViewController.swift in Sources */, D9B7ADF02130048E009B0564 /* ExchangeRatesModuleInterface.swift in Sources */, + 737FB68C2396363100EA4AED /* NewRegisterStep3Presenter.swift in Sources */, 739045DB237921D500CD5D8A /* ManageAccountGroupWireframeInput.swift in Sources */, 73A6215F2330AD20000FFB5B /* RecentHistoriesModuleInterface.swift in Sources */, 739045BB2378FC9500CD5D8A /* AddInboundAccountViewController.swift in Sources */, @@ -15956,6 +16061,7 @@ 73149F6D22E5AF8000D66B26 /* LauncherScreenViewController.swift in Sources */, D92E656D222620A0004D1B3D /* SendMoneyCodeWireframeInput.swift in Sources */, 730197AD22535135001954AB /* kycForm2ServiceType.swift in Sources */, + 737FB68A2396363100EA4AED /* NewRegisterStep3InteractorIO.swift in Sources */, 730197A822535135001954AB /* kycForm3WireframeInput.swift in Sources */, 73149F6922E5AF8000D66B26 /* LauncherScreenWireframeInput.swift in Sources */, D96BD1232164870C00DFE7D8 /* DateFormatter+Ext.swift in Sources */, @@ -16014,6 +16120,7 @@ 049E61A51FF0AE9D00817C76 /* UrlManager.swift in Sources */, 730D78B2227A94F2007E517E /* JusoResult.swift in Sources */, 73341C90238F4FE900394676 /* UILabel+Ext.swift in Sources */, + 737FB68D2396363100EA4AED /* NewRegisterStep3Wireframe.swift in Sources */, D9AFE856215C7166005F3A25 /* HomeCollectionTableViewCell.swift in Sources */, BE74AFC1227C8FF200F05CE7 /* AddAccountWireframeInput.swift in Sources */, BEC9AFFC224FC49C00A2DA06 /* BiometricAuthenticationModuleInterface.swift in Sources */, @@ -16075,6 +16182,7 @@ D9380D2D2165A2ED00E45156 /* ProfileViewController.swift in Sources */, D945F122213E1D5100A24824 /* SendMoneyReceiptPresenter.swift in Sources */, D92B802A2140C3CB00A25B26 /* MainPresenter.swift in Sources */, + 737FB6902396363100EA4AED /* NewRegisterStep3ViewController.swift in Sources */, 738714B4237CE86E0038FCB1 /* InboundReceiptServiceType.swift in Sources */, D946719721426DFB003924DB /* LoginServiceType.swift in Sources */, D9DC107821639078008F3C51 /* MessageComposeModuleInterface.swift in Sources */, diff --git a/GME Remit/Modules/RegisterModules/KYC/kycForm3/User Interface/View/kycForm3.storyboard b/GME Remit/Modules/RegisterModules/KYC/kycForm3/User Interface/View/kycForm3.storyboard index 9fe6e1f1..b89bf0f6 100644 --- a/GME Remit/Modules/RegisterModules/KYC/kycForm3/User Interface/View/kycForm3.storyboard +++ b/GME Remit/Modules/RegisterModules/KYC/kycForm3/User Interface/View/kycForm3.storyboard @@ -1,9 +1,9 @@ - - + + - + @@ -295,13 +295,13 @@ - + - + - + 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 2935ad17..3c6b35c9 100644 --- a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegister.storyboard +++ b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegister.storyboard @@ -122,7 +122,11 @@ - + + + + + @@ -156,12 +160,16 @@ + + + + diff --git a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegisterViewController.swift b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegisterViewController.swift index 5e2567ed..048c42b4 100644 --- a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegisterViewController.swift +++ b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/View/NewRegisterViewController.swift @@ -50,10 +50,12 @@ class NewRegisterViewController: UIViewController { super.viewWillAppear(animated) title = "Register GME" setupNormalNavigation() + setupNavigationShadow(isUse: true) } override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) + setupNavigationShadow(isUse: false) } // MARK: IBActions 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 1bbb3b44..ade772c3 100644 --- a/GME Remit/Modules/RegisterModules/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift +++ b/GME Remit/Modules/RegisterModules/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift @@ -47,8 +47,8 @@ extension NewRegisterWireframe: NewRegisterWireframeInput { let step2 = NewRegisterStep2Wireframe().getMainView(with: self) move(step2) case .finish: - let step1 = NewRegisterStep1Wireframe().getMainView(with: self) - move(step1) + let step3 = NewRegisterStep3Wireframe().getMainView(with: self) + move(step3) } } diff --git a/GME Remit/Modules/RegisterModules/NewRegisterStep1/User Interface/View/NewRegisterStep1.storyboard b/GME Remit/Modules/RegisterModules/NewRegisterStep1/User Interface/View/NewRegisterStep1.storyboard index 1f36d1b1..d047a6a8 100644 --- a/GME Remit/Modules/RegisterModules/NewRegisterStep1/User Interface/View/NewRegisterStep1.storyboard +++ b/GME Remit/Modules/RegisterModules/NewRegisterStep1/User Interface/View/NewRegisterStep1.storyboard @@ -47,7 +47,7 @@ - diff --git a/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/View/NewRegisterStep3ViewController.swift b/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/View/NewRegisterStep3ViewController.swift new file mode 100644 index 00000000..86b99cbe --- /dev/null +++ b/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/View/NewRegisterStep3ViewController.swift @@ -0,0 +1,91 @@ +// +// NewRegisterStep3ViewController.swift +// GME Remit +// +// Created by InKwon James Kim on 2019/12/03. +//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import UIKit +import RxSwift +import RxCocoa + +class NewRegisterStep3ViewController: UIViewController { + + // MARK: Properties + var presenter: NewRegisterStep3Presenter! + weak var delegate: NewRegisterDelegate? + + private let disposeBag = DisposeBag() + // MARK: Computed Properties + + // MARK: IBOutlets + + @IBOutlet weak var continueButton: UIButton! + + // MARK: VC's Life cycle + override func viewDidLoad() { + super.viewDidLoad() + setup() + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + } + + // willMove -> It appears on the parent screen. + override func willMove(toParent parent: UIViewController?) { + print(#function) + if let `parent` = parent as UIViewController? { + print(parent) + } + } + + // It appears on the parent screen. -> didMove + override func didMove(toParent parent: UIViewController?) { + print(#function) + if let `parent` = parent as UIViewController? { + print(parent) + } + } + + // MARK: IBActions + +} + +// MARK: Other Functions +extension NewRegisterStep3ViewController { + + private func setup() { + setUI() + setBinding() + setUIBinding() + } + + private func setUI() { + continueButton.layer.cornerRadius = 5 + } + + private func setUIBinding() { + + } + + private func setBinding() { + let input = NewRegisterStep3Presenter.Input() + let output = presenter.transform(input: input) + + output.isError + .drive( + onNext: { self.alert(type: .error, message: $0.localizedDescription) } + ).disposed(by: disposeBag) + + output.isProgress + .drive( + onNext: { $0 ? self.showProgressHud() : self.hideProgressHud() } + ).disposed(by: disposeBag) + } +} diff --git a/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/Wireframe/NewRegisterStep3Wireframe.swift b/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/Wireframe/NewRegisterStep3Wireframe.swift new file mode 100644 index 00000000..bfeb3940 --- /dev/null +++ b/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/Wireframe/NewRegisterStep3Wireframe.swift @@ -0,0 +1,42 @@ +// +// NewRegisterStep3Wireframe.swift +// GME Remit +// +// Created by InKwon James Kim on 2019/12/03. +//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import UIKit + +class NewRegisterStep3Wireframe { + weak var view: UIViewController! + weak var delegate: NewRegisterDelegate? +} + +extension NewRegisterStep3Wireframe: NewRegisterStep3WireframeInput { + + var storyboardName: String {return "NewRegisterStep3"} + + func getMainView() -> UIViewController { + let service = NewRegisterStep3Service() + let interactor = NewRegisterStep3Interactor(service: service) + let presenter = NewRegisterStep3Presenter() + let viewController = viewControllerFromStoryboard(of: NewRegisterStep3ViewController.self) + + viewController.presenter = presenter + viewController.delegate = delegate + + interactor.output = presenter + presenter.interactor = interactor + presenter.wireframe = self + + view = viewController + return viewController + } + + func getMainView(with delegate: NewRegisterDelegate?) -> UIViewController { + self.delegate = delegate + + return getMainView() + } +} diff --git a/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/Wireframe/NewRegisterStep3WireframeInput.swift b/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/Wireframe/NewRegisterStep3WireframeInput.swift new file mode 100644 index 00000000..7121cfd5 --- /dev/null +++ b/GME Remit/Modules/RegisterModules/NewRegisterStep3/User Interface/Wireframe/NewRegisterStep3WireframeInput.swift @@ -0,0 +1,13 @@ +// +// NewRegisterStep3WireframeInput.swift +// GME Remit +// +// Created by InKwon James Kim on 2019/12/03. +//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import Foundation + +protocol NewRegisterStep3WireframeInput: WireframeInput { + +} diff --git a/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift b/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift index 95fd1eaf..fe4d4f8d 100644 --- a/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift +++ b/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift @@ -227,7 +227,7 @@ class SplashScreenViewController: UIViewController { navigationController?.navigationBar.barTintColor = .themeRed navigationController?.navigationBar.isTranslucent = false navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default) - navigationController?.navigationBar.shadowImage = UIImage() + setupNavigationShadow(isUse: false) } private func setup() { diff --git a/GME Remit/Supported Files/Assets.xcassets/NewRegistration/call.imageset/Contents.json b/GME Remit/Supported Files/Assets.xcassets/NewRegistration/call.imageset/Contents.json new file mode 100644 index 00000000..50d7b10c --- /dev/null +++ b/GME Remit/Supported Files/Assets.xcassets/NewRegistration/call.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "call.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/GME Remit/Supported Files/Assets.xcassets/NewRegistration/call.imageset/call.png b/GME Remit/Supported Files/Assets.xcassets/NewRegistration/call.imageset/call.png new file mode 100644 index 00000000..6478281c Binary files /dev/null and b/GME Remit/Supported Files/Assets.xcassets/NewRegistration/call.imageset/call.png differ