open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
5c2be3e2 1 parent 7cbd7316

Add market coupons inner view

Inline Side-by-side
Showing 5 changed files with 139 additions and 75 deletions
...@@ -22,7 +22,11 @@ import AVFoundation ...@@ -22,7 +22,11 @@ import AVFoundation
22 @IBOutlet weak var merchantDescrTextView: UnselectableTappableTextView! 22 @IBOutlet weak var merchantDescrTextView: UnselectableTappableTextView!
23 @IBOutlet weak var merchantDescrTextViewHeight: NSLayoutConstraint! 23 @IBOutlet weak var merchantDescrTextViewHeight: NSLayoutConstraint!
24 @IBOutlet weak var merchantDescrTextViewTopSpace: NSLayoutConstraint! 24 @IBOutlet weak var merchantDescrTextViewTopSpace: NSLayoutConstraint!
25 + @IBOutlet weak var couponCodeLabel: UILabel!
26 + @IBOutlet weak var couponCodeLabelHeight: NSLayoutConstraint!
25 @IBOutlet weak var couponView: UIView! 27 @IBOutlet weak var couponView: UIView!
28 + @IBOutlet weak var couponViewTopSpace: NSLayoutConstraint!
29 + @IBOutlet weak var couponViewHeight: NSLayoutConstraint!
26 @IBOutlet weak var couponNumberLabel: CopyableLabel! 30 @IBOutlet weak var couponNumberLabel: CopyableLabel!
27 @IBOutlet weak var barcodeImage: UIImageView! 31 @IBOutlet weak var barcodeImage: UIImageView!
28 @IBOutlet weak var barcodeImageHeight: NSLayoutConstraint! 32 @IBOutlet weak var barcodeImageHeight: NSLayoutConstraint!
...@@ -59,6 +63,7 @@ import AVFoundation ...@@ -59,6 +63,7 @@ import AVFoundation
59 63
60 public var coupon: swiftApi.CouponItemModel? 64 public var coupon: swiftApi.CouponItemModel?
61 public var isFromWallet: Bool? = false 65 public var isFromWallet: Bool? = false
66 + public var isMarket: Bool? = false
62 67
63 public override func viewDidLoad() { 68 public override func viewDidLoad() {
64 super.viewDidLoad() 69 super.viewDidLoad()
...@@ -95,17 +100,31 @@ import AVFoundation ...@@ -95,17 +100,31 @@ import AVFoundation
95 // topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR) 100 // topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR)
96 // ]) 101 // ])
97 102
98 - // COUPONSET: desc, img_preview, name, terms 103 + // COUPONSET: description, img_preview, name, terms
99 // COUPON: coupon, expiration, discount, status 104 // COUPON: coupon, expiration, discount, status
100 105
106 + // OLD COUPON KEYS: coupon, expiration, discount, status
107 + // NEW COUPON KEYS (from couponset): inner_text, merchant_uuid
108 + // MISSING KEYS (from couponset): img_preview, name, short_description, terms
109 +
101 let couponSetData: swiftApi.CouponSetItemModel? = coupon?.couponset_data 110 let couponSetData: swiftApi.CouponSetItemModel? = coupon?.couponset_data
102 111
112 + if (isMarket == true) {
113 + couponImage.load(link: coupon?.image ?? "", placeholder: UIImage(), cache: URLCache())
114 + } else {
103 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 115 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
116 + }
117 +
104 couponImage.contentMode = .scaleAspectFill 118 couponImage.contentMode = .scaleAspectFill
105 couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25 119 couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
106 120
121 + if (isMarket == true) {
122 + nameLabel.text = coupon?.name ?? ""
123 + discriptionLabel.text = coupon?.short_description ?? ""
124 + } else {
107 nameLabel.text = couponSetData?.name ?? "" 125 nameLabel.text = couponSetData?.name ?? ""
108 discriptionLabel.text = couponSetData?.short_description ?? "" 126 discriptionLabel.text = couponSetData?.short_description ?? ""
127 + }
109 128
110 merchantDescrTextView.text = "" 129 merchantDescrTextView.text = ""
111 merchantDescrTextViewTopSpace.constant = CGFloat(0) 130 merchantDescrTextViewTopSpace.constant = CGFloat(0)
...@@ -114,9 +133,15 @@ import AVFoundation ...@@ -114,9 +133,15 @@ import AVFoundation
114 couponCodeLabelTopSpace.constant = CGFloat(35) 133 couponCodeLabelTopSpace.constant = CGFloat(35)
115 134
116 let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList() 135 let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList()
136 + var merchantUuid: String = ""
137 + if (isMarket == true) {
138 + merchantUuid = coupon?.merchant_uuid ?? ""
139 + } else {
140 + merchantUuid = couponSetData?.merchant_uuid ?? ""
141 + }
117 142
118 for merchant in merchantList { 143 for merchant in merchantList {
119 - if (merchant._uuid == couponSetData?.merchant_uuid) { 144 + if (merchant._uuid == merchantUuid) {
120 let htmlMerchDescrText = merchant._body 145 let htmlMerchDescrText = merchant._body
121 146
122 if (htmlMerchDescrText != "") { 147 if (htmlMerchDescrText != "") {
...@@ -146,6 +171,25 @@ import AVFoundation ...@@ -146,6 +171,25 @@ import AVFoundation
146 couponNumberLabel.text = coupon?.coupon ?? "" 171 couponNumberLabel.text = coupon?.coupon ?? ""
147 couponView.frame = CGRect(x: 0.0, y: 0.0, width: couponView.intrinsicContentSize.width, height: 55) 172 couponView.frame = CGRect(x: 0.0, y: 0.0, width: couponView.intrinsicContentSize.width, height: 55)
148 173
174 + if (isMarket == true) {
175 + couponCodeLabel.isHidden = true
176 + couponCodeLabelHeight.constant = CGFloat(0)
177 + couponCodeLabelTopSpace.constant = CGFloat(0)
178 +
179 + couponView.isHidden = true
180 + couponViewHeight.constant = CGFloat(0)
181 + couponViewTopSpace.constant = CGFloat(0)
182 +
183 + } else {
184 + couponCodeLabel.isHidden = false
185 + couponCodeLabelHeight.constant = CGFloat(20)
186 + couponCodeLabelTopSpace.constant = CGFloat(35)
187 +
188 + couponView.isHidden = true
189 + couponViewHeight.constant = CGFloat(55)
190 + couponViewTopSpace.constant = CGFloat(20)
191 + }
192 +
149 let barcodeString = constructBarcode() ?? "" 193 let barcodeString = constructBarcode() ?? ""
150 barcodeLabel.text = barcodeString 194 barcodeLabel.text = barcodeString
151 195
...@@ -283,7 +327,13 @@ import AVFoundation ...@@ -283,7 +327,13 @@ import AVFoundation
283 termsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); 327 termsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5);
284 termsButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) 328 termsButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8)
285 329
286 - let htmlText = couponSetData?.terms ?? "" 330 + var htmlText = ""
331 + if (isMarket == true) {
332 + htmlText = coupon?.terms ?? ""
333 + } else {
334 + htmlText = couponSetData?.terms ?? ""
335 + }
336 +
287 termsTextView.attributedText = htmlText.htmlToAttributedString 337 termsTextView.attributedText = htmlText.htmlToAttributedString
288 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 14) 338 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 14)
289 termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) 339 termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
...@@ -297,7 +347,9 @@ import AVFoundation ...@@ -297,7 +347,9 @@ import AVFoundation
297 347
298 // Uncomment if Barcode Section is active again 348 // Uncomment if Barcode Section is active again
299 // toggleTerms() 349 // toggleTerms()
350 + if (isMarket == false) {
300 toggleBarcode() 351 toggleBarcode()
352 + }
301 353
302 // Logs 354 // Logs
303 print("Coupon: " + (coupon?.coupon ?? "")) 355 print("Coupon: " + (coupon?.coupon ?? ""))
......
...@@ -79,22 +79,22 @@ ...@@ -79,22 +79,22 @@
79 </constraints> 79 </constraints>
80 </view> 80 </view>
81 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWw-Mr-bn2"> 81 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWw-Mr-bn2">
82 - <rect key="frame" x="119" y="-13.5" width="255" height="20.5"/> 82 + <rect key="frame" x="119" y="-13" width="255" height="20"/>
83 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> 83 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
84 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 84 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
85 <nil key="highlightedColor"/> 85 <nil key="highlightedColor"/>
86 </label> 86 </label>
87 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="URC-i5-9Gw"> 87 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="URC-i5-9Gw">
88 - <rect key="frame" x="119" y="12" width="255" height="41"/> 88 + <rect key="frame" x="119" y="12" width="255" height="40.5"/>
89 <subviews> 89 <subviews>
90 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ssk-9S-HMD"> 90 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ssk-9S-HMD">
91 - <rect key="frame" x="0.0" y="0.0" width="127.5" height="41"/> 91 + <rect key="frame" x="0.0" y="0.0" width="127.5" height="40.5"/>
92 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="35"/> 92 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="35"/>
93 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 93 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
94 <nil key="highlightedColor"/> 94 <nil key="highlightedColor"/>
95 </label> 95 </label>
96 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hWa-mr-cXD"> 96 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hWa-mr-cXD">
97 - <rect key="frame" x="132.5" y="13.5" width="122.5" height="14"/> 97 + <rect key="frame" x="132.5" y="13" width="122.5" height="15"/>
98 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 98 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
99 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 99 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
100 <nil key="highlightedColor"/> 100 <nil key="highlightedColor"/>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 </constraints> 106 </constraints>
107 </stackView> 107 </stackView>
108 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kdt-I2-GtS"> 108 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kdt-I2-GtS">
109 - <rect key="frame" x="119" y="58" width="255" height="14"/> 109 + <rect key="frame" x="119" y="57.5" width="255" height="15"/>
110 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 110 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
111 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 111 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
112 <nil key="highlightedColor"/> 112 <nil key="highlightedColor"/>
...@@ -257,13 +257,13 @@ ...@@ -257,13 +257,13 @@
257 <nil key="highlightedColor"/> 257 <nil key="highlightedColor"/>
258 </label> 258 </label>
259 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lIv-wc-Oa8"> 259 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lIv-wc-Oa8">
260 - <rect key="frame" x="20" y="35" width="210.5" height="17.5"/> 260 + <rect key="frame" x="20" y="35" width="210.5" height="18.5"/>
261 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> 261 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
262 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 262 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
263 <nil key="highlightedColor"/> 263 <nil key="highlightedColor"/>
264 </label> 264 </label>
265 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bmR-su-WJq"> 265 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bmR-su-WJq">
266 - <rect key="frame" x="20" y="91" width="210.5" height="17.5"/> 266 + <rect key="frame" x="20" y="90" width="210.5" height="18.5"/>
267 <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="15"/> 267 <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="15"/>
268 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 268 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
269 <nil key="highlightedColor"/> 269 <nil key="highlightedColor"/>
...@@ -1656,13 +1656,13 @@ ...@@ -1656,13 +1656,13 @@
1656 </constraints> 1656 </constraints>
1657 </imageView> 1657 </imageView>
1658 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Γιώργος Γεωργίου" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1XZ-NB-F8P"> 1658 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Γιώργος Γεωργίου" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1XZ-NB-F8P">
1659 - <rect key="frame" x="20" y="105" width="374" height="20"/> 1659 + <rect key="frame" x="20" y="105" width="374" height="21"/>
1660 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/> 1660 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/>
1661 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 1661 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
1662 <nil key="highlightedColor"/> 1662 <nil key="highlightedColor"/>
1663 </label> 1663 </label>
1664 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV"> 1664 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV">
1665 - <rect key="frame" x="174" y="135" width="66" height="508"/> 1665 + <rect key="frame" x="172" y="136" width="70" height="507"/>
1666 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1666 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1667 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/> 1667 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/>
1668 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/> 1668 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/>
...@@ -1957,7 +1957,7 @@ ...@@ -1957,7 +1957,7 @@
1957 </constraints> 1957 </constraints>
1958 </imageView> 1958 </imageView>
1959 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SIP-ou-T3X"> 1959 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SIP-ou-T3X">
1960 - <rect key="frame" x="0.0" y="125" width="374" height="17.5"/> 1960 + <rect key="frame" x="0.0" y="125" width="374" height="18.5"/>
1961 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> 1961 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
1962 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 1962 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
1963 <nil key="highlightedColor"/> 1963 <nil key="highlightedColor"/>
...@@ -2035,22 +2035,22 @@ ...@@ -2035,22 +2035,22 @@
2035 </constraints> 2035 </constraints>
2036 </view> 2036 </view>
2037 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0"> 2037 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0">
2038 - <rect key="frame" x="119" y="-13.5" width="255" height="20.5"/> 2038 + <rect key="frame" x="119" y="-13" width="255" height="20"/>
2039 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> 2039 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
2040 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2040 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2041 <nil key="highlightedColor"/> 2041 <nil key="highlightedColor"/>
2042 </label> 2042 </label>
2043 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3"> 2043 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3">
2044 - <rect key="frame" x="119" y="12" width="255" height="41"/> 2044 + <rect key="frame" x="119" y="12" width="255" height="40.5"/>
2045 <subviews> 2045 <subviews>
2046 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt"> 2046 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt">
2047 - <rect key="frame" x="0.0" y="0.0" width="127.5" height="41"/> 2047 + <rect key="frame" x="0.0" y="0.0" width="127.5" height="40.5"/>
2048 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="35"/> 2048 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="35"/>
2049 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2049 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2050 <nil key="highlightedColor"/> 2050 <nil key="highlightedColor"/>
2051 </label> 2051 </label>
2052 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk"> 2052 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk">
2053 - <rect key="frame" x="132.5" y="13.5" width="122.5" height="14"/> 2053 + <rect key="frame" x="132.5" y="13" width="122.5" height="15"/>
2054 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2054 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2055 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2055 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2056 <nil key="highlightedColor"/> 2056 <nil key="highlightedColor"/>
...@@ -2062,7 +2062,7 @@ ...@@ -2062,7 +2062,7 @@
2062 </constraints> 2062 </constraints>
2063 </stackView> 2063 </stackView>
2064 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td"> 2064 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td">
2065 - <rect key="frame" x="119" y="58" width="255" height="14"/> 2065 + <rect key="frame" x="119" y="57.5" width="255" height="15"/>
2066 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2066 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2067 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2067 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2068 <nil key="highlightedColor"/> 2068 <nil key="highlightedColor"/>
...@@ -2126,16 +2126,16 @@ ...@@ -2126,16 +2126,16 @@
2126 <rect key="frame" x="10" y="0.0" width="394" height="100"/> 2126 <rect key="frame" x="10" y="0.0" width="394" height="100"/>
2127 <subviews> 2127 <subviews>
2128 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Pso-iJ-S9p"> 2128 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Pso-iJ-S9p">
2129 - <rect key="frame" x="20" y="31" width="254" height="38"/> 2129 + <rect key="frame" x="20" y="30" width="254" height="40"/>
2130 <subviews> 2130 <subviews>
2131 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ενεργός κωδικός:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T8m-z1-J6k"> 2131 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ενεργός κωδικός:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T8m-z1-J6k">
2132 - <rect key="frame" x="0.0" y="0.0" width="254" height="20"/> 2132 + <rect key="frame" x="0.0" y="0.0" width="254" height="21"/>
2133 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="17"/> 2133 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="17"/>
2134 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2134 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2135 <nil key="highlightedColor"/> 2135 <nil key="highlightedColor"/>
2136 </label> 2136 </label>
2137 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfx-z1-VHT"> 2137 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfx-z1-VHT">
2138 - <rect key="frame" x="0.0" y="22" width="254" height="0.0"/> 2138 + <rect key="frame" x="0.0" y="23" width="254" height="0.0"/>
2139 <subviews> 2139 <subviews>
2140 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TPp-HH-CgA"> 2140 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TPp-HH-CgA">
2141 <rect key="frame" x="0.0" y="0.0" width="254" height="0.0"/> 2141 <rect key="frame" x="0.0" y="0.0" width="254" height="0.0"/>
...@@ -2165,7 +2165,7 @@ ...@@ -2165,7 +2165,7 @@
2165 <nil key="highlightedColor"/> 2165 <nil key="highlightedColor"/>
2166 </label> 2166 </label>
2167 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Λήγει σε 4 ημέρες" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zz2-r5-rnf"> 2167 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Λήγει σε 4 ημέρες" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zz2-r5-rnf">
2168 - <rect key="frame" x="0.0" y="24" width="254" height="14"/> 2168 + <rect key="frame" x="0.0" y="25" width="254" height="15"/>
2169 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2169 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2170 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2170 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2171 <nil key="highlightedColor"/> 2171 <nil key="highlightedColor"/>
...@@ -2274,13 +2274,13 @@ ...@@ -2274,13 +2274,13 @@
2274 <nil key="highlightedColor"/> 2274 <nil key="highlightedColor"/>
2275 </label> 2275 </label>
2276 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJD-Db-B4t"> 2276 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJD-Db-B4t">
2277 - <rect key="frame" x="292.5" y="25.5" width="81.5" height="14"/> 2277 + <rect key="frame" x="292.5" y="25" width="81.5" height="15"/>
2278 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2278 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2279 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2279 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2280 <nil key="highlightedColor"/> 2280 <nil key="highlightedColor"/>
2281 </label> 2281 </label>
2282 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C5t-xz-oAO"> 2282 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C5t-xz-oAO">
2283 - <rect key="frame" x="119" y="35.5" width="255" height="14"/> 2283 + <rect key="frame" x="119" y="34.5" width="255" height="15"/>
2284 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2284 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2285 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2285 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2286 <nil key="highlightedColor"/> 2286 <nil key="highlightedColor"/>
...@@ -2336,19 +2336,19 @@ ...@@ -2336,19 +2336,19 @@
2336 <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> 2336 <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
2337 <autoresizingMask key="autoresizingMask"/> 2337 <autoresizingMask key="autoresizingMask"/>
2338 <subviews> 2338 <subviews>
2339 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AV7-t1-eK0"> 2339 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AV7-t1-eK0">
2340 <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> 2340 <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
2341 <subviews> 2341 <subviews>
2342 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="COSMOTE Επιβράβευση" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z0E-V6-vKD"> 2342 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="COSMOTE Επιβράβευση" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z0E-V6-vKD">
2343 <rect key="frame" x="20" y="30" width="374" height="0.0"/> 2343 <rect key="frame" x="20" y="30" width="374" height="0.0"/>
2344 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="21"/> 2344 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="21"/>
2345 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2345 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2346 <nil key="highlightedColor"/> 2346 <nil key="highlightedColor"/>
2347 </label> 2347 </label>
2348 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kge-nO-6ZA" userLabel="BadgesView"> 2348 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kge-nO-6ZA" userLabel="BadgesView">
2349 <rect key="frame" x="0.0" y="44" width="414" height="0.0"/> 2349 <rect key="frame" x="0.0" y="44" width="414" height="0.0"/>
2350 <subviews> 2350 <subviews>
2351 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="wallet_badge_lines" translatesAutoresizingMaskIntoConstraints="NO" id="Cib-tj-hT7"> 2351 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_badge_lines" translatesAutoresizingMaskIntoConstraints="NO" id="Cib-tj-hT7">
2352 <rect key="frame" x="7" y="50" width="400" height="80"/> 2352 <rect key="frame" x="7" y="50" width="400" height="80"/>
2353 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2353 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2354 <constraints> 2354 <constraints>
...@@ -2356,14 +2356,14 @@ ...@@ -2356,14 +2356,14 @@
2356 <constraint firstAttribute="width" constant="400" id="aZp-jX-jNM"/> 2356 <constraint firstAttribute="width" constant="400" id="aZp-jX-jNM"/>
2357 </constraints> 2357 </constraints>
2358 </imageView> 2358 </imageView>
2359 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UuC-Lf-eNr"> 2359 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UuC-Lf-eNr">
2360 <rect key="frame" x="162" y="0.0" width="90" height="90"/> 2360 <rect key="frame" x="162" y="0.0" width="90" height="90"/>
2361 <subviews> 2361 <subviews>
2362 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="myJ-Di-R2M"> 2362 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="myJ-Di-R2M">
2363 <rect key="frame" x="0.0" y="0.0" width="90" height="90"/> 2363 <rect key="frame" x="0.0" y="0.0" width="90" height="90"/>
2364 </imageView> 2364 </imageView>
2365 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AHT-NP-UcH"> 2365 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AHT-NP-UcH">
2366 - <rect key="frame" x="5" y="51.666666666666671" width="80" height="16.333333333333329"/> 2366 + <rect key="frame" x="5" y="54" width="80" height="14"/>
2367 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="14"/> 2367 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="14"/>
2368 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2368 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2369 <nil key="highlightedColor"/> 2369 <nil key="highlightedColor"/>
...@@ -2382,14 +2382,14 @@ ...@@ -2382,14 +2382,14 @@
2382 <constraint firstAttribute="trailing" secondItem="myJ-Di-R2M" secondAttribute="trailing" id="yP0-4e-mRo"/> 2382 <constraint firstAttribute="trailing" secondItem="myJ-Di-R2M" secondAttribute="trailing" id="yP0-4e-mRo"/>
2383 </constraints> 2383 </constraints>
2384 </view> 2384 </view>
2385 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="af5-Pz-rum"> 2385 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="af5-Pz-rum">
2386 - <rect key="frame" x="64.666666666666686" y="100" width="75" height="75"/> 2386 + <rect key="frame" x="64.5" y="100" width="75" height="75"/>
2387 <subviews> 2387 <subviews>
2388 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="K43-m1-wTl"> 2388 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="K43-m1-wTl">
2389 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/> 2389 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
2390 </imageView> 2390 </imageView>
2391 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ku-5y-o0b"> 2391 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ku-5y-o0b">
2392 - <rect key="frame" x="5" y="44" width="65" height="13"/> 2392 + <rect key="frame" x="5" y="46" width="65" height="11"/>
2393 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/> 2393 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/>
2394 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2394 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2395 <nil key="highlightedColor"/> 2395 <nil key="highlightedColor"/>
...@@ -2423,14 +2423,14 @@ ...@@ -2423,14 +2423,14 @@
2423 <constraint firstAttribute="height" constant="75" id="sgx-Z2-YsH"/> 2423 <constraint firstAttribute="height" constant="75" id="sgx-Z2-YsH"/>
2424 </constraints> 2424 </constraints>
2425 </view> 2425 </view>
2426 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qge-34-vJ3"> 2426 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qge-34-vJ3">
2427 - <rect key="frame" x="169.66666666666666" y="120" width="75" height="73"/> 2427 + <rect key="frame" x="169.5" y="120" width="75" height="73"/>
2428 <subviews> 2428 <subviews>
2429 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="gGn-2u-akB"> 2429 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="gGn-2u-akB">
2430 <rect key="frame" x="0.0" y="0.0" width="75" height="73"/> 2430 <rect key="frame" x="0.0" y="0.0" width="75" height="73"/>
2431 </imageView> 2431 </imageView>
2432 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8JV-5a-Jar"> 2432 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8JV-5a-Jar">
2433 - <rect key="frame" x="5" y="42" width="65" height="13"/> 2433 + <rect key="frame" x="5" y="44" width="65" height="11"/>
2434 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/> 2434 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/>
2435 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2435 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2436 <nil key="highlightedColor"/> 2436 <nil key="highlightedColor"/>
...@@ -2464,14 +2464,14 @@ ...@@ -2464,14 +2464,14 @@
2464 <constraint firstAttribute="trailing" secondItem="6UC-iU-ey4" secondAttribute="trailing" id="cB7-Ks-NGG"/> 2464 <constraint firstAttribute="trailing" secondItem="6UC-iU-ey4" secondAttribute="trailing" id="cB7-Ks-NGG"/>
2465 </constraints> 2465 </constraints>
2466 </view> 2466 </view>
2467 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8V2-Ru-8jC"> 2467 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8V2-Ru-8jC">
2468 - <rect key="frame" x="274.66666666666669" y="100" width="75" height="75"/> 2468 + <rect key="frame" x="274.5" y="100" width="75" height="75"/>
2469 <subviews> 2469 <subviews>
2470 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="oXU-NL-imE"> 2470 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_dfy_earn" translatesAutoresizingMaskIntoConstraints="NO" id="oXU-NL-imE">
2471 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/> 2471 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
2472 </imageView> 2472 </imageView>
2473 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxE-g9-jaK"> 2473 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxE-g9-jaK">
2474 - <rect key="frame" x="5" y="44" width="65" height="13"/> 2474 + <rect key="frame" x="5" y="46" width="65" height="11"/>
2475 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/> 2475 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/>
2476 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2476 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2477 <nil key="highlightedColor"/> 2477 <nil key="highlightedColor"/>
...@@ -3008,20 +3008,20 @@ ...@@ -3008,20 +3008,20 @@
3008 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 3008 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3009 <prototypes> 3009 <prototypes>
3010 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="InboxTableViewCellId" id="5x6-NG-BBQ" customClass="InboxTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> 3010 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="InboxTableViewCellId" id="5x6-NG-BBQ" customClass="InboxTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target">
3011 - <rect key="frame" x="0.0" y="50" width="414" height="77.5"/> 3011 + <rect key="frame" x="0.0" y="50" width="414" height="78.5"/>
3012 <autoresizingMask key="autoresizingMask"/> 3012 <autoresizingMask key="autoresizingMask"/>
3013 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5x6-NG-BBQ" id="7Ha-bG-aYy"> 3013 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5x6-NG-BBQ" id="7Ha-bG-aYy">
3014 - <rect key="frame" x="0.0" y="0.0" width="414" height="77.5"/> 3014 + <rect key="frame" x="0.0" y="0.0" width="414" height="78.5"/>
3015 <autoresizingMask key="autoresizingMask"/> 3015 <autoresizingMask key="autoresizingMask"/>
3016 <subviews> 3016 <subviews>
3017 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dwe-Hj-Zch"> 3017 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dwe-Hj-Zch">
3018 - <rect key="frame" x="20" y="0.0" width="374" height="77.5"/> 3018 + <rect key="frame" x="20" y="0.0" width="374" height="78.5"/>
3019 <subviews> 3019 <subviews>
3020 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jxX-dy-R3y"> 3020 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jxX-dy-R3y">
3021 - <rect key="frame" x="0.0" y="0.0" width="205.5" height="77.5"/> 3021 + <rect key="frame" x="0.0" y="0.0" width="205.5" height="78.5"/>
3022 </imageView> 3022 </imageView>
3023 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DIv-Ip-CVk"> 3023 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DIv-Ip-CVk">
3024 - <rect key="frame" x="215.5" y="30" width="148.5" height="17.5"/> 3024 + <rect key="frame" x="215.5" y="30" width="148.5" height="18.5"/>
3025 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> 3025 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
3026 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 3026 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
3027 <nil key="highlightedColor"/> 3027 <nil key="highlightedColor"/>
...@@ -3475,17 +3475,17 @@ ...@@ -3475,17 +3475,17 @@
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="935.5" width="414" height="160"/> 3478 + <rect key="frame" x="0.0" y="935.5" width="414" height="44"/>
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="44"/>
3482 <autoresizingMask key="autoresizingMask"/> 3482 <autoresizingMask key="autoresizingMask"/>
3483 <subviews> 3483 <subviews>
3484 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ"> 3484 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ">
3485 - <rect key="frame" x="0.0" y="0.0" width="414" height="160"/> 3485 + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
3486 <subviews> 3486 <subviews>
3487 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-w7-eKZ"> 3487 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-w7-eKZ">
3488 - <rect key="frame" x="123.5" y="20" width="167" height="50"/> 3488 + <rect key="frame" x="123.5" y="20" width="167" height="33"/>
3489 <constraints> 3489 <constraints>
3490 <constraint firstAttribute="height" constant="50" id="SUG-HC-XQH"/> 3490 <constraint firstAttribute="height" constant="50" id="SUG-HC-XQH"/>
3491 </constraints> 3491 </constraints>
...@@ -3499,7 +3499,7 @@ ...@@ -3499,7 +3499,7 @@
3499 </connections> 3499 </connections>
3500 </button> 3500 </button>
3501 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sq7-ea-Nx2"> 3501 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sq7-ea-Nx2">
3502 - <rect key="frame" x="103.5" y="90" width="207" height="40"/> 3502 + <rect key="frame" x="103.5" y="-10" width="207" height="24"/>
3503 <constraints> 3503 <constraints>
3504 <constraint firstAttribute="height" constant="40" id="UgG-aB-OOw"/> 3504 <constraint firstAttribute="height" constant="40" id="UgG-aB-OOw"/>
3505 </constraints> 3505 </constraints>
...@@ -3514,7 +3514,7 @@ ...@@ -3514,7 +3514,7 @@
3514 </connections> 3514 </connections>
3515 </button> 3515 </button>
3516 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kkr-9H-ZSx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> 3516 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kkr-9H-ZSx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
3517 - <rect key="frame" x="20" y="130" width="374" height="0.0"/> 3517 + <rect key="frame" x="20" y="14" width="374" height="0.0"/>
3518 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 3518 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
3519 <constraints> 3519 <constraints>
3520 <constraint firstAttribute="height" id="oLt-F6-WA7"/> 3520 <constraint firstAttribute="height" id="oLt-F6-WA7"/>
...@@ -3640,13 +3640,16 @@ ...@@ -3640,13 +3640,16 @@
3640 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> 3640 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
3641 </textView> 3641 </textView>
3642 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Κωδικός Κουπονιού" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sg1-QU-FY1"> 3642 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Κωδικός Κουπονιού" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sg1-QU-FY1">
3643 - <rect key="frame" x="20" y="389" width="374" height="21"/> 3643 + <rect key="frame" x="20" y="389" width="374" height="20"/>
3644 + <constraints>
3645 + <constraint firstAttribute="height" constant="20" id="mKs-LB-L7G"/>
3646 + </constraints>
3644 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/> 3647 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/>
3645 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 3648 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
3646 <nil key="highlightedColor"/> 3649 <nil key="highlightedColor"/>
3647 </label> 3650 </label>
3648 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View"> 3651 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View">
3649 - <rect key="frame" x="20" y="430" width="374" height="55"/> 3652 + <rect key="frame" x="20" y="429" width="374" height="55"/>
3650 <subviews> 3653 <subviews>
3651 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BJS-kk-CBZ" customClass="CopyableLabel" customModule="SwiftWarplyFramework" customModuleProvider="target"> 3654 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BJS-kk-CBZ" customClass="CopyableLabel" customModule="SwiftWarplyFramework" customModuleProvider="target">
3652 <rect key="frame" x="20" y="12.5" width="334" height="30"/> 3655 <rect key="frame" x="20" y="12.5" width="334" height="30"/>
...@@ -3664,20 +3667,20 @@ ...@@ -3664,20 +3667,20 @@
3664 </constraints> 3667 </constraints>
3665 </view> 3668 </view>
3666 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrM-7n-fSw" userLabel="Border View"> 3669 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrM-7n-fSw" userLabel="Border View">
3667 - <rect key="frame" x="20" y="505" width="374" height="1"/> 3670 + <rect key="frame" x="20" y="504" width="374" height="1"/>
3668 <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> 3671 <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/>
3669 <constraints> 3672 <constraints>
3670 <constraint firstAttribute="height" constant="1" id="eF3-7T-hMu"/> 3673 <constraint firstAttribute="height" constant="1" id="eF3-7T-hMu"/>
3671 </constraints> 3674 </constraints>
3672 </view> 3675 </view>
3673 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="huh-zh-82C"> 3676 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="huh-zh-82C">
3674 - <rect key="frame" x="30" y="516" width="354" height="110"/> 3677 + <rect key="frame" x="30" y="515" width="354" height="110"/>
3675 <constraints> 3678 <constraints>
3676 <constraint firstAttribute="height" constant="110" id="LJq-uV-eb8"/> 3679 <constraint firstAttribute="height" constant="110" id="LJq-uV-eb8"/>
3677 </constraints> 3680 </constraints>
3678 </imageView> 3681 </imageView>
3679 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789101112" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EKv-Mx-6Yv"> 3682 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789101112" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EKv-Mx-6Yv">
3680 - <rect key="frame" x="20" y="636" width="374" height="26.5"/> 3683 + <rect key="frame" x="20" y="635" width="374" height="26.5"/>
3681 <constraints> 3684 <constraints>
3682 <constraint firstAttribute="height" constant="26.5" id="LfJ-bC-nLk"/> 3685 <constraint firstAttribute="height" constant="26.5" id="LfJ-bC-nLk"/>
3683 </constraints> 3686 </constraints>
...@@ -3686,14 +3689,14 @@ ...@@ -3686,14 +3689,14 @@
3686 <nil key="highlightedColor"/> 3689 <nil key="highlightedColor"/>
3687 </label> 3690 </label>
3688 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6rV-2m-QMZ" userLabel="Border 2 View"> 3691 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6rV-2m-QMZ" userLabel="Border 2 View">
3689 - <rect key="frame" x="20" y="677.5" width="374" height="1"/> 3692 + <rect key="frame" x="20" y="676.5" width="374" height="1"/>
3690 <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> 3693 <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/>
3691 <constraints> 3694 <constraints>
3692 <constraint firstAttribute="height" constant="1" id="DVl-3B-zqo"/> 3695 <constraint firstAttribute="height" constant="1" id="DVl-3B-zqo"/>
3693 </constraints> 3696 </constraints>
3694 </view> 3697 </view>
3695 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zw5-Wj-WD5"> 3698 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zw5-Wj-WD5">
3696 - <rect key="frame" x="103.5" y="688.5" width="207" height="50"/> 3699 + <rect key="frame" x="103.5" y="687.5" width="207" height="50"/>
3697 <constraints> 3700 <constraints>
3698 <constraint firstAttribute="height" constant="50" id="ZSP-NX-0a7"/> 3701 <constraint firstAttribute="height" constant="50" id="ZSP-NX-0a7"/>
3699 </constraints> 3702 </constraints>
...@@ -3708,13 +3711,13 @@ ...@@ -3708,13 +3711,13 @@
3708 </connections> 3711 </connections>
3709 </button> 3712 </button>
3710 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Το κουπόνι ισχύει έως 05/12/2022" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UhC-Lj-tfN"> 3713 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Το κουπόνι ισχύει έως 05/12/2022" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UhC-Lj-tfN">
3711 - <rect key="frame" x="20" y="768.5" width="374" height="20"/> 3714 + <rect key="frame" x="20" y="767.5" width="374" height="20"/>
3712 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> 3715 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
3713 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 3716 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
3714 <nil key="highlightedColor"/> 3717 <nil key="highlightedColor"/>
3715 </label> 3718 </label>
3716 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ"> 3719 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ">
3717 - <rect key="frame" x="167.5" y="808.5" width="79" height="50"/> 3720 + <rect key="frame" x="167.5" y="807.5" width="79" height="50"/>
3718 <constraints> 3721 <constraints>
3719 <constraint firstAttribute="height" constant="50" id="ccg-NP-FIH"/> 3722 <constraint firstAttribute="height" constant="50" id="ccg-NP-FIH"/>
3720 </constraints> 3723 </constraints>
...@@ -3728,7 +3731,7 @@ ...@@ -3728,7 +3731,7 @@
3728 </connections> 3731 </connections>
3729 </button> 3732 </button>
3730 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W5f-1T-iW6"> 3733 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W5f-1T-iW6">
3731 - <rect key="frame" x="128" y="868.5" width="158" height="50"/> 3734 + <rect key="frame" x="128" y="867.5" width="158" height="50"/>
3732 <constraints> 3735 <constraints>
3733 <constraint firstAttribute="height" constant="50" id="3pq-y5-f66"/> 3736 <constraint firstAttribute="height" constant="50" id="3pq-y5-f66"/>
3734 </constraints> 3737 </constraints>
...@@ -3742,7 +3745,7 @@ ...@@ -3742,7 +3745,7 @@
3742 </connections> 3745 </connections>
3743 </button> 3746 </button>
3744 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8UD-WL-JB7"> 3747 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8UD-WL-JB7">
3745 - <rect key="frame" x="103.5" y="938.5" width="207" height="40"/> 3748 + <rect key="frame" x="103.5" y="937.5" width="207" height="40"/>
3746 <constraints> 3749 <constraints>
3747 <constraint firstAttribute="height" constant="40" id="xdq-YS-AL4"/> 3750 <constraint firstAttribute="height" constant="40" id="xdq-YS-AL4"/>
3748 </constraints> 3751 </constraints>
...@@ -3757,7 +3760,7 @@ ...@@ -3757,7 +3760,7 @@
3757 </connections> 3760 </connections>
3758 </button> 3761 </button>
3759 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xjX-HZ-MpD" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> 3762 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xjX-HZ-MpD" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
3760 - <rect key="frame" x="20" y="978.5" width="374" height="0.0"/> 3763 + <rect key="frame" x="20" y="977.5" width="374" height="0.0"/>
3761 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 3764 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
3762 <constraints> 3765 <constraints>
3763 <constraint firstAttribute="height" id="3GU-tg-S3t"/> 3766 <constraint firstAttribute="height" id="3GU-tg-S3t"/>
...@@ -3879,11 +3882,15 @@ ...@@ -3879,11 +3882,15 @@
3879 <outlet property="border2TopSpace" destination="hL4-rX-9aa" id="87h-tF-CnT"/> 3882 <outlet property="border2TopSpace" destination="hL4-rX-9aa" id="87h-tF-CnT"/>
3880 <outlet property="borderView2Height" destination="DVl-3B-zqo" id="USP-Iq-ZAd"/> 3883 <outlet property="borderView2Height" destination="DVl-3B-zqo" id="USP-Iq-ZAd"/>
3881 <outlet property="borderViewHeight" destination="eF3-7T-hMu" id="Wt2-MV-eTg"/> 3884 <outlet property="borderViewHeight" destination="eF3-7T-hMu" id="Wt2-MV-eTg"/>
3885 + <outlet property="couponCodeLabel" destination="Sg1-QU-FY1" id="i9H-Ny-Pgu"/>
3886 + <outlet property="couponCodeLabelHeight" destination="mKs-LB-L7G" id="V4p-2e-Knn"/>
3882 <outlet property="couponCodeLabelTopSpace" destination="WWh-BA-7qP" id="7ba-Oy-kc3"/> 3887 <outlet property="couponCodeLabelTopSpace" destination="WWh-BA-7qP" id="7ba-Oy-kc3"/>
3883 <outlet property="couponImage" destination="iiM-5P-m5s" id="oKZ-Up-sI3"/> 3888 <outlet property="couponImage" destination="iiM-5P-m5s" id="oKZ-Up-sI3"/>
3884 <outlet property="couponImageHeight" destination="kL0-u7-VI9" id="QJ9-gs-XUh"/> 3889 <outlet property="couponImageHeight" destination="kL0-u7-VI9" id="QJ9-gs-XUh"/>
3885 <outlet property="couponNumberLabel" destination="BJS-kk-CBZ" id="Sdz-3a-Jvq"/> 3890 <outlet property="couponNumberLabel" destination="BJS-kk-CBZ" id="Sdz-3a-Jvq"/>
3886 <outlet property="couponView" destination="Zdf-1r-FdJ" id="OA8-73-e0p"/> 3891 <outlet property="couponView" destination="Zdf-1r-FdJ" id="OA8-73-e0p"/>
3892 + <outlet property="couponViewHeight" destination="XVr-JP-U40" id="zhH-KN-zLy"/>
3893 + <outlet property="couponViewTopSpace" destination="KZi-Jl-Yyz" id="Xlm-Ls-aNv"/>
3887 <outlet property="discriptionLabel" destination="mri-Wl-spg" id="iuf-XL-NWH"/> 3894 <outlet property="discriptionLabel" destination="mri-Wl-spg" id="iuf-XL-NWH"/>
3888 <outlet property="expirationLabel" destination="UhC-Lj-tfN" id="9Hj-I1-nJa"/> 3895 <outlet property="expirationLabel" destination="UhC-Lj-tfN" id="9Hj-I1-nJa"/>
3889 <outlet property="mainView" destination="P3Q-nP-aSj" id="pZK-pk-db5"/> 3896 <outlet property="mainView" destination="P3Q-nP-aSj" id="pZK-pk-db5"/>
...@@ -4191,7 +4198,7 @@ ...@@ -4191,7 +4198,7 @@
4191 <rect key="frame" x="10" y="0.0" width="394" height="44"/> 4198 <rect key="frame" x="10" y="0.0" width="394" height="44"/>
4192 <subviews> 4199 <subviews>
4193 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eHE-4G-yAU"> 4200 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eHE-4G-yAU">
4194 - <rect key="frame" x="10" y="12.5" width="374" height="19"/> 4201 + <rect key="frame" x="10" y="12" width="374" height="20"/>
4195 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> 4202 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
4196 <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 4203 <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
4197 <nil key="highlightedColor"/> 4204 <nil key="highlightedColor"/>
......
...@@ -181,18 +181,19 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa ...@@ -181,18 +181,19 @@ extension UnifiedCouponBarcodeViewController: UITableViewDelegate, UITableViewDa
181 // SwiftEventBus.post("couponBarcodePressed", sender: coupons[indexPath.row]) 181 // SwiftEventBus.post("couponBarcodePressed", sender: coupons[indexPath.row])
182 182
183 // Logs 183 // Logs
184 -// let couponSetData: swiftApi.CouponSetItemModel? = coupons[indexPath.row].couponset_data 184 +// let couponSetData: swiftApi.CouponSetItemModel? = self.coupon?._coupons[indexPath.row].couponset_data
185 -// print("Coupon clicked: " + (coupons[indexPath.row].coupon ?? "")) 185 +// print("Coupon clicked: " + (self.coupon?._coupons[indexPath.row].coupon ?? ""))
186 // print("Coupon Name clicked: " + (couponSetData?.name ?? "")) 186 // print("Coupon Name clicked: " + (couponSetData?.name ?? ""))
187 // print("Coupon Description clicked: " + (couponSetData?.short_description ?? "")) 187 // print("Coupon Description clicked: " + (couponSetData?.short_description ?? ""))
188 -// print("Coupon Expiration clicked: " + (coupons[indexPath.row].expiration ?? "")) 188 +// print("Coupon Expiration clicked: " + (self.coupon?._coupons[indexPath.row].expiration ?? ""))
189 189
190 -// swiftApi().logTrackersEvent("click", ("Coupon:" + (couponSetData?.name ?? ""))) 190 + swiftApi().logTrackersEvent("click", ("Coupon:" + (self.coupon?._coupons[indexPath.row].name ?? "")))
191 191
192 -// let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) 192 + let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self))
193 -// let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as! SwiftWarplyFramework.CouponBarcodeViewController 193 + let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as! SwiftWarplyFramework.CouponBarcodeViewController
194 -// vc.coupon = self.coupon?._coupons[indexPath.row] 194 + vc.coupon = self.coupon?._coupons[indexPath.row]
195 -// self.navigationController?.pushViewController(vc, animated: true) 195 + vc.isMarket = true
196 + self.navigationController?.pushViewController(vc, animated: true)
196 } 197 }
197 198
198 public func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { 199 public func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
......
...@@ -610,6 +610,8 @@ public class swiftApi { ...@@ -610,6 +610,8 @@ public class swiftApi {
610 // Market Coupon 610 // Market Coupon
611 public let inner_text: String? 611 public let inner_text: String?
612 public let merchant_uuid: String? 612 public let merchant_uuid: String?
613 + public let short_description: String?
614 + public let terms: String?
613 615
614 616
615 public init(dictionary: [String: Any]) { 617 public init(dictionary: [String: Any]) {
...@@ -626,6 +628,8 @@ public class swiftApi { ...@@ -626,6 +628,8 @@ public class swiftApi {
626 // Market Coupon 628 // Market Coupon
627 self.inner_text = dictionary["inner_text"] as? String? ?? "" 629 self.inner_text = dictionary["inner_text"] as? String? ?? ""
628 self.merchant_uuid = dictionary["merchant_uuid"] as? String? ?? "" 630 self.merchant_uuid = dictionary["merchant_uuid"] as? String? ?? ""
631 + self.short_description = dictionary["short_description"] as? String? ?? ""
632 + self.terms = dictionary["terms"] as? String? ?? ""
629 633
630 if let couponSetData = dictionary["couponset_data"] as? [String: Any]? ?? ["":""] { 634 if let couponSetData = dictionary["couponset_data"] as? [String: Any]? ?? ["":""] {
631 635
......