Showing
2 changed files
with
76 additions
and
72 deletions
... | @@ -77,22 +77,22 @@ import AVFoundation | ... | @@ -77,22 +77,22 @@ import AVFoundation |
77 | // scrollView.layer.cornerRadius = 30 | 77 | // scrollView.layer.cornerRadius = 30 |
78 | // scrollView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius | 78 | // scrollView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius |
79 | 79 | ||
80 | - let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)! | 80 | +// let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)! |
81 | - var aspectR: CGFloat = 0.0 | 81 | +// var aspectR: CGFloat = 0.0 |
82 | - | 82 | +// |
83 | - aspectR = image.size.width/image.size.height | 83 | +// aspectR = image.size.width/image.size.height |
84 | - | 84 | +// |
85 | - topBorderLine.translatesAutoresizingMaskIntoConstraints = false | 85 | +// topBorderLine.translatesAutoresizingMaskIntoConstraints = false |
86 | - topBorderLine.image = image | 86 | +// topBorderLine.image = image |
87 | - topBorderLine.contentMode = .scaleAspectFill | 87 | +// topBorderLine.contentMode = .scaleAspectFill |
88 | - | 88 | +// |
89 | - NSLayoutConstraint.activate([ | 89 | +// NSLayoutConstraint.activate([ |
90 | - topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0), | 90 | +// topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0), |
91 | - topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0), | 91 | +// topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0), |
92 | - topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0), | 92 | +// topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0), |
93 | - topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width), | 93 | +// topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width), |
94 | - topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR) | 94 | +// topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR) |
95 | - ]) | 95 | +// ]) |
96 | 96 | ||
97 | // COUPONSET: desc, img_preview, name, terms | 97 | // COUPONSET: desc, img_preview, name, terms |
98 | // COUPON: coupon, expiration, discount, status | 98 | // COUPON: coupon, expiration, discount, status |
... | @@ -119,8 +119,8 @@ import AVFoundation | ... | @@ -119,8 +119,8 @@ import AVFoundation |
119 | 119 | ||
120 | if (htmlMerchDescrText != "") { | 120 | if (htmlMerchDescrText != "") { |
121 | merchantDescrTextView.attributedText = htmlMerchDescrText.htmlToAttributedString | 121 | merchantDescrTextView.attributedText = htmlMerchDescrText.htmlToAttributedString |
122 | - merchantDescrTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 17) | 122 | + merchantDescrTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) |
123 | - merchantDescrTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00) | 123 | + merchantDescrTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) |
124 | merchantDescrTextView.textAlignment = .center | 124 | merchantDescrTextView.textAlignment = .center |
125 | merchantDescrTextView.isScrollEnabled = false | 125 | merchantDescrTextView.isScrollEnabled = false |
126 | merchantDescrTextView.isUserInteractionEnabled = true | 126 | merchantDescrTextView.isUserInteractionEnabled = true |
... | @@ -138,7 +138,7 @@ import AVFoundation | ... | @@ -138,7 +138,7 @@ import AVFoundation |
138 | } | 138 | } |
139 | } | 139 | } |
140 | 140 | ||
141 | - couponView.layer.cornerRadius = 8 | 141 | + couponView.layer.cornerRadius = 16 |
142 | couponNumberLabel.text = coupon?.coupon ?? "" | 142 | couponNumberLabel.text = coupon?.coupon ?? "" |
143 | couponView.frame = CGRect(x: 0.0, y: 0.0, width: couponView.intrinsicContentSize.width, height: 55) | 143 | couponView.frame = CGRect(x: 0.0, y: 0.0, width: couponView.intrinsicContentSize.width, height: 55) |
144 | 144 | ||
... | @@ -182,23 +182,23 @@ import AVFoundation | ... | @@ -182,23 +182,23 @@ import AVFoundation |
182 | showBarcodeButtonTopSpace.constant = 0 | 182 | showBarcodeButtonTopSpace.constant = 0 |
183 | // === | 183 | // === |
184 | 184 | ||
185 | - showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) | 185 | + showBarcodeButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 16) |
186 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 186 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
187 | - showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 187 | + showBarcodeButton.setTitleColor(UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00), for: .normal) |
188 | showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 188 | showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
189 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft | 189 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft |
190 | - showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 190 | + showBarcodeButton.tintColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 1.00) |
191 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 191 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
192 | showBarcodeButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); | 192 | showBarcodeButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); |
193 | showBarcodeButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) | 193 | showBarcodeButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) |
194 | 194 | ||
195 | expirationLabel.text = "Το κουπόνι ισχύει έως " + (coupon?.expiration ?? "") | 195 | expirationLabel.text = "Το κουπόνι ισχύει έως " + (coupon?.expiration ?? "") |
196 | 196 | ||
197 | - redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18) | 197 | + redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 18) |
198 | redeemButton.setTitle("Δώρισέ το", for: .normal) | 198 | redeemButton.setTitle("Δώρισέ το", for: .normal) |
199 | redeemButton.setTitleColor(.white, for: .normal) | 199 | redeemButton.setTitleColor(.white, for: .normal) |
200 | - redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) | 200 | + redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) |
201 | - redeemButton.layer.cornerRadius = 8.0 | 201 | + redeemButton.layer.cornerRadius = 16.0 |
202 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) | 202 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) |
203 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) | 203 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) |
204 | // Fix width for ipad | 204 | // Fix width for ipad |
... | @@ -210,13 +210,16 @@ import AVFoundation | ... | @@ -210,13 +210,16 @@ import AVFoundation |
210 | // redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true | 210 | // redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true |
211 | // } | 211 | // } |
212 | 212 | ||
213 | - mapButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18) | 213 | + mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 18) |
214 | mapButton.setTitle("Δες τα καταστήματα", for: .normal) | 214 | mapButton.setTitle("Δες τα καταστήματα", for: .normal) |
215 | - mapButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) | 215 | + mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) |
216 | - mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) | 216 | + mapButton.layer.cornerRadius = 15.0 |
217 | - mapButton.layer.cornerRadius = 8.0 | ||
218 | mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) | 217 | mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) |
219 | mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) | 218 | mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) |
219 | + mapButton.backgroundColor = .clear | ||
220 | + mapButton.layer.borderWidth = 2 | ||
221 | + mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor | ||
222 | + | ||
220 | 223 | ||
221 | // mapButton.isHidden = true | 224 | // mapButton.isHidden = true |
222 | // mapButtonHeight.constant = 0 | 225 | // mapButtonHeight.constant = 0 |
... | @@ -265,21 +268,21 @@ import AVFoundation | ... | @@ -265,21 +268,21 @@ import AVFoundation |
265 | // mapButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true | 268 | // mapButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true |
266 | // } | 269 | // } |
267 | 270 | ||
268 | - termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 16) | 271 | + termsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 16) |
269 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 272 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
270 | termsButton.setTitle("Όροι χρήσης", for: .normal) | 273 | termsButton.setTitle("Όροι χρήσης", for: .normal) |
271 | - termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 274 | + termsButton.setTitleColor(UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00), for: .normal) |
272 | termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 275 | termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
273 | termsButton.semanticContentAttribute = .forceRightToLeft | 276 | termsButton.semanticContentAttribute = .forceRightToLeft |
274 | - termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 277 | + termsButton.tintColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 1.00) |
275 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 278 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
276 | termsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); | 279 | termsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); |
277 | termsButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) | 280 | termsButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) |
278 | 281 | ||
279 | let htmlText = couponSetData?.terms ?? "" | 282 | let htmlText = couponSetData?.terms ?? "" |
280 | termsTextView.attributedText = htmlText.htmlToAttributedString | 283 | termsTextView.attributedText = htmlText.htmlToAttributedString |
281 | - termsTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 15) | 284 | + termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 15) |
282 | - termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00) | 285 | + termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) |
283 | termsTextView.textAlignment = .center | 286 | termsTextView.textAlignment = .center |
284 | termsTextView.isScrollEnabled = false | 287 | termsTextView.isScrollEnabled = false |
285 | 288 | ... | ... |
... | @@ -3181,19 +3181,19 @@ | ... | @@ -3181,19 +3181,19 @@ |
3181 | </constraints> | 3181 | </constraints> |
3182 | </imageView> | 3182 | </imageView> |
3183 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xz4-EE-EzJ"> | 3183 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xz4-EE-EzJ"> |
3184 | - <rect key="frame" x="20" y="220" width="374" height="34"/> | 3184 | + <rect key="frame" x="20" y="220" width="374" height="39.5"/> |
3185 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> | 3185 | + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> |
3186 | - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3186 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3187 | <nil key="highlightedColor"/> | 3187 | <nil key="highlightedColor"/> |
3188 | </label> | 3188 | </label> |
3189 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mri-Wl-spg"> | 3189 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mri-Wl-spg"> |
3190 | - <rect key="frame" x="20" y="269" width="374" height="51"/> | 3190 | + <rect key="frame" x="20" y="274.5" width="374" height="59.5"/> |
3191 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="17"/> | 3191 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> |
3192 | - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3192 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3193 | <nil key="highlightedColor"/> | 3193 | <nil key="highlightedColor"/> |
3194 | </label> | 3194 | </label> |
3195 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tzW-b9-Rbx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> | 3195 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tzW-b9-Rbx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> |
3196 | - <rect key="frame" x="20" y="335" width="374" height="0.0"/> | 3196 | + <rect key="frame" x="20" y="349" width="374" height="0.0"/> |
3197 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 3197 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
3198 | <constraints> | 3198 | <constraints> |
3199 | <constraint firstAttribute="height" id="7ch-2U-9oE"/> | 3199 | <constraint firstAttribute="height" id="7ch-2U-9oE"/> |
... | @@ -3203,22 +3203,22 @@ | ... | @@ -3203,22 +3203,22 @@ |
3203 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> | 3203 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> |
3204 | </textView> | 3204 | </textView> |
3205 | <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"> | 3205 | <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"> |
3206 | - <rect key="frame" x="20" y="370" width="374" height="17"/> | 3206 | + <rect key="frame" x="20" y="384" width="374" height="21"/> |
3207 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> | 3207 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/> |
3208 | - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3208 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3209 | <nil key="highlightedColor"/> | 3209 | <nil key="highlightedColor"/> |
3210 | </label> | 3210 | </label> |
3211 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View"> | 3211 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View"> |
3212 | - <rect key="frame" x="152.5" y="397" width="109" height="55"/> | 3212 | + <rect key="frame" x="150.5" y="415" width="113.5" height="55"/> |
3213 | <subviews> | 3213 | <subviews> |
3214 | <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"> | 3214 | <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"> |
3215 | - <rect key="frame" x="20" y="13.5" width="69" height="28"/> | 3215 | + <rect key="frame" x="20" y="10.5" width="73.5" height="34.5"/> |
3216 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Bold" family="PF Square Sans Pro" pointSize="28"/> | 3216 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="28"/> |
3217 | - <color key="textColor" red="0.25490196078431371" green="0.33333333333333331" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> | 3217 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3218 | <nil key="highlightedColor"/> | 3218 | <nil key="highlightedColor"/> |
3219 | </label> | 3219 | </label> |
3220 | </subviews> | 3220 | </subviews> |
3221 | - <color key="backgroundColor" red="0.95686274509803915" green="0.95686274509803915" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/> | 3221 | + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/> |
3222 | <constraints> | 3222 | <constraints> |
3223 | <constraint firstAttribute="trailing" secondItem="BJS-kk-CBZ" secondAttribute="trailing" constant="20" id="Adz-tK-JPK"/> | 3223 | <constraint firstAttribute="trailing" secondItem="BJS-kk-CBZ" secondAttribute="trailing" constant="20" id="Adz-tK-JPK"/> |
3224 | <constraint firstItem="BJS-kk-CBZ" firstAttribute="centerY" secondItem="Zdf-1r-FdJ" secondAttribute="centerY" id="WUs-XT-erR"/> | 3224 | <constraint firstItem="BJS-kk-CBZ" firstAttribute="centerY" secondItem="Zdf-1r-FdJ" secondAttribute="centerY" id="WUs-XT-erR"/> |
... | @@ -3227,43 +3227,43 @@ | ... | @@ -3227,43 +3227,43 @@ |
3227 | </constraints> | 3227 | </constraints> |
3228 | </view> | 3228 | </view> |
3229 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrM-7n-fSw" userLabel="Border View"> | 3229 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrM-7n-fSw" userLabel="Border View"> |
3230 | - <rect key="frame" x="20" y="472" width="374" height="1"/> | 3230 | + <rect key="frame" x="20" y="490" width="374" height="1"/> |
3231 | <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> | 3231 | <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> |
3232 | <constraints> | 3232 | <constraints> |
3233 | <constraint firstAttribute="height" constant="1" id="eF3-7T-hMu"/> | 3233 | <constraint firstAttribute="height" constant="1" id="eF3-7T-hMu"/> |
3234 | </constraints> | 3234 | </constraints> |
3235 | </view> | 3235 | </view> |
3236 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="huh-zh-82C"> | 3236 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="huh-zh-82C"> |
3237 | - <rect key="frame" x="30" y="483" width="354" height="110"/> | 3237 | + <rect key="frame" x="30" y="501" width="354" height="110"/> |
3238 | <constraints> | 3238 | <constraints> |
3239 | <constraint firstAttribute="height" constant="110" id="LJq-uV-eb8"/> | 3239 | <constraint firstAttribute="height" constant="110" id="LJq-uV-eb8"/> |
3240 | </constraints> | 3240 | </constraints> |
3241 | </imageView> | 3241 | </imageView> |
3242 | <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"> | 3242 | <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"> |
3243 | - <rect key="frame" x="20" y="603" width="374" height="26.5"/> | 3243 | + <rect key="frame" x="20" y="621" width="374" height="26.5"/> |
3244 | <constraints> | 3244 | <constraints> |
3245 | <constraint firstAttribute="height" constant="26.5" id="LfJ-bC-nLk"/> | 3245 | <constraint firstAttribute="height" constant="26.5" id="LfJ-bC-nLk"/> |
3246 | </constraints> | 3246 | </constraints> |
3247 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="23"/> | 3247 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="23"/> |
3248 | - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3248 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3249 | <nil key="highlightedColor"/> | 3249 | <nil key="highlightedColor"/> |
3250 | </label> | 3250 | </label> |
3251 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6rV-2m-QMZ" userLabel="Border 2 View"> | 3251 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6rV-2m-QMZ" userLabel="Border 2 View"> |
3252 | - <rect key="frame" x="20" y="644.5" width="374" height="1"/> | 3252 | + <rect key="frame" x="20" y="662.5" width="374" height="1"/> |
3253 | <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> | 3253 | <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> |
3254 | <constraints> | 3254 | <constraints> |
3255 | <constraint firstAttribute="height" constant="1" id="DVl-3B-zqo"/> | 3255 | <constraint firstAttribute="height" constant="1" id="DVl-3B-zqo"/> |
3256 | </constraints> | 3256 | </constraints> |
3257 | </view> | 3257 | </view> |
3258 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zw5-Wj-WD5"> | 3258 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zw5-Wj-WD5"> |
3259 | - <rect key="frame" x="103.5" y="655.5" width="207" height="50"/> | 3259 | + <rect key="frame" x="103.5" y="673.5" width="207" height="50"/> |
3260 | <constraints> | 3260 | <constraints> |
3261 | <constraint firstAttribute="height" constant="50" id="ZSP-NX-0a7"/> | 3261 | <constraint firstAttribute="height" constant="50" id="ZSP-NX-0a7"/> |
3262 | </constraints> | 3262 | </constraints> |
3263 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="16"/> | 3263 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="16"/> |
3264 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/> | 3264 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/> |
3265 | <state key="normal" title="Εμφάνιση barcode" image="ic_down_dark"> | 3265 | <state key="normal" title="Εμφάνιση barcode" image="ic_down_dark"> |
3266 | - <color key="titleColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3266 | + <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3267 | <preferredSymbolConfiguration key="preferredSymbolConfiguration"/> | 3267 | <preferredSymbolConfiguration key="preferredSymbolConfiguration"/> |
3268 | </state> | 3268 | </state> |
3269 | <connections> | 3269 | <connections> |
... | @@ -3271,17 +3271,17 @@ | ... | @@ -3271,17 +3271,17 @@ |
3271 | </connections> | 3271 | </connections> |
3272 | </button> | 3272 | </button> |
3273 | <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"> | 3273 | <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"> |
3274 | - <rect key="frame" x="20" y="740.5" width="374" height="15"/> | 3274 | + <rect key="frame" x="20" y="758.5" width="374" height="18.5"/> |
3275 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="15"/> | 3275 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> |
3276 | - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3276 | + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> |
3277 | <nil key="highlightedColor"/> | 3277 | <nil key="highlightedColor"/> |
3278 | </label> | 3278 | </label> |
3279 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ"> | 3279 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ"> |
3280 | - <rect key="frame" x="172.5" y="790.5" width="69" height="44"/> | 3280 | + <rect key="frame" x="167.5" y="812" width="79" height="44"/> |
3281 | <constraints> | 3281 | <constraints> |
3282 | <constraint firstAttribute="height" constant="44" id="ccg-NP-FIH"/> | 3282 | <constraint firstAttribute="height" constant="44" id="ccg-NP-FIH"/> |
3283 | </constraints> | 3283 | </constraints> |
3284 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="16"/> | 3284 | + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="16"/> |
3285 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | 3285 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> |
3286 | <state key="normal" title="Δώρισέ το"> | 3286 | <state key="normal" title="Δώρισέ το"> |
3287 | <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3287 | <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
... | @@ -3291,11 +3291,11 @@ | ... | @@ -3291,11 +3291,11 @@ |
3291 | </connections> | 3291 | </connections> |
3292 | </button> | 3292 | </button> |
3293 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W5f-1T-iW6"> | 3293 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W5f-1T-iW6"> |
3294 | - <rect key="frame" x="139.5" y="844.5" width="135" height="44"/> | 3294 | + <rect key="frame" x="128" y="866" width="158" height="44"/> |
3295 | <constraints> | 3295 | <constraints> |
3296 | <constraint firstAttribute="height" constant="44" id="3pq-y5-f66"/> | 3296 | <constraint firstAttribute="height" constant="44" id="3pq-y5-f66"/> |
3297 | </constraints> | 3297 | </constraints> |
3298 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="16"/> | 3298 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="16"/> |
3299 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | 3299 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> |
3300 | <state key="normal" title="Δες τα καταστήματα"> | 3300 | <state key="normal" title="Δες τα καταστήματα"> |
3301 | <color key="titleColor" red="0.31372549019607843" green="0.61960784313725492" blue="0.18431372549019609" alpha="1" colorSpace="calibratedRGB"/> | 3301 | <color key="titleColor" red="0.31372549019607843" green="0.61960784313725492" blue="0.18431372549019609" alpha="1" colorSpace="calibratedRGB"/> |
... | @@ -3305,14 +3305,14 @@ | ... | @@ -3305,14 +3305,14 @@ |
3305 | </connections> | 3305 | </connections> |
3306 | </button> | 3306 | </button> |
3307 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8UD-WL-JB7"> | 3307 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8UD-WL-JB7"> |
3308 | - <rect key="frame" x="103.5" y="908.5" width="207" height="50"/> | 3308 | + <rect key="frame" x="103.5" y="930" width="207" height="50"/> |
3309 | <constraints> | 3309 | <constraints> |
3310 | <constraint firstAttribute="height" constant="50" id="xdq-YS-AL4"/> | 3310 | <constraint firstAttribute="height" constant="50" id="xdq-YS-AL4"/> |
3311 | </constraints> | 3311 | </constraints> |
3312 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> | 3312 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="16"/> |
3313 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/> | 3313 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/> |
3314 | <state key="normal" title="Όροι χρήσης" image="ic_down_dark"> | 3314 | <state key="normal" title="Όροι χρήσης" image="ic_down_dark"> |
3315 | - <color key="titleColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> | 3315 | + <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3316 | <preferredSymbolConfiguration key="preferredSymbolConfiguration"/> | 3316 | <preferredSymbolConfiguration key="preferredSymbolConfiguration"/> |
3317 | </state> | 3317 | </state> |
3318 | <connections> | 3318 | <connections> |
... | @@ -3320,13 +3320,13 @@ | ... | @@ -3320,13 +3320,13 @@ |
3320 | </connections> | 3320 | </connections> |
3321 | </button> | 3321 | </button> |
3322 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xjX-HZ-MpD" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> | 3322 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xjX-HZ-MpD" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> |
3323 | - <rect key="frame" x="20" y="968.5" width="374" height="0.0"/> | 3323 | + <rect key="frame" x="20" y="990" width="374" height="0.0"/> |
3324 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 3324 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
3325 | <constraints> | 3325 | <constraints> |
3326 | <constraint firstAttribute="height" id="3GU-tg-S3t"/> | 3326 | <constraint firstAttribute="height" id="3GU-tg-S3t"/> |
3327 | </constraints> | 3327 | </constraints> |
3328 | - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> | 3328 | + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> |
3329 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="15"/> | 3329 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> |
3330 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> | 3330 | <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> |
3331 | </textView> | 3331 | </textView> |
3332 | </subviews> | 3332 | </subviews> |
... | @@ -3394,7 +3394,7 @@ | ... | @@ -3394,7 +3394,7 @@ |
3394 | <viewLayoutGuide key="contentLayoutGuide" id="4fu-Tq-CEO"/> | 3394 | <viewLayoutGuide key="contentLayoutGuide" id="4fu-Tq-CEO"/> |
3395 | <viewLayoutGuide key="frameLayoutGuide" id="282-tV-FBh"/> | 3395 | <viewLayoutGuide key="frameLayoutGuide" id="282-tV-FBh"/> |
3396 | </scrollView> | 3396 | </scrollView> |
3397 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PQs-Qn-5Rq"> | 3397 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PQs-Qn-5Rq"> |
3398 | <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> | 3398 | <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> |
3399 | </imageView> | 3399 | </imageView> |
3400 | </subviews> | 3400 | </subviews> |
... | @@ -3416,6 +3416,7 @@ | ... | @@ -3416,6 +3416,7 @@ |
3416 | <variation key="default"> | 3416 | <variation key="default"> |
3417 | <mask key="subviews"> | 3417 | <mask key="subviews"> |
3418 | <exclude reference="B6L-Zs-Vnz"/> | 3418 | <exclude reference="B6L-Zs-Vnz"/> |
3419 | + <exclude reference="PQs-Qn-5Rq"/> | ||
3419 | </mask> | 3420 | </mask> |
3420 | </variation> | 3421 | </variation> |
3421 | </view> | 3422 | </view> | ... | ... |
-
Please register or login to post a comment