open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
c9c8a8f3 1 parent 6b7195b5

MarketPass verbal fixes and MarketPassInfo update

Expand all
Inline Side-by-side
Showing 10 changed files with 40 additions and 9 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -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,13 +82,13 @@ import UIKit ...@@ -74,13 +82,13 @@ 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
81 // okButton 89 // okButton
82 okButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15) 90 okButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
83 - okButton.setTitle("Επιστροφή", for: .normal) 91 + okButton.setTitle("Επιστροφή στο Supermarket Deals", for: .normal)
84 okButton.setTitleColor(.white, for: .normal) 92 okButton.setTitleColor(.white, for: .normal)
85 okButton.backgroundColor = UIColor(rgb: 0x0EA600) 93 okButton.backgroundColor = UIColor(rgb: 0x0EA600)
86 okButton.layer.cornerRadius = 10.0 94 okButton.layer.cornerRadius = 10.0
......
...@@ -85,7 +85,7 @@ import SwiftEventBus ...@@ -85,7 +85,7 @@ import SwiftEventBus
85 passTitleLabel.font = UIFont(name: "BTCosmo-Bold", size: 22) 85 passTitleLabel.font = UIFont(name: "BTCosmo-Bold", size: 22)
86 passTitleLabel.textColor = .white 86 passTitleLabel.textColor = .white
87 87
88 - passSubtitleLabel.text = "Χρησιμοποίησε τον κωδικό σου και κέρδισε έκπτωση στις αγορές σου!" 88 + passSubtitleLabel.text = "Χρησιμοποίησε το μοναδικό κωδικό σου για να κερδίσεις έκπτωση σε επιλεγμένα προϊόντα. Ανακάλυψε τα κουπόνια στο For You."
89 passSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0) 89 passSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0)
90 passSubtitleLabel.textColor = .white 90 passSubtitleLabel.textColor = .white
91 91
...@@ -114,8 +114,8 @@ import SwiftEventBus ...@@ -114,8 +114,8 @@ import SwiftEventBus
114 let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] 114 let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
115 let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] 115 let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
116 116
117 - let couponsValueNormalText1 = "Έχεις κουπόνια συνολικής αξίας " 117 + let couponsValueNormalText1 = "Με τα διαθέσιμα κουπόνια μπορείς να εξοικονομήσεις έως και "
118 - let couponsValueBoldText = couponsValueString + "€" 118 + let couponsValueBoldText = couponsValueString + "€."
119 119
120 let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular) 120 let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular)
121 let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold) 121 let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold)
...@@ -200,8 +200,8 @@ import SwiftEventBus ...@@ -200,8 +200,8 @@ import SwiftEventBus
200 let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] 200 let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
201 let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white] 201 let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
202 202
203 - let couponsValueNormalText1 = "Έχεις κουπόνια συνολικής αξίας " 203 + let couponsValueNormalText1 = "Με τα διαθέσιμα κουπόνια μπορείς να εξοικονομήσεις έως και "
204 - let couponsValueBoldText = couponsValueString + "€" 204 + let couponsValueBoldText = couponsValueString + "€."
205 205
206 let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular) 206 let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular)
207 let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold) 207 let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold)
......
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 +}