open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
f9585a43 1 parent 11ab022d

new green color

Inline Side-by-side
Showing 39 changed files with 36 additions and 36 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>
......
...@@ -30,7 +30,7 @@ private extension CSMButton { ...@@ -30,7 +30,7 @@ private extension CSMButton {
30 titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18) 30 titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18)
31 setTitleColor(.white, for: .normal) 31 setTitleColor(.white, for: .normal)
32 // backgroundColor = UIColor(rgb: 0x79BF14) 32 // backgroundColor = UIColor(rgb: 0x79BF14)
33 - backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 33 + backgroundColor = UIColor(rgb: 0x0E8103)
34 layer.cornerRadius = 12.0 34 layer.cornerRadius = 12.0
35 35
36 imageEdgeInsets = UIEdgeInsets(top:0.0, left:0.0, bottom:0.0, right:5.0); 36 imageEdgeInsets = UIEdgeInsets(top:0.0, left:0.0, bottom:0.0, right:5.0);
......
...@@ -79,7 +79,7 @@ import SwiftEventBus ...@@ -79,7 +79,7 @@ import SwiftEventBus
79 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 79 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
80 redeemButton.setTitle("Ενεργοποίηση", for: .normal) 80 redeemButton.setTitle("Ενεργοποίηση", for: .normal)
81 redeemButton.setTitleColor(.white, for: .normal) 81 redeemButton.setTitleColor(.white, for: .normal)
82 - redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 82 + redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
83 redeemButton.layer.cornerRadius = 16.0 83 redeemButton.layer.cornerRadius = 16.0
84 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50) 84 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
85 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 85 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
...@@ -408,7 +408,7 @@ import AVFoundation ...@@ -408,7 +408,7 @@ import AVFoundation
408 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 408 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
409 redeemButton.setTitle("Βρες το στα supermarket", for: .normal) 409 redeemButton.setTitle("Βρες το στα supermarket", for: .normal)
410 redeemButton.setTitleColor(.white, for: .normal) 410 redeemButton.setTitleColor(.white, for: .normal)
411 - redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 411 + redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
412 redeemButton.layer.cornerRadius = 16.0 412 redeemButton.layer.cornerRadius = 16.0
413 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55) 413 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
414 // redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 414 // redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
...@@ -424,20 +424,20 @@ import AVFoundation ...@@ -424,20 +424,20 @@ import AVFoundation
424 424
425 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17) 425 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
426 mapButton.setTitle("Δώρισέ το", for: .normal) 426 mapButton.setTitle("Δώρισέ το", for: .normal)
427 - mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 427 + mapButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
428 mapButton.layer.cornerRadius = 15.0 428 mapButton.layer.cornerRadius = 15.0
429 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55) 429 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
430 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55) 430 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
431 // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 431 // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
432 mapButton.backgroundColor = .clear 432 mapButton.backgroundColor = .clear
433 mapButton.layer.borderWidth = 2 433 mapButton.layer.borderWidth = 2
434 - mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 434 + mapButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
435 435
436 } else { 436 } else {
437 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 437 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
438 redeemButton.setTitle("Δώρισέ το", for: .normal) 438 redeemButton.setTitle("Δώρισέ το", for: .normal)
439 redeemButton.setTitleColor(.white, for: .normal) 439 redeemButton.setTitleColor(.white, for: .normal)
440 - redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 440 + redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
441 redeemButton.layer.cornerRadius = 16.0 441 redeemButton.layer.cornerRadius = 16.0
442 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55) 442 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
443 // redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 443 // redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
...@@ -453,14 +453,14 @@ import AVFoundation ...@@ -453,14 +453,14 @@ import AVFoundation
453 453
454 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17) 454 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
455 mapButton.setTitle("Δες τα καταστήματα", for: .normal) 455 mapButton.setTitle("Δες τα καταστήματα", for: .normal)
456 - mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 456 + mapButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
457 mapButton.layer.cornerRadius = 15.0 457 mapButton.layer.cornerRadius = 15.0
458 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55) 458 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
459 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55) 459 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
460 // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 460 // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
461 mapButton.backgroundColor = .clear 461 mapButton.backgroundColor = .clear
462 mapButton.layer.borderWidth = 2 462 mapButton.layer.borderWidth = 2
463 - mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 463 + mapButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
464 } 464 }
465 465
466 466
......
...@@ -99,7 +99,7 @@ import SwiftEventBus ...@@ -99,7 +99,7 @@ import SwiftEventBus
99 99
100 redeemButton.setTitle("Απόκτησέ το δωρεάν", for: .normal) 100 redeemButton.setTitle("Απόκτησέ το δωρεάν", for: .normal)
101 redeemButton.setTitleColor(.white, for: .normal) 101 redeemButton.setTitleColor(.white, for: .normal)
102 - redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 102 + redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
103 redeemButton.layer.cornerRadius = 16.0 103 redeemButton.layer.cornerRadius = 16.0
104 // redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50) 104 // redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
105 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 105 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
...@@ -105,7 +105,7 @@ import MapKit ...@@ -105,7 +105,7 @@ import MapKit
105 directionsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18) 105 directionsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18)
106 directionsButton.setTitleColor(.white, for: .normal) 106 directionsButton.setTitleColor(.white, for: .normal)
107 directionsButton.tintColor = .white 107 directionsButton.tintColor = .white
108 - directionsButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 108 + directionsButton.backgroundColor = UIColor(rgb: 0x0E8103)
109 directionsButton.layer.cornerRadius = 16.0 109 directionsButton.layer.cornerRadius = 16.0
110 // directionsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); 110 // directionsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5);
111 // directionsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); 111 // directionsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0);
......
...@@ -95,7 +95,7 @@ import UIKit ...@@ -95,7 +95,7 @@ import UIKit
95 okButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15) 95 okButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
96 okButton.setTitle("Επιστροφή", for: .normal) 96 okButton.setTitle("Επιστροφή", for: .normal)
97 okButton.setTitleColor(.white, for: .normal) 97 okButton.setTitleColor(.white, for: .normal)
98 - okButton.backgroundColor = UIColor(rgb: 0x0EA600) 98 + okButton.backgroundColor = UIColor(rgb: 0x0E8103)
99 okButton.layer.cornerRadius = 10.0 99 okButton.layer.cornerRadius = 10.0
100 } 100 }
101 101
......
...@@ -152,14 +152,14 @@ import SwiftEventBus ...@@ -152,14 +152,14 @@ import SwiftEventBus
152 152
153 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 16) 153 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 16)
154 mapButton.setTitle("Δες στο χάρτη", for: .normal) 154 mapButton.setTitle("Δες στο χάρτη", for: .normal)
155 - mapButton.setTitleColor(UIColor(rgb: 0x006D26), for: .normal) 155 + mapButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
156 mapButton.layer.cornerRadius = 10.0 156 mapButton.layer.cornerRadius = 10.0
157 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 148, height: 48) 157 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 148, height: 48)
158 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55) 158 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
159 // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 159 // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
160 mapButton.backgroundColor = .clear 160 mapButton.backgroundColor = .clear
161 mapButton.layer.borderWidth = 2 161 mapButton.layer.borderWidth = 2
162 - mapButton.layer.borderColor = UIColor(rgb: 0x006D26).cgColor 162 + mapButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
163 163
164 smLogosView.layer.cornerRadius = 16.0 164 smLogosView.layer.cornerRadius = 16.0
165 smLogosView.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // Bottom left, right corner radius 165 smLogosView.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // Bottom left, right corner radius
......
...@@ -53,7 +53,7 @@ class MerchantTableViewCell: UITableViewCell { ...@@ -53,7 +53,7 @@ class MerchantTableViewCell: UITableViewCell {
53 buttonTitleLable.font = UIFont(name: "PeridotPE-SBold", size: 13) 53 buttonTitleLable.font = UIFont(name: "PeridotPE-SBold", size: 13)
54 buttonTitleLable.textColor = UIColor(rgb: 0xFFFFFF) 54 buttonTitleLable.textColor = UIColor(rgb: 0xFFFFFF)
55 55
56 - buttonView.backgroundColor = UIColor(rgb: 0x0EA600) 56 + buttonView.backgroundColor = UIColor(rgb: 0x0E8103)
57 buttonView.layer.cornerRadius = 12.0 57 buttonView.layer.cornerRadius = 12.0
58 58
59 // Add action for button tap 59 // Add action for button tap
......
...@@ -43,18 +43,18 @@ class PopupMerchantCategoriesViewController: UIViewController { ...@@ -43,18 +43,18 @@ class PopupMerchantCategoriesViewController: UIViewController {
43 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 43 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
44 mapButton.setTitle("Δες τα καταστήματα στο χάρτη", for: .normal) 44 mapButton.setTitle("Δες τα καταστήματα στο χάρτη", for: .normal)
45 mapButton.setTitleColor(.white, for: .normal) 45 mapButton.setTitleColor(.white, for: .normal)
46 - mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 46 + mapButton.backgroundColor = UIColor(rgb: 0x0E8103)
47 mapButton.layer.cornerRadius = 16.0 47 mapButton.layer.cornerRadius = 16.0
48 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55) 48 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55)
49 49
50 eshopsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17) 50 eshopsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
51 eshopsButton.setTitle("Δες τα eshop", for: .normal) 51 eshopsButton.setTitle("Δες τα eshop", for: .normal)
52 - eshopsButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 52 + eshopsButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
53 eshopsButton.layer.cornerRadius = 15.0 53 eshopsButton.layer.cornerRadius = 15.0
54 eshopsButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55) 54 eshopsButton.frame = CGRect(x: 0.0, y: 0.0, width: 312, height: 55)
55 eshopsButton.backgroundColor = .clear 55 eshopsButton.backgroundColor = .clear
56 eshopsButton.layer.borderWidth = 2 56 eshopsButton.layer.borderWidth = 2
57 - eshopsButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 57 + eshopsButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
58 } 58 }
59 59
60 @objc private func mapButtonTapped() { 60 @objc private func mapButtonTapped() {
......
...@@ -104,7 +104,7 @@ import SwiftEventBus ...@@ -104,7 +104,7 @@ import SwiftEventBus
104 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 104 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
105 redeemButton.setTitle("Αποστολή με SMS", for: .normal) 105 redeemButton.setTitle("Αποστολή με SMS", for: .normal)
106 redeemButton.setTitleColor(.white, for: .normal) 106 redeemButton.setTitleColor(.white, for: .normal)
107 - redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 107 + redeemButton.backgroundColor = UIColor(rgb: 0x0E8103)
108 redeemButton.layer.cornerRadius = 16.0 108 redeemButton.layer.cornerRadius = 16.0
109 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50) 109 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
110 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 110 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
...@@ -96,7 +96,7 @@ import SwiftEventBus ...@@ -96,7 +96,7 @@ import SwiftEventBus
96 activateButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 96 activateButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
97 activateButton.setTitle("Ενεργοποίηση", for: .normal) 97 activateButton.setTitle("Ενεργοποίηση", for: .normal)
98 activateButton.setTitleColor(.white, for: .normal) 98 activateButton.setTitleColor(.white, for: .normal)
99 - activateButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 99 + activateButton.backgroundColor = UIColor(rgb: 0x0E8103)
100 activateButton.layer.cornerRadius = 16.0 100 activateButton.layer.cornerRadius = 16.0
101 activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 50) 101 activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 50)
102 activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 102 activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
......
...@@ -28,7 +28,7 @@ import AVFoundation ...@@ -28,7 +28,7 @@ import AVFoundation
28 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17) 28 mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 17)
29 mapButton.setTitle("Δες τα supermarket", for: .normal) 29 mapButton.setTitle("Δες τα supermarket", for: .normal)
30 mapButton.setTitleColor(UIColor(red: 1.00, green: 1.00, blue: 1.00, alpha: 1.00), for: .normal) 30 mapButton.setTitleColor(UIColor(red: 1.00, green: 1.00, blue: 1.00, alpha: 1.00), for: .normal)
31 - mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 31 + mapButton.backgroundColor = UIColor(rgb: 0x0E8103)
32 mapButton.layer.cornerRadius = 15.0 32 mapButton.layer.cornerRadius = 15.0
33 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55) 33 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
34 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50) 34 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50)
...@@ -36,14 +36,14 @@ import AVFoundation ...@@ -36,14 +36,14 @@ import AVFoundation
36 36
37 cancelButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17) 37 cancelButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
38 cancelButton.setTitle("Ακυρωση κουπονιού", for: .normal) // Ακύρωση ενιαίου κουπονιού 38 cancelButton.setTitle("Ακυρωση κουπονιού", for: .normal) // Ακύρωση ενιαίου κουπονιού
39 - cancelButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 39 + cancelButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
40 cancelButton.layer.cornerRadius = 15.0 40 cancelButton.layer.cornerRadius = 15.0
41 cancelButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55) 41 cancelButton.frame = CGRect(x: 0.0, y: 0.0, width: 260, height: 55)
42 // cancelButton.frame = CGRect(x: 0.0, y: 0.0, width: cancelButton.intrinsicContentSize.width, height: 50) 42 // cancelButton.frame = CGRect(x: 0.0, y: 0.0, width: cancelButton.intrinsicContentSize.width, height: 50)
43 // cancelButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25) 43 // cancelButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
44 cancelButton.backgroundColor = .clear 44 cancelButton.backgroundColor = .clear
45 cancelButton.layer.borderWidth = 2 45 cancelButton.layer.borderWidth = 2
46 - cancelButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 46 + cancelButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
47 47
48 // mapButton.isHidden = true 48 // mapButton.isHidden = true
49 // mapButtonHeight.constant = 0 49 // mapButtonHeight.constant = 0
......
...@@ -98,7 +98,7 @@ import SwiftEventBus ...@@ -98,7 +98,7 @@ import SwiftEventBus
98 submitButton.setTitle("Συνδύασε τις προσφορές σε ένα κουπόνι", for: .normal) 98 submitButton.setTitle("Συνδύασε τις προσφορές σε ένα κουπόνι", for: .normal)
99 submitButton.setTitleColor(.white, for: .normal) 99 submitButton.setTitleColor(.white, for: .normal)
100 submitButton.layer.cornerRadius = 16.0 100 submitButton.layer.cornerRadius = 16.0
101 -// submitButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 101 +// submitButton.backgroundColor = UIColor(rgb: 0x0E8103)
102 submitButton.backgroundColor = UIColor(rgb: 0x9D9D9C) 102 submitButton.backgroundColor = UIColor(rgb: 0x9D9D9C)
103 submitButton.isEnabled = false 103 submitButton.isEnabled = false
104 // submitButton.frame = CGRect(x: 0.0, y: 0.0, width: submitButton.intrinsicContentSize.width, height: 50) 104 // submitButton.frame = CGRect(x: 0.0, y: 0.0, width: submitButton.intrinsicContentSize.width, height: 50)
...@@ -223,7 +223,7 @@ import SwiftEventBus ...@@ -223,7 +223,7 @@ import SwiftEventBus
223 223
224 func handleSubmitButtonUI() { 224 func handleSubmitButtonUI() {
225 if (self.smCouponsSelected.count > 0) { 225 if (self.smCouponsSelected.count > 0) {
226 - submitButton.backgroundColor = UIColor(rgb: 0x0EA600) 226 + submitButton.backgroundColor = UIColor(rgb: 0x0E8103)
227 submitButton.isEnabled = true 227 submitButton.isEnabled = true
228 228
229 } else { 229 } else {
......
...@@ -27,13 +27,13 @@ import UIKit ...@@ -27,13 +27,13 @@ import UIKit
27 27
28 bannerView.layer.cornerRadius = 12.0 28 bannerView.layer.cornerRadius = 12.0
29 bannerView.layer.borderWidth = 1 29 bannerView.layer.borderWidth = 1
30 - bannerView.layer.borderColor = UIColor(rgb: 0x0E8004).cgColor 30 + bannerView.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
31 // bannerView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 31 // bannerView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
32 // bannerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 32 // bannerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
33 33
34 bannerCenteredView.layer.cornerRadius = 12.0 34 bannerCenteredView.layer.cornerRadius = 12.0
35 bannerCenteredView.layer.borderWidth = 1 35 bannerCenteredView.layer.borderWidth = 1
36 - bannerCenteredView.layer.borderColor = UIColor(rgb: 0x0E8004).cgColor 36 + bannerCenteredView.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
37 // bannerCenteredView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 37 // bannerCenteredView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
38 38
39 // Add shadow 39 // Add shadow
...@@ -47,9 +47,9 @@ import UIKit ...@@ -47,9 +47,9 @@ import UIKit
47 // bannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 47 // bannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
48 48
49 bannerLabel.font = UIFont(name: "PeridotPE-Bold", size: 12) 49 bannerLabel.font = UIFont(name: "PeridotPE-Bold", size: 12)
50 - bannerLabel.textColor = UIColor(rgb: 0x0E8004) 50 + bannerLabel.textColor = UIColor(rgb: 0x0E8103)
51 bannerCenteredLabel.font = UIFont(name: "PeridotPE-Bold", size: 12) 51 bannerCenteredLabel.font = UIFont(name: "PeridotPE-Bold", size: 12)
52 - bannerCenteredLabel.textColor = UIColor(rgb: 0x0E8004) 52 + bannerCenteredLabel.textColor = UIColor(rgb: 0x0E8103)
53 } 53 }
54 54
55 public override func setSelected(_ selected: Bool, animated: Bool) { 55 public override func setSelected(_ selected: Bool, animated: Bool) {
......
...@@ -230,26 +230,26 @@ import SwiftEventBus ...@@ -230,26 +230,26 @@ import SwiftEventBus
230 } else { 230 } else {
231 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal) 231 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
232 // questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15) 232 // questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
233 -// questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 233 +// questionnaireButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
234 // questionnaireButton.backgroundColor = .clear 234 // questionnaireButton.backgroundColor = .clear
235 // questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26) 235 // questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26)
236 // questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10) 236 // questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
237 } 237 }
238 238
239 questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15) 239 questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
240 - questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 240 + questionnaireButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
241 questionnaireButton.backgroundColor = .clear 241 questionnaireButton.backgroundColor = .clear
242 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42) 242 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
243 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20) 243 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
244 244
245 questionnaireButton.layer.cornerRadius = 16.0 245 questionnaireButton.layer.cornerRadius = 16.0
246 questionnaireButton.layer.borderWidth = 1 246 questionnaireButton.layer.borderWidth = 1
247 - questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 247 + questionnaireButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
248 248
249 historyButtonView.backgroundColor = .clear 249 historyButtonView.backgroundColor = .clear
250 historyButtonView.layer.cornerRadius = 16.0 250 historyButtonView.layer.cornerRadius = 16.0
251 historyButtonView.layer.borderWidth = 1 251 historyButtonView.layer.borderWidth = 1
252 - historyButtonView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 252 + historyButtonView.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
253 253
254 dfyEarnBannerInnerView.layer.cornerRadius = 16.5 254 dfyEarnBannerInnerView.layer.cornerRadius = 16.5
255 // dfyEarnBannerInnerView.layer.borderWidth = 1 255 // dfyEarnBannerInnerView.layer.borderWidth = 1
...@@ -558,14 +558,14 @@ import SwiftEventBus ...@@ -558,14 +558,14 @@ import SwiftEventBus
558 // questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10) 558 // questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
559 } 559 }
560 questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15) 560 questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
561 - questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 561 + questionnaireButton.setTitleColor(UIColor(rgb: 0x0E8103), for: .normal)
562 questionnaireButton.backgroundColor = .clear 562 questionnaireButton.backgroundColor = .clear
563 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42) 563 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
564 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20) 564 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
565 565
566 questionnaireButton.layer.cornerRadius = 16.0 566 questionnaireButton.layer.cornerRadius = 16.0
567 questionnaireButton.layer.borderWidth = 1 567 questionnaireButton.layer.borderWidth = 1
568 - questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 568 + questionnaireButton.layer.borderColor = UIColor(rgb: 0x0E8103).cgColor
569 } 569 }
570 570
571 self.coupons = swiftApi().getCouponList() 571 self.coupons = swiftApi().getCouponList()
......