Showing
7 changed files
with
19 additions
and
18 deletions
No preview for this file type
| ... | @@ -63,7 +63,7 @@ import SwiftEventBus | ... | @@ -63,7 +63,7 @@ import SwiftEventBus |
| 63 | 63 | ||
| 64 | couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) | 64 | couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) |
| 65 | couponImage.contentMode = .scaleAspectFill | 65 | couponImage.contentMode = .scaleAspectFill |
| 66 | - couponImageHeight.constant = self.uiscreen.height * 0.25 | 66 | + couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 |
| 67 | 67 | ||
| 68 | nameLabel.text = ccms?._title ?? "" | 68 | nameLabel.text = ccms?._title ?? "" |
| 69 | descriptionLabel.text = ccms?._subtitle ?? "" | 69 | descriptionLabel.text = ccms?._subtitle ?? "" |
| ... | @@ -72,7 +72,7 @@ import SwiftEventBus | ... | @@ -72,7 +72,7 @@ import SwiftEventBus |
| 72 | redeemButton.setTitle("Ενεργοποίηση", for: .normal) | 72 | redeemButton.setTitle("Ενεργοποίηση", for: .normal) |
| 73 | redeemButton.setTitleColor(.white, for: .normal) | 73 | redeemButton.setTitleColor(.white, for: .normal) |
| 74 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) | 74 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) |
| 75 | - redeemButton.layer.cornerRadius = 12.0 | 75 | + redeemButton.layer.cornerRadius = 8.0 |
| 76 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) | 76 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) |
| 77 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) | 77 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) |
| 78 | // Fix width for ipad | 78 | // Fix width for ipad | ... | ... |
| ... | @@ -83,13 +83,14 @@ import AVFoundation | ... | @@ -83,13 +83,14 @@ import AVFoundation |
| 83 | 83 | ||
| 84 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 84 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
| 85 | couponImage.contentMode = .scaleAspectFill | 85 | couponImage.contentMode = .scaleAspectFill |
| 86 | - couponImageHeight.constant = self.uiscreen.height * 0.25 | 86 | + couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 |
| 87 | 87 | ||
| 88 | nameLabel.text = couponSetData?.name ?? "" | 88 | nameLabel.text = couponSetData?.name ?? "" |
| 89 | discriptionLabel.text = couponSetData?.short_description ?? "" | 89 | discriptionLabel.text = couponSetData?.short_description ?? "" |
| 90 | 90 | ||
| 91 | - couponView.layer.cornerRadius = 10 | 91 | + couponView.layer.cornerRadius = 8 |
| 92 | couponNumberLabel.text = coupon?.coupon ?? "" | 92 | couponNumberLabel.text = coupon?.coupon ?? "" |
| 93 | + couponView.frame = CGRect(x: 0.0, y: 0.0, width: couponView.intrinsicContentSize.width, height: 55) | ||
| 93 | 94 | ||
| 94 | let barcodeString = constructBarcode() ?? "" | 95 | let barcodeString = constructBarcode() ?? "" |
| 95 | barcodeLabel.text = barcodeString | 96 | barcodeLabel.text = barcodeString |
| ... | @@ -118,7 +119,7 @@ import AVFoundation | ... | @@ -118,7 +119,7 @@ import AVFoundation |
| 118 | redeemButton.setTitle("Κάνε δώρο", for: .normal) | 119 | redeemButton.setTitle("Κάνε δώρο", for: .normal) |
| 119 | redeemButton.setTitleColor(.white, for: .normal) | 120 | redeemButton.setTitleColor(.white, for: .normal) |
| 120 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) | 121 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) |
| 121 | - redeemButton.layer.cornerRadius = 12.0 | 122 | + redeemButton.layer.cornerRadius = 8.0 |
| 122 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) | 123 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) |
| 123 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) | 124 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) |
| 124 | // Fix width for ipad | 125 | // Fix width for ipad |
| ... | @@ -134,7 +135,7 @@ import AVFoundation | ... | @@ -134,7 +135,7 @@ import AVFoundation |
| 134 | mapButton.setTitle("Δες τα καταστήματα", for: .normal) | 135 | mapButton.setTitle("Δες τα καταστήματα", for: .normal) |
| 135 | mapButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) | 136 | mapButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) |
| 136 | mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) | 137 | mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) |
| 137 | - mapButton.layer.cornerRadius = 12.0 | 138 | + mapButton.layer.cornerRadius = 8.0 |
| 138 | mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) | 139 | mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) |
| 139 | mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) | 140 | mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) |
| 140 | // Fix width for ipad | 141 | // Fix width for ipad | ... | ... |
| ... | @@ -69,7 +69,7 @@ import SwiftEventBus | ... | @@ -69,7 +69,7 @@ import SwiftEventBus |
| 69 | 69 | ||
| 70 | couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 70 | couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
| 71 | couponImage.contentMode = .scaleAspectFill | 71 | couponImage.contentMode = .scaleAspectFill |
| 72 | - couponImageHeight.constant = self.uiscreen.height * 0.25 | 72 | + couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 |
| 73 | 73 | ||
| 74 | nameLabel.text = couponset?.name ?? "" | 74 | nameLabel.text = couponset?.name ?? "" |
| 75 | let htmlDescrText = couponset?.description ?? "" | 75 | let htmlDescrText = couponset?.description ?? "" |
| ... | @@ -78,19 +78,19 @@ import SwiftEventBus | ... | @@ -78,19 +78,19 @@ import SwiftEventBus |
| 78 | redeemButton.setTitle("Απόκτησέ το", for: .normal) | 78 | redeemButton.setTitle("Απόκτησέ το", for: .normal) |
| 79 | redeemButton.setTitleColor(.white, for: .normal) | 79 | redeemButton.setTitleColor(.white, for: .normal) |
| 80 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) | 80 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) |
| 81 | - redeemButton.layer.cornerRadius = 12.0 | 81 | + redeemButton.layer.cornerRadius = 8.0 |
| 82 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) | 82 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) |
| 83 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) | 83 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) |
| 84 | // Fix width for ipad | 84 | // Fix width for ipad |
| 85 | -// if UIDevice.current.userInterfaceIdiom == .pad { | 85 | + if UIDevice.current.userInterfaceIdiom == .pad { |
| 86 | -// // iPad | 86 | + // iPad |
| 87 | -// redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 19) | 87 | + redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 19) |
| 88 | // redeemButton.widthAnchor.constraint(equalToConstant: 250).isActive = true | 88 | // redeemButton.widthAnchor.constraint(equalToConstant: 250).isActive = true |
| 89 | -// } else { | 89 | + } else { |
| 90 | -// // not iPad (iPhone, mac, tv, carPlay, unspecified) | 90 | + // not iPad (iPhone, mac, tv, carPlay, unspecified) |
| 91 | -// redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) | 91 | + redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) |
| 92 | // redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true | 92 | // redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true |
| 93 | -// } | 93 | + } |
| 94 | 94 | ||
| 95 | termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) | 95 | termsButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) |
| 96 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 96 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | ... | ... |
This diff is collapsed. Click to expand it.
| ... | @@ -78,7 +78,7 @@ import SwiftEventBus | ... | @@ -78,7 +78,7 @@ import SwiftEventBus |
| 78 | 78 | ||
| 79 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) | 79 | couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) |
| 80 | couponImage.contentMode = .scaleAspectFill | 80 | couponImage.contentMode = .scaleAspectFill |
| 81 | - couponImageHeight.constant = self.uiscreen.height * 0.25 | 81 | + couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 |
| 82 | 82 | ||
| 83 | nameLabel.text = couponSetData?.name ?? "" | 83 | nameLabel.text = couponSetData?.name ?? "" |
| 84 | // descriptionLabel.text = couponSetData?.short_description ?? "" | 84 | // descriptionLabel.text = couponSetData?.short_description ?? "" |
| ... | @@ -99,7 +99,7 @@ import SwiftEventBus | ... | @@ -99,7 +99,7 @@ import SwiftEventBus |
| 99 | redeemButton.setTitle("Αποστολή με SMS", for: .normal) | 99 | redeemButton.setTitle("Αποστολή με SMS", for: .normal) |
| 100 | redeemButton.setTitleColor(.white, for: .normal) | 100 | redeemButton.setTitleColor(.white, for: .normal) |
| 101 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) | 101 | redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) |
| 102 | - redeemButton.layer.cornerRadius = 12.0 | 102 | + redeemButton.layer.cornerRadius = 8.0 |
| 103 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) | 103 | redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) |
| 104 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) | 104 | redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) |
| 105 | // Fix width for ipad | 105 | // Fix width for ipad | ... | ... |
| ... | @@ -92,7 +92,7 @@ import SwiftEventBus | ... | @@ -92,7 +92,7 @@ import SwiftEventBus |
| 92 | activateButton.setTitle("Ενεργοποίηση", for: .normal) | 92 | activateButton.setTitle("Ενεργοποίηση", for: .normal) |
| 93 | activateButton.setTitleColor(.white, for: .normal) | 93 | activateButton.setTitleColor(.white, for: .normal) |
| 94 | activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) | 94 | activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) |
| 95 | - activateButton.layer.cornerRadius = 12.0 | 95 | + activateButton.layer.cornerRadius = 8.0 |
| 96 | activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 44) | 96 | activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 44) |
| 97 | activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) | 97 | activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8) |
| 98 | 98 | ... | ... |
-
Please register or login to post a comment