open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
65852719 1 parent 127b52c5

change system fonts to PFSquareSansPro

Inline Side-by-side
Showing 12 changed files with 43 additions and 24 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>1</integer> 10 + <integer>0</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>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -45,8 +45,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -45,8 +45,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
45 let coupBoldText2 = String(loyaltyBadge._couponCount) 45 let coupBoldText2 = String(loyaltyBadge._couponCount)
46 let coupNormalText3 = " κουπόνια!" 46 let coupNormalText3 = " κουπόνια!"
47 47
48 - let attrRegular = [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)] 48 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17)]
49 - let attrBold = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 16)] 49 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17)]
50 50
51 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular) 51 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular)
52 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold) 52 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold)
......
...@@ -86,21 +86,30 @@ import AVFoundation ...@@ -86,21 +86,30 @@ import AVFoundation
86 barcodeImageHeight.constant = 0 86 barcodeImageHeight.constant = 0
87 } 87 }
88 88
89 + showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
90 + showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal)
91 + showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
92 + showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil), for: .normal)
93 + showBarcodeButton.semanticContentAttribute = .forceRightToLeft
94 + showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00)
95 + showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0);
96 + showBarcodeButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5);
97 +
89 expirationLabel.text = "Το κουπόνι ισχύει έως " + (coupon?.expiration ?? "") 98 expirationLabel.text = "Το κουπόνι ισχύει έως " + (coupon?.expiration ?? "")
90 99
91 - redeemButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold) 100 + redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
92 redeemButton.setTitle("Κάντο δώρο!", for: .normal) 101 redeemButton.setTitle("Κάντο δώρο!", for: .normal)
93 redeemButton.setTitleColor(.white, for: .normal) 102 redeemButton.setTitleColor(.white, for: .normal)
94 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 103 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
95 redeemButton.layer.cornerRadius = 12.0 104 redeemButton.layer.cornerRadius = 12.0
96 105
97 - mapButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold) 106 + mapButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
98 mapButton.setTitle("Δες τα καταστήματα", for: .normal) 107 mapButton.setTitle("Δες τα καταστήματα", for: .normal)
99 mapButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) 108 mapButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
100 mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 109 mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
101 mapButton.layer.cornerRadius = 12.0 110 mapButton.layer.cornerRadius = 12.0
102 111
103 - termsButton.titleLabel?.font = .systemFont(ofSize: 15.0, weight: .medium) 112 + termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 16)
104 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) 113 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
105 termsButton.setTitle("Όροι χρήσης", for: .normal) 114 termsButton.setTitle("Όροι χρήσης", for: .normal)
106 termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) 115 termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
...@@ -112,7 +121,7 @@ import AVFoundation ...@@ -112,7 +121,7 @@ import AVFoundation
112 121
113 let htmlText = couponSetData?.terms ?? "" 122 let htmlText = couponSetData?.terms ?? ""
114 termsTextView.attributedText = htmlText.htmlToAttributedString 123 termsTextView.attributedText = htmlText.htmlToAttributedString
115 - termsTextView.font = UIFont.systemFont(ofSize: 14, weight: UIFont.Weight.regular) 124 + termsTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 15)
116 termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00) 125 termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00)
117 termsTextView.textAlignment = .center 126 termsTextView.textAlignment = .center
118 termsTextView.isScrollEnabled = false 127 termsTextView.isScrollEnabled = false
......
...@@ -51,13 +51,13 @@ import UIKit ...@@ -51,13 +51,13 @@ import UIKit
51 nameLabel.text = couponset?.name ?? "" 51 nameLabel.text = couponset?.name ?? ""
52 descriptionLabel.text = couponset?.short_description ?? "" 52 descriptionLabel.text = couponset?.short_description ?? ""
53 53
54 - redeemButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold) 54 + redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
55 redeemButton.setTitle("Απόκτησέ το", for: .normal) 55 redeemButton.setTitle("Απόκτησέ το", for: .normal)
56 redeemButton.setTitleColor(.white, for: .normal) 56 redeemButton.setTitleColor(.white, for: .normal)
57 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 57 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
58 redeemButton.layer.cornerRadius = 12.0 58 redeemButton.layer.cornerRadius = 12.0
59 59
60 - termsButton.titleLabel?.font = .systemFont(ofSize: 15.0, weight: .semibold) 60 + termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
61 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) 61 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
62 termsButton.setTitle("Όροι χρήσης", for: .normal) 62 termsButton.setTitle("Όροι χρήσης", for: .normal)
63 termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) 63 termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
...@@ -69,7 +69,7 @@ import UIKit ...@@ -69,7 +69,7 @@ import UIKit
69 69
70 let htmlText = couponset?.terms ?? "" 70 let htmlText = couponset?.terms ?? ""
71 termsTextView.attributedText = htmlText.htmlToAttributedString 71 termsTextView.attributedText = htmlText.htmlToAttributedString
72 - termsTextView.font = UIFont.systemFont(ofSize: 14, weight: UIFont.Weight.regular) 72 + termsTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 15)
73 termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00) 73 termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00)
74 termsTextView.textAlignment = .center 74 termsTextView.textAlignment = .center
75 termsTextView.isScrollEnabled = false 75 termsTextView.isScrollEnabled = false
......
...@@ -27,12 +27,12 @@ import UIKit ...@@ -27,12 +27,12 @@ import UIKit
27 setNavigationTitle("Ανάλυση") 27 setNavigationTitle("Ανάλυση")
28 28
29 // tab 29 // tab
30 - leftButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular) 30 + leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
31 leftButton.setTitle("Εξαργυρωμένα", for:.normal) 31 leftButton.setTitle("Εξαργυρωμένα", for:.normal)
32 leftButton.backgroundColor = . clear 32 leftButton.backgroundColor = . clear
33 leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 33 leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
34 34
35 - rightButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular) 35 + rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
36 rightButton.setTitle("Μοιρασμένα δώρα", for:.normal) 36 rightButton.setTitle("Μοιρασμένα δώρα", for:.normal)
37 rightButton.backgroundColor = . clear 37 rightButton.backgroundColor = . clear
38 rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 38 rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
...@@ -85,6 +85,9 @@ import UIKit ...@@ -85,6 +85,9 @@ import UIKit
85 self.leftLineView.isHidden = false 85 self.leftLineView.isHidden = false
86 self.rightLineView.isHidden = true 86 self.rightLineView.isHidden = true
87 87
88 + self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
89 + self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
90 +
88 self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 91 self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
89 self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 92 self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
90 } 93 }
...@@ -102,6 +105,9 @@ import UIKit ...@@ -102,6 +105,9 @@ import UIKit
102 self.leftLineView.isHidden = true 105 self.leftLineView.isHidden = true
103 self.rightLineView.isHidden = false 106 self.rightLineView.isHidden = false
104 107
108 + self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
109 + self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
110 +
105 self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 111 self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
106 self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 112 self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
107 } 113 }
...@@ -155,6 +161,8 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV ...@@ -155,6 +161,8 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV
155 if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] { 161 if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] {
156 let currentIndex = childVCs[0].index 162 let currentIndex = childVCs[0].index
157 if (currentIndex == 0) { 163 if (currentIndex == 0) {
164 + self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
165 + self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
158 self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 166 self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
159 self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 167 self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
160 self.tabSelected = 0 168 self.tabSelected = 0
...@@ -162,6 +170,8 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV ...@@ -162,6 +170,8 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV
162 self.rightLineView.isHidden = true 170 self.rightLineView.isHidden = true
163 171
164 } else { 172 } else {
173 + self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
174 + self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
165 self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 175 self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
166 self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 176 self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
167 self.tabSelected = 1 177 self.tabSelected = 1
......
This diff could not be displayed because it is too large.
...@@ -71,12 +71,12 @@ import UIKit ...@@ -71,12 +71,12 @@ import UIKit
71 71
72 senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside) 72 senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside)
73 73
74 - numberTextField.font = UIFont.systemFont(ofSize: 15, weight: UIFont.Weight.medium) 74 + numberTextField.font = UIFont(name: "PFSquareSansPro-Regular", size: 16)
75 numberTextField.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00) 75 numberTextField.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00)
76 numberTextField.attributedPlaceholder = NSAttributedString(string: "Καταχώρηση τηλεφώνου", attributes: [NSAttributedString.Key.foregroundColor: UIColor(red: 0.68, green: 0.68, blue: 0.68, alpha: 1.00)]) 76 numberTextField.attributedPlaceholder = NSAttributedString(string: "Καταχώρηση τηλεφώνου", attributes: [NSAttributedString.Key.foregroundColor: UIColor(red: 0.68, green: 0.68, blue: 0.68, alpha: 1.00)])
77 numberTextField.keyboardType = .asciiCapableNumberPad 77 numberTextField.keyboardType = .asciiCapableNumberPad
78 78
79 - redeemButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold) 79 + redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
80 redeemButton.setTitle("Αποστολή με SMS", for: .normal) 80 redeemButton.setTitle("Αποστολή με SMS", for: .normal)
81 redeemButton.setTitleColor(.white, for: .normal) 81 redeemButton.setTitleColor(.white, for: .normal)
82 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 82 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
......
...@@ -46,7 +46,7 @@ import UIKit ...@@ -46,7 +46,7 @@ import UIKit
46 nameLabel.text = ccms?._title ?? "" 46 nameLabel.text = ccms?._title ?? ""
47 descriptionLabel.text = ccms?._subtitle ?? "" 47 descriptionLabel.text = ccms?._subtitle ?? ""
48 48
49 - activateButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold) 49 + activateButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
50 activateButton.setTitle("Ενεργοποίηση", for: .normal) 50 activateButton.setTitle("Ενεργοποίηση", for: .normal)
51 activateButton.setTitleColor(.white, for: .normal) 51 activateButton.setTitleColor(.white, for: .normal)
52 activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 52 activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
......
...@@ -43,9 +43,9 @@ extension UIViewController { ...@@ -43,9 +43,9 @@ extension UIViewController {
43 titleLabel.text = title 43 titleLabel.text = title
44 titleLabel.textColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) 44 titleLabel.textColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00)
45 if (fontWeight == "bold") { 45 if (fontWeight == "bold") {
46 - titleLabel.font = UIFont.systemFont(ofSize: 16, weight: UIFont.Weight.bold) 46 + titleLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 17)
47 } else { 47 } else {
48 - titleLabel.font = UIFont.systemFont(ofSize: 16, weight: UIFont.Weight.semibold) 48 + titleLabel.font = UIFont(name: "PFSquareSansPro-Medium", size: 17)
49 } 49 }
50 titleLabel.adjustsFontSizeToFitWidth = true 50 titleLabel.adjustsFontSizeToFitWidth = true
51 titleLabel.textAlignment = .center 51 titleLabel.textAlignment = .center
......
...@@ -83,7 +83,7 @@ import SwiftEventBus ...@@ -83,7 +83,7 @@ import SwiftEventBus
83 print("User tag: " + userTag) 83 print("User tag: " + userTag)
84 if (userTag != "" && userTag != "undefined") { 84 if (userTag != "" && userTag != "undefined") {
85 questionnaireButton.setTitle(userTag, for: .normal) 85 questionnaireButton.setTitle(userTag, for: .normal)
86 - questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold) 86 + questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
87 questionnaireButton.setTitleColor(.white, for: .normal) 87 questionnaireButton.setTitleColor(.white, for: .normal)
88 // questionnaireButton.sizeToFit() 88 // questionnaireButton.sizeToFit()
89 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height) 89 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
...@@ -96,7 +96,7 @@ import SwiftEventBus ...@@ -96,7 +96,7 @@ import SwiftEventBus
96 questionnaireButton.layer.masksToBounds = false 96 questionnaireButton.layer.masksToBounds = false
97 } else { 97 } else {
98 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal) 98 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
99 - questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold) 99 + questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
100 questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) 100 questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
101 questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 101 questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
102 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height) 102 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
...@@ -132,8 +132,8 @@ import SwiftEventBus ...@@ -132,8 +132,8 @@ import SwiftEventBus
132 let boldText = totalCouponValueString + "€" 132 let boldText = totalCouponValueString + "€"
133 let normalText2 = " με το DEALS for YOU!" 133 let normalText2 = " με το DEALS for YOU!"
134 134
135 - let attrRegular = [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)] 135 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17)]
136 - let attrBold = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 16)] 136 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17)]
137 137
138 let attributedString = NSMutableAttributedString(string:normalText1, attributes:attrRegular) 138 let attributedString = NSMutableAttributedString(string:normalText1, attributes:attrRegular)
139 let boldString = NSMutableAttributedString(string: boldText, attributes:attrBold) 139 let boldString = NSMutableAttributedString(string: boldText, attributes:attrBold)
...@@ -285,7 +285,7 @@ import SwiftEventBus ...@@ -285,7 +285,7 @@ import SwiftEventBus
285 if (questionnaireButton.currentTitle != userTag) { 285 if (questionnaireButton.currentTitle != userTag) {
286 if (userTag != "" && userTag != "undefined") { 286 if (userTag != "" && userTag != "undefined") {
287 questionnaireButton.setTitle(userTag, for: .normal) 287 questionnaireButton.setTitle(userTag, for: .normal)
288 - questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold) 288 + questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
289 questionnaireButton.setTitleColor(.white, for: .normal) 289 questionnaireButton.setTitleColor(.white, for: .normal)
290 // questionnaireButton.sizeToFit() 290 // questionnaireButton.sizeToFit()
291 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height) 291 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
...@@ -304,7 +304,7 @@ import SwiftEventBus ...@@ -304,7 +304,7 @@ import SwiftEventBus
304 } 304 }
305 questionnaireButton.layer.shadowOpacity = 0.0; 305 questionnaireButton.layer.shadowOpacity = 0.0;
306 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal) 306 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
307 - questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold) 307 + questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
308 questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) 308 questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
309 questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 309 questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
310 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height) 310 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
......