Manos Chorianopoulos

redesign feedback part 2

......@@ -40,6 +40,12 @@ import UIKit
// inboxView.layer.cornerRadius = 5.0
// inboxView.clipsToBounds = true
// Add shadow
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
curvedBgImage.image = UIImage(named: "curved_bg_white_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......@@ -61,22 +67,22 @@ import UIKit
// Add different corner radius - Do it here, otherwise it won't be applied to all cells
inboxView.roundCorners(topLeft: 20, topRight: 45, bottomLeft: 20, bottomRight: 0)
// Delete extra borderLayers added
for layer in (inboxView.layer.sublayers ?? []) {
if(layer.name == "MFYItemBorderLayer"){
layer.removeFromSuperlayer()
}
}
// Add borderLayer
let borderLayer = CAShapeLayer()
borderLayer.path = (inboxView.layer.mask! as! CAShapeLayer).path! // Reuse the Bezier path
borderLayer.strokeColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
borderLayer.fillColor = UIColor.clear.cgColor
borderLayer.lineWidth = 1
borderLayer.frame = inboxView.bounds
borderLayer.name = "MFYItemBorderLayer"
inboxView.layer.addSublayer(borderLayer)
// // Delete extra borderLayers added
// for layer in (inboxView.layer.sublayers ?? []) {
// if(layer.name == "MFYItemBorderLayer"){
// layer.removeFromSuperlayer()
// }
// }
//
// // Add borderLayer
// let borderLayer = CAShapeLayer()
// borderLayer.path = (inboxView.layer.mask! as! CAShapeLayer).path! // Reuse the Bezier path
// borderLayer.strokeColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// borderLayer.fillColor = UIColor.clear.cgColor
// borderLayer.lineWidth = 1
// borderLayer.frame = inboxView.bounds
// borderLayer.name = "MFYItemBorderLayer"
// inboxView.layer.addSublayer(borderLayer)
}
......
This diff could not be displayed because it is too large.
......@@ -93,7 +93,7 @@ import AVFoundation
let termsText = "1. Το εκπτωτικό κουπόνι ισχύει έως την ημερομηνία που αναφέρεται παραπάνω\n2. To εκπτωτικό κουπόνι αφορά στα ενεργά κουπόνια προσφορών όπως αναφέρονται παραπάνω.\n3. Το εκπτωτικό κουπόνι μπορεί να χρησιμοποιηθεί σε μια μόνο συναλλαγή.\n4. Εάν δεν γίνει χρήση ενός επιμέρους κουπονιού προσφοράς από το εκπτωτικό κουπόνι, το κουπόνι προσφοράς επιστρέφει στο καλάθι στην ενότητα COSMOTE SuperMarket Deals"
termsTextView.attributedText = NSAttributedString(string: termsText)
termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 14)
termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
termsTextView.textAlignment = .left
termsTextView.isScrollEnabled = false
......
......@@ -21,6 +21,12 @@ import UIKit
super.awakeFromNib()
// Initialization code
// Add shadow
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
couponImage.image = UIImage(named: "coupon_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......
......@@ -107,6 +107,13 @@ import UIKit
// Configure the view for the selected state
}
public override func layoutSubviews() {
super.layoutSubviews()
//set the values for top,left,bottom,right margins
let margins = UIEdgeInsets(top: 0, left: 0, bottom: 4, right: 0)
contentView.frame = contentView.frame.inset(by: margins)
}
func configureCell(totalCouponValue: Float, totalCouponDiscount: Float, unifiedCouponsDiscount: Float, forYouExpanded: Bool) {
if (forYouExpanded == false) {
......
......@@ -130,16 +130,16 @@ import SwiftEventBus
if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") {
profileImage.layer.cornerRadius = 19
profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
profileImage.layer.borderWidth = 1
profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache())
} else {
profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
}
profileImage.layer.cornerRadius = 19
profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
profileImage.layer.borderWidth = 1
profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
print("Profile Name: " + (profile?._firstname ?? "") + " " + (profile?._lastname ?? ""))
profileNameLabel.text = (profile?._firstname ?? "") + " " + (profile?._lastname ?? "")
......