IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug fixes

v0.17
stepie.ub 1 year ago
parent
99c904b343
commit
a2eecb73c0
6 changed files with 54 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      GME Remit.xcodeproj/project.pbxproj
  2. 6
      GME Remit/Modules/Home/User Interface/View/Home.storyboard
  3. 36
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard
  4. 12
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
  5. 53
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
  6. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift

1
GME Remit.xcodeproj/project.pbxproj
View File

@ -8967,6 +8967,7 @@
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=*]" = arm64;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",

6
GME Remit/Modules/Home/User Interface/View/Home.storyboard
View File

@ -37,7 +37,7 @@
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="frG-CG-zlO">
<rect key="frame" x="0.0" y="0.0" width="304" height="32"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_image" translatesAutoresizingMaskIntoConstraints="NO" id="uWJ-LO-XOz">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="profile" translatesAutoresizingMaskIntoConstraints="NO" id="uWJ-LO-XOz">
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="ObI-hY-fPi"/>
@ -288,7 +288,7 @@
<tabBarItem key="tabBarItem" title="Home" image="branch" id="If6-UM-LN6"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="NbY-y6-481">
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
@ -308,8 +308,8 @@
<image name="copy_paste" width="16" height="20"/>
<image name="customer_support_new" width="24" height="24"/>
<image name="notification_bell_new" width="24" height="24"/>
<image name="profile" width="24" height="24"/>
<image name="upload slip" width="16" height="16"/>
<image name="user_image" width="96" height="96"/>
<namedColor name="ThemeMainBackground">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>

36
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="7Ae-bw-nta">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -26,7 +26,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QYh-gV-EHL">
<rect key="frame" x="0.0" y="44" width="375" height="2456"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="2500"/>
<subviews>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="900" translatesAutoresizingMaskIntoConstraints="NO" id="PIe-ui-tiD">
<rect key="frame" x="0.0" y="0.0" width="375" height="1859.5"/>
@ -590,14 +590,6 @@
<constraint firstItem="QYh-gV-EHL" firstAttribute="top" secondItem="O1T-1R-Sun" secondAttribute="top" id="S3Y-mu-Ktt"/>
</constraints>
</view>
<navigationItem key="navigationItem" id="0hW-Zq-UP1">
<barButtonItem key="leftBarButtonItem" image="ic_back_button" id="acX-gL-bI7">
<color key="tintColor" name="ThemeBlack"/>
<connections>
<action selector="touchCloseButton:" destination="HSb-ou-7T5" id="xgn-lF-0yF"/>
</connections>
</barButtonItem>
</navigationItem>
<size key="freeformSize" width="375" height="2500"/>
<connections>
<outlet property="accountTextField" destination="8Rm-uv-VaK" id="xaY-bG-C2w"/>
@ -649,24 +641,6 @@
</objects>
<point key="canvasLocation" x="847.20000000000005" y="232.08395802098951"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="t4a-9K-9qk">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="7Ae-bw-nta" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="mmL-0X-Yso">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="HSb-ou-7T5" kind="relationship" relationship="rootViewController" id="mRx-Ic-OUc"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="CoQ-mP-Sfx" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-92" y="232.53373313343329"/>
</scene>
</scenes>
<designables>
<designable name="0W1-8y-tX6">
@ -745,10 +719,6 @@
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<image name="dropdown_grey" width="15" height="8"/>
<image name="ic_back_button" width="23" height="17"/>
<namedColor name="ThemeBlack">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</namedColor>
<namedColor name="ThemeBlue">
<color red="0.047058823529411764" green="0.12941176470588237" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>

12
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
View File

@ -114,7 +114,7 @@ class SetupRecipientViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
title = "send_money_title_text".localized()
self.navigationItem.title = "send_money_title_text".localized()
setupNormalNavigation()
// accountTextField.delegate = self
lastNameTextField.delegate = self
@ -421,6 +421,7 @@ extension SetupRecipientViewController {
}
self.viewModel?.presenter?.gotoSendMoney(recipient, paymentMethod)
}
// self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
@ -432,10 +433,11 @@ extension SetupRecipientViewController {
},
cancelAction: { [weak self] in guard let `self` = self else { return }
self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
self.delegate?.setupRecieient(
self,
didSelectRecipientID: nil
)
self.navigationController?.popToRootViewController(animated: true)
// self.delegate?.setupRecieient(
// self,
// didSelectRecipientID: nil
// )
}
})
}

53
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
View File

@ -73,13 +73,19 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput {
recipient = model
sendReciptent = completion
let viewcontroller = getMainView()
let navigationController = UINavigationController(
rootViewController: viewcontroller
)
navigationController.hero.isEnabled = true
navigationController.modalPresentationStyle = .overFullScreen
// base.navigationController.push(getMainView(), animated: true)
base.present(navigationController, animated: true)
// let navigationController = UINavigationController(
// rootViewController: viewcontroller
// )
if let navVC = base.navigationController {
// let wireframe = BeneficiaryDetailWireframe()
navVC.push(viewcontroller, animated: true)
}
// navigationController.hero.isEnabled = true
// navigationController.mxodalPresentationStyle = .overFullScreen
//// base.navigationController.push(getMainView(), animated: true)
// base.present(navigationController, animated: true)
}
@ -94,12 +100,19 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput {
self.delegate = delegate
self.parentType = parentType
let viewcontroller = getMainView()
let navigationController = UINavigationController(
rootViewController: viewcontroller
)
navigationController.hero.isEnabled = true
navigationController.modalPresentationStyle = .overFullScreen
base.present(navigationController, animated: true, completion: completion)
// let navigationController = UINavigationController(
// rootViewController: viewcontroller
// )
// navigationController.hero.isEnabled = true
// navigationController.modalPresentationStyle = .overFullScreen
// base.present(navigationController, animated: true, completion: completion)
if let navVC = base.navigationController {
// let wireframe = BeneficiaryDetailWireframe()
// wireframe.recipient = reciptent
navVC.push(viewcontroller, animated: true)
}
}
func openSelectMode(with model: [TablePresenterProtocol], type: SetupOpenType) {
@ -197,7 +210,19 @@ extension SetupRecipientWireframe: TablePresenterDelegate {
wireframe.output = self.presenter
wireframe.viewModel = self.viewModel
wireframe.paymentMethod = paymentMethod
wireframe.open(for: recipientData, in: navigationVC)
guard let parentVC = self.view.presentingViewController else {
wireframe.open(for: recipientData, in: navigationVC)
return
}
guard let parentNavVC = parentVC.navigationController else {
return
}
wireframe.open(for: recipientData, in: parentNavVC)
navigationVC.navigationController?.popToRootViewController(animated: true)
}
}

2
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift
View File

@ -149,7 +149,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
"PayOutPartner": reciepient.payoutPartner ?? reciepient.paymentMethod?.payoutPartner ?? "",
"IsAgreed": "TRUE",
"TxnPassword": model.transactionPassword ?? "",
"ReceiverAccountNo": paymentModel?.agent?.accountNumber ?? "",
"ReceiverAccountNo": paymentModel?.agent?.accountNumber ?? reciepient.agent?.accountNumber ?? "",
"ProcessId": "",
// "schemeId": "",
"isUseBiometric": model.isUseBiometric ?? false,

Write Preview
Loading…
Cancel
Save