From dfd51391aefd5500d3b131c601a588297baa1fbf Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Fri, 10 Jan 2020 14:12:18 +0900 Subject: [PATCH] 1. Changed modal style as full screen (ManageAgreement, NewRegister) 2. Edited check balance as <= 3. Set Default branch Information as GME Online 4. Added reactive method at GMEDB 5. Applied username, mobile, email as Rx --- GME Remit.xcodeproj/project.pbxproj | 4 ++ GME Remit/AppDelegate.swift | 2 +- .../View/ManageAgreement.storyboard | 4 +- .../Wireframe/ManageAgreementWireframe.swift | 2 +- .../PhoneCardRechargePresenter.swift | 6 +-- .../View/PhoneCardRecharge.storyboard | 6 +-- .../Wireframe/NewRegisterWireframe.swift | 2 +- .../View/NewRegisterStep1ViewController.swift | 4 +- .../SideMenu/SideMenuViewController.swift | 14 ++++-- .../PDFVIewer/PDFViewController.swift | 2 - .../Database/Rx+UserDefaultsWrapper.swift | 44 +++++++++++++++++++ GME RemitTests/APITest.swift | 1 + GME RemitTests/DatabaseTest.swift | 18 ++++++++ GME RemitTests/FunctionTest.swift | 2 +- 14 files changed, 93 insertions(+), 18 deletions(-) create mode 100644 GME Remit/Utilities/Database/Rx+UserDefaultsWrapper.swift diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 0ef4a7f9..de3fbd52 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -186,6 +186,7 @@ 73149F6B22E5AF8000D66B26 /* LauncherScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73149F6022E5AF8000D66B26 /* LauncherScreen.storyboard */; }; 73149F6C22E5AF8000D66B26 /* LauncherScreenViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73149F6122E5AF8000D66B26 /* LauncherScreenViewInterface.swift */; }; 73149F6D22E5AF8000D66B26 /* LauncherScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73149F6222E5AF8000D66B26 /* LauncherScreenViewController.swift */; }; + 7315526E23C839CF0011D37C /* Rx+UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7315526D23C839CF0011D37C /* Rx+UserDefaultsWrapper.swift */; }; 73157B9B22DC1EEC009B836F /* PopupNotificationModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73157B8922DC1EEC009B836F /* PopupNotificationModuleInterface.swift */; }; 73157B9C22DC1EEC009B836F /* PopupNotificationServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73157B8C22DC1EEC009B836F /* PopupNotificationServiceType.swift */; }; 73157B9D22DC1EEC009B836F /* PopupNotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73157B8D22DC1EEC009B836F /* PopupNotificationService.swift */; }; @@ -2601,6 +2602,7 @@ 73149F6022E5AF8000D66B26 /* LauncherScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LauncherScreen.storyboard; sourceTree = ""; }; 73149F6122E5AF8000D66B26 /* LauncherScreenViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LauncherScreenViewInterface.swift; sourceTree = ""; }; 73149F6222E5AF8000D66B26 /* LauncherScreenViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LauncherScreenViewController.swift; sourceTree = ""; }; + 7315526D23C839CF0011D37C /* Rx+UserDefaultsWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Rx+UserDefaultsWrapper.swift"; sourceTree = ""; }; 73157B8922DC1EEC009B836F /* PopupNotificationModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupNotificationModuleInterface.swift; sourceTree = ""; }; 73157B8C22DC1EEC009B836F /* PopupNotificationServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupNotificationServiceType.swift; sourceTree = ""; }; 73157B8D22DC1EEC009B836F /* PopupNotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupNotificationService.swift; sourceTree = ""; }; @@ -7232,6 +7234,7 @@ children = ( 7383F43522DEB864003D6393 /* GMEDB.swift */, 7383F43D22DF15B8003D6393 /* UserDefaultsWrapper.swift */, + 7315526D23C839CF0011D37C /* Rx+UserDefaultsWrapper.swift */, ); path = Database; sourceTree = ""; @@ -16473,6 +16476,7 @@ 7301979D22535135001954AB /* kycForm1WireframeInput.swift in Sources */, 7327568B23B052DB00BF66C5 /* PDFViewController.swift in Sources */, 73F77279239749DF00E22A82 /* NewRegisterStep2Presenter.swift in Sources */, + 7315526E23C839CF0011D37C /* Rx+UserDefaultsWrapper.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/GME Remit/AppDelegate.swift b/GME Remit/AppDelegate.swift index 77ca5c14..ecf5dc98 100644 --- a/GME Remit/AppDelegate.swift +++ b/GME Remit/AppDelegate.swift @@ -24,7 +24,7 @@ import LGSideMenuController #if DEBUG var server: Server = .live #else -let server: Server = .uat +let server: Server = .live #endif var destination: PushNotificationDestination? diff --git a/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard b/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard index 8123b289..5c4c9172 100644 --- a/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard +++ b/GME Remit/Modules/ManageAgreement/User Interface/View/ManageAgreement.storyboard @@ -170,7 +170,7 @@ -