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

represent point as money (comma)

pull/1/head
James 5 years ago
parent
f8e3c4b89a
commit
d7d03682ce
26 changed files with 96 additions and 200 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. BIN
      .DS_Store
  2. 21
      GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/Contents.json
  3. BIN
      GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/aquarium.jpg
  4. 21
      GMERemittance/Assets.xcassets/RewardItems/bose.imageset/Contents.json
  5. BIN
      GMERemittance/Assets.xcassets/RewardItems/bose.imageset/bose.jpg
  6. 21
      GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/Contents.json
  7. BIN
      GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/caribbeanBay.jpg
  8. 21
      GMERemittance/Assets.xcassets/RewardItems/everland.imageset/Contents.json
  9. BIN
      GMERemittance/Assets.xcassets/RewardItems/everland.imageset/everland.jpg
  10. 21
      GMERemittance/Assets.xcassets/RewardItems/grill.imageset/Contents.json
  11. BIN
      GMERemittance/Assets.xcassets/RewardItems/grill.imageset/grill.JPG
  12. 21
      GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/Contents.json
  13. BIN
      GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/hanriver.jpg
  14. 10
      GMERemittance/Extension/StringExtension.swift
  15. 8
      GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
  16. 45
      GMERemittance/Module/Home/User Interface/View/Home.storyboard
  17. 2
      GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
  18. 2
      GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
  19. 3
      GMERemittance/Module/RewardModules/Redeem/User Interface/View/Redeem.storyboard
  20. 6
      GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
  21. 1
      GMERemittance/Module/RewardModules/Reward/Application Logic/Model/RewardProduct.swift
  22. 2
      GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
  23. 20
      GMERemittance/Module/RewardModules/Reward/User Interface/View/Reward.storyboard
  24. 9
      GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift
  25. 5
      GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
  26. 1
      GMERemittance/Module/SendMoney/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift

BIN
.DS_Store
View File

21
GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "aquarium.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/aquarium.jpg
View File

Side by Side

Before

Width: 550  |  Height: 500  |  Size: 103 KiB

21
GMERemittance/Assets.xcassets/RewardItems/bose.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "bose.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/RewardItems/bose.imageset/bose.jpg
View File

Side by Side

Before

Width: 1500  |  Height: 1500  |  Size: 188 KiB

21
GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "caribbeanBay.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/caribbeanBay.jpg
View File

Side by Side

Before

Width: 489  |  Height: 326  |  Size: 70 KiB

21
GMERemittance/Assets.xcassets/RewardItems/everland.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "everland.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/RewardItems/everland.imageset/everland.jpg
View File

Side by Side

Before

Width: 2915  |  Height: 1640  |  Size: 4.1 MiB

21
GMERemittance/Assets.xcassets/RewardItems/grill.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "grill.JPG",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/RewardItems/grill.imageset/grill.JPG
View File

Side by Side

Before

Width: 1233  |  Height: 760  |  Size: 80 KiB

21
GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/Contents.json
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "hanriver.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/hanriver.jpg
View File

Side by Side

Before

Width: 490  |  Height: 425  |  Size: 53 KiB

10
GMERemittance/Extension/StringExtension.swift
View File

@ -53,3 +53,13 @@ extension String {
return first + other
}
}
extension String {
func likeCommaMoney() -> String? {
guard let _ = Int(self) else{
return nil
}
return Utility.getCommaSeperatedString(numberString: self)
}
}

8
GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
View File

@ -15,6 +15,7 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
let yearlyLimit = "remaining_limit_text".localized()
}
@IBOutlet weak var pointContainerView: UIView!
@IBOutlet weak var pointBackgroundView: UIView!
@IBOutlet weak var amountLabel: UILabel!
@IBOutlet weak var rewardPointAmountLabel: UILabel!
@ -38,12 +39,13 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
configureText()
self.rewardTapGesture.addTarget(self, action: #selector(self.rewardTap(_:)))
self.pointBackgroundView.addGestureRecognizer(self.rewardTapGesture)
self.pointBackgroundView.isUserInteractionEnabled = true
self.pointContainerView.addGestureRecognizer(self.rewardTapGesture)
self.pointContainerView.isUserInteractionEnabled = true
self.rewardPointAmountLabel.text = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)
self.rewardPointAmountLabel.text = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)?.likeCommaMoney()
self.pointBackgroundView.layer.cornerRadius = 10
pointContainerView.layer.cornerRadius = 10
pointBackgroundView.hero.id = "pointsView"
}

