open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
bae6d3c4 1 parent 06639709

UnifiedCouponBarcodeViewController fixes

Inline Side-by-side
Showing 4 changed files with 22 additions and 16 deletions
...@@ -43,12 +43,6 @@ import UIKit ...@@ -43,12 +43,6 @@ import UIKit
43 super.awakeFromNib() 43 super.awakeFromNib()
44 // Initialization code 44 // Initialization code
45 45
46 - // Add shadow
47 - self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
48 - self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
49 - self.layer.shadowOpacity = 1.0
50 - self.layer.shadowRadius = 1.0
51 -
52 couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 46 couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
53 47
54 borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0) 48 borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0)
...@@ -73,6 +67,12 @@ import UIKit ...@@ -73,6 +67,12 @@ import UIKit
73 // COUPON: coupon, expiration, discount, status 67 // COUPON: coupon, expiration, discount, status
74 // MERCHANT: _img_preview,_admin_name 68 // MERCHANT: _img_preview,_admin_name
75 69
70 + // Add shadow
71 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
72 + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
73 + self.layer.shadowOpacity = 1.0
74 + self.layer.shadowRadius = 1.0
75 +
76 let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList() 76 let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList()
77 77
78 let couponSetData: swiftApi.CouponSetItemModel? = coupon.couponset_data 78 let couponSetData: swiftApi.CouponSetItemModel? = coupon.couponset_data
...@@ -106,6 +106,12 @@ import UIKit ...@@ -106,6 +106,12 @@ import UIKit
106 // COUPON: coupon, expiration, discount, status 106 // COUPON: coupon, expiration, discount, status
107 // MERCHANT: _img_preview,_admin_name 107 // MERCHANT: _img_preview,_admin_name
108 108
109 +// // Add shadow
110 + contentView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
111 + contentView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
112 + contentView.layer.shadowOpacity = 1.0
113 + contentView.layer.shadowRadius = 1.0
114 +
109 expirationLabel.isHidden = true 115 expirationLabel.isHidden = true
110 expirationRedView.isHidden = true 116 expirationRedView.isHidden = true
111 expirationLabel.text = "" 117 expirationLabel.text = ""
......
...@@ -3340,14 +3340,14 @@ ...@@ -3340,14 +3340,14 @@
3340 </connections> 3340 </connections>
3341 </tableViewCell> 3341 </tableViewCell>
3342 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="TAK-Ug-AzU" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework"> 3342 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="TAK-Ug-AzU" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework">
3343 - <rect key="frame" x="0.0" y="869" width="414" height="69.5"/> 3343 + <rect key="frame" x="0.0" y="869" width="414" height="66.5"/>
3344 <autoresizingMask key="autoresizingMask"/> 3344 <autoresizingMask key="autoresizingMask"/>
3345 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TAK-Ug-AzU" id="LFe-Vj-kjJ"> 3345 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TAK-Ug-AzU" id="LFe-Vj-kjJ">
3346 - <rect key="frame" x="0.0" y="0.0" width="414" height="69.5"/> 3346 + <rect key="frame" x="0.0" y="0.0" width="414" height="66.5"/>
3347 <autoresizingMask key="autoresizingMask"/> 3347 <autoresizingMask key="autoresizingMask"/>
3348 <subviews> 3348 <subviews>
3349 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="35i-Iq-TId"> 3349 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="35i-Iq-TId">
3350 - <rect key="frame" x="10" y="5" width="394" height="64.5"/> 3350 + <rect key="frame" x="10" y="0.0" width="394" height="64.5"/>
3351 <subviews> 3351 <subviews>
3352 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="58G-jP-FMr"> 3352 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="58G-jP-FMr">
3353 <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/> 3353 <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/>
...@@ -3455,9 +3455,9 @@ ...@@ -3455,9 +3455,9 @@
3455 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 3455 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3456 <constraints> 3456 <constraints>
3457 <constraint firstItem="35i-Iq-TId" firstAttribute="leading" secondItem="LFe-Vj-kjJ" secondAttribute="leading" constant="10" id="3hq-3Z-4i8"/> 3457 <constraint firstItem="35i-Iq-TId" firstAttribute="leading" secondItem="LFe-Vj-kjJ" secondAttribute="leading" constant="10" id="3hq-3Z-4i8"/>
3458 - <constraint firstItem="35i-Iq-TId" firstAttribute="top" secondItem="LFe-Vj-kjJ" secondAttribute="top" constant="5" id="Ex4-yD-ujb"/> 3458 + <constraint firstItem="35i-Iq-TId" firstAttribute="top" secondItem="LFe-Vj-kjJ" secondAttribute="top" id="Ex4-yD-ujb"/>
3459 <constraint firstAttribute="trailing" secondItem="35i-Iq-TId" secondAttribute="trailing" constant="10" id="GdO-6L-lwn"/> 3459 <constraint firstAttribute="trailing" secondItem="35i-Iq-TId" secondAttribute="trailing" constant="10" id="GdO-6L-lwn"/>
3460 - <constraint firstAttribute="bottom" secondItem="35i-Iq-TId" secondAttribute="bottom" id="Qim-cz-Ryu"/> 3460 + <constraint firstAttribute="bottom" secondItem="35i-Iq-TId" secondAttribute="bottom" constant="2" id="Qim-cz-Ryu"/>
3461 </constraints> 3461 </constraints>
3462 </tableViewCellContentView> 3462 </tableViewCellContentView>
3463 <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/> 3463 <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
...@@ -3475,7 +3475,7 @@ ...@@ -3475,7 +3475,7 @@
3475 </connections> 3475 </connections>
3476 </tableViewCell> 3476 </tableViewCell>
3477 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework"> 3477 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework">
3478 - <rect key="frame" x="0.0" y="938.5" width="414" height="160"/> 3478 + <rect key="frame" x="0.0" y="935.5" width="414" height="160"/>
3479 <autoresizingMask key="autoresizingMask"/> 3479 <autoresizingMask key="autoresizingMask"/>
3480 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5"> 3480 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5">
3481 <rect key="frame" x="0.0" y="0.0" width="414" height="160"/> 3481 <rect key="frame" x="0.0" y="0.0" width="414" height="160"/>
......
...@@ -201,7 +201,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa ...@@ -201,7 +201,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa
201 201
202 } else if (section == 1) { 202 } else if (section == 1) {
203 if (couponsVisible == true) { 203 if (couponsVisible == true) {
204 - let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 8)) 204 + let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 12))
205 view.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00) 205 view.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00)
206 206
207 return view 207 return view
...@@ -220,7 +220,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa ...@@ -220,7 +220,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa
220 220
221 } else if (section == 1) { 221 } else if (section == 1) {
222 if (couponsVisible == true) { 222 if (couponsVisible == true) {
223 - return 8.0 223 + return 12.0
224 } else { 224 } else {
225 return 0.0 225 return 0.0
226 } 226 }
...@@ -236,7 +236,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa ...@@ -236,7 +236,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa
236 236
237 } else if (section == 1) { 237 } else if (section == 1) {
238 if (couponsVisible == true) { 238 if (couponsVisible == true) {
239 - return 8.0 239 + return 2.0
240 } else { 240 } else {
241 return 0.0 241 return 0.0
242 } 242 }
...@@ -252,7 +252,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa ...@@ -252,7 +252,7 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa
252 252
253 } else if (section == 1) { 253 } else if (section == 1) {
254 if (couponsVisible == true) { 254 if (couponsVisible == true) {
255 - let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 8)) 255 + let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 2))
256 view.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00) 256 view.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00)
257 257
258 return view 258 return view
......