open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
ea564383 1 parent 7711af27

redesign feedback part 2

Inline Side-by-side
Showing 7 changed files with 41 additions and 22 deletions
...@@ -40,6 +40,12 @@ import UIKit ...@@ -40,6 +40,12 @@ import UIKit
40 // inboxView.layer.cornerRadius = 5.0 40 // inboxView.layer.cornerRadius = 5.0
41 // inboxView.clipsToBounds = true 41 // inboxView.clipsToBounds = true
42 42
43 + // Add shadow
44 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
45 + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
46 + self.layer.shadowOpacity = 1.0
47 + self.layer.shadowRadius = 3.0
48 +
43 newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 49 newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
44 curvedBgImage.image = UIImage(named: "curved_bg_white_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 50 curvedBgImage.image = UIImage(named: "curved_bg_white_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
45 51
...@@ -61,22 +67,22 @@ import UIKit ...@@ -61,22 +67,22 @@ import UIKit
61 // Add different corner radius - Do it here, otherwise it won't be applied to all cells 67 // Add different corner radius - Do it here, otherwise it won't be applied to all cells
62 inboxView.roundCorners(topLeft: 20, topRight: 45, bottomLeft: 20, bottomRight: 0) 68 inboxView.roundCorners(topLeft: 20, topRight: 45, bottomLeft: 20, bottomRight: 0)
63 69
64 - // Delete extra borderLayers added 70 +// // Delete extra borderLayers added
65 - for layer in (inboxView.layer.sublayers ?? []) { 71 +// for layer in (inboxView.layer.sublayers ?? []) {
66 - if(layer.name == "MFYItemBorderLayer"){ 72 +// if(layer.name == "MFYItemBorderLayer"){
67 - layer.removeFromSuperlayer() 73 +// layer.removeFromSuperlayer()
68 - } 74 +// }
69 - } 75 +// }
70 - 76 +//
71 - // Add borderLayer 77 +// // Add borderLayer
72 - let borderLayer = CAShapeLayer() 78 +// let borderLayer = CAShapeLayer()
73 - borderLayer.path = (inboxView.layer.mask! as! CAShapeLayer).path! // Reuse the Bezier path 79 +// borderLayer.path = (inboxView.layer.mask! as! CAShapeLayer).path! // Reuse the Bezier path
74 - borderLayer.strokeColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 80 +// borderLayer.strokeColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
75 - borderLayer.fillColor = UIColor.clear.cgColor 81 +// borderLayer.fillColor = UIColor.clear.cgColor
76 - borderLayer.lineWidth = 1 82 +// borderLayer.lineWidth = 1
77 - borderLayer.frame = inboxView.bounds 83 +// borderLayer.frame = inboxView.bounds
78 - borderLayer.name = "MFYItemBorderLayer" 84 +// borderLayer.name = "MFYItemBorderLayer"
79 - inboxView.layer.addSublayer(borderLayer) 85 +// inboxView.layer.addSublayer(borderLayer)
80 } 86 }
81 87
82 88
......
This diff could not be displayed because it is too large.
...@@ -93,7 +93,7 @@ import AVFoundation ...@@ -93,7 +93,7 @@ import AVFoundation
93 let termsText = "1. Το εκπτωτικό κουπόνι ισχύει έως την ημερομηνία που αναφέρεται παραπάνω\n2. To εκπτωτικό κουπόνι αφορά στα ενεργά κουπόνια προσφορών όπως αναφέρονται παραπάνω.\n3. Το εκπτωτικό κουπόνι μπορεί να χρησιμοποιηθεί σε μια μόνο συναλλαγή.\n4. Εάν δεν γίνει χρήση ενός επιμέρους κουπονιού προσφοράς από το εκπτωτικό κουπόνι, το κουπόνι προσφοράς επιστρέφει στο καλάθι στην ενότητα COSMOTE SuperMarket Deals" 93 let termsText = "1. Το εκπτωτικό κουπόνι ισχύει έως την ημερομηνία που αναφέρεται παραπάνω\n2. To εκπτωτικό κουπόνι αφορά στα ενεργά κουπόνια προσφορών όπως αναφέρονται παραπάνω.\n3. Το εκπτωτικό κουπόνι μπορεί να χρησιμοποιηθεί σε μια μόνο συναλλαγή.\n4. Εάν δεν γίνει χρήση ενός επιμέρους κουπονιού προσφοράς από το εκπτωτικό κουπόνι, το κουπόνι προσφοράς επιστρέφει στο καλάθι στην ενότητα COSMOTE SuperMarket Deals"
94 termsTextView.attributedText = NSAttributedString(string: termsText) 94 termsTextView.attributedText = NSAttributedString(string: termsText)
95 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 14) 95 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 14)
96 - termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) 96 + termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
97 termsTextView.textAlignment = .left 97 termsTextView.textAlignment = .left
98 termsTextView.isScrollEnabled = false 98 termsTextView.isScrollEnabled = false
99 99
......
...@@ -21,6 +21,12 @@ import UIKit ...@@ -21,6 +21,12 @@ import UIKit
21 super.awakeFromNib() 21 super.awakeFromNib()
22 // Initialization code 22 // Initialization code
23 23
24 + // Add shadow
25 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
26 + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
27 + self.layer.shadowOpacity = 1.0
28 + self.layer.shadowRadius = 3.0
29 +
24 couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 30 couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
25 couponImage.image = UIImage(named: "coupon_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 31 couponImage.image = UIImage(named: "coupon_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
26 32
......
...@@ -107,6 +107,13 @@ import UIKit ...@@ -107,6 +107,13 @@ import UIKit
107 // Configure the view for the selected state 107 // Configure the view for the selected state
108 } 108 }
109 109
110 + public override func layoutSubviews() {
111 + super.layoutSubviews()
112 + //set the values for top,left,bottom,right margins
113 + let margins = UIEdgeInsets(top: 0, left: 0, bottom: 4, right: 0)
114 + contentView.frame = contentView.frame.inset(by: margins)
115 + }
116 +
110 func configureCell(totalCouponValue: Float, totalCouponDiscount: Float, unifiedCouponsDiscount: Float, forYouExpanded: Bool) { 117 func configureCell(totalCouponValue: Float, totalCouponDiscount: Float, unifiedCouponsDiscount: Float, forYouExpanded: Bool) {
111 118
112 if (forYouExpanded == false) { 119 if (forYouExpanded == false) {
......
...@@ -130,16 +130,16 @@ import SwiftEventBus ...@@ -130,16 +130,16 @@ import SwiftEventBus
130 130
131 if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") { 131 if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") {
132 132
133 - profileImage.layer.cornerRadius = 19
134 - profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
135 - profileImage.layer.borderWidth = 1
136 - profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
137 -
138 profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache()) 133 profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache())
139 } else { 134 } else {
140 profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 135 profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
141 } 136 }
142 137
138 + profileImage.layer.cornerRadius = 19
139 + profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
140 + profileImage.layer.borderWidth = 1
141 + profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
142 +
143 print("Profile Name: " + (profile?._firstname ?? "") + " " + (profile?._lastname ?? "")) 143 print("Profile Name: " + (profile?._firstname ?? "") + " " + (profile?._lastname ?? ""))
144 144
145 profileNameLabel.text = (profile?._firstname ?? "") + " " + (profile?._lastname ?? "") 145 profileNameLabel.text = (profile?._firstname ?? "") + " " + (profile?._lastname ?? "")
......