Showing
8 changed files
with
78 additions
and
12 deletions
No preview for this file type
| ... | @@ -475,7 +475,7 @@ | ... | @@ -475,7 +475,7 @@ |
| 475 | <rect key="frame" x="0.0" y="0.0" width="414" height="848"/> | 475 | <rect key="frame" x="0.0" y="0.0" width="414" height="848"/> |
| 476 | <subviews> | 476 | <subviews> |
| 477 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4cB-Mm-sjZ" userLabel="ScrollContentView"> | 477 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4cB-Mm-sjZ" userLabel="ScrollContentView"> |
| 478 | - <rect key="frame" x="0.0" y="0.0" width="414" height="917.5"/> | 478 | + <rect key="frame" x="0.0" y="0.0" width="414" height="1012.5"/> |
| 479 | <subviews> | 479 | <subviews> |
| 480 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q7G-bb-pvF"> | 480 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q7G-bb-pvF"> |
| 481 | <rect key="frame" x="82" y="15" width="250" height="230"/> | 481 | <rect key="frame" x="82" y="15" width="250" height="230"/> |
| ... | @@ -491,8 +491,36 @@ | ... | @@ -491,8 +491,36 @@ |
| 491 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | 491 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
| 492 | <nil key="highlightedColor"/> | 492 | <nil key="highlightedColor"/> |
| 493 | </label> | 493 | </label> |
| 494 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3DN-zX-ngv" userLabel="ProductInfoView"> | ||
| 495 | + <rect key="frame" x="33" y="314" width="361" height="66"/> | ||
| 496 | + <subviews> | ||
| 497 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WHZ-co-sYK"> | ||
| 498 | + <rect key="frame" x="5" y="0.0" width="41" height="41"/> | ||
| 499 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 500 | + <constraints> | ||
| 501 | + <constraint firstAttribute="height" constant="41" id="Ddt-rr-zXB"/> | ||
| 502 | + <constraint firstAttribute="width" constant="41" id="XzM-Do-o4J"/> | ||
| 503 | + </constraints> | ||
| 504 | + </imageView> | ||
| 505 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Επιλογή προϊόντων με εκπτωτικό κουπόνι SUPERMARKET DEALS για τις αγορές σου." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oGM-ep-i3d"> | ||
| 506 | + <rect key="frame" x="56" y="0.0" width="305" height="66"/> | ||
| 507 | + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="19"/> | ||
| 508 | + <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | ||
| 509 | + <nil key="highlightedColor"/> | ||
| 510 | + </label> | ||
| 511 | + </subviews> | ||
| 512 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 513 | + <constraints> | ||
| 514 | + <constraint firstAttribute="trailing" secondItem="oGM-ep-i3d" secondAttribute="trailing" id="2EC-yl-0gv"/> | ||
| 515 | + <constraint firstItem="oGM-ep-i3d" firstAttribute="top" secondItem="3DN-zX-ngv" secondAttribute="top" id="FeY-Xp-fJS"/> | ||
| 516 | + <constraint firstItem="WHZ-co-sYK" firstAttribute="top" secondItem="3DN-zX-ngv" secondAttribute="top" id="N2j-vd-hZx"/> | ||
| 517 | + <constraint firstAttribute="bottom" secondItem="oGM-ep-i3d" secondAttribute="bottom" id="bNg-qV-YJ0"/> | ||
| 518 | + <constraint firstItem="oGM-ep-i3d" firstAttribute="leading" secondItem="WHZ-co-sYK" secondAttribute="trailing" constant="10" id="dbR-tv-73y"/> | ||
| 519 | + <constraint firstItem="WHZ-co-sYK" firstAttribute="leading" secondItem="3DN-zX-ngv" secondAttribute="leading" constant="5" id="qYo-Sp-bAG"/> | ||
| 520 | + </constraints> | ||
| 521 | + </view> | ||
| 494 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RQ6-Ao-ZSE" userLabel="StoreInfoView"> | 522 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RQ6-Ao-ZSE" userLabel="StoreInfoView"> |
| 495 | - <rect key="frame" x="33" y="314" width="361" height="136"/> | 523 | + <rect key="frame" x="33" y="409" width="361" height="136"/> |
| 496 | <subviews> | 524 | <subviews> |
| 497 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cdX-tv-BAt"> | 525 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cdX-tv-BAt"> |
| 498 | <rect key="frame" x="5" y="0.0" width="41" height="41"/> | 526 | <rect key="frame" x="5" y="0.0" width="41" height="41"/> |
| ... | @@ -529,7 +557,7 @@ | ... | @@ -529,7 +557,7 @@ |
| 529 | </constraints> | 557 | </constraints> |
| 530 | </view> | 558 | </view> |
| 531 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YMb-aS-khb" userLabel="EshopInfoView"> | 559 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YMb-aS-khb" userLabel="EshopInfoView"> |
| 532 | - <rect key="frame" x="33" y="479" width="361" height="114"/> | 560 | + <rect key="frame" x="33" y="574" width="361" height="114"/> |
| 533 | <subviews> | 561 | <subviews> |
| 534 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gpt-rt-Tct"> | 562 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gpt-rt-Tct"> |
| 535 | <rect key="frame" x="5" y="0.0" width="41" height="41"/> | 563 | <rect key="frame" x="5" y="0.0" width="41" height="41"/> |
| ... | @@ -567,7 +595,7 @@ | ... | @@ -567,7 +595,7 @@ |
| 567 | </constraints> | 595 | </constraints> |
| 568 | </view> | 596 | </view> |
| 569 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BkT-Kn-CNF" userLabel="ABInfoView"> | 597 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BkT-Kn-CNF" userLabel="ABInfoView"> |
| 570 | - <rect key="frame" x="33" y="622" width="361" height="197.5"/> | 598 | + <rect key="frame" x="33" y="717" width="361" height="197.5"/> |
| 571 | <subviews> | 599 | <subviews> |
| 572 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TSK-M9-ex7"> | 600 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TSK-M9-ex7"> |
| 573 | <rect key="frame" x="5" y="0.0" width="41" height="41"/> | 601 | <rect key="frame" x="5" y="0.0" width="41" height="41"/> |
| ... | @@ -605,7 +633,7 @@ | ... | @@ -605,7 +633,7 @@ |
| 605 | </constraints> | 633 | </constraints> |
| 606 | </view> | 634 | </view> |
| 607 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E3U-j8-3p0"> | 635 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E3U-j8-3p0"> |
| 608 | - <rect key="frame" x="29" y="852.5" width="356" height="55"/> | 636 | + <rect key="frame" x="29" y="947.5" width="356" height="55"/> |
| 609 | <constraints> | 637 | <constraints> |
| 610 | <constraint firstAttribute="height" constant="55" id="AD0-86-4Rz"/> | 638 | <constraint firstAttribute="height" constant="55" id="AD0-86-4Rz"/> |
| 611 | </constraints> | 639 | </constraints> |
| ... | @@ -628,11 +656,14 @@ | ... | @@ -628,11 +656,14 @@ |
| 628 | <constraint firstItem="E3U-j8-3p0" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="29" id="F4v-ZX-h04"/> | 656 | <constraint firstItem="E3U-j8-3p0" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="29" id="F4v-ZX-h04"/> |
| 629 | <constraint firstItem="YMb-aS-khb" firstAttribute="top" secondItem="RQ6-Ao-ZSE" secondAttribute="bottom" constant="29" id="MQV-Wz-mKJ"/> | 657 | <constraint firstItem="YMb-aS-khb" firstAttribute="top" secondItem="RQ6-Ao-ZSE" secondAttribute="bottom" constant="29" id="MQV-Wz-mKJ"/> |
| 630 | <constraint firstAttribute="trailing" secondItem="Pi8-if-AND" secondAttribute="trailing" constant="33" id="Nkf-1N-yXM"/> | 658 | <constraint firstAttribute="trailing" secondItem="Pi8-if-AND" secondAttribute="trailing" constant="33" id="Nkf-1N-yXM"/> |
| 659 | + <constraint firstItem="3DN-zX-ngv" firstAttribute="top" secondItem="Pi8-if-AND" secondAttribute="bottom" constant="34" id="Oa9-H1-jCu"/> | ||
| 631 | <constraint firstAttribute="trailing" secondItem="RQ6-Ao-ZSE" secondAttribute="trailing" constant="20" id="Ura-7W-bHW"/> | 660 | <constraint firstAttribute="trailing" secondItem="RQ6-Ao-ZSE" secondAttribute="trailing" constant="20" id="Ura-7W-bHW"/> |
| 632 | - <constraint firstItem="RQ6-Ao-ZSE" firstAttribute="top" secondItem="Pi8-if-AND" secondAttribute="bottom" constant="34" id="VEQ-wH-agZ"/> | 661 | + <constraint firstItem="RQ6-Ao-ZSE" firstAttribute="top" secondItem="3DN-zX-ngv" secondAttribute="bottom" constant="29" id="VEQ-wH-agZ"/> |
| 633 | <constraint firstItem="BkT-Kn-CNF" firstAttribute="top" secondItem="YMb-aS-khb" secondAttribute="bottom" constant="29" id="cq1-3M-wY3"/> | 662 | <constraint firstItem="BkT-Kn-CNF" firstAttribute="top" secondItem="YMb-aS-khb" secondAttribute="bottom" constant="29" id="cq1-3M-wY3"/> |
| 634 | <constraint firstItem="E3U-j8-3p0" firstAttribute="top" secondItem="BkT-Kn-CNF" secondAttribute="bottom" constant="33" id="dsu-I3-Jdg"/> | 663 | <constraint firstItem="E3U-j8-3p0" firstAttribute="top" secondItem="BkT-Kn-CNF" secondAttribute="bottom" constant="33" id="dsu-I3-Jdg"/> |
| 664 | + <constraint firstItem="3DN-zX-ngv" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="fbz-ym-3D6"/> | ||
| 635 | <constraint firstItem="Pi8-if-AND" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="ghq-zb-Jc6"/> | 665 | <constraint firstItem="Pi8-if-AND" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="ghq-zb-Jc6"/> |
| 666 | + <constraint firstAttribute="trailing" secondItem="3DN-zX-ngv" secondAttribute="trailing" constant="20" id="iAJ-2X-eaR"/> | ||
| 636 | <constraint firstItem="Q7G-bb-pvF" firstAttribute="top" secondItem="4cB-Mm-sjZ" secondAttribute="top" constant="15" id="iF9-DB-GQ7"/> | 667 | <constraint firstItem="Q7G-bb-pvF" firstAttribute="top" secondItem="4cB-Mm-sjZ" secondAttribute="top" constant="15" id="iF9-DB-GQ7"/> |
| 637 | <constraint firstItem="YMb-aS-khb" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="nac-YS-9nd"/> | 668 | <constraint firstItem="YMb-aS-khb" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="nac-YS-9nd"/> |
| 638 | <constraint firstItem="RQ6-Ao-ZSE" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="ndc-fy-Aqm"/> | 669 | <constraint firstItem="RQ6-Ao-ZSE" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="ndc-fy-Aqm"/> |
| ... | @@ -683,6 +714,8 @@ | ... | @@ -683,6 +714,8 @@ |
| 683 | <outlet property="heroImage" destination="Q7G-bb-pvF" id="90F-4L-Q5j"/> | 714 | <outlet property="heroImage" destination="Q7G-bb-pvF" id="90F-4L-Q5j"/> |
| 684 | <outlet property="heroTitleLabel" destination="Pi8-if-AND" id="2j9-qH-nyZ"/> | 715 | <outlet property="heroTitleLabel" destination="Pi8-if-AND" id="2j9-qH-nyZ"/> |
| 685 | <outlet property="okButton" destination="E3U-j8-3p0" id="zK4-8K-cDb"/> | 716 | <outlet property="okButton" destination="E3U-j8-3p0" id="zK4-8K-cDb"/> |
| 717 | + <outlet property="productInfoImage" destination="WHZ-co-sYK" id="kbF-hj-IQ0"/> | ||
| 718 | + <outlet property="productInfoTitleLabel" destination="oGM-ep-i3d" id="etH-F4-ayK"/> | ||
| 686 | <outlet property="storeInfoImage" destination="cdX-tv-BAt" id="D0f-vV-cVT"/> | 719 | <outlet property="storeInfoImage" destination="cdX-tv-BAt" id="D0f-vV-cVT"/> |
| 687 | <outlet property="storeInfoSubtitleLabel" destination="LaN-sW-jUd" id="30N-8d-9hc"/> | 720 | <outlet property="storeInfoSubtitleLabel" destination="LaN-sW-jUd" id="30N-8d-9hc"/> |
| 688 | <outlet property="storeInfoTitleLabel" destination="N0n-0q-Ggu" id="DeO-A5-ct1"/> | 721 | <outlet property="storeInfoTitleLabel" destination="N0n-0q-Ggu" id="DeO-A5-ct1"/> | ... | ... |
| ... | @@ -10,6 +10,8 @@ import UIKit | ... | @@ -10,6 +10,8 @@ import UIKit |
| 10 | @objc public class MarketPassInfoViewController: UIViewController { | 10 | @objc public class MarketPassInfoViewController: UIViewController { |
| 11 | @IBOutlet weak var heroImage: UIImageView! | 11 | @IBOutlet weak var heroImage: UIImageView! |
| 12 | @IBOutlet weak var heroTitleLabel: UILabel! | 12 | @IBOutlet weak var heroTitleLabel: UILabel! |
| 13 | + @IBOutlet weak var productInfoImage: UIImageView! | ||
| 14 | + @IBOutlet weak var productInfoTitleLabel: UILabel! | ||
| 13 | @IBOutlet weak var storeInfoImage: UIImageView! | 15 | @IBOutlet weak var storeInfoImage: UIImageView! |
| 14 | @IBOutlet weak var storeInfoTitleLabel: UILabel! | 16 | @IBOutlet weak var storeInfoTitleLabel: UILabel! |
| 15 | @IBOutlet weak var storeInfoSubtitleLabel: UILabel! | 17 | @IBOutlet weak var storeInfoSubtitleLabel: UILabel! |
| ... | @@ -43,6 +45,7 @@ import UIKit | ... | @@ -43,6 +45,7 @@ import UIKit |
| 43 | // MARK: - Functions | 45 | // MARK: - Functions |
| 44 | func setupUI() { | 46 | func setupUI() { |
| 45 | heroImage.image = UIImage(named: "pass_info_hero", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 47 | heroImage.image = UIImage(named: "pass_info_hero", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 48 | + productInfoImage.image = UIImage(named: "pass_info_product", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ||
| 46 | storeInfoImage.image = UIImage(named: "pass_info_cart", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 49 | storeInfoImage.image = UIImage(named: "pass_info_cart", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 47 | eshopInfoImage.image = UIImage(named: "pass_info_globe", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 50 | eshopInfoImage.image = UIImage(named: "pass_info_globe", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 48 | abInfoImage.image = UIImage(named: "pass_info_ab", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 51 | abInfoImage.image = UIImage(named: "pass_info_ab", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| ... | @@ -52,6 +55,11 @@ import UIKit | ... | @@ -52,6 +55,11 @@ import UIKit |
| 52 | heroTitleLabel.textColor = UIColor(rgb: 0x212121) | 55 | heroTitleLabel.textColor = UIColor(rgb: 0x212121) |
| 53 | 56 | ||
| 54 | // StoreInfoView | 57 | // StoreInfoView |
| 58 | + productInfoTitleLabel.text = "Επιλογή προϊόντων με εκπτωτικό κουπόνι SUPERMARKET DEALS για τις αγορές σου." | ||
| 59 | + productInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0) | ||
| 60 | + productInfoTitleLabel.textColor = UIColor(rgb: 0x212121) | ||
| 61 | + | ||
| 62 | + // StoreInfoView | ||
| 55 | storeInfoTitleLabel.text = "Εξαργύρωση σε φυσικά καταστήματα" | 63 | storeInfoTitleLabel.text = "Εξαργύρωση σε φυσικά καταστήματα" |
| 56 | storeInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0) | 64 | storeInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0) |
| 57 | storeInfoTitleLabel.textColor = UIColor(rgb: 0x212121) | 65 | storeInfoTitleLabel.textColor = UIColor(rgb: 0x212121) |
| ... | @@ -74,7 +82,7 @@ import UIKit | ... | @@ -74,7 +82,7 @@ import UIKit |
| 74 | abInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0) | 82 | abInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0) |
| 75 | abInfoTitleLabel.textColor = UIColor(rgb: 0x212121) | 83 | abInfoTitleLabel.textColor = UIColor(rgb: 0x212121) |
| 76 | 84 | ||
| 77 | - abInfoSubtitleLabel.text = "1. Eνεργοποίησε τον κωδικό στην κάρτα ΑΒ PLUS στο kiosk του καταστήματος ή μέσω eshop / app στην ενοτητα στην ενότητα Συνεργασίες – SUPERMARKET DEALS.\n\n2. Κάνε τις αγορές σου και κέρδισε απευθείας έκπτωση με χρήση της AB PLUS από τα διαθέσιμα κουπόνια." | 85 | + abInfoSubtitleLabel.text = "1. Eνεργοποίησε τον κωδικό στην κάρτα ΑΒ PLUS στο kiosk του καταστήματος ή μέσω eshop / app στην ενότητα Συνεργασίες – SUPERMARKET DEALS.\n\n2. Κάνε τις αγορές σου και κέρδισε απευθείας έκπτωση με χρήση της AB PLUS από τα διαθέσιμα κουπόνια." |
| 78 | abInfoSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0) | 86 | abInfoSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0) |
| 79 | abInfoSubtitleLabel.textColor = UIColor(rgb: 0x212121) | 87 | abInfoSubtitleLabel.textColor = UIColor(rgb: 0x212121) |
| 80 | 88 | ... | ... |
| ... | @@ -87,7 +87,7 @@ import SwiftEventBus | ... | @@ -87,7 +87,7 @@ import SwiftEventBus |
| 87 | passTitleLabel.font = UIFont(name: "BTCosmo-Bold", size: 22) | 87 | passTitleLabel.font = UIFont(name: "BTCosmo-Bold", size: 22) |
| 88 | passTitleLabel.textColor = .white | 88 | passTitleLabel.textColor = .white |
| 89 | 89 | ||
| 90 | - passSubtitleLabel.text = "Χρησιμοποίησε τον κωδικό σου και κέρδισε έκπτωση στις αγορές σου!" | 90 | + passSubtitleLabel.text = "Χρησιμοποίησε το μοναδικό κωδικό σου για να κερδίσεις έκπτωση σε επιλεγμένα προϊόντα. Ανακάλυψε τα κουπόνια στο For You." |
| 91 | passSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0) | 91 | passSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0) |
| 92 | passSubtitleLabel.textColor = .white | 92 | passSubtitleLabel.textColor = .white |
| 93 | 93 | ||
| ... | @@ -116,14 +116,15 @@ import SwiftEventBus | ... | @@ -116,14 +116,15 @@ import SwiftEventBus |
| 116 | let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] | 116 | let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] |
| 117 | let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] | 117 | let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] |
| 118 | 118 | ||
| 119 | - let couponsValueNormalText1 = "Έχεις κουπόνια συνολικής αξίας " | 119 | + let couponsValueNormalText1 = "Με τα διαθέσιμα κουπόνια μπορείς να εξοικονομήσεις έως και " |
| 120 | - let couponsValueBoldText = couponsValueString + "€" | 120 | + let couponsValueBoldText = couponsValueString + "€." |
| 121 | 121 | ||
| 122 | let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular) | 122 | let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular) |
| 123 | let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold) | 123 | let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold) |
| 124 | 124 | ||
| 125 | couponsValueAttributedString.append(couponsValueBoldString) | 125 | couponsValueAttributedString.append(couponsValueBoldString) |
| 126 | couponsValueLabel.attributedText = couponsValueAttributedString | 126 | couponsValueLabel.attributedText = couponsValueAttributedString |
| 127 | + couponsValueLabel.textAlignment = .left | ||
| 127 | 128 | ||
| 128 | mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 16) | 129 | mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 16) |
| 129 | mapButton.setTitle("Δες στο χάρτη", for: .normal) | 130 | mapButton.setTitle("Δες στο χάρτη", for: .normal) |
| ... | @@ -223,14 +224,15 @@ import SwiftEventBus | ... | @@ -223,14 +224,15 @@ import SwiftEventBus |
| 223 | let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] | 224 | let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] |
| 224 | let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] | 225 | let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] |
| 225 | 226 | ||
| 226 | - let couponsValueNormalText1 = "Έχεις κουπόνια συνολικής αξίας " | 227 | + let couponsValueNormalText1 = "Με τα διαθέσιμα κουπόνια μπορείς να εξοικονομήσεις έως και " |
| 227 | - let couponsValueBoldText = couponsValueString + "€" | 228 | + let couponsValueBoldText = couponsValueString + "€." |
| 228 | 229 | ||
| 229 | let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular) | 230 | let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular) |
| 230 | let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold) | 231 | let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold) |
| 231 | 232 | ||
| 232 | couponsValueAttributedString.append(couponsValueBoldString) | 233 | couponsValueAttributedString.append(couponsValueBoldString) |
| 233 | couponsValueLabel.attributedText = couponsValueAttributedString | 234 | couponsValueLabel.attributedText = couponsValueAttributedString |
| 235 | + couponsValueLabel.textAlignment = .left | ||
| 234 | 236 | ||
| 235 | let formattedCost = couponsValueString.replacingOccurrences(of: ".", with: ",") | 237 | let formattedCost = couponsValueString.replacingOccurrences(of: ".", with: ",") |
| 236 | couponsValueLabel.isAccessibilityElement = true | 238 | couponsValueLabel.isAccessibilityElement = true | ... | ... |
SwiftWarplyFramework/SwiftWarplyFramework/Media.xcassets/pass_info_product.imageset/Contents.json
0 → 100644
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "filename" : "pass_info_product.png", | ||
| 5 | + "idiom" : "universal", | ||
| 6 | + "scale" : "1x" | ||
| 7 | + }, | ||
| 8 | + { | ||
| 9 | + "filename" : "pass_info_product 1.png", | ||
| 10 | + "idiom" : "universal", | ||
| 11 | + "scale" : "2x" | ||
| 12 | + }, | ||
| 13 | + { | ||
| 14 | + "filename" : "pass_info_product 2.png", | ||
| 15 | + "idiom" : "universal", | ||
| 16 | + "scale" : "3x" | ||
| 17 | + } | ||
| 18 | + ], | ||
| 19 | + "info" : { | ||
| 20 | + "author" : "xcode", | ||
| 21 | + "version" : 1 | ||
| 22 | + } | ||
| 23 | +} |
3.45 KB
3.45 KB
-
Please register or login to post a comment