Manos Chorianopoulos

change system fonts to PFSquareSansPro

......@@ -7,7 +7,7 @@
<key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
......
......@@ -7,7 +7,7 @@
<key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
......
......@@ -45,8 +45,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
let coupBoldText2 = String(loyaltyBadge._couponCount)
let coupNormalText3 = " κουπόνια!"
let attrRegular = [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
let attrBold = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 16)]
let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17)]
let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17)]
let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular)
let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold)
......
......@@ -86,21 +86,30 @@ import AVFoundation
barcodeImageHeight.constant = 0
}
showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal)
showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil), for: .normal)
showBarcodeButton.semanticContentAttribute = .forceRightToLeft
showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00)
showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0);
showBarcodeButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5);
expirationLabel.text = "Το κουπόνι ισχύει έως " + (coupon?.expiration ?? "")
redeemButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold)
redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
redeemButton.setTitle("Κάντο δώρο!", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
redeemButton.layer.cornerRadius = 12.0
mapButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold)
mapButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
mapButton.setTitle("Δες τα καταστήματα", for: .normal)
mapButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
mapButton.layer.cornerRadius = 12.0
termsButton.titleLabel?.font = .systemFont(ofSize: 15.0, weight: .medium)
termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 16)
// termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
termsButton.setTitle("Όροι χρήσης", for: .normal)
termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
......@@ -112,7 +121,7 @@ import AVFoundation
let htmlText = couponSetData?.terms ?? ""
termsTextView.attributedText = htmlText.htmlToAttributedString
termsTextView.font = UIFont.systemFont(ofSize: 14, weight: UIFont.Weight.regular)
termsTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 15)
termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00)
termsTextView.textAlignment = .center
termsTextView.isScrollEnabled = false
......
......@@ -51,13 +51,13 @@ import UIKit
nameLabel.text = couponset?.name ?? ""
descriptionLabel.text = couponset?.short_description ?? ""
redeemButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold)
redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
redeemButton.setTitle("Απόκτησέ το", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
redeemButton.layer.cornerRadius = 12.0
termsButton.titleLabel?.font = .systemFont(ofSize: 15.0, weight: .semibold)
termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
// termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
termsButton.setTitle("Όροι χρήσης", for: .normal)
termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
......@@ -69,7 +69,7 @@ import UIKit
let htmlText = couponset?.terms ?? ""
termsTextView.attributedText = htmlText.htmlToAttributedString
termsTextView.font = UIFont.systemFont(ofSize: 14, weight: UIFont.Weight.regular)
termsTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 15)
termsTextView.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00)
termsTextView.textAlignment = .center
termsTextView.isScrollEnabled = false
......
......@@ -27,12 +27,12 @@ import UIKit
setNavigationTitle("Ανάλυση")
// tab
leftButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular)
leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
leftButton.setTitle("Εξαργυρωμένα", for:.normal)
leftButton.backgroundColor = . clear
leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
rightButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular)
rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
rightButton.setTitle("Μοιρασμένα δώρα", for:.normal)
rightButton.backgroundColor = . clear
rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
......@@ -85,6 +85,9 @@ import UIKit
self.leftLineView.isHidden = false
self.rightLineView.isHidden = true
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
}
......@@ -102,6 +105,9 @@ import UIKit
self.leftLineView.isHidden = true
self.rightLineView.isHidden = false
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
}
......@@ -155,6 +161,8 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV
if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] {
let currentIndex = childVCs[0].index
if (currentIndex == 0) {
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
self.tabSelected = 0
......@@ -162,6 +170,8 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV
self.rightLineView.isHidden = true
} else {
self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14)
self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal)
self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal)
self.tabSelected = 1
......
This diff could not be displayed because it is too large.
......@@ -71,12 +71,12 @@ import UIKit
senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside)
numberTextField.font = UIFont.systemFont(ofSize: 15, weight: UIFont.Weight.medium)
numberTextField.font = UIFont(name: "PFSquareSansPro-Regular", size: 16)
numberTextField.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00)
numberTextField.attributedPlaceholder = NSAttributedString(string: "Καταχώρηση τηλεφώνου", attributes: [NSAttributedString.Key.foregroundColor: UIColor(red: 0.68, green: 0.68, blue: 0.68, alpha: 1.00)])
numberTextField.keyboardType = .asciiCapableNumberPad
redeemButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold)
redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
redeemButton.setTitle("Αποστολή με SMS", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
......
......@@ -46,7 +46,7 @@ import UIKit
nameLabel.text = ccms?._title ?? ""
descriptionLabel.text = ccms?._subtitle ?? ""
activateButton.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .semibold)
activateButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16)
activateButton.setTitle("Ενεργοποίηση", for: .normal)
activateButton.setTitleColor(.white, for: .normal)
activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
......
......@@ -43,9 +43,9 @@ extension UIViewController {
titleLabel.text = title
titleLabel.textColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00)
if (fontWeight == "bold") {
titleLabel.font = UIFont.systemFont(ofSize: 16, weight: UIFont.Weight.bold)
titleLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 17)
} else {
titleLabel.font = UIFont.systemFont(ofSize: 16, weight: UIFont.Weight.semibold)
titleLabel.font = UIFont(name: "PFSquareSansPro-Medium", size: 17)
}
titleLabel.adjustsFontSizeToFitWidth = true
titleLabel.textAlignment = .center
......
......@@ -83,7 +83,7 @@ import SwiftEventBus
print("User tag: " + userTag)
if (userTag != "" && userTag != "undefined") {
questionnaireButton.setTitle(userTag, for: .normal)
questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold)
questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
questionnaireButton.setTitleColor(.white, for: .normal)
// questionnaireButton.sizeToFit()
questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
......@@ -96,7 +96,7 @@ import SwiftEventBus
questionnaireButton.layer.masksToBounds = false
} else {
questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold)
questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
......@@ -132,8 +132,8 @@ import SwiftEventBus
let boldText = totalCouponValueString + "€"
let normalText2 = " με το DEALS for YOU!"
let attrRegular = [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
let attrBold = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 16)]
let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17)]
let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17)]
let attributedString = NSMutableAttributedString(string:normalText1, attributes:attrRegular)
let boldString = NSMutableAttributedString(string: boldText, attributes:attrBold)
......@@ -285,7 +285,7 @@ import SwiftEventBus
if (questionnaireButton.currentTitle != userTag) {
if (userTag != "" && userTag != "undefined") {
questionnaireButton.setTitle(userTag, for: .normal)
questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold)
questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
questionnaireButton.setTitleColor(.white, for: .normal)
// questionnaireButton.sizeToFit()
questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
......@@ -304,7 +304,7 @@ import SwiftEventBus
}
questionnaireButton.layer.shadowOpacity = 0.0;
questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
questionnaireButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .semibold)
questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: questionnaireButton.intrinsicContentSize.height)
......