Showing
13 changed files
with
60 additions
and
32 deletions
No preview for this file type
... | @@ -48,6 +48,12 @@ import UIKit | ... | @@ -48,6 +48,12 @@ import UIKit |
48 | // dfyCoupons = swiftApi().getActiveDFYCoupons() | 48 | // dfyCoupons = swiftApi().getActiveDFYCoupons() |
49 | // TODO: DELETE <=== | 49 | // TODO: DELETE <=== |
50 | 50 | ||
51 | + // Add shadow | ||
52 | + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor | ||
53 | + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) | ||
54 | + self.layer.shadowOpacity = 1.0 | ||
55 | + self.layer.shadowRadius = 3.0 | ||
56 | + | ||
51 | activeCodeView.layer.cornerRadius = 16.5 | 57 | activeCodeView.layer.cornerRadius = 16.5 |
52 | activeCodeView.layer.borderWidth = 1 | 58 | activeCodeView.layer.borderWidth = 1 |
53 | activeCodeView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor | 59 | activeCodeView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor |
... | @@ -183,5 +189,12 @@ import UIKit | ... | @@ -183,5 +189,12 @@ import UIKit |
183 | 189 | ||
184 | // Configure the view for the selected state | 190 | // Configure the view for the selected state |
185 | } | 191 | } |
192 | + | ||
193 | + public override func layoutSubviews() { | ||
194 | + super.layoutSubviews() | ||
195 | + //set the values for top,left,bottom,right margins | ||
196 | + let margins = UIEdgeInsets(top: 2, left: 0, bottom: 4, right: 0) | ||
197 | + contentView.frame = contentView.frame.inset(by: margins) | ||
198 | + } | ||
186 | 199 | ||
187 | } | 200 | } | ... | ... |
... | @@ -66,7 +66,7 @@ import SwiftEventBus | ... | @@ -66,7 +66,7 @@ import SwiftEventBus |
66 | 66 | ||
67 | couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) | 67 | couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) |
68 | couponImage.contentMode = .scaleAspectFill | 68 | couponImage.contentMode = .scaleAspectFill |
69 | - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 | 69 | + couponImageHeight.constant = 255 // 230 // 253 // self.uiscreen.height * 0.25 |
70 | 70 | ||
71 | nameLabel.text = ccms?._titleOffer ?? "" | 71 | nameLabel.text = ccms?._titleOffer ?? "" |
72 | descriptionLabel.text = ccms?._description ?? "" | 72 | descriptionLabel.text = ccms?._description ?? "" | ... | ... |
... | @@ -102,7 +102,7 @@ import AVFoundation | ... | @@ -102,7 +102,7 @@ import AVFoundation |
102 | 102 | ||
103 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 103 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
104 | couponImage.contentMode = .scaleAspectFill | 104 | couponImage.contentMode = .scaleAspectFill |
105 | - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 | 105 | + couponImageHeight.constant = 255 // 230 // 253 // self.uiscreen.height * 0.25 |
106 | 106 | ||
107 | nameLabel.text = couponSetData?.name ?? "" | 107 | nameLabel.text = couponSetData?.name ?? "" |
108 | discriptionLabel.text = couponSetData?.short_description ?? "" | 108 | discriptionLabel.text = couponSetData?.short_description ?? "" |
... | @@ -286,7 +286,7 @@ import AVFoundation | ... | @@ -286,7 +286,7 @@ import AVFoundation |
286 | let htmlText = couponSetData?.terms ?? "" | 286 | let htmlText = couponSetData?.terms ?? "" |
287 | termsTextView.attributedText = htmlText.htmlToAttributedString | 287 | termsTextView.attributedText = htmlText.htmlToAttributedString |
288 | termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) | 288 | termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) |
289 | - termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) | 289 | + termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) |
290 | termsTextView.textAlignment = .left | 290 | termsTextView.textAlignment = .left |
291 | termsTextView.isScrollEnabled = false | 291 | termsTextView.isScrollEnabled = false |
292 | 292 | ... | ... |
... | @@ -77,7 +77,7 @@ import SwiftEventBus | ... | @@ -77,7 +77,7 @@ import SwiftEventBus |
77 | 77 | ||
78 | couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 78 | couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
79 | couponImage.contentMode = .scaleAspectFill | 79 | couponImage.contentMode = .scaleAspectFill |
80 | - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 | 80 | + couponImageHeight.constant = 255 // 230 // 253 // self.uiscreen.height * 0.25 |
81 | 81 | ||
82 | nameLabel.text = couponset?.name ?? "" | 82 | nameLabel.text = couponset?.name ?? "" |
83 | let htmlDescrText = couponset?.description ?? "" | 83 | let htmlDescrText = couponset?.description ?? "" |
... | @@ -126,7 +126,7 @@ import SwiftEventBus | ... | @@ -126,7 +126,7 @@ import SwiftEventBus |
126 | let htmlText = couponset?.terms ?? "" | 126 | let htmlText = couponset?.terms ?? "" |
127 | termsTextView.attributedText = htmlText.htmlToAttributedString | 127 | termsTextView.attributedText = htmlText.htmlToAttributedString |
128 | termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) | 128 | termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) |
129 | - termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) | 129 | + termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) |
130 | termsTextView.textAlignment = .left | 130 | termsTextView.textAlignment = .left |
131 | termsTextView.isScrollEnabled = false | 131 | termsTextView.isScrollEnabled = false |
132 | termsTextView.isUserInteractionEnabled = true | 132 | termsTextView.isUserInteractionEnabled = true |
... | @@ -191,9 +191,14 @@ import SwiftEventBus | ... | @@ -191,9 +191,14 @@ import SwiftEventBus |
191 | 191 | ||
192 | func showSpinner() { | 192 | func showSpinner() { |
193 | // add the spinner view controller | 193 | // add the spinner view controller |
194 | +// addChild(spinner) | ||
195 | +// spinner.view.frame = view.frame | ||
196 | +// view.addSubview(spinner.view) | ||
197 | +// spinner.didMove(toParent: self) | ||
198 | + | ||
194 | addChild(spinner) | 199 | addChild(spinner) |
195 | - spinner.view.frame = view.frame | 200 | + spinner.view.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height) |
196 | - view.addSubview(spinner.view) | 201 | + self.view.addSubview(spinner.view) |
197 | spinner.didMove(toParent: self) | 202 | spinner.didMove(toParent: self) |
198 | } | 203 | } |
199 | 204 | ... | ... |
... | @@ -43,6 +43,12 @@ import UIKit | ... | @@ -43,6 +43,12 @@ 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 = 3.0 | ||
51 | + | ||
46 | couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 52 | couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
47 | 53 | ||
48 | borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0) | 54 | borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0) | ... | ... |
... | @@ -34,7 +34,7 @@ import SwiftEventBus | ... | @@ -34,7 +34,7 @@ import SwiftEventBus |
34 | self.hidesBottomBarWhenPushed = true | 34 | self.hidesBottomBarWhenPushed = true |
35 | 35 | ||
36 | setBackButton() | 36 | setBackButton() |
37 | - setNavigationTitle("GIFTS for YOU", "bold") | 37 | + setNavigationTitle("GIFTS FOR YOU", "bold") |
38 | 38 | ||
39 | tableView.delegate = self | 39 | tableView.delegate = self |
40 | tableView.dataSource = self | 40 | tableView.dataSource = self | ... | ... |
... | @@ -34,11 +34,13 @@ import UIKit | ... | @@ -34,11 +34,13 @@ import UIKit |
34 | public override func awakeFromNib() { | 34 | public override func awakeFromNib() { |
35 | super.awakeFromNib() | 35 | super.awakeFromNib() |
36 | 36 | ||
37 | + // Add shadow | ||
38 | + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor | ||
39 | + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) | ||
40 | + self.layer.shadowOpacity = 1.0 | ||
41 | + self.layer.shadowRadius = 3.0 | ||
42 | + | ||
37 | inboxView.layer.cornerRadius = 16.0 | 43 | inboxView.layer.cornerRadius = 16.0 |
38 | - inboxView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor | ||
39 | - inboxView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) | ||
40 | - inboxView.layer.shadowOpacity = 1.0 | ||
41 | - inboxView.layer.shadowRadius = 15.0 | ||
42 | inboxView.clipsToBounds = true | 44 | inboxView.clipsToBounds = true |
43 | 45 | ||
44 | newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 46 | newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ... | ... |
... | @@ -99,7 +99,7 @@ | ... | @@ -99,7 +99,7 @@ |
99 | <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"> | 99 | <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"> |
100 | <rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/> | 100 | <rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/> |
101 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> | 101 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
102 | - <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> | 102 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
103 | <nil key="highlightedColor"/> | 103 | <nil key="highlightedColor"/> |
104 | </label> | 104 | </label> |
105 | </subviews> | 105 | </subviews> |
... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
111 | <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"> | 111 | <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"> |
112 | <rect key="frame" x="119" y="59" width="255" height="15"/> | 112 | <rect key="frame" x="119" y="59" width="255" height="15"/> |
113 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> | 113 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
114 | - <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> | 114 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
115 | <nil key="highlightedColor"/> | 115 | <nil key="highlightedColor"/> |
116 | </label> | 116 | </label> |
117 | </subviews> | 117 | </subviews> |
... | @@ -1836,7 +1836,7 @@ | ... | @@ -1836,7 +1836,7 @@ |
1836 | <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"> | 1836 | <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"> |
1837 | <rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/> | 1837 | <rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/> |
1838 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> | 1838 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
1839 | - <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> | 1839 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
1840 | <nil key="highlightedColor"/> | 1840 | <nil key="highlightedColor"/> |
1841 | </label> | 1841 | </label> |
1842 | </subviews> | 1842 | </subviews> |
... | @@ -1848,7 +1848,7 @@ | ... | @@ -1848,7 +1848,7 @@ |
1848 | <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"> | 1848 | <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"> |
1849 | <rect key="frame" x="119" y="59" width="255" height="15"/> | 1849 | <rect key="frame" x="119" y="59" width="255" height="15"/> |
1850 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> | 1850 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
1851 | - <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> | 1851 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
1852 | <nil key="highlightedColor"/> | 1852 | <nil key="highlightedColor"/> |
1853 | </label> | 1853 | </label> |
1854 | </subviews> | 1854 | </subviews> |
... | @@ -3414,7 +3414,7 @@ | ... | @@ -3414,7 +3414,7 @@ |
3414 | <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"> | 3414 | <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"> |
3415 | <rect key="frame" x="20" y="758.5" width="374" height="16"/> | 3415 | <rect key="frame" x="20" y="758.5" width="374" height="16"/> |
3416 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="13"/> | 3416 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="13"/> |
3417 | - <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> | 3417 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3418 | <nil key="highlightedColor"/> | 3418 | <nil key="highlightedColor"/> |
3419 | </label> | 3419 | </label> |
3420 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ"> | 3420 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ"> |
... | @@ -3466,7 +3466,7 @@ | ... | @@ -3466,7 +3466,7 @@ |
3466 | <constraints> | 3466 | <constraints> |
3467 | <constraint firstAttribute="height" id="3GU-tg-S3t"/> | 3467 | <constraint firstAttribute="height" id="3GU-tg-S3t"/> |
3468 | </constraints> | 3468 | </constraints> |
3469 | - <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> | 3469 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3470 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> | 3470 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> |
3471 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> | 3471 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> |
3472 | </textView> | 3472 | </textView> | ... | ... |
... | @@ -81,7 +81,7 @@ import SwiftEventBus | ... | @@ -81,7 +81,7 @@ import SwiftEventBus |
81 | 81 | ||
82 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 82 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
83 | couponImage.contentMode = .scaleAspectFill | 83 | couponImage.contentMode = .scaleAspectFill |
84 | - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 | 84 | + couponImageHeight.constant = 255 // 230 // 253 // self.uiscreen.height * 0.25 |
85 | 85 | ||
86 | nameLabel.text = couponSetData?.name ?? "" | 86 | nameLabel.text = couponSetData?.name ?? "" |
87 | // descriptionLabel.text = couponSetData?.short_description ?? "" | 87 | // descriptionLabel.text = couponSetData?.short_description ?? "" | ... | ... |
... | @@ -77,7 +77,7 @@ import SwiftEventBus | ... | @@ -77,7 +77,7 @@ import SwiftEventBus |
77 | 77 | ||
78 | heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache()) | 78 | heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache()) |
79 | heroImage.contentMode = .scaleAspectFill | 79 | heroImage.contentMode = .scaleAspectFill |
80 | - heroImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 | 80 | + heroImageHeight.constant = 255 // 230 // 253 // self.uiscreen.height * 0.25 |
81 | nameLabel.text = ccms?._description ?? "" | 81 | nameLabel.text = ccms?._description ?? "" |
82 | // descriptionLabel.text = ccms?._subtitle ?? "" | 82 | // descriptionLabel.text = ccms?._subtitle ?? "" |
83 | 83 | ||
... | @@ -123,7 +123,7 @@ import SwiftEventBus | ... | @@ -123,7 +123,7 @@ import SwiftEventBus |
123 | // moreTextView.attributedText = htmlText.htmlToAttributedString | 123 | // moreTextView.attributedText = htmlText.htmlToAttributedString |
124 | moreTextView.text = ccms?._termsAndConditions ?? "" | 124 | moreTextView.text = ccms?._termsAndConditions ?? "" |
125 | moreTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) | 125 | moreTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) |
126 | - moreTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) | 126 | + moreTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) |
127 | moreTextView.textAlignment = .left | 127 | moreTextView.textAlignment = .left |
128 | moreTextView.isScrollEnabled = false | 128 | moreTextView.isScrollEnabled = false |
129 | 129 | ... | ... |
... | @@ -52,7 +52,7 @@ import AVFoundation | ... | @@ -52,7 +52,7 @@ import AVFoundation |
52 | // couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 52 | // couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
53 | couponImage.image = UIImage(named: "market_bg", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 53 | couponImage.image = UIImage(named: "market_bg", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
54 | couponImage.contentMode = .scaleAspectFill | 54 | couponImage.contentMode = .scaleAspectFill |
55 | - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 | 55 | + couponImageHeight.constant = 255 // 230 // 253 // self.uiscreen.height * 0.25 |
56 | 56 | ||
57 | nameLabel.text = "Εκπτωτικό κουπόνι COSMOTE SuperMarket Deals!" | 57 | nameLabel.text = "Εκπτωτικό κουπόνι COSMOTE SuperMarket Deals!" |
58 | discriptionLabel.text = "Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών." | 58 | discriptionLabel.text = "Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών." | ... | ... |
... | @@ -180,11 +180,12 @@ import SwiftEventBus | ... | @@ -180,11 +180,12 @@ import SwiftEventBus |
180 | dfyEarnBannerInnerView.layer.cornerRadius = 16.5 | 180 | dfyEarnBannerInnerView.layer.cornerRadius = 16.5 |
181 | dfyEarnBannerInnerView.layer.borderWidth = 1 | 181 | dfyEarnBannerInnerView.layer.borderWidth = 1 |
182 | dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor | 182 | dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor |
183 | - | 183 | + |
184 | -// dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor | 184 | + // Add shadow |
185 | -// dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) | 185 | + dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor |
186 | -// dfyEarnBannerView.layer.shadowOpacity = 1.0 | 186 | + dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) |
187 | -// dfyEarnBannerView.layer.shadowRadius = 3.0 | 187 | + dfyEarnBannerView.layer.shadowOpacity = 1.0 |
188 | + dfyEarnBannerView.layer.shadowRadius = 3.0 | ||
188 | 189 | ||
189 | // var totalCouponValue = swiftApi().getDealsCouponsSum() | 190 | // var totalCouponValue = swiftApi().getDealsCouponsSum() |
190 | 191 | ||
... | @@ -244,10 +245,11 @@ import SwiftEventBus | ... | @@ -244,10 +245,11 @@ import SwiftEventBus |
244 | couponEarnInnerView.layer.borderWidth = 1 | 245 | couponEarnInnerView.layer.borderWidth = 1 |
245 | couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor | 246 | couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor |
246 | 247 | ||
247 | -// couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor | 248 | + // Add shadow |
248 | -// couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) | 249 | + couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor |
249 | -// couponEarnView.layer.shadowOpacity = 1.0 | 250 | + couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) |
250 | -// couponEarnView.layer.shadowRadius = 3.0 | 251 | + couponEarnView.layer.shadowOpacity = 1.0 |
252 | + couponEarnView.layer.shadowRadius = 3.0 | ||
251 | 253 | ||
252 | // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) | 254 | // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) |
253 | var totalCouponDiscountString = "0" | 255 | var totalCouponDiscountString = "0" |
... | @@ -803,7 +805,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -803,7 +805,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
803 | let titleLabel = UILabel(frame: CGRect(x: 20, y: 30, width: view.frame.width - 40, height: 20)) | 805 | let titleLabel = UILabel(frame: CGRect(x: 20, y: 30, width: view.frame.width - 40, height: 20)) |
804 | titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20) | 806 | titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20) |
805 | titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) | 807 | titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) |
806 | - titleLabel.text = "GIFTS for YOU" | 808 | + titleLabel.text = "GIFTS FOR YOU" |
807 | 809 | ||
808 | view.addSubview(titleLabel) | 810 | view.addSubview(titleLabel) |
809 | return view | 811 | return view | ... | ... |
-
Please register or login to post a comment