From e6179ac2bc45da3802391b891d54f974290e96ba Mon Sep 17 00:00:00 2001 From: Suraj Lohani Date: Thu, 25 May 2023 10:37:40 +0545 Subject: [PATCH] storyboard issue fixed --- GME Remit.xcodeproj/project.pbxproj | 8 ++-- .../View/BeneficiaryDetail.storyboard | 48 +++++++++---------- .../SendMoneyExchangeRateViewController.swift | 22 ++++----- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 09be088b..450055bd 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -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 = ""; }; 24BBCCDC29CD7C430081F4A6 /* BeneficiaryDetailWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailWireframe.swift; sourceTree = ""; }; 24BBCCDD29CD7C430081F4A6 /* BeneficiaryDetailWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailWireframeInput.swift; sourceTree = ""; }; - 24BBCCE029CD7C430081F4A6 /* BeneficiaryDetail.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BeneficiaryDetail.storyboard; sourceTree = ""; }; 24BBCCE129CD7C430081F4A6 /* BeneficiaryDetailViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailViewInterface.swift; sourceTree = ""; }; 24BBCCE229CD7C430081F4A6 /* BeneficiaryDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailViewController.swift; sourceTree = ""; }; 24D013CE29D2C296000A3B78 /* BeneficiaryDetailHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeneficiaryDetailHeaderView.swift; sourceTree = ""; }; @@ -1549,6 +1548,7 @@ BEC9AFF9224FC49C00A2DA06 /* BiometricAuthenticationViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationViewInterface.swift; sourceTree = ""; }; BEC9AFFA224FC49C00A2DA06 /* BiometricAuthenticationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationViewController.swift; sourceTree = ""; }; BEC9AFFB224FC49C00A2DA06 /* BiometricAuthentication.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BiometricAuthentication.storyboard; sourceTree = ""; }; + C3466DB52A1F1D46001AA9AE /* BeneficiaryDetail.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BeneficiaryDetail.storyboard; sourceTree = ""; }; C3BD928C2A1E3CED00568DEC /* SendMoneyExchangeRate.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SendMoneyExchangeRate.storyboard; sourceTree = ""; }; C3BD928D2A1E3CED00568DEC /* SendMoneyExchangeRateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyExchangeRateViewController.swift; sourceTree = ""; }; D9030ABA2138DDD900A1BCA0 /* SendMoneyExchangeRate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMoneyExchangeRate.swift; sourceTree = ""; }; @@ -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 */, diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard index 160334f9..fd0d2fb2 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard @@ -85,49 +85,37 @@ - + - + - + - + - - @@ -135,13 +123,25 @@ + - + @@ -160,9 +160,8 @@ - - + @@ -239,6 +238,7 @@ + diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift index e76b08b2..6756b608 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift @@ -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" {