From 72e8dcc2bc9f112e6aac1b1298eec1309898b6ce Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Tue, 13 Aug 2019 14:42:07 +0900 Subject: [PATCH] BiometricAuth - apply SwiftLint --- GME Remit.xcodeproj/project.pbxproj | 94 ++++++------- GME Remit/APIs/ExchangeRateApiService.swift | 1 - GME Remit/Models/NativeCountry.swift | 3 +- GME Remit/Modules/.DS_Store | Bin 8196 -> 8196 bytes .../BiometricAuthenticationInteractor.swift | 28 ++-- .../BiometricAuthenticationService.swift | 12 +- ...ometricAuthenticationModuleInterface.swift | 2 +- .../BiometricAuthenticationPresenter.swift | 28 ++-- ...iometricAuthenticationViewController.swift | 17 ++- .../BiometricAuthenticationWireframe.swift | 10 +- ...iometricAuthenticationWireframeInput.swift | 22 +-- ...AuthenticationNotificationInteractor.swift | 31 ----- ...cAuthenticationNotificationPresenter.swift | 32 ----- ...cAuthenticationNotificationWireframe.swift | 34 ----- .../BiometricNotification/.DS_Store | Bin 0 -> 6148 bytes .../BiometricNotificationInteractor.swift | 31 +++++ .../BiometricNotificationInteractorIO.swift} | 4 +- .../BiometricNotificationService.swift} | 14 +- .../BiometricNotificationServiceType.swift} | 2 +- ...iometricNotificationModuleInterface.swift} | 2 +- .../BiometricNotificationPresenter.swift | 32 +++++ .../User Interface/View/.DS_Store | Bin .../View/BiometricNotification.storyboard} | 2 +- ...BiometricNotificationViewController.swift} | 6 +- .../BiometricNotificationViewInterface.swift} | 2 +- .../User Interface/Wireframe/.DS_Store | Bin 0 -> 6148 bytes .../BiometricNotificationWireframe.swift | 34 +++++ ...BiometricNotificationWireframeInput.swift} | 2 +- .../View/HomeViewController.swift | 2 +- .../View/PaymentSelectionViewController.swift | 131 +++++++++--------- .../Application Logic/Model/JusoCommon.swift | 33 +++-- 31 files changed, 306 insertions(+), 305 deletions(-) delete mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractor.swift delete mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Presenter/BiometricAuthenticationNotificationPresenter.swift delete mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframe.swift create mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricNotification/.DS_Store create mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractor.swift rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractorIO.swift => BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractorIO.swift} (59%) rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationService.swift => BiometricNotification/Application Logic/Service/BiometricNotificationService.swift} (52%) rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationServiceType.swift => BiometricNotification/Application Logic/Service/BiometricNotificationServiceType.swift} (77%) rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/Module Interface/BiometricAuthenticationNotificationModuleInterface.swift => BiometricNotification/Module Interface/BiometricNotificationModuleInterface.swift} (75%) create mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Presenter/BiometricNotificationPresenter.swift rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification => BiometricNotification}/User Interface/View/.DS_Store (100%) rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotification.storyboard => BiometricNotification/User Interface/View/BiometricNotification.storyboard} (98%) rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewController.swift => BiometricNotification/User Interface/View/BiometricNotificationViewController.swift} (88%) rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewInterface.swift => BiometricNotification/User Interface/View/BiometricNotificationViewInterface.swift} (75%) create mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/.DS_Store create mode 100644 GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/BiometricNotificationWireframe.swift rename GME Remit/Modules/BiometricAuthModules/{BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframeInput.swift => BiometricNotification/User Interface/Wireframe/BiometricNotificationWireframeInput.swift} (74%) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 5a2470b2..c2bf7b38 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -242,17 +242,17 @@ 73469FA22293C1B00062946B /* SelectPaymentViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73469F962293C1AF0062946B /* SelectPaymentViewInterface.swift */; }; 73469FA32293C1B00062946B /* SelectPayment.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73469F972293C1AF0062946B /* SelectPayment.storyboard */; }; 73538B2222EFC5FA00188CDD /* CommonServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73538B2122EFC5FA00188CDD /* CommonServiceType.swift */; }; - 736A8C402277EB2A00337A50 /* BiometricAuthenticationNotificationModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C2D2277EB2900337A50 /* BiometricAuthenticationNotificationModuleInterface.swift */; }; - 736A8C412277EB2A00337A50 /* BiometricAuthenticationNotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C312277EB2900337A50 /* BiometricAuthenticationNotificationService.swift */; }; - 736A8C422277EB2A00337A50 /* BiometricAuthenticationNotificationServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C322277EB2900337A50 /* BiometricAuthenticationNotificationServiceType.swift */; }; - 736A8C432277EB2A00337A50 /* BiometricAuthenticationNotificationInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C342277EB2900337A50 /* BiometricAuthenticationNotificationInteractor.swift */; }; - 736A8C442277EB2A00337A50 /* BiometricAuthenticationNotificationInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C352277EB2900337A50 /* BiometricAuthenticationNotificationInteractorIO.swift */; }; - 736A8C452277EB2A00337A50 /* BiometricAuthenticationNotificationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C382277EB2900337A50 /* BiometricAuthenticationNotificationPresenter.swift */; }; - 736A8C462277EB2A00337A50 /* BiometricAuthenticationNotificationWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3A2277EB2900337A50 /* BiometricAuthenticationNotificationWireframeInput.swift */; }; - 736A8C472277EB2A00337A50 /* BiometricAuthenticationNotificationWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3B2277EB2900337A50 /* BiometricAuthenticationNotificationWireframe.swift */; }; - 736A8C482277EB2A00337A50 /* BiometricAuthenticationNotification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 736A8C3D2277EB2900337A50 /* BiometricAuthenticationNotification.storyboard */; }; - 736A8C492277EB2A00337A50 /* BiometricAuthenticationNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3E2277EB2900337A50 /* BiometricAuthenticationNotificationViewController.swift */; }; - 736A8C4A2277EB2A00337A50 /* BiometricAuthenticationNotificationViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3F2277EB2900337A50 /* BiometricAuthenticationNotificationViewInterface.swift */; }; + 736A8C402277EB2A00337A50 /* BiometricNotificationModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C2D2277EB2900337A50 /* BiometricNotificationModuleInterface.swift */; }; + 736A8C412277EB2A00337A50 /* BiometricNotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C312277EB2900337A50 /* BiometricNotificationService.swift */; }; + 736A8C422277EB2A00337A50 /* BiometricNotificationServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C322277EB2900337A50 /* BiometricNotificationServiceType.swift */; }; + 736A8C432277EB2A00337A50 /* BiometricNotificationInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C342277EB2900337A50 /* BiometricNotificationInteractor.swift */; }; + 736A8C442277EB2A00337A50 /* BiometricNotificationInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C352277EB2900337A50 /* BiometricNotificationInteractorIO.swift */; }; + 736A8C452277EB2A00337A50 /* BiometricNotificationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C382277EB2900337A50 /* BiometricNotificationPresenter.swift */; }; + 736A8C462277EB2A00337A50 /* BiometricNotificationWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3A2277EB2900337A50 /* BiometricNotificationWireframeInput.swift */; }; + 736A8C472277EB2A00337A50 /* BiometricNotificationWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3B2277EB2900337A50 /* BiometricNotificationWireframe.swift */; }; + 736A8C482277EB2A00337A50 /* BiometricNotification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 736A8C3D2277EB2900337A50 /* BiometricNotification.storyboard */; }; + 736A8C492277EB2A00337A50 /* BiometricNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3E2277EB2900337A50 /* BiometricNotificationViewController.swift */; }; + 736A8C4A2277EB2A00337A50 /* BiometricNotificationViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736A8C3F2277EB2900337A50 /* BiometricNotificationViewInterface.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 */; }; @@ -2467,17 +2467,17 @@ 73469F962293C1AF0062946B /* SelectPaymentViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPaymentViewInterface.swift; sourceTree = ""; }; 73469F972293C1AF0062946B /* SelectPayment.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SelectPayment.storyboard; sourceTree = ""; }; 73538B2122EFC5FA00188CDD /* CommonServiceType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonServiceType.swift; sourceTree = ""; }; - 736A8C2D2277EB2900337A50 /* BiometricAuthenticationNotificationModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationModuleInterface.swift; sourceTree = ""; }; - 736A8C312277EB2900337A50 /* BiometricAuthenticationNotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationService.swift; sourceTree = ""; }; - 736A8C322277EB2900337A50 /* BiometricAuthenticationNotificationServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationServiceType.swift; sourceTree = ""; }; - 736A8C342277EB2900337A50 /* BiometricAuthenticationNotificationInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationInteractor.swift; sourceTree = ""; }; - 736A8C352277EB2900337A50 /* BiometricAuthenticationNotificationInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationInteractorIO.swift; sourceTree = ""; }; - 736A8C382277EB2900337A50 /* BiometricAuthenticationNotificationPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationPresenter.swift; sourceTree = ""; }; - 736A8C3A2277EB2900337A50 /* BiometricAuthenticationNotificationWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationWireframeInput.swift; sourceTree = ""; }; - 736A8C3B2277EB2900337A50 /* BiometricAuthenticationNotificationWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationWireframe.swift; sourceTree = ""; }; - 736A8C3D2277EB2900337A50 /* BiometricAuthenticationNotification.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BiometricAuthenticationNotification.storyboard; sourceTree = ""; }; - 736A8C3E2277EB2900337A50 /* BiometricAuthenticationNotificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationViewController.swift; sourceTree = ""; }; - 736A8C3F2277EB2900337A50 /* BiometricAuthenticationNotificationViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationNotificationViewInterface.swift; sourceTree = ""; }; + 736A8C2D2277EB2900337A50 /* BiometricNotificationModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationModuleInterface.swift; sourceTree = ""; }; + 736A8C312277EB2900337A50 /* BiometricNotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationService.swift; sourceTree = ""; }; + 736A8C322277EB2900337A50 /* BiometricNotificationServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationServiceType.swift; sourceTree = ""; }; + 736A8C342277EB2900337A50 /* BiometricNotificationInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationInteractor.swift; sourceTree = ""; }; + 736A8C352277EB2900337A50 /* BiometricNotificationInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationInteractorIO.swift; sourceTree = ""; }; + 736A8C382277EB2900337A50 /* BiometricNotificationPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationPresenter.swift; sourceTree = ""; }; + 736A8C3A2277EB2900337A50 /* BiometricNotificationWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationWireframeInput.swift; sourceTree = ""; }; + 736A8C3B2277EB2900337A50 /* BiometricNotificationWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationWireframe.swift; sourceTree = ""; }; + 736A8C3D2277EB2900337A50 /* BiometricNotification.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BiometricNotification.storyboard; sourceTree = ""; }; + 736A8C3E2277EB2900337A50 /* BiometricNotificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationViewController.swift; sourceTree = ""; }; + 736A8C3F2277EB2900337A50 /* BiometricNotificationViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricNotificationViewInterface.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 = ""; }; @@ -6068,26 +6068,26 @@ 736A8C262277EAC100337A50 /* BiometricAuthModules */ = { isa = PBXGroup; children = ( - 736A8C2B2277EB2900337A50 /* BiometricAuthenticationNotification */, + 736A8C2B2277EB2900337A50 /* BiometricNotification */, BEC9AFE7224FC49C00A2DA06 /* BiometricAuthentication */, ); path = BiometricAuthModules; sourceTree = ""; }; - 736A8C2B2277EB2900337A50 /* BiometricAuthenticationNotification */ = { + 736A8C2B2277EB2900337A50 /* BiometricNotification */ = { isa = PBXGroup; children = ( 736A8C2C2277EB2900337A50 /* Module Interface */, 736A8C2E2277EB2900337A50 /* Application Logic */, 736A8C362277EB2900337A50 /* User Interface */, ); - path = BiometricAuthenticationNotification; + path = BiometricNotification; sourceTree = ""; }; 736A8C2C2277EB2900337A50 /* Module Interface */ = { isa = PBXGroup; children = ( - 736A8C2D2277EB2900337A50 /* BiometricAuthenticationNotificationModuleInterface.swift */, + 736A8C2D2277EB2900337A50 /* BiometricNotificationModuleInterface.swift */, ); path = "Module Interface"; sourceTree = ""; @@ -6112,8 +6112,8 @@ 736A8C302277EB2900337A50 /* Service */ = { isa = PBXGroup; children = ( - 736A8C312277EB2900337A50 /* BiometricAuthenticationNotificationService.swift */, - 736A8C322277EB2900337A50 /* BiometricAuthenticationNotificationServiceType.swift */, + 736A8C312277EB2900337A50 /* BiometricNotificationService.swift */, + 736A8C322277EB2900337A50 /* BiometricNotificationServiceType.swift */, ); path = Service; sourceTree = ""; @@ -6121,8 +6121,8 @@ 736A8C332277EB2900337A50 /* Interactor */ = { isa = PBXGroup; children = ( - 736A8C342277EB2900337A50 /* BiometricAuthenticationNotificationInteractor.swift */, - 736A8C352277EB2900337A50 /* BiometricAuthenticationNotificationInteractorIO.swift */, + 736A8C342277EB2900337A50 /* BiometricNotificationInteractor.swift */, + 736A8C352277EB2900337A50 /* BiometricNotificationInteractorIO.swift */, ); path = Interactor; sourceTree = ""; @@ -6140,7 +6140,7 @@ 736A8C372277EB2900337A50 /* Presenter */ = { isa = PBXGroup; children = ( - 736A8C382277EB2900337A50 /* BiometricAuthenticationNotificationPresenter.swift */, + 736A8C382277EB2900337A50 /* BiometricNotificationPresenter.swift */, ); path = Presenter; sourceTree = ""; @@ -6148,8 +6148,8 @@ 736A8C392277EB2900337A50 /* Wireframe */ = { isa = PBXGroup; children = ( - 736A8C3A2277EB2900337A50 /* BiometricAuthenticationNotificationWireframeInput.swift */, - 736A8C3B2277EB2900337A50 /* BiometricAuthenticationNotificationWireframe.swift */, + 736A8C3A2277EB2900337A50 /* BiometricNotificationWireframeInput.swift */, + 736A8C3B2277EB2900337A50 /* BiometricNotificationWireframe.swift */, ); path = Wireframe; sourceTree = ""; @@ -6157,9 +6157,9 @@ 736A8C3C2277EB2900337A50 /* View */ = { isa = PBXGroup; children = ( - 736A8C3D2277EB2900337A50 /* BiometricAuthenticationNotification.storyboard */, - 736A8C3E2277EB2900337A50 /* BiometricAuthenticationNotificationViewController.swift */, - 736A8C3F2277EB2900337A50 /* BiometricAuthenticationNotificationViewInterface.swift */, + 736A8C3D2277EB2900337A50 /* BiometricNotification.storyboard */, + 736A8C3E2277EB2900337A50 /* BiometricNotificationViewController.swift */, + 736A8C3F2277EB2900337A50 /* BiometricNotificationViewInterface.swift */, ); path = View; sourceTree = ""; @@ -12782,7 +12782,7 @@ D93C2A3D22000D650079BF03 /* iPad_transkey_landscape_alnum_cmd_8_english.png in Resources */, D93C29D122000D650079BF03 /* iPhone_transkey_number_cmd_2_2_thai.png in Resources */, D93C277822000D630079BF03 /* iPhone_transkey_alnum_sym_9.png in Resources */, - 736A8C482277EB2A00337A50 /* BiometricAuthenticationNotification.storyboard in Resources */, + 736A8C482277EB2A00337A50 /* BiometricNotification.storyboard in Resources */, D93C26B922000D630079BF03 /* iPhone_transkey_landscape_alnum_eng_10.png in Resources */, D93C281622000D640079BF03 /* iPad_transkey_landscape_alnum_cap_20.png in Resources */, D93C284222000D640079BF03 /* iPad_transkey_keypad_bg.png in Resources */, @@ -14070,7 +14070,7 @@ 73210DA522FBE73100715D6C /* RecipientsInteractor.swift in Sources */, 7383F43E22DF15B8003D6393 /* UserDefaultsWrapper.swift in Sources */, 730197B222535135001954AB /* kycForm2Wireframe.swift in Sources */, - 736A8C422277EB2A00337A50 /* BiometricAuthenticationNotificationServiceType.swift in Sources */, + 736A8C422277EB2A00337A50 /* BiometricNotificationServiceType.swift in Sources */, 73149F6822E5AF8000D66B26 /* LauncherScreenPresenter.swift in Sources */, D9D2242B22407EBA00C7313D /* ResendListModel.swift in Sources */, 04E36E2121AE585200783685 /* PennyTestSubmitViewController.swift in Sources */, @@ -14096,7 +14096,7 @@ 7389600C22C2F208003FEA90 /* TablePresenterService.swift in Sources */, D903113C214786EA00AD5BA9 /* ForgotPasswordModuleInterface.swift in Sources */, 730D78BD227A94F2007E517E /* SearchAddressViewInterface.swift in Sources */, - 736A8C462277EB2A00337A50 /* BiometricAuthenticationNotificationWireframeInput.swift in Sources */, + 736A8C462277EB2A00337A50 /* BiometricNotificationWireframeInput.swift in Sources */, BEC9B003224FC49C00A2DA06 /* BiometricAuthenticationWireframeInput.swift in Sources */, D946719D21426DFB003924DB /* LoginViewInterface.swift in Sources */, D922D9AB21351B7400D43053 /* SendMoneyVerificationInteractorIO.swift in Sources */, @@ -14123,7 +14123,7 @@ D90D55D221327CD600EEEE04 /* AddReciepientWireframeInput.swift in Sources */, 730D7887227A94E1007E517E /* RedeemViewInterface.swift in Sources */, 73FE8837228A4A8C00A5EB56 /* OrderHistoryModuleInterface.swift in Sources */, - 736A8C442277EB2A00337A50 /* BiometricAuthenticationNotificationInteractorIO.swift in Sources */, + 736A8C442277EB2A00337A50 /* BiometricNotificationInteractorIO.swift in Sources */, 73FE8839228A4A8C00A5EB56 /* OrderHistoryServiceType.swift in Sources */, 73071AC72296CF9B008840FD /* HotLineInteractorIO.swift in Sources */, 73538B2222EFC5FA00188CDD /* CommonServiceType.swift in Sources */, @@ -14220,7 +14220,7 @@ 73469F9D2293C1B00062946B /* SelectPaymentPresenter.swift in Sources */, 739A7784228BB2B40018A1A9 /* DetailOrderInteractor.swift in Sources */, D9BE022C21E2DD45003AA8C7 /* PaymentSelectionInteractorIO.swift in Sources */, - 736A8C452277EB2A00337A50 /* BiometricAuthenticationNotificationPresenter.swift in Sources */, + 736A8C452277EB2A00337A50 /* BiometricNotificationPresenter.swift in Sources */, D9A060DF223F680B00F5D7C4 /* ResendExchangeViewController.swift in Sources */, 730D787F227A94E1007E517E /* RedeemService.swift in Sources */, 73BCCDCF228993040057B161 /* RewardGroupModuleInterface.swift in Sources */, @@ -14251,12 +14251,12 @@ 73A6E20222CEE51600E9BC68 /* BadgeAppearance.swift in Sources */, D97785AA215DD04400754079 /* TransactionHistoryTableViewCell.swift in Sources */, 730D7894227A94E1007E517E /* RewardItemCollectionViewCell.swift in Sources */, - 736A8C432277EB2A00337A50 /* BiometricAuthenticationNotificationInteractor.swift in Sources */, + 736A8C432277EB2A00337A50 /* BiometricNotificationInteractor.swift in Sources */, D95B5E3921311057000C0B33 /* GmeContactsModuleInterface.swift in Sources */, 7313872322E68F4C0095ACEB /* ScrollableSegmentedControl.swift in Sources */, D9CB4977213290B200B7A124 /* SendMoneyTransFerReasonViewModel.swift in Sources */, D922D98921351AAE00D43053 /* SendMoneyExchangeRatePresenter.swift in Sources */, - 736A8C472277EB2A00337A50 /* BiometricAuthenticationNotificationWireframe.swift in Sources */, + 736A8C472277EB2A00337A50 /* BiometricNotificationWireframe.swift in Sources */, 730D7891227A94E1007E517E /* RewardWireframe.swift in Sources */, 7389601322C2F208003FEA90 /* TablePresenterViewInterface.swift in Sources */, D9031146214786EA00AD5BA9 /* ForgotPasswordViewInterface.swift in Sources */, @@ -14397,7 +14397,7 @@ 042E6EFD203EAF95004667A1 /* SideMenuViewController.swift in Sources */, D9535CCC2150C14700EDFCD2 /* KYCResponseModel.swift in Sources */, D96A4FD621460B4A00CFD507 /* SplashScreenServiceType.swift in Sources */, - 736A8C412277EB2A00337A50 /* BiometricAuthenticationNotificationService.swift in Sources */, + 736A8C412277EB2A00337A50 /* BiometricNotificationService.swift in Sources */, 73210DA122FBE73100715D6C /* RecipientsModuleInterface.swift in Sources */, D9A060D9223F680B00F5D7C4 /* ResendExchangeServiceType.swift in Sources */, 730D788A227A94E1007E517E /* RewardProduct.swift in Sources */, @@ -14479,7 +14479,7 @@ D9B7ADF72130048E009B0564 /* ExchangeRatesWireframe.swift in Sources */, BE74AFD0227C8FF200F05CE7 /* AutoDebitViewController.swift in Sources */, D96A4FFA2146625C00CFD507 /* RegisterInteractorIO.swift in Sources */, - 736A8C4A2277EB2A00337A50 /* BiometricAuthenticationNotificationViewInterface.swift in Sources */, + 736A8C4A2277EB2A00337A50 /* BiometricNotificationViewInterface.swift in Sources */, D9B7ADF82130048E009B0564 /* ExchangeRatesViewController.swift in Sources */, 73BCCDD6228993040057B161 /* RewardGroupWireframe.swift in Sources */, 73BCCDD0228993040057B161 /* RewardGroupServiceType.swift in Sources */, @@ -14524,7 +14524,7 @@ 04E36E2021AE585200783685 /* PennyTestSubmitWireframeInput.swift in Sources */, D90A9D5C2136942300A96E45 /* BankBranchPickerViewController.swift in Sources */, D922D9682135145F00D43053 /* SendMoneyParentWireframe.swift in Sources */, - 736A8C402277EB2A00337A50 /* BiometricAuthenticationNotificationModuleInterface.swift in Sources */, + 736A8C402277EB2A00337A50 /* BiometricNotificationModuleInterface.swift in Sources */, 73149F6422E5AF8000D66B26 /* LauncherScreenServiceType.swift in Sources */, 73071ACD2296CF9B008840FD /* HotLineViewInterface.swift in Sources */, 730197AF22535135001954AB /* kycForm2InteractorIO.swift in Sources */, @@ -14550,7 +14550,7 @@ D946719621426DFB003924DB /* LoginService.swift in Sources */, 043770F021AD04240005B22D /* PennyTestViewController.swift in Sources */, D92B80282140C3CB00A25B26 /* MainInteractor.swift in Sources */, - 736A8C492277EB2A00337A50 /* BiometricAuthenticationNotificationViewController.swift in Sources */, + 736A8C492277EB2A00337A50 /* BiometricNotificationViewController.swift in Sources */, 04E36E1E21AE585200783685 /* PennyTestSubmitPresenter.swift in Sources */, D92E6570222620A0004D1B3D /* SendMoneyCodeViewInterface.swift in Sources */, 73469FA02293C1B00062946B /* SelectPaymentViewController.swift in Sources */, diff --git a/GME Remit/APIs/ExchangeRateApiService.swift b/GME Remit/APIs/ExchangeRateApiService.swift index cc10d51c..58f72502 100644 --- a/GME Remit/APIs/ExchangeRateApiService.swift +++ b/GME Remit/APIs/ExchangeRateApiService.swift @@ -9,7 +9,6 @@ import Foundation import Alamofire - protocol FetchCountryCurrencyInformation: ApiServiceType { func fetchCountryCurrencyInfo( isAuth: Bool, diff --git a/GME Remit/Models/NativeCountry.swift b/GME Remit/Models/NativeCountry.swift index a9dcffc5..438f5865 100644 --- a/GME Remit/Models/NativeCountry.swift +++ b/GME Remit/Models/NativeCountry.swift @@ -13,12 +13,11 @@ struct StaticModels { let nativeCountries: [NativeCountryModel] - init(){ + init() { nativeCountries = nativeCountryOrigin!.nativeCountries } } - struct NativeCountryContainer: Mappable { var nativeCountries = [NativeCountryModel]() diff --git a/GME Remit/Modules/.DS_Store b/GME Remit/Modules/.DS_Store index 698d38b2a5f4b17637607c259d681405ff3f968f..88d0fc0b3ca0f1f03a5f315283840df988813db4 100644 GIT binary patch delta 65 zcmZp1XmOa}&&abeU^hP_&t@J09Y$#p1}BD0hJ1!xhE#?Uh9V$4nZc2v6v)olEG-zs Sym_5W81uvip3UqMf7t;NfDoks delta 34 qcmZp1XmOa}&&a(oU^hP__hude9mdTCf~L%yb9rVlZ)TVH%MJjyTnbVE diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Interactor/BiometricAuthenticationInteractor.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Interactor/BiometricAuthenticationInteractor.swift index af576018..4f27f124 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Interactor/BiometricAuthenticationInteractor.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Interactor/BiometricAuthenticationInteractor.swift @@ -9,23 +9,23 @@ import Foundation class BiometricAuthenticationInteractor { - - // MARK: Properties - - weak var output: BiometricAuthenticationInteractorOutput? - private let service: BiometricAuthenticationServiceType - - // MARK: Initialization - - init(service: BiometricAuthenticationServiceType) { - self.service = service - } - - // MARK: Converting entities + + // MARK: Properties + + weak var output: BiometricAuthenticationInteractorOutput? + private let service: BiometricAuthenticationServiceType + + // MARK: Initialization + + init(service: BiometricAuthenticationServiceType) { + self.service = service + } + + // MARK: Converting entities } // MARK: BiometricAuthentication interactor input interface extension BiometricAuthenticationInteractor: BiometricAuthenticationInteractorInput { - + } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Service/BiometricAuthenticationService.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Service/BiometricAuthenticationService.swift index 2e6427c8..33f950d4 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Service/BiometricAuthenticationService.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Application Logic/Service/BiometricAuthenticationService.swift @@ -9,10 +9,10 @@ import Foundation class BiometricAuthenticationService: BiometricAuthenticationServiceType { - - // MARK: Properties - - // MARK: Initialization - - // MARK: Data management + + // MARK: Properties + + // MARK: Initialization + + // MARK: Data management } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Module Interface/BiometricAuthenticationModuleInterface.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Module Interface/BiometricAuthenticationModuleInterface.swift index 53cfac0d..a6021a87 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Module Interface/BiometricAuthenticationModuleInterface.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/Module Interface/BiometricAuthenticationModuleInterface.swift @@ -7,5 +7,5 @@ // protocol BiometricAuthenticationModuleInterface: class { - func showBiometricAuthentication() + func showBiometricAuthentication() } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Presenter/BiometricAuthenticationPresenter.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Presenter/BiometricAuthenticationPresenter.swift index dfc6b29f..f26f45cc 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Presenter/BiometricAuthenticationPresenter.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Presenter/BiometricAuthenticationPresenter.swift @@ -9,28 +9,26 @@ import Foundation class BiometricAuthenticationPresenter { - - // MARK: Properties - - weak var view: BiometricAuthenticationViewInterface? - var interactor: BiometricAuthenticationInteractorInput? - var wireframe: BiometricAuthenticationWireframeInput? - - // MARK: Converting entities + + // MARK: Properties + + weak var view: BiometricAuthenticationViewInterface? + var interactor: BiometricAuthenticationInteractorInput? + var wireframe: BiometricAuthenticationWireframeInput? + + // MARK: Converting entities } - // MARK: BiometricAuthentication module interface +// MARK: BiometricAuthentication module interface extension BiometricAuthenticationPresenter: BiometricAuthenticationModuleInterface { - - func showBiometricAuthentication(){ - // TODO: 생체인증 띄우기 - self.wireframe?.showBiometricAuthentication(completion: nil) - } + func showBiometricAuthentication() { + self.wireframe?.showBiometricAuthentication(completion: nil) + } } // MARK: BiometricAuthentication interactor output interface extension BiometricAuthenticationPresenter: BiometricAuthenticationInteractorOutput { - + } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthenticationViewController.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthenticationViewController.swift index 213c6638..5c10f392 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthenticationViewController.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthenticationViewController.swift @@ -36,7 +36,8 @@ enum BiometricAuthenticationError: Error { case .biometryNotAvailable: msg = "FaceID & TouchID is not available." case .biometryNotEnrolled: - msg = "FaceID & TouchID is not set up.\nCheck your device setting.\n(Setting -> FaceID(TouchID) & Passcode" + let path = "(Setting -> FaceID(TouchID) & Passcode" + msg = "FaceID & TouchID is not set up.\nCheck your device setting.\n\(path)" case .biometryLockout: msg = "FaceID & TouchID is locked." default: @@ -46,9 +47,7 @@ enum BiometricAuthenticationError: Error { } } - - -protocol BiometricAuthenticationViewControllerDelegate: class{ +protocol BiometricAuthenticationViewControllerDelegate: class { func doSelectLocalAuthenticationPolicy( _ viewController: BiometricAuthenticationViewController ) -> BiometricAuthenticationPolicy @@ -71,7 +70,7 @@ protocol BiometricAuthenticationViewControllerDelegate: class{ extension BiometricAuthenticationViewControllerDelegate { func doSelectLocalAuthenticationPolicy( _ viewController: BiometricAuthenticationViewController - ) -> BiometricAuthenticationPolicy{ + ) -> BiometricAuthenticationPolicy { return .deviceOwnerAuthenticationWithBiometrics } } @@ -103,7 +102,7 @@ final class BiometricAuthenticationViewController: UIViewController, BiometricAu override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - if self.isViewDidLoad{ + if self.isViewDidLoad { self.showAuthentication() self.isViewDidLoad = false } @@ -128,17 +127,17 @@ final class BiometricAuthenticationViewController: UIViewController, BiometricAu } - private func setUI(){ + private func setUI() { setBackground() biometricAuthenticationImageButton.layer.cornerRadius = 5 biometricAuthenticationImageButton.setTitle(buttonTitle, for: .normal) } - private func setBackground(){ + private func setBackground() { self.view.backgroundColor = AppConstants.themeRedColor } - private func showAuthentication(){ + private func showAuthentication() { guard let isUseBiometricAuth = KeyChain.shared.get(key: .biometricAuth), diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframe.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframe.swift index 6f9987e7..46428029 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframe.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframe.swift @@ -72,7 +72,11 @@ extension BiometricAuthenticationWireframe: BiometricAuthenticationWireframeInpu DispatchQueue.main.async { let bioError = self.setBiometricError(error: error) completion?(bioError) - self.delegate?.viewController(vc, didFailWithError: bioError, errorMessage: bioError.localizedDescription) + self.delegate?.viewController( + vc, + didFailWithError: bioError, + errorMessage: bioError.localizedDescription + ) } } } @@ -80,7 +84,7 @@ extension BiometricAuthenticationWireframe: BiometricAuthenticationWireframeInpu func openWithDelegate( on window: UIWindow, delegate: BiometricAuthenticationViewControllerDelegate - ){ + ) { let vc = getMainView() self.delegate = delegate (vc as? BiometricAuthenticationViewController)?.delegate = delegate @@ -91,7 +95,7 @@ extension BiometricAuthenticationWireframe: BiometricAuthenticationWireframeInpu func openWithDelegate( on viewConroller: UIViewController, delegate: BiometricAuthenticationViewControllerDelegate - ){ + ) { let vc = getMainView() self.delegate = delegate (vc as? BiometricAuthenticationViewController)?.delegate = delegate diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframeInput.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframeInput.swift index 8bb6d1ed..09ca214d 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframeInput.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricAuthentication/User Interface/Wireframe/BiometricAuthenticationWireframeInput.swift @@ -9,15 +9,15 @@ import Foundation protocol BiometricAuthenticationWireframeInput: WireframeInput { - func showBiometricAuthentication(completion: ((BiometricAuthenticationError?) -> Void)?) - - func openWithDelegate( - on viewConroller: UIViewController, - delegate: BiometricAuthenticationViewControllerDelegate - ) - - func openWithDelegate( - on window: UIWindow, - delegate: BiometricAuthenticationViewControllerDelegate - ) + func showBiometricAuthentication(completion: ((BiometricAuthenticationError?) -> Void)?) + + func openWithDelegate( + on viewConroller: UIViewController, + delegate: BiometricAuthenticationViewControllerDelegate + ) + + func openWithDelegate( + on window: UIWindow, + delegate: BiometricAuthenticationViewControllerDelegate + ) } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractor.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractor.swift deleted file mode 100644 index 84cadceb..00000000 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractor.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// BiometricAuthenticationNotificationInteractor.swift -// GME Remit -// -// Created by InKwon Devik Kim on 30/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class BiometricAuthenticationNotificationInteractor { - - // MARK: Properties - - weak var output: BiometricAuthenticationNotificationInteractorOutput? - private let service: BiometricAuthenticationNotificationServiceType - - // MARK: Initialization - - init(service: BiometricAuthenticationNotificationServiceType) { - self.service = service - } - - // MARK: Converting entities -} - -// MARK: BiometricAuthenticationNotification interactor input interface - -extension BiometricAuthenticationNotificationInteractor: BiometricAuthenticationNotificationInteractorInput { - -} diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Presenter/BiometricAuthenticationNotificationPresenter.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Presenter/BiometricAuthenticationNotificationPresenter.swift deleted file mode 100644 index ad3df038..00000000 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Presenter/BiometricAuthenticationNotificationPresenter.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// BiometricAuthenticationNotificationPresenter.swift -// GME Remit -// -// Created by InKwon Devik Kim on 30/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import Foundation - -class BiometricAuthenticationNotificationPresenter { - - // MARK: Properties - - weak var view: BiometricAuthenticationNotificationViewInterface? - var interactor: BiometricAuthenticationNotificationInteractorInput? - var wireframe: BiometricAuthenticationNotificationWireframeInput? - - // MARK: Converting entities -} - -// MARK: BiometricAuthenticationNotification module interface - -extension BiometricAuthenticationNotificationPresenter: BiometricAuthenticationNotificationModuleInterface { - -} - -// MARK: BiometricAuthenticationNotification interactor output interface - -extension BiometricAuthenticationNotificationPresenter: BiometricAuthenticationNotificationInteractorOutput { - -} diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframe.swift b/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframe.swift deleted file mode 100644 index 335198de..00000000 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframe.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// BiometricAuthenticationNotificationWireframe.swift -// GME Remit -// -// Created by InKwon Devik Kim on 30/04/2019. -//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. -// - -import UIKit - -class BiometricAuthenticationNotificationWireframe { - weak var view: UIViewController! -} - -extension BiometricAuthenticationNotificationWireframe: BiometricAuthenticationNotificationWireframeInput { - - var storyboardName: String {return "BiometricAuthenticationNotification"} - - func getMainView() -> UIViewController { - let service = BiometricAuthenticationNotificationService() - let interactor = BiometricAuthenticationNotificationInteractor(service: service) - let presenter = BiometricAuthenticationNotificationPresenter() - let viewController = viewControllerFromStoryboard(of: BiometricAuthenticationNotificationViewController.self) - - viewController.presenter = presenter - interactor.output = presenter - presenter.interactor = interactor - presenter.wireframe = self - presenter.view = viewController - - self.view = viewController - return viewController - } -} diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricNotification/.DS_Store b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..313da43d473df2493b8c70db9768cedde8bcb600 GIT binary patch literal 6148 zcmeHK%}N6?5T4YkX+`ZpP;a?->!B^Eco3Fa58j0J=b)mycGZQtE8VR{Yh|B9-^ds6 zb(~4kVySu(QJI0sH<`>NnpJ=j07z8ATmhR8gvLq7BxgN@LeHUK2O>xz zfc984JANYrbar#F4~agr_vd#39-Kqqcas~x75f=vz4EQS7ssuk?fC~`&^;|JY{gOPg;CJf$ze0VkmJKJYR27q z+=-frp2sxgLYb_1%5%q5t?~ zs22EDYMHk&~RyzOy literal 0 HcmV?d00001 diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractor.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractor.swift new file mode 100644 index 00000000..dafa16d5 --- /dev/null +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractor.swift @@ -0,0 +1,31 @@ +// +// BiometricNotificationInteractor.swift +// GME Remit +// +// Created by InKwon Devik Kim on 30/04/2019. +//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import Foundation + +class BiometricNotificationInteractor { + + // MARK: Properties + + weak var output: BiometricNotificationInteractorOutput? + private let service: BiometricNotificationServiceType + + // MARK: Initialization + + init(service: BiometricNotificationServiceType) { + self.service = service + } + + // MARK: Converting entities +} + +// MARK: BiometricAuthenticationNotification interactor input interface + +extension BiometricNotificationInteractor: BiometricNotificationInteractorInput { + +} diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractorIO.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractorIO.swift similarity index 59% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractorIO.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractorIO.swift index 5aaf4c9f..f5be255f 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Interactor/BiometricAuthenticationNotificationInteractorIO.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Interactor/BiometricNotificationInteractorIO.swift @@ -6,10 +6,10 @@ //Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. // -protocol BiometricAuthenticationNotificationInteractorInput: class { +protocol BiometricNotificationInteractorInput: class { } -protocol BiometricAuthenticationNotificationInteractorOutput: class { +protocol BiometricNotificationInteractorOutput: class { } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationService.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Service/BiometricNotificationService.swift similarity index 52% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationService.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Service/BiometricNotificationService.swift index 84362544..3089dc07 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationService.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Service/BiometricNotificationService.swift @@ -8,11 +8,11 @@ import Foundation -class BiometricAuthenticationNotificationService: BiometricAuthenticationNotificationServiceType { - - // MARK: Properties - - // MARK: Initialization - - // MARK: Data management +class BiometricNotificationService: BiometricNotificationServiceType { + + // MARK: Properties + + // MARK: Initialization + + // MARK: Data management } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationServiceType.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Service/BiometricNotificationServiceType.swift similarity index 77% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationServiceType.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Service/BiometricNotificationServiceType.swift index 6d853c2d..ffaa3610 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Application Logic/Service/BiometricAuthenticationNotificationServiceType.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Application Logic/Service/BiometricNotificationServiceType.swift @@ -8,6 +8,6 @@ import Foundation -protocol BiometricAuthenticationNotificationServiceType: class { +protocol BiometricNotificationServiceType: class { } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Module Interface/BiometricAuthenticationNotificationModuleInterface.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Module Interface/BiometricNotificationModuleInterface.swift similarity index 75% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Module Interface/BiometricAuthenticationNotificationModuleInterface.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/Module Interface/BiometricNotificationModuleInterface.swift index 7d74b840..137fefc7 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/Module Interface/BiometricAuthenticationNotificationModuleInterface.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/Module Interface/BiometricNotificationModuleInterface.swift @@ -6,6 +6,6 @@ //Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. // -protocol BiometricAuthenticationNotificationModuleInterface: class { +protocol BiometricNotificationModuleInterface: class { } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Presenter/BiometricNotificationPresenter.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Presenter/BiometricNotificationPresenter.swift new file mode 100644 index 00000000..da9ca276 --- /dev/null +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Presenter/BiometricNotificationPresenter.swift @@ -0,0 +1,32 @@ +// +// BiometricAuthenticationNotificationPresenter.swift +// GME Remit +// +// Created by InKwon Devik Kim on 30/04/2019. +//Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import Foundation + +class BiometricNotificationPresenter { + + // MARK: Properties + + weak var view: BiometricNotificationViewInterface? + var interactor: BiometricNotificationInteractorInput? + var wireframe: BiometricNotificationWireframeInput? + + // MARK: Converting entities +} + +// MARK: BiometricAuthenticationNotification module interface + +extension BiometricNotificationPresenter: BiometricNotificationModuleInterface { + +} + +// MARK: BiometricAuthenticationNotification interactor output interface + +extension BiometricNotificationPresenter: BiometricNotificationInteractorOutput { + +} diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/.DS_Store b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/.DS_Store similarity index 100% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/.DS_Store rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/.DS_Store diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotification.storyboard b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotification.storyboard similarity index 98% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotification.storyboard rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotification.storyboard index 94847814..06be22df 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotification.storyboard +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotification.storyboard @@ -21,7 +21,7 @@ - + diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewController.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotificationViewController.swift similarity index 88% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewController.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotificationViewController.swift index 52ad332a..ace69a01 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewController.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotificationViewController.swift @@ -8,11 +8,11 @@ import UIKit -class BiometricAuthenticationNotificationViewController: UIViewController { +class BiometricNotificationViewController: UIViewController { // MARK: Properties - var presenter: BiometricAuthenticationNotificationModuleInterface? + var presenter: BiometricNotificationModuleInterface? // MARK: IBOutlets @IBOutlet weak var useBiometricAuthButton: UIButton! @@ -66,6 +66,6 @@ class BiometricAuthenticationNotificationViewController: UIViewController { } // MARK: BiometricAuthenticationNotificationViewInterface -extension BiometricAuthenticationNotificationViewController: BiometricAuthenticationNotificationViewInterface { +extension BiometricNotificationViewController: BiometricNotificationViewInterface { } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewInterface.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotificationViewInterface.swift similarity index 75% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewInterface.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotificationViewInterface.swift index 3688d068..c83bca07 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/View/BiometricAuthenticationNotificationViewInterface.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/View/BiometricNotificationViewInterface.swift @@ -6,6 +6,6 @@ //Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. // -protocol BiometricAuthenticationNotificationViewInterface: class { +protocol BiometricNotificationViewInterface: class { } diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/.DS_Store b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 UIViewController { + let service = BiometricNotificationService() + let interactor = BiometricNotificationInteractor(service: service) + let presenter = BiometricNotificationPresenter() + let viewController = viewControllerFromStoryboard(of: BiometricNotificationViewController.self) + + viewController.presenter = presenter + interactor.output = presenter + presenter.interactor = interactor + presenter.wireframe = self + presenter.view = viewController + + self.view = viewController + return viewController + } +} diff --git a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframeInput.swift b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/BiometricNotificationWireframeInput.swift similarity index 74% rename from GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframeInput.swift rename to GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/BiometricNotificationWireframeInput.swift index bf48d2bb..79275ea8 100644 --- a/GME Remit/Modules/BiometricAuthModules/BiometricAuthenticationNotification/User Interface/Wireframe/BiometricAuthenticationNotificationWireframeInput.swift +++ b/GME Remit/Modules/BiometricAuthModules/BiometricNotification/User Interface/Wireframe/BiometricNotificationWireframeInput.swift @@ -8,6 +8,6 @@ import Foundation -protocol BiometricAuthenticationNotificationWireframeInput: WireframeInput { +protocol BiometricNotificationWireframeInput: WireframeInput { } diff --git a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift index d1ac8ba4..230a1885 100644 --- a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift +++ b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift @@ -142,7 +142,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { } } else { if KeyChain.shared.get(key: .biometricAuth) == nil { - BiometricAuthenticationNotificationWireframe().openMainView(source: self) + BiometricNotificationWireframe().openMainView(source: self) } } } diff --git a/GME Remit/Modules/SendMoneyModules/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift b/GME Remit/Modules/SendMoneyModules/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift index d1e97d29..ee206aba 100644 --- a/GME Remit/Modules/SendMoneyModules/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift +++ b/GME Remit/Modules/SendMoneyModules/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift @@ -9,84 +9,87 @@ import UIKit class PaymentSelectionViewController: UIViewController { - - struct StringConstants { - // Todo ccr - let closeText = "penny_test_close_text".localized() - } - - // MARK: IBOutlets - @IBOutlet weak var mainView: UIView! - @IBOutlet weak var closeButton: UIButton! - - - // MARK: Properties - var accounts: [Account]? - var onSelection: ((Account) -> ())? - @IBOutlet weak var tableView: UITableView! - var presenter: PaymentSelectionModuleInterface? - // MARK: VC's Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - self.setup() - } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - mainView.bottomToOrigin() - } + struct StringConstants { + // Todo ccr + let closeText = "penny_test_close_text".localized() + } - // MARK: IBActions - - @IBAction func close(_ sender: Any) { - mainView.originToBottom(){ - self.dismiss(animated: true, completion: nil) - } - } - // MARK: Other Functions - - private func setup() { - // all setup should be done here - self.mainView.layer.cornerRadius = 10 - self.mainView.clipsToBounds = true - self.tableView.dataSource = self - self.tableView.delegate = self - self.tableView.reloadData() - configureText() - mainView.layer.cornerRadius = 10 - closeButton.layer.cornerRadius = 10 - } - - private func configureText() { - self.closeButton.setTitle(StringConstants().closeText, for: UIControl.State.normal) + // MARK: IBOutlets + @IBOutlet weak var mainView: UIView! + @IBOutlet weak var closeButton: UIButton! + + // MARK: Properties + var accounts: [Account]? + var onSelection: ((Account) -> Void)? + + @IBOutlet weak var tableView: UITableView! + var presenter: PaymentSelectionModuleInterface? + // MARK: VC's Life cycle + + override func viewDidLoad() { + super.viewDidLoad() + self.setup() + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + mainView.bottomToOrigin() + } + + // MARK: IBActions + + @IBAction func close(_ sender: Any) { + mainView.originToBottom() { + self.dismiss(animated: true, completion: nil) } + } + // MARK: Other Functions + + private func setup() { + // all setup should be done here + self.mainView.layer.cornerRadius = 10 + self.mainView.clipsToBounds = true + self.tableView.dataSource = self + self.tableView.delegate = self + self.tableView.reloadData() + configureText() + mainView.layer.cornerRadius = 10 + closeButton.layer.cornerRadius = 10 + } + + private func configureText() { + self.closeButton.setTitle(StringConstants().closeText, for: UIControl.State.normal) + } } // MARK: PaymentSelectionViewInterface extension PaymentSelectionViewController: PaymentSelectionViewInterface { - + } extension PaymentSelectionViewController: UITableViewDelegate { - func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - if let accunt = self.accounts?.elementAt(index: indexPath.row) { - mainView.originToBottom(){ - self.dismiss(animated: true, completion: nil) - } - } + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + if self.accounts?.elementAt(index: indexPath.row) != nil { + mainView.originToBottom() { + self.dismiss(animated: true, completion: nil) + } } + } } extension PaymentSelectionViewController: UITableViewDataSource { - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return self.accounts?.count ?? 0 + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return self.accounts?.count ?? 0 + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + guard let model = tableView.dequeueReusableCell(withIdentifier: "PaymentSelectionTableViewCell") as? PaymentSelectionTableViewCell else { + return UITableViewCell() } - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let model = tableView.dequeueReusableCell(withIdentifier: "PaymentSelectionTableViewCell") as! PaymentSelectionTableViewCell - model.acunt = accounts?.elementAt(index: indexPath.row) - model.setup() - return model - } + model.acunt = accounts?.elementAt(index: indexPath.row) + model.setup() + return model + } } diff --git a/GME Remit/Utilities/SearchAddress/Application Logic/Model/JusoCommon.swift b/GME Remit/Utilities/SearchAddress/Application Logic/Model/JusoCommon.swift index cc83085f..0412ce63 100644 --- a/GME Remit/Utilities/SearchAddress/Application Logic/Model/JusoCommon.swift +++ b/GME Remit/Utilities/SearchAddress/Application Logic/Model/JusoCommon.swift @@ -10,22 +10,21 @@ import Foundation import ObjectMapper class JusoCommon: Mappable { - var totalCount: String? - var currentPage: String? - var countPerPage: String? - var errorCode: String? - var errorMessage: String? + var totalCount: String? + var currentPage: String? + var countPerPage: String? + var errorCode: String? + var errorMessage: String? + + required init?(map: Map) { - - required init?(map: Map) { - - } - - func mapping(map: Map) { - self.totalCount <- map["totalCount"] - self.currentPage <- map["currentPage"] - self.countPerPage <- map["countPerPage"] - self.errorCode <- map["errorCode"] - self.errorMessage <- map["errorMessage"] - } + } + + func mapping(map: Map) { + self.totalCount <- map["totalCount"] + self.currentPage <- map["currentPage"] + self.countPerPage <- map["countPerPage"] + self.errorCode <- map["errorCode"] + self.errorMessage <- map["errorMessage"] + } }