45
GMERemittance/Module/Home/User Interface/View/Home.storyboard
View File

@ -124,28 +124,28 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="wLs-Rj-kxu">
<rect key="frame" x="15" y="10" width="384" height="84.333333333333329"/>
<rect key="frame" x="15" y="10" width="384" height="83.666666666666671"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="ybO-Kz-ezE">
<rect key="frame" x="0.0" y="0.0" width="384" height="42.333333333333336"/>
<rect key="frame" x="0.0" y="0.0" width="384" height="41.666666666666664"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remaining Yearly Limit" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q5T-Xf-a5s">
<rect key="frame" x="114.33333333333333" y="0.0" width="155.33333333333337" height="18"/>
<rect key="frame" x="116" y="0.0" width="152" height="17.666666666666668"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Ofo-oE-AGa">
<rect key="frame" x="138.66666666666666" y="22" width="106.66666666666666" height="20.333333333333329"/>
<rect key="frame" x="135.66666666666666" y="21.666666666666668" width="113" height="20.000000000000004"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="87473839" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Bf-q6-azV">
<rect key="frame" x="0.0" y="0.0" width="73.333333333333329" height="20.333333333333332"/>
<rect key="frame" x="0.0" y="0.0" width="75.666666666666671" height="20"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XTv-9z-6sB">
<rect key="frame" x="75.333333333333343" y="0.0" width="31.333333333333329" height="20.333333333333332"/>
<rect key="frame" x="77.666666666666686" y="0.0" width="35.333333333333343" height="20"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -155,34 +155,37 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Ze-gK-s6z">
<rect key="frame" x="0.0" y="52.333333333333336" width="384" height="2"/>
<rect key="frame" x="0.0" y="51.666666666666664" width="384" height="2"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="2" id="h7h-4F-Ddy"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Peb-Sn-rcC">
<rect key="frame" x="0.0" y="64.333333333333329" width="384" height="20"/>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Peb-Sn-rcC">
<rect key="frame" x="0.0" y="63.666666666666671" width="384" height="20"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="dzi-vM-GUm">
<rect key="frame" x="0.0" y="0.0" width="192" height="20"/>
<rect key="frame" x="0.0" y="0.0" width="58.666666666666664" height="20"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sdfghgfd" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HSv-Iz-JvY">
<rect key="frame" x="0.0" y="0.0" width="192" height="20"/>
<rect key="frame" x="0.0" y="0.0" width="58.666666666666664" height="20"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9M5-BJ-Q2C">
<rect key="frame" x="58.666666666666657" y="0.0" width="325.33333333333337" height="20"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="cpr-KK-Kff">
<rect key="frame" x="192" y="0.0" width="192" height="20"/>
<rect key="frame" x="0.0" y="0.0" width="325.33333333333331" height="20"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Bbu-MJ-HYv">
<rect key="frame" x="0.0" y="0.0" width="146.33333333333334" height="20"/>
<rect key="frame" x="0.0" y="0.0" width="279.66666666666669" height="20"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Reward point: " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rt7-Pa-xst">
<rect key="frame" x="0.0" y="0.0" width="146.33333333333334" height="20"/>
<rect key="frame" x="0.0" y="0.0" width="279.66666666666669" height="20"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.43529412150000002" green="0.4431372583" blue="0.47450980539999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -191,13 +194,13 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="HCB-sr-BJo">
<rect key="frame" x="148.33333333333331" y="0.0" width="43.666666666666657" height="20"/>
<rect key="frame" x="281.66666666666663" y="0.0" width="43.666666666666686" height="20"/>
<subviews>
<view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="aUP-ND-ctM">
<rect key="frame" x="0.0" y="0.0" width="43.666666666666664" height="20"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" text="98877" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qFV-c8-8UI">
<rect key="frame" x="5" y="3.0000000000000009" width="33.666666666666664" height="14.333333333333336"/>
<rect key="frame" x="5" y="3" width="33.666666666666664" height="14"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="15" id="71F-b2-SSk"/>
@ -219,6 +222,15 @@
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="cpr-KK-Kff" firstAttribute="top" secondItem="9M5-BJ-Q2C" secondAttribute="top" id="Nf4-hm-HMI"/>
<constraint firstAttribute="bottom" secondItem="cpr-KK-Kff" secondAttribute="bottom" id="fw3-UF-prv"/>
<constraint firstItem="cpr-KK-Kff" firstAttribute="leading" secondItem="9M5-BJ-Q2C" secondAttribute="leading" id="jXL-tP-Ofc"/>
<constraint firstAttribute="trailing" secondItem="cpr-KK-Kff" secondAttribute="trailing" id="n1l-Uh-9gq"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="7b7-7Q-oHt"/>
<constraint firstAttribute="height" constant="20" id="sD1-nP-ywn"/>
@ -237,6 +249,7 @@
<connections>
<outlet property="amountLabel" destination="8Bf-q6-azV" id="KaT-Ma-SBd"/>
<outlet property="pointBackgroundView" destination="aUP-ND-ctM" id="M9X-co-v60"/>
<outlet property="pointContainerView" destination="9M5-BJ-Q2C" id="B1j-hP-IOb"/>
<outlet property="pointTitleLabel" destination="Rt7-Pa-xst" id="NYO-sD-u2A"/>
<outlet property="remainingYearlyLabel" destination="q5T-Xf-a5s" id="Q5Q-NT-Wr6"/>
<outlet property="rewardPointAmountLabel" destination="qFV-c8-8UI" id="YKL-6A-gRk"/>

2
GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
View File

@ -29,7 +29,7 @@ class DetailOrderViewController: UIViewController {
pickupBranchLabel.text = order.branchName
productNameLabel.text = order.productName
productPointLabel.text = order.usePoint
productPointLabel.text = order.usePoint?.likeCommaMoney()
orderStatusLabel.text = status.message
orderDateLabel.text = order.createdDate

2
GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
View File

@ -92,7 +92,7 @@ class OrderCell: UITableViewCell {
branchNameLabel.text = model.branchName
orderedProductNameLabel.text = model.productName
orderedProductPointLabel.text = model.usePoint
orderedProductPointLabel.text = model.usePoint?.likeCommaMoney()
orderStatusLabel.layer.cornerRadius = 5
orderStatusLabel.backgroundColor = status.color

3
GMERemittance/Module/RewardModules/Redeem/User Interface/View/Redeem.storyboard
View File

@ -47,7 +47,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mT2-re-Yo2">
<imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_reward" translatesAutoresizingMaskIntoConstraints="NO" id="mT2-re-Yo2">
<rect key="frame" x="10" y="10" width="335" height="120"/>
<constraints>
<constraint firstAttribute="height" constant="120" id="RE8-H1-M1o"/>
@ -359,6 +359,7 @@
</scene>
</scenes>
<resources>
<image name="ic_reward" width="74" height="74"/>
<image name="ic_reward_location" width="60" height="60"/>
<image name="ic_search_light" width="20" height="20"/>
<image name="starredBackground" width="355" height="132"/>

6
GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
View File

@ -32,7 +32,7 @@ class RedeemViewController: UIViewController {
guard
let selectedItemName = model?.productName,
let selectedItemPoint = model?.pointPrice else {
let selectedItemPoint = model?.pointPrice?.likeCommaMoney() else {
return
}
@ -413,10 +413,6 @@ extension RedeemViewController {
}
private func setMultiLanguage(){
// redeemTitleLabel.text = "redeem_text".localized()
// pointsWillBeDeductedLabel.text = "points_deducted_text".localized()
// fromTourRewardPointLabel.text = "from_your_reward_point_text".localized()
receiverTitleLabel.text = "receiver_text".localized()
phoneNumberTitleLabel.text = "mobile_number_text".localized()

1
GMERemittance/Module/RewardModules/Reward/Application Logic/Model/RewardProduct.swift
View File

@ -27,3 +27,4 @@ struct RewardProduct: Mappable {
productImgPath <- map["productImgPath"]
}
}

2
GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
View File

@ -36,7 +36,7 @@ class RewardItemCollectionViewCell: UICollectionViewCell {
}
self.itemNameLabel.text = model?.productName
self.itemPriceLabel.text = model?.pointPrice
self.itemPriceLabel.text = model?.pointPrice?.likeCommaMoney()
self.model = model
self.delegate = delegate

20
GMERemittance/Module/RewardModules/Reward/User Interface/View/Reward.storyboard
View File

@ -27,29 +27,29 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mVq-cj-kN9">
<rect key="frame" x="10" y="30" width="355" height="132"/>
<rect key="frame" x="10" y="30" width="355" height="16"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="starredBackground" translatesAutoresizingMaskIntoConstraints="NO" id="OUC-GY-cfV">
<rect key="frame" x="0.0" y="0.0" width="355" height="132"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="16"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note: The reward point is valid for a year only." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zsW-Jn-5cx">
<rect key="frame" x="53.5" y="113" width="248.5" height="16"/>
<rect key="frame" x="45" y="-2.5" width="265.5" height="15.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="13"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_reward" translatesAutoresizingMaskIntoConstraints="NO" id="w0R-LI-YPR">
<rect key="frame" x="75.5" y="19.5" width="80" height="80"/>
<rect key="frame" x="75.5" y="-33" width="80" height="80"/>
<constraints>
<constraint firstAttribute="height" constant="80" id="0qu-ST-7fP"/>
<constraint firstAttribute="width" constant="80" id="LaH-ji-hpA"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="a1o-7y-Kgz">
<rect key="frame" x="187.5" y="34.5" width="92" height="50"/>
<rect key="frame" x="184.5" y="-18" width="98" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reward Points" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vyv-ya-vvm">
<rect key="frame" x="0.0" y="0.0" width="92" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="98" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="bs5-Ee-cbW"/>
</constraints>
@ -58,7 +58,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="999" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qUz-im-Ri9">
<rect key="frame" x="21" y="25" width="50.5" height="25"/>
<rect key="frame" x="24" y="25" width="50.5" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="30"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -84,7 +84,7 @@
</constraints>
</view>
<collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="vmj-sE-fUF">
<rect key="frame" x="10" y="197" width="355" height="460"/>
<rect key="frame" x="10" y="81" width="355" height="576"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="TUx-T5-4WL">
<size key="itemSize" width="320" height="260"/>
@ -106,7 +106,7 @@
<view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gXS-zt-2Em" userLabel="Image">
<rect key="frame" x="10" y="15" width="300" height="138.5"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yBC-h9-W9V">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_reward" translatesAutoresizingMaskIntoConstraints="NO" id="yBC-h9-W9V">
<rect key="frame" x="0.0" y="0.0" width="300" height="138.5"/>
</imageView>
</subviews>
@ -215,7 +215,7 @@
</cells>
</collectionView>
<segmentedControl opaque="NO" clipsSubviews="YES" contentMode="scaleAspectFit" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="pUS-5u-yiU">
<rect key="frame" x="320" y="172" width="45" height="21"/>
<rect key="frame" x="320" y="56" width="45" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="45" id="3Ig-8M-nEs"/>
<constraint firstAttribute="height" constant="20" id="Ohr-Rq-jxc"/>

9
GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift
View File

@ -52,8 +52,9 @@ class RewardViewController: UIViewController {
title = "reward_group_title_text".localized()
collectionView.setContentOffset(.zero, animated: false)
rewardPoint = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)?.likeCommaMoney()
rewardPoint = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)
collectionView.reloadData()
}
override func viewWillDisappear(_ animated: Bool) {
@ -63,11 +64,7 @@ class RewardViewController: UIViewController {
// MARK: IBActions
@objc func selectLayout(_ sender: UISegmentedControl) {
switch sender.selectedSegmentIndex {
case 0: setCollectionViewLayout(0)
case 1: setCollectionViewLayout(1)
default: break
}
setCollectionViewLayout(sender.selectedSegmentIndex)
}
// MARK: Other Functions

5
GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
View File

@ -322,12 +322,13 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func setCoupon(){
if exchangeRateModel?.schemeId != nil &&
exchangeRateModel?.schemeId != "",
let couponName = exchangeRateModel?.couponName {
let couponName = exchangeRateModel?.couponName,
let couponType = exchangeRateModel?.couponType{
let discountPercent = exchangeRateModel?.discountPercent ?? ""
let discountValue = exchangeRateModel?.discountValue ?? ""
couponNameLabel.text = couponName
couponPercentLabel.text = "\(discountPercent)%"
couponPercentLabel.text = couponType == "1" ? "\(discountPercent)%" : ""
couponValueLabel.text = "(-\(discountValue) KRW)"
couponsCountLabel.text = ""
} else {

1
GMERemittance/Module/SendMoney/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -169,6 +169,7 @@ class SendMoneyReceiptViewController: UIViewController {
self.doneButton.setTitle(StringConstants().doneText, for: UIControlState.normal)
self.requestToCancelButton.setTitle("request_to_cancel_text".localized(), for: UIControlState.normal)
self.requestToChangeButton.setTitle("request_to_change_text".localized(), for: UIControlState.normal)
usedCouponTitleLabel.text = "used_coupon_title_text".localized()
}
func setupBackButton() {

Write Preview
Loading…
Cancel
Save