Browse Source

changes

v0.17
stepie.ub 1 year ago
parent
commit
9c25473180
  1. 24
      GME Remit.xcodeproj/project.pbxproj
  2. 38
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
  3. 129
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
  4. 24
      GME Remit/Supported Files/Info.plist

24
GME Remit.xcodeproj/project.pbxproj

@ -183,6 +183,8 @@
41F06FB929B712A2008E9E5D /* TransferListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41F06FAE29B712A2008E9E5D /* TransferListViewController.swift */; };
41F06FBA29B712A2008E9E5D /* TransferList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 41F06FAF29B712A2008E9E5D /* TransferList.storyboard */; };
41F06FBB29B712A2008E9E5D /* TransferListViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41F06FB029B712A2008E9E5D /* TransferListViewInterface.swift */; };
542326842A1F2A2D0030052F /* SendMoneyExchangeRateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 542326822A1F2A2D0030052F /* SendMoneyExchangeRateViewController.swift */; };
542326852A1F2A2D0030052F /* SendMoneyExchangeRate.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 542326832A1F2A2D0030052F /* SendMoneyExchangeRate.storyboard */; };
5565FF1D1FE275E5002934E9 /* SanFranciscoDisplay-Heavy.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5565FF071FE275E0002934E9 /* SanFranciscoDisplay-Heavy.otf */; };
5565FF1E1FE275E5002934E9 /* SanFranciscoText-RegularItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5565FF081FE275E0002934E9 /* SanFranciscoText-RegularItalic.otf */; };
5565FF1F1FE275E5002934E9 /* SanFranciscoText-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5565FF091FE275E0002934E9 /* SanFranciscoText-Regular.otf */; };
@ -645,8 +647,6 @@
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 */; };
D9030ABB2138DDD900A1BCA0 /* SendMoneyExchangeRate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9030ABA2138DDD900A1BCA0 /* SendMoneyExchangeRate.swift */; };
D9030ABD2139113A00A1BCA0 /* SendMoneyAccountValidationRequestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9030ABC2139113A00A1BCA0 /* SendMoneyAccountValidationRequestModel.swift */; };
@ -1077,6 +1077,8 @@
41F06FAE29B712A2008E9E5D /* TransferListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransferListViewController.swift; sourceTree = "<group>"; };
41F06FAF29B712A2008E9E5D /* TransferList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = TransferList.storyboard; sourceTree = "<group>"; };
41F06FB029B712A2008E9E5D /* TransferListViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransferListViewInterface.swift; sourceTree = "<group>"; };
542326822A1F2A2D0030052F /* SendMoneyExchangeRateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyExchangeRateViewController.swift; sourceTree = "<group>"; };
542326832A1F2A2D0030052F /* SendMoneyExchangeRate.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SendMoneyExchangeRate.storyboard; sourceTree = "<group>"; };
55600052AED9B7B09887A8B3 /* Pods-GME Remit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GME Remit.debug.xcconfig"; path = "Target Support Files/Pods-GME Remit/Pods-GME Remit.debug.xcconfig"; sourceTree = "<group>"; };
5565FF071FE275E0002934E9 /* SanFranciscoDisplay-Heavy.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SanFranciscoDisplay-Heavy.otf"; sourceTree = "<group>"; };
5565FF081FE275E0002934E9 /* SanFranciscoText-RegularItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SanFranciscoText-RegularItalic.otf"; sourceTree = "<group>"; };
@ -1549,8 +1551,6 @@
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>"; };
D9030ABC2139113A00A1BCA0 /* SendMoneyAccountValidationRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMoneyAccountValidationRequestModel.swift; sourceTree = "<group>"; };
D9031129214786EA00AD5BA9 /* ForgotPasswordModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForgotPasswordModuleInterface.swift; sourceTree = "<group>"; };
@ -5381,8 +5381,8 @@
89739DD224459A620016251B /* View */ = {
isa = PBXGroup;
children = (
C3BD928C2A1E3CED00568DEC /* SendMoneyExchangeRate.storyboard */,
C3BD928D2A1E3CED00568DEC /* SendMoneyExchangeRateViewController.swift */,
542326832A1F2A2D0030052F /* SendMoneyExchangeRate.storyboard */,
542326822A1F2A2D0030052F /* SendMoneyExchangeRateViewController.swift */,
89739DD424459A620016251B /* SendMoneyExchangeRateViewInterface.swift */,
);
path = View;
@ -7464,7 +7464,7 @@
40B9B0A824EC4ED1002C258C /* ExistingUserKyc.storyboard in Resources */,
5565FF291FE275E5002934E9 /* SanFranciscoDisplay-Black.otf in Resources */,
FF6E7D9421BF951D00A003B9 /* AppUpdate.storyboard in Resources */,
C3BD928E2A1E3CED00568DEC /* SendMoneyExchangeRate.storyboard in Resources */,
542326852A1F2A2D0030052F /* SendMoneyExchangeRate.storyboard in Resources */,
D9692A1B221396AF00795EBC /* Setting.storyboard in Resources */,
2454866E29BA2AE60065E1DD /* volte-semibold.otf in Resources */,
73195ABC22FD14D500151434 /* SetupRecipient.storyboard in Resources */,
@ -8419,7 +8419,7 @@
DDCDF6682A0ACBDB00124D00 /* AllRecipientsService.swift in Sources */,
40B33AAB24CAF87A00AFE2AB /* ExistingUserRegistrationViewController.swift in Sources */,
FF6E7D9221BF951D00A003B9 /* AppUpdateModuleInterface.swift in Sources */,
C3BD928F2A1E3CED00568DEC /* SendMoneyExchangeRateViewController.swift in Sources */,
542326842A1F2A2D0030052F /* SendMoneyExchangeRateViewController.swift in Sources */,
89739E2B24459A630016251B /* SendMoneyParentServiceType.swift in Sources */,
41F06FB129B712A2008E9E5D /* TransferListModuleInterface.swift in Sources */,
735F68DE2394A76800A2DBC8 /* NewRegisterInteractor.swift in Sources */,
@ -8917,7 +8917,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
DEVELOPMENT_TEAM = GH2642V3WY;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = (
@ -8941,7 +8941,7 @@
"$(OTHER_LDFLAGS)",
"-ObjC",
);
PRODUCT_BUNDLE_IDENTIFIER = com.japan.jmeremit;
PRODUCT_BUNDLE_IDENTIFIER = com.japan.jmeremit1;
PRODUCT_NAME = "JME Remit";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "GME Remit/Supported Files/GMERemittance-Bridging-Header.h";
@ -8962,7 +8962,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
DEVELOPMENT_TEAM = GH2642V3WY;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -8985,7 +8985,7 @@
"$(OTHER_LDFLAGS)",
"-ObjC",
);
PRODUCT_BUNDLE_IDENTIFIER = com.japan.jmeremit;
PRODUCT_BUNDLE_IDENTIFIER = com.japan.jmeremit1;
PRODUCT_NAME = "JME Remit";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "GME Remit/Supported Files/GMERemittance-Bridging-Header.h";

38
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard

@ -47,19 +47,19 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N88-OZ-ngd">
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="TN0-EW-4Gc">
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="TN0-EW-4Gc">
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="You Send" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="GrN-Cz-PcA" customClass="GMENumberTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="254.5" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="252.5" height="60"/>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="33"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JPY" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="MSh-eh-Zu9">
<rect key="frame" x="259.5" y="0.0" width="30.5" height="60"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
<rect key="frame" x="260.5" y="0.0" width="26.5" height="60"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="16"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
@ -118,21 +118,18 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gtt-aM-RV9">
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="XEN-DQ-Jzb">
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="XEN-DQ-Jzb">
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="100,000" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="mxZ-7C-1X0" customClass="GMENumberTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="225" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="245" height="60"/>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="33"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NPR" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="Xg5-aU-wzd">
<rect key="frame" x="240" y="0.0" width="40" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="mPm-KC-8C9"/>
</constraints>
<rect key="frame" x="253" y="0.0" width="34" height="60"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -198,13 +195,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-1,000 JPY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Qp-Ox-hzM">
<rect key="frame" x="50" y="0.0" width="149" height="42"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Trans Fee Included" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZH0-7r-sJc">
<rect key="frame" x="207" y="0.0" width="144" height="42"/>
<rect key="frame" x="50" y="0.0" width="301" height="42"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -222,13 +213,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="-1,000 JPY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ktw-QK-fOc">
<rect key="frame" x="50" y="0.0" width="117.5" height="42"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Exchange Rate" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1p5-3l-wde">
<rect key="frame" x="175.5" y="0.0" width="175.5" height="42"/>
<rect key="frame" x="50" y="0.0" width="301" height="42"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -346,13 +331,13 @@
</constraints>
</view>
<connections>
<outlet property="backgroundViewCountryLabel1" destination="45f-a8-tno" id="74c-NJ-HjT"/>
<outlet property="cardView" destination="1C1-lc-CNF" id="hue-ze-seQ"/>
<outlet property="continueButton" destination="Y2T-0J-Buu" id="JAp-jW-eIU"/>
<outlet property="countryCodeLabel" destination="Xg5-aU-wzd" id="2h6-XS-3da"/>
<outlet property="countryFlagImage" destination="Jwb-Yx-xTa" id="2Rz-AE-Qtv"/>
<outlet property="exchangeBackground1" destination="N88-OZ-ngd" id="4QK-Qd-Isw"/>
<outlet property="exchangeBackground2" destination="gtt-aM-RV9" id="cVu-ur-5RK"/>
<outlet property="exchangeRateIconView" destination="VVX-nA-s2I" id="dev-er-V82"/>
<outlet property="exchangeRateLabel" destination="ktw-QK-fOc" id="RGB-MK-LF8"/>
<outlet property="exchangeRateView" destination="2ew-7X-bNl" id="i1t-Jx-8ft"/>
<outlet property="noteLabel" destination="KcZ-og-aDA" id="Xe2-fc-yST"/>
@ -362,7 +347,8 @@
<outlet property="rewardView" destination="BNM-CV-jRi" id="yVY-6f-PAV"/>
<outlet property="senderTextField" destination="GrN-Cz-PcA" id="Gtq-Gw-0Ra"/>
<outlet property="serviceChargeView" destination="UJu-xI-S2v" id="2bj-tJ-Vnc"/>
<outlet property="transferFeeInfoLabel" destination="ZH0-7r-sJc" id="E3i-5x-X83"/>
<outlet property="transferFeeIconView" destination="6vG-7Q-Lr6" id="UB4-Io-LT0"/>
<outlet property="transferFeeLabel" destination="5Qp-Ox-hzM" id="At2-MC-ulP"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="NtY-m3-JdG" userLabel="First Responder" sceneMemberID="firstResponder"/>

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

@ -31,6 +31,17 @@ enum ActionBehaviour {
class SendMoneyExchangeRateViewController: UIViewController {
struct StringConstants {
let selectPaymentModeText = "select_payment_mode_text".localized()
let youSendText = "you_send_text".localized()
let recepientGetsText = "receipient_gets_text".localized()
let calculate = "calculate_text".localized()
let title = "todays_rate_text".localized()
let currentExchangeRateText = "current_exchange_rate_text".localized()
let transferFeeDetailText = "transfer_fee_included_text".localized()
let defaultCurrency = "default_currency_text".localized()
}
private enum DiscountType: String {
case percent = "1"
case value = "2"
@ -42,36 +53,34 @@ class SendMoneyExchangeRateViewController: UIViewController {
@IBOutlet weak var cardView: UIView!
@IBOutlet private weak var exchangeBackground1: UIView!
@IBOutlet private weak var exchangeBackground2: UIView!
@IBOutlet private weak var dropDownImageView: UIImageView!
@IBOutlet private weak var backgroundViewCountryLabel1: UIView!
@IBOutlet private weak var backgroundViewCountryLabel2: UIView!
@IBOutlet private weak var countryListStackView: UIStackView!
// @IBOutlet private weak var countryListStackView: UIStackView!
@IBOutlet private weak var countryCodeLabel: UILabel!
@IBOutlet private weak var countryFlagImage: UIImageView!
@IBOutlet private weak var continueButton: UIButton!
@IBOutlet private weak var senderTextField: GMENumberTextField!
@IBOutlet private weak var reciepientTextField: GMENumberTextField!
@IBOutlet private weak var transferFeeInfoLabel: UILabel!
@IBOutlet weak var transferFeeIconView: UIImageView!
@IBOutlet weak var transferFeeLabel: UILabel!
@IBOutlet weak var exchangeRateIconView: UIImageView!
@IBOutlet private weak var exchangeRateLabel: UILabel!
@IBOutlet private weak var youSendTitleLabel: UILabel!
@IBOutlet private weak var recipientGetsTitleLabel: UILabel!
@IBOutlet weak var calculatedInfoView: UIView!
@IBOutlet weak var serviceChargeView: UIStackView!
@IBOutlet weak var exchangeRateView: UIStackView!
@IBOutlet weak var backgroundView: UIView!{
didSet{
backgroundView.layer.cornerRadius = 12
backgroundView.layer.borderWidth = 0.2
backgroundView.layer.borderColor = UIColor.themeSeparate.cgColor
backgroundView.layer.addShadow(with: UIColor.themeShadow)
}
}
@IBOutlet weak var couponListFetch: UIView!
@IBOutlet weak var couponListShow: UIStackView!
@IBOutlet weak var rewardView: UIView!
// @IBOutlet weak var backgroundView: UIView!{
// didSet{
// backgroundView.layer.cornerRadius = 12
// backgroundView.layer.borderWidth = 0.2
// backgroundView.layer.borderColor = UIColor.themeSeparate.cgColor
// backgroundView.layer.addShadow(with: UIColor.themeShadow)
// }
// }
@IBOutlet weak var rewardView: UIStackView!
@IBOutlet weak var rewardTitle: UILabel!
@IBOutlet weak var rewardTextField: UITextField!
@ -135,15 +144,42 @@ class SendMoneyExchangeRateViewController: UIViewController {
numberString: model.senderAmount ?? ""
)
transferFeeIconView.image = UIImage(named: "exchange_rate_transfer_fee")
exchangeRateIconView.image = UIImage(named: "exchange_rate_transfer_fee")
let serviceCharge = model.transferFee?.likeCommaMoney() ??
model.transferFee ??
"0.00"
let transferFee = serviceCharge != "0.00" ? "-\(serviceCharge)" : "\(serviceCharge)"
let transferInfo = "exchange_rate_guranteed".localized().attributedText(color: .theme2E89FF, font: .sanfrancisco(.semibold, size: 14))
let transferFee = (serviceCharge != "0.00" ? "-\(serviceCharge)" : "\(serviceCharge)").attributedText(color: .themeBlack, font: .sanfrancisco(.semibold, size: 14))
let transfer = NSMutableAttributedString()
transfer.append(transferFee)
transfer.append(transferInfo)
transferFeeLabel.attributedText = transfer
let exchangeRate = model.exchangeRate ?? ""
let exchangeRateAttributed = ("1000 JPY = \(exchangeRate) \(exchangeRateModel?.senderCurrency ?? "") ").attributedText(color: .themeBlack, font: .sanfrancisco(.semibold, size: 14))
let exchangeRateInfo = ("".localized()).attributedText(color: .theme2E89FF, font: .sanfrancisco(.semibold, size: 14))
transferFeeInfoLabel.text = "\(transferFee)\n(\("transfer_fee_included_text".localized()))"
exchangeRateLabel.text =
"\(model.exchangeRate ?? "")\n(\("current_exchange_rate_text".localized()))"
exchangeRateAttributed.append(exchangeRateAttributed)
exchangeRateAttributed.append(exchangeRateInfo)
exchangeRateLabel.attributedText = exchangeRateAttributed
self.showExchangeRateInfomation(isHidden: false)
@ -182,6 +218,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
// MARK: VC's Life cycle
override func viewDidLoad() {
super.viewDidLoad()
setup()
self.cardView.isHidden = true
cardView.layer.cornerRadius = 10
@ -235,29 +272,24 @@ class SendMoneyExchangeRateViewController: UIViewController {
// MARK: Other Functions
private func setup() {
// all setup should be done here
// backgroundViewCountryLabel2.hero.id = reciepient?.receiverID
// backgroundViewCountryLabel2.hero.modifiers = [.translate()]
uiPropertySetup()
setupTargets()
action = .calculate
senderTextField.delegate = self
reciepientTextField.delegate = self
calcBy = "c"
// [backgroundViewCountryLabel1, backgroundViewCountryLabel2].forEach { $0?.layer.cornerRadius = 5 }
[exchangeBackground1, exchangeBackground2].forEach {
$0?.layer.borderWidth = 1
$0?.layer.borderColor = UIColor.themeSeparate.cgColor
$0?.layer.borderWidth = 2
$0?.layer.borderColor = UIColor.init(hex: "#00001F").cgColor
// UIColor.init(hex: "#E0E0E0").cgColor
$0?.layer.cornerRadius = 5
$0?.layer.cornerRadius = 16
}
configureLanguage()
continueButton.layer.cornerRadius = 5
continueButton.backgroundColor = .themeRed
continueButton.titleLabel?.font = .sanfrancisco(.medium, size: 18)
senderTextField.textColor = .black
reciepientTextField.textColor = .black
// backgroundViewCountryLabel1.backgroundColor = .themeRed
@ -266,9 +298,21 @@ class SendMoneyExchangeRateViewController: UIViewController {
rewardTextField.placeholder = "rewards_point_placeholder_text".localized()
}
private func uiPropertySetup() {
countryCodeLabel.textColor = .themeBlack
countryCodeLabel.font = .sanfrancisco(.semibold, size: 16)
continueButton.setTitle("continue_text".localized(), for: .normal)
continueButton.backgroundColor = .theme2E89FF
continueButton.titleLabel?.font = .sanfrancisco(.semibold, size: 20)
continueButton.set(cornerRadius: 10)
}
private func showExchangeRateInfomation(isHidden flag: Bool) {
// calculatedInfoView.isHidden = flag
// calculatedInfoView.alpha = flag ? 0.0 : 1.0
if !flag {
self.serviceChargeView.isHidden = false
@ -299,7 +343,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func configureLanguage() {
// youSendTitleLabel.text = "you_send_text".localized()
// recipientGetsTitleLabel.text = "receipient_gets_text".localized()
continueButton.setTitle("calculate_text".localized(), for: .normal)
}
private func setCountryFlag(countryCode: String) {
@ -314,7 +358,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func setupTargets() {
let tapGuesture = UITapGestureRecognizer(target: self, action: #selector(showCountryList(_:)))
countryListTapGuesture = tapGuesture
// countryListStackView.addGestureRecognizer(countryListTapGuesture)
countryFlagImage.addGestureRecognizer(countryListTapGuesture)
reciepientTextField.addTarget(
@ -340,10 +384,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func configureViews() {
exchangeRateModel = nil
let dropDownImage = UIImage(named: "dropdown_grey")
let image = dropDownImage
// dropDownImageView.image = image
setCountryFlag(countryCode: reciepient?.countryCode ?? "")
let deliveryMethod = requestModel?.paymemtMode
if (deliveryMethod?.bankRequired ?? "false").lowercased() == "true" {
@ -434,10 +475,10 @@ class SendMoneyExchangeRateViewController: UIViewController {
let reciepientCountryName = reciepient?.country
let reciepientCountryId = reciepient?.countryID
let paymentMode = "wallet"
let paymentMethodId = paymentModel?.id
let paymentMethodId = paymentModel?.receiverId
let payoutPartner = requestModel?.paymemtMode?.payoutPartner
let myUsername = Utility.getMyUserName()
let bankId = requestModel?.bank?.id
let bankId = paymentModel?.receiverId
let discountedFee = rewardTextField.text
// let discountedFee
//bank id if selected bank

24
GME Remit/Supported Files/Info.plist

@ -81,28 +81,28 @@
<key>NSCalendarsUsageDescription</key>
<string></string>
<key>NSCameraUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your camera to capture Identification documents, Deposit slips</string>
<string>Allow "JME Remittance" to use your camera to capture Identification documents, Deposit slips</string>
<key>NSContactsUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your contacts to get users contact</string>
<string>Allow "JME Remittance" to use your contacts to get users contact</string>
<key>NSFaceIDUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your biometrics to simplify and secure your app usage</string>
<string>Allow "JME Remittance" to use your biometrics to simplify and secure your app usage</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your location?
Turning on location service allows us to show you nearby JME&apos;s branches.</string>
<string>Allow "JME Remittance" to use your location?
Turning on location service allows us to show you nearby JME's branches.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your location?
Turning on location service allows us to show you nearby JME&apos;s branches.</string>
<string>Allow "JME Remittance" to use your location?
Turning on location service allows us to show you nearby JME's branches.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your location?
Turning on location service allows us to show you nearby JME&apos;s branches.</string>
<string>Allow "JME Remittance" to use your location?
Turning on location service allows us to show you nearby JME's branches.</string>
<key>NSMicrophoneUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your microphone for access to your recorded voice </string>
<string>Allow "JME Remittance" to use your microphone for access to your recorded voice </string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your gallery to use images of documents and depositslips</string>
<string>Allow "JME Remittance" to use your gallery to use images of documents and depositslips</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Allow &quot;JME Remittance&quot; to use your gallery to use images of documents and depositslips</string>
<string>Allow "JME Remittance" to use your gallery to use images of documents and depositslips</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string></string>
<key>UIAppFonts</key>

Loading…
Cancel
Save