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

storyboard issue fixed

v0.17
Suraj Lohani 1 year ago
parent
a55195156c
commit
e6179ac2bc
3 changed files with 39 additions and 39 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. 8
      GME Remit.xcodeproj/project.pbxproj
  2. 48
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
  3. 22
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

8
GME Remit.xcodeproj/project.pbxproj
View File

@ -61,7 +61,6 @@
24BBCCE829CD7C430081F4A6 /* BeneficiaryDetailPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBCCDA29CD7C430081F4A6 /* BeneficiaryDetailPresenter.swift */; };
24BBCCE929CD7C430081F4A6 /* BeneficiaryDetailWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBCCDC29CD7C430081F4A6 /* BeneficiaryDetailWireframe.swift */; };
24BBCCEA29CD7C430081F4A6 /* BeneficiaryDetailWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBCCDD29CD7C430081F4A6 /* BeneficiaryDetailWireframeInput.swift */; };
24BBCCEB29CD7C430081F4A6 /* BeneficiaryDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24BBCCE029CD7C430081F4A6 /* BeneficiaryDetail.storyboard */; };
24BBCCEC29CD7C430081F4A6 /* BeneficiaryDetailViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBCCE129CD7C430081F4A6 /* BeneficiaryDetailViewInterface.swift */; };
24BBCCED29CD7C430081F4A6 /* BeneficiaryDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24BBCCE229CD7C430081F4A6 /* BeneficiaryDetailViewController.swift */; };
24D013CF29D2C296000A3B78 /* BeneficiaryDetailHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D013CE29D2C296000A3B78 /* BeneficiaryDetailHeaderView.swift */; };
@ -645,6 +644,7 @@
BEC9B004224FC49C00A2DA06 /* BiometricAuthenticationViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC9AFF9224FC49C00A2DA06 /* BiometricAuthenticationViewInterface.swift */; };
BEC9B005224FC49C00A2DA06 /* BiometricAuthenticationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC9AFFA224FC49C00A2DA06 /* BiometricAuthenticationViewController.swift */; };
BEC9B006224FC49C00A2DA06 /* BiometricAuthentication.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BEC9AFFB224FC49C00A2DA06 /* BiometricAuthentication.storyboard */; };
C3466DB62A1F1D46001AA9AE /* BeneficiaryDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3466DB52A1F1D46001AA9AE /* BeneficiaryDetail.storyboard */; };
C3BD928E2A1E3CED00568DEC /* SendMoneyExchangeRate.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3BD928C2A1E3CED00568DEC /* SendMoneyExchangeRate.storyboard */; };
C3BD928F2A1E3CED00568DEC /* SendMoneyExchangeRateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3BD928D2A1E3CED00568DEC /* SendMoneyExchangeRateViewController.swift */; };
CC9B671D5DDC9BB476C2775F /* Pods_GME_Remit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 754C503578F5B5FFF3758D6E /* Pods_GME_Remit.framework */; };
@ -938,7 +938,6 @@
24BBCCDA29CD7C430081F4A6 /* BeneficiaryDetailPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailPresenter.swift; sourceTree = "<group>"; };
24BBCCDC29CD7C430081F4A6 /* BeneficiaryDetailWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailWireframe.swift; sourceTree = "<group>"; };
24BBCCDD29CD7C430081F4A6 /* BeneficiaryDetailWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailWireframeInput.swift; sourceTree = "<group>"; };
24BBCCE029CD7C430081F4A6 /* BeneficiaryDetail.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BeneficiaryDetail.storyboard; sourceTree = "<group>"; };
24BBCCE129CD7C430081F4A6 /* BeneficiaryDetailViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailViewInterface.swift; sourceTree = "<group>"; };
24BBCCE229CD7C430081F4A6 /* BeneficiaryDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailViewController.swift; sourceTree = "<group>"; };
24D013CE29D2C296000A3B78 /* BeneficiaryDetailHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailHeaderView.swift; sourceTree = "<group>"; };
@ -1549,6 +1548,7 @@
BEC9AFF9224FC49C00A2DA06 /* BiometricAuthenticationViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationViewInterface.swift; sourceTree = "<group>"; };
BEC9AFFA224FC49C00A2DA06 /* BiometricAuthenticationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationViewController.swift; sourceTree = "<group>"; };
BEC9AFFB224FC49C00A2DA06 /* BiometricAuthentication.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BiometricAuthentication.storyboard; sourceTree = "<group>"; };
C3466DB52A1F1D46001AA9AE /* BeneficiaryDetail.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BeneficiaryDetail.storyboard; sourceTree = "<group>"; };
C3BD928C2A1E3CED00568DEC /* SendMoneyExchangeRate.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SendMoneyExchangeRate.storyboard; sourceTree = "<group>"; };
C3BD928D2A1E3CED00568DEC /* SendMoneyExchangeRateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyExchangeRateViewController.swift; sourceTree = "<group>"; };
D9030ABA2138DDD900A1BCA0 /* SendMoneyExchangeRate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMoneyExchangeRate.swift; sourceTree = "<group>"; };
@ -2031,7 +2031,7 @@
isa = PBXGroup;
children = (
24BBCCDF29CD7C430081F4A6 /* ViewModels */,
24BBCCE029CD7C430081F4A6 /* BeneficiaryDetail.storyboard */,
C3466DB52A1F1D46001AA9AE /* BeneficiaryDetail.storyboard */,
24BBCCE129CD7C430081F4A6 /* BeneficiaryDetailViewInterface.swift */,
24BBCCE229CD7C430081F4A6 /* BeneficiaryDetailViewController.swift */,
240CCA7929D165CA008867D2 /* BeneficiaryTableViewCell.swift */,
@ -7387,6 +7387,7 @@
4060B97924DBBA0300E90F8C /* KYCVerifyStep1.storyboard in Resources */,
241796D529B3810C005D8219 /* LoyalityPoints.storyboard in Resources */,
73157BA522DC1EEC009B836F /* PopupNotification.storyboard in Resources */,
C3466DB62A1F1D46001AA9AE /* BeneficiaryDetail.storyboard in Resources */,
7389601222C2F208003FEA90 /* TablePresenter.storyboard in Resources */,
5565FF2E1FE275E5002934E9 /* SanFranciscoText-Semibold.otf in Resources */,
73AF9C6C275CB708003A701E /* GoogleService-Info.plist in Resources */,
@ -7451,7 +7452,6 @@
2454866B29BA2AE60065E1DD /* volte-regular.otf in Resources */,
D931E22A216DCC2A008A8CD1 /* MessageCompose.storyboard in Resources */,
7327568623B0456400BF66C5 /* ManageAgreement.storyboard in Resources */,
24BBCCEB29CD7C430081F4A6 /* BeneficiaryDetail.storyboard in Resources */,
7E364CEC24A4455A007D6E02 /* PasswordInputViewController.xib in Resources */,
5565FF2C1FE275E5002934E9 /* SanFranciscoText-Medium.otf in Resources */,
5565FF311FE275E5002934E9 /* SanFranciscoDisplay-Medium.otf in Resources */,

48
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
View File

@ -85,49 +85,37 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDM-LN-544">
<rect key="frame" x="0.0" y="0.0" width="265" height="195"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="DHQ-Um-OF3">
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="DHQ-Um-OF3">
<rect key="frame" x="16" y="16" width="249" height="163"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bank_deposit" translatesAutoresizingMaskIntoConstraints="NO" id="hqc-cx-rzh">
<rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
<rect key="frame" x="0.0" y="61.5" width="40" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="2AX-wg-DHd"/>
<constraint firstAttribute="width" constant="40" id="jBV-OA-jx3"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cnn-41-XDg">
<rect key="frame" x="56" y="0.0" width="193" height="92"/>
<rect key="frame" x="48" y="56.5" width="161" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IME Pay Mobile Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-L0-gY3">
<rect key="frame" x="0.0" y="0.0" width="193" height="14"/>
<rect key="frame" x="0.0" y="0.0" width="161" height="14"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Lh7-U6-fWO">
<rect key="frame" x="0.0" y="22" width="193" height="70"/>
<rect key="frame" x="0.0" y="22" width="161" height="28"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doi-P7-z1R">
<rect key="frame" x="0.0" y="0.0" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O58-Ke-fq6">
<rect key="frame" x="0.0" y="18.5" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uL-wQ-mZd">
<rect key="frame" x="0.0" y="37" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="0.0" width="161" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jsp-NN-jLM">
<rect key="frame" x="0.0" y="55.5" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="16" width="161" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
@ -135,13 +123,25 @@
</stackView>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sb6-dg-9Kc">
<rect key="frame" x="217" y="65.5" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="gJS-vx-kSM"/>
<constraint firstAttribute="height" constant="32" id="wDK-0a-BFM"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" image="ic_delete3"/>
<connections>
<action selector="deleteAction:" destination="Zvf-x1-Wi5" eventType="touchUpInside" id="E6X-6Z-oTi"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="0.038622723509933773" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="DHQ-Um-OF3" firstAttribute="top" secondItem="ZDM-LN-544" secondAttribute="top" constant="16" id="IPG-sG-484"/>
<constraint firstAttribute="trailing" secondItem="DHQ-Um-OF3" secondAttribute="trailing" id="JfO-A7-ABO"/>
<constraint firstAttribute="trailing" secondItem="DHQ-Um-OF3" secondAttribute="trailing" id="Va2-wU-p6e"/>
<constraint firstAttribute="bottom" secondItem="DHQ-Um-OF3" secondAttribute="bottom" constant="16" id="hMX-bV-B8j"/>
<constraint firstItem="DHQ-Um-OF3" firstAttribute="leading" secondItem="ZDM-LN-544" secondAttribute="leading" constant="16" id="s4K-Rw-9Ce"/>
</constraints>
@ -160,9 +160,8 @@
</tableViewCellContentView>
<connections>
<outlet property="AcBranchLabel" destination="jsp-NN-jLM" id="xDJ-Y2-c78"/>
<outlet property="AcNameLabel" destination="O58-Ke-fq6" id="KVS-Xt-oRd"/>
<outlet property="AcNumberLabel" destination="9uL-wQ-mZd" id="Pks-mP-OJX"/>
<outlet property="idNumberLabel" destination="doi-P7-z1R" id="6QK-2D-gYe"/>
<outlet property="deleteButtonOutlet" destination="sb6-dg-9Kc" id="eib-yA-E3c"/>
<outlet property="indicatorButton" destination="g1X-nk-DT1" id="4vj-vA-Y9D"/>
<outlet property="localizedNameLabel" destination="Ae7-L0-gY3" id="Ksl-Xn-apk"/>
<outlet property="walletInfoView" destination="ZDM-LN-544" id="QlL-Ah-8f5"/>
@ -239,6 +238,7 @@
<image name="backIconBlack" width="21" height="16"/>
<image name="bank_deposit" width="54" height="54"/>
<image name="circle" catalog="system" width="128" height="123"/>
<image name="ic_delete3" width="24" height="24"/>
<namedColor name="ThemeBlack">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</namedColor>

22
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
View File

@ -235,8 +235,8 @@ class SendMoneyExchangeRateViewController: UIViewController {
// MARK: Other Functions
private func setup() {
// all setup should be done here
backgroundViewCountryLabel2.hero.id = reciepient?.receiverID
backgroundViewCountryLabel2.hero.modifiers = [.translate()]
// backgroundViewCountryLabel2.hero.id = reciepient?.receiverID
// backgroundViewCountryLabel2.hero.modifiers = [.translate()]
setupTargets()
action = .calculate
@ -244,7 +244,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
reciepientTextField.delegate = self
calcBy = "c"
[backgroundViewCountryLabel1, backgroundViewCountryLabel2].forEach { $0?.layer.cornerRadius = 5 }
// [backgroundViewCountryLabel1, backgroundViewCountryLabel2].forEach { $0?.layer.cornerRadius = 5 }
[exchangeBackground1, exchangeBackground2].forEach {
$0?.layer.borderWidth = 1
$0?.layer.borderColor = UIColor.themeSeparate.cgColor
@ -260,15 +260,15 @@ class SendMoneyExchangeRateViewController: UIViewController {
senderTextField.textColor = .black
reciepientTextField.textColor = .black
backgroundViewCountryLabel1.backgroundColor = .themeRed
backgroundViewCountryLabel2.backgroundColor = .themeRed
// backgroundViewCountryLabel1.backgroundColor = .themeRed
// backgroundViewCountryLabel2.backgroundColor = .themeRed
rewardTextField.placeholder = "rewards_point_placeholder_text".localized()
}
private func showExchangeRateInfomation(isHidden flag: Bool) {
calculatedInfoView.isHidden = flag
calculatedInfoView.alpha = flag ? 0.0 : 1.0
// calculatedInfoView.isHidden = flag
// calculatedInfoView.alpha = flag ? 0.0 : 1.0
if !flag {
self.serviceChargeView.isHidden = false
@ -297,8 +297,8 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func configureLanguage() {
youSendTitleLabel.text = "you_send_text".localized()
recipientGetsTitleLabel.text = "receipient_gets_text".localized()
// youSendTitleLabel.text = "you_send_text".localized()
// recipientGetsTitleLabel.text = "receipient_gets_text".localized()
continueButton.setTitle("calculate_text".localized(), for: .normal)
}
@ -314,7 +314,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func setupTargets() {
let tapGuesture = UITapGestureRecognizer(target: self, action: #selector(showCountryList(_:)))
countryListTapGuesture = tapGuesture
countryListStackView.addGestureRecognizer(countryListTapGuesture)
// countryListStackView.addGestureRecognizer(countryListTapGuesture)
reciepientTextField.addTarget(
@ -343,7 +343,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
let dropDownImage = UIImage(named: "dropdown_grey")
let image = dropDownImage
dropDownImageView.image = image
// dropDownImageView.image = image
setCountryFlag(countryCode: reciepient?.countryCode ?? "")
let deliveryMethod = requestModel?.paymemtMode
if (deliveryMethod?.bankRequired ?? "false").lowercased() == "true" {

Write Preview
Loading…
Cancel
Save