open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
5d4c6dbf 1 parent 478759d4

MarketPass changes

Expand all
Inline Side-by-side
Showing 8 changed files with 39 additions and 6 deletions
...@@ -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
......
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 +}