Manos Chorianopoulos

new green color

Showing 37 changed files with 34 additions and 34 deletions
......@@ -30,7 +30,7 @@ private extension CSMButton {
titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18)
setTitleColor(.white, for: .normal)
// backgroundColor = UIColor(rgb: 0x79BF14)
backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
backgroundColor = UIColor(rgb: 0x0E8103)
layer.cornerRadius = 12.0
imageEdgeInsets = UIEdgeInsets(top:0.0, left:0.0, bottom:0.0, right:5.0);
......
......@@ -79,7 +79,7 @@ import SwiftEventBus
redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
redeemButton.setTitle("Ενεργοποίηση", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
......@@ -411,7 +411,7 @@ import AVFoundation
redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
redeemButton.setTitle("Βρες το στα supermarket", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
// redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
......@@ -427,20 +427,20 @@ import AVFoundation
mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
mapButton.setTitle("Δώρισέ το", for: .normal)
mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
mapButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
mapButton.layer.cornerRadius = 15.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
// mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
// mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
mapButton.backgroundColor = .clear
mapButton.layer.borderWidth = 2
mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
mapButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
} else {
redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
redeemButton.setTitle("Δώρισέ το", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
// redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
......@@ -456,14 +456,14 @@ import AVFoundation
mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
mapButton.setTitle("Δες τα καταστήματα", for: .normal)
mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
mapButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
mapButton.layer.cornerRadius = 15.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
// mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
// mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
mapButton.backgroundColor = .clear
mapButton.layer.borderWidth = 2
mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
mapButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
}
......
......@@ -104,7 +104,7 @@ import SwiftEventBus
redeemButton.setTitle("Απόκτησέ το δωρεάν", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
redeemButton.layer.cornerRadius = 16.0
// redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
......@@ -106,7 +106,7 @@ import MapKit
directionsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18)
directionsButton.setTitleColor(.white, for: .normal)
directionsButton.tintColor = .white
directionsButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
directionsButton.backgroundColor = UIColor(rgb: 0x0E8103)
directionsButton.layer.cornerRadius = 16.0
// directionsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5);
// directionsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0);
......
......@@ -95,7 +95,7 @@ import UIKit
okButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
okButton.setTitle("Επιστροφή", for: .normal)
okButton.setTitleColor(.white, for: .normal)
okButton.backgroundColor = UIColor(rgb: 0x0EA600)
okButton.backgroundColor = UIColor(rgb: 0x0E8103)
okButton.layer.cornerRadius = 10.0
setupAccessibilty()
......
......@@ -155,14 +155,14 @@ import SwiftEventBus
mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 16)
mapButton.setTitle("Δες στο χάρτη", for: .normal)
mapButton.setTitleColor(UIColor(rgb: 0x006D26), for: .normal)
mapButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
mapButton.layer.cornerRadius = 10.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 148, height: 48)
// mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
// mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
mapButton.backgroundColor = .clear
mapButton.layer.borderWidth = 2
mapButton.layer.borderColor = UIColor(rgb: 0x006D26).cgColor
mapButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
mapButton.isAccessibilityElement = true
mapButton.accessibilityLabel = mapButton.title(for: .normal)
......
......@@ -53,7 +53,7 @@ class MerchantTableViewCell: UITableViewCell {
buttonTitleLable.font = UIFont(name: "PeridotPE-SBold", size: 13)
buttonTitleLable.textColor = UIColor(rgb: 0xFFFFFF)
buttonView.backgroundColor = UIColor(rgb: 0x0EA600)
buttonView.backgroundColor = UIColor(rgb: 0x0E8103)
buttonView.layer.cornerRadius = 12.0
// Add action for button tap
......
......@@ -43,18 +43,18 @@ class PopupMerchantCategoriesViewController: UIViewController {
mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
mapButton.setTitle("Δες τα καταστήματα στο χάρτη", for: .normal)
mapButton.setTitleColor(.white, for: .normal)
mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
mapButton.backgroundColor = UIColor(rgb: 0x0E8103)
mapButton.layer.cornerRadius = 16.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55)
eshopsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
eshopsButton.setTitle("Δες τα eshop", for: .normal)
eshopsButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
eshopsButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
eshopsButton.layer.cornerRadius = 15.0
eshopsButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55)
eshopsButton.backgroundColor = .clear
eshopsButton.layer.borderWidth = 2
eshopsButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
eshopsButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
}
@objc private func mapButtonTapped() {
......
......@@ -107,7 +107,7 @@ import SwiftEventBus
redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
redeemButton.setTitle("Αποστολή με SMS", for: .normal)
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
......@@ -96,7 +96,7 @@ import SwiftEventBus
activateButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
activateButton.setTitle("Ενεργοποίηση", for: .normal)
activateButton.setTitleColor(.white, for: .normal)
activateButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
activateButton.backgroundColor = UIColor(rgb: 0x0E8103)
activateButton.layer.cornerRadius = 16.0
activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 50)
activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
......@@ -28,7 +28,7 @@ import AVFoundation
mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
mapButton.setTitle("Δες τα supermarket", for: .normal)
mapButton.setTitleColor(UIColor(red: 1.00, green: 1.00, blue: 1.00, alpha: 1.00), for: .normal)
mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
mapButton.backgroundColor = UIColor(rgb: 0x0E8103)
mapButton.layer.cornerRadius = 15.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
// mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50)
......@@ -36,14 +36,14 @@ import AVFoundation
cancelButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
cancelButton.setTitle("Ακυρωση κουπονιού", for: .normal) // Ακύρωση ενιαίου κουπονιού
cancelButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
cancelButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
cancelButton.layer.cornerRadius = 15.0
cancelButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
// cancelButton.frame = CGRect(x: 0.0, y: 0.0, width: cancelButton.intrinsicContentSize.width, height: 50)
// cancelButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
cancelButton.backgroundColor = .clear
cancelButton.layer.borderWidth = 2
cancelButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
cancelButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
// mapButton.isHidden = true
// mapButtonHeight.constant = 0
......
......@@ -98,7 +98,7 @@ import SwiftEventBus
submitButton.setTitle("Συνδύασε τις προσφορές σε ένα κουπόνι", for: .normal)
submitButton.setTitleColor(.white, for: .normal)
submitButton.layer.cornerRadius = 16.0
// submitButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
// submitButton.backgroundColor = UIColor(rgb: 0x0E8103)
submitButton.backgroundColor = UIColor(rgb: 0x9D9D9C)
submitButton.isEnabled = false
// submitButton.frame = CGRect(x: 0.0, y: 0.0, width: submitButton.intrinsicContentSize.width, height: 50)
......@@ -223,7 +223,7 @@ import SwiftEventBus
func handleSubmitButtonUI() {
if (self.smCouponsSelected.count > 0) {
submitButton.backgroundColor = UIColor(rgb: 0x0EA600)
submitButton.backgroundColor = UIColor(rgb: 0x0E8103)
submitButton.isEnabled = true
} else {
......
......@@ -27,13 +27,13 @@ import UIKit
bannerView.layer.cornerRadius = 12.0
bannerView.layer.borderWidth = 1
bannerView.layer.borderColor = UIColor(rgb: 0x0E8004).cgColor
bannerView.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
// bannerView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
// bannerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
bannerCenteredView.layer.cornerRadius = 12.0
bannerCenteredView.layer.borderWidth = 1
bannerCenteredView.layer.borderColor = UIColor(rgb: 0x0E8004).cgColor
bannerCenteredView.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
// bannerCenteredView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
// Add shadow
......@@ -47,9 +47,9 @@ import UIKit
// bannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
bannerLabel.font = UIFont(name: "PeridotPE-Bold", size: 12)
bannerLabel.textColor = UIColor(rgb: 0x0E8004)
bannerLabel.textColor = UIColor(rgb: 0x0E8103)
bannerCenteredLabel.font = UIFont(name: "PeridotPE-Bold", size: 12)
bannerCenteredLabel.textColor = UIColor(rgb: 0x0E8004)
bannerCenteredLabel.textColor = UIColor(rgb: 0x0E8103)
}
public override func setSelected(_ selected: Bool, animated: Bool) {
......
......@@ -230,26 +230,26 @@ import SwiftEventBus
} else {
questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
// questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
// questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
// questionnaireButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
// questionnaireButton.backgroundColor = .clear
// questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26)
// questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
}
questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
questionnaireButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
questionnaireButton.backgroundColor = .clear
questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
questionnaireButton.layer.cornerRadius = 16.0
questionnaireButton.layer.borderWidth = 1
questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
questionnaireButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
historyButtonView.backgroundColor = .clear
historyButtonView.layer.cornerRadius = 16.0
historyButtonView.layer.borderWidth = 1
historyButtonView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
historyButtonView.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
dfyEarnBannerInnerView.layer.cornerRadius = 16.5
// dfyEarnBannerInnerView.layer.borderWidth = 1
......@@ -558,14 +558,14 @@ import SwiftEventBus
// questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
}
questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
questionnaireButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
questionnaireButton.backgroundColor = .clear
questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
questionnaireButton.layer.cornerRadius = 16.0
questionnaireButton.layer.borderWidth = 1
questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
questionnaireButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
}
self.coupons = swiftApi().getCouponList()
......