open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
ea3e2ce8 1 parent b0fa29ac

redesign History

Expand all
Inline Side-by-side
Showing 6 changed files with 148 additions and 43 deletions
...@@ -11,9 +11,13 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -11,9 +11,13 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
11 11
12 // attributes 12 // attributes
13 @IBOutlet weak var itemImage: UIImageView! 13 @IBOutlet weak var itemImage: UIImageView!
14 + @IBOutlet weak var messageLabelView: UIView!
14 @IBOutlet weak var messageLabel: UILabel! 15 @IBOutlet weak var messageLabel: UILabel!
15 @IBOutlet weak var titleLabel: UILabel! 16 @IBOutlet weak var titleLabel: UILabel!
16 @IBOutlet weak var emptyLabel: UILabel! 17 @IBOutlet weak var emptyLabel: UILabel!
18 + @IBOutlet weak var emptyLabelHeight: NSLayoutConstraint!
19 + @IBOutlet weak var emptyLabelTopSpace: NSLayoutConstraint!
20 + @IBOutlet weak var emptyLabelBottomSpace: NSLayoutConstraint!
17 21
18 public var loyaltyBadge:swiftApi.LoyaltyBadgeModel = swiftApi().getLoyaltyBadge() 22 public var loyaltyBadge:swiftApi.LoyaltyBadgeModel = swiftApi().getLoyaltyBadge()
19 23
...@@ -25,14 +29,15 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -25,14 +29,15 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
25 // itemImage.image = UIImage(named: "ic_gift_circle_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 29 // itemImage.image = UIImage(named: "ic_gift_circle_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
26 30
27 // title 31 // title
28 - titleLabel.textColor = UIColor(rgb: 0x435563) 32 + titleLabel.textColor = UIColor(rgb: 0x212121)
29 titleLabel.text = "Αναλυτικά:" 33 titleLabel.text = "Αναλυτικά:"
30 34
31 // message 35 // message
32 - messageLabel.textColor = UIColor(rgb: 0x435563) 36 + messageLabel.textColor = UIColor(rgb: 0x212121)
33 - messageLabel.layer.borderWidth = 1.0 37 + messageLabelView.layer.borderWidth = 1.0
34 - messageLabel.layer.borderColor = UIColor(rgb: 0x1DA6B9).cgColor 38 + messageLabelView.layer.borderColor = UIColor(rgb: 0xE6E6E6).cgColor
35 - messageLabel.layer.cornerRadius = 5 39 + messageLabelView.layer.cornerRadius = 16.5
40 + messageLabelView.backgroundColor = .white
36 41
37 // messageLabel.text = "Μέχρι τώρα έχεις κερδίσει " + totalCouponDiscountString + "€ σε προσφορές από " + String(loyaltyBadge._couponCount) + " κουπόνια!" 42 // messageLabel.text = "Μέχρι τώρα έχεις κερδίσει " + totalCouponDiscountString + "€ σε προσφορές από " + String(loyaltyBadge._couponCount) + " κουπόνια!"
38 43
...@@ -44,8 +49,14 @@ extension AnalysisHeaderMessageViewCell { ...@@ -44,8 +49,14 @@ extension AnalysisHeaderMessageViewCell {
44 49
45 if (isEmpty == true) { 50 if (isEmpty == true) {
46 emptyLabel.isHidden = false 51 emptyLabel.isHidden = false
52 + emptyLabelHeight.constant = 18.5
53 + emptyLabelTopSpace.constant = 30.0
54 + emptyLabelBottomSpace.constant = 10.0
47 } else { 55 } else {
48 emptyLabel.isHidden = true 56 emptyLabel.isHidden = true
57 + emptyLabelHeight.constant = 0.0
58 + emptyLabelTopSpace.constant = 0.0
59 + emptyLabelBottomSpace.constant = 0.0
49 } 60 }
50 61
51 if (isMarket == true) { 62 if (isMarket == true) {
...@@ -71,8 +82,8 @@ extension AnalysisHeaderMessageViewCell { ...@@ -71,8 +82,8 @@ extension AnalysisHeaderMessageViewCell {
71 let coupBoldText2 = String(oldUnifiedCouponListLength) 82 let coupBoldText2 = String(oldUnifiedCouponListLength)
72 let coupNormalText3 = " κουπόνια!" 83 let coupNormalText3 = " κουπόνια!"
73 84
74 - let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16)] 85 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16)]
75 - let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16)] 86 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16)]
76 87
77 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular) 88 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular)
78 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold) 89 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold)
...@@ -99,8 +110,8 @@ extension AnalysisHeaderMessageViewCell { ...@@ -99,8 +110,8 @@ extension AnalysisHeaderMessageViewCell {
99 let coupBoldText2 = String(loyaltyBadge._couponCount) 110 let coupBoldText2 = String(loyaltyBadge._couponCount)
100 let coupNormalText3 = " κουπόνια!" 111 let coupNormalText3 = " κουπόνια!"
101 112
102 - let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16)] 113 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16)]
103 - let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16)] 114 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16)]
104 115
105 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular) 116 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular)
106 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold) 117 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold)
......
...@@ -38,16 +38,16 @@ class AnalysisItemViewCell: UITableViewCell { ...@@ -38,16 +38,16 @@ class AnalysisItemViewCell: UITableViewCell {
38 super.awakeFromNib() 38 super.awakeFromNib()
39 39
40 // date 40 // date
41 - dateLabel.textColor = UIColor(rgb: 0x435563) 41 + dateLabel.textColor = UIColor(rgb: 0x212121)
42 42
43 // title 43 // title
44 - titleLabel.textColor = UIColor(rgb: 0x435563) 44 + titleLabel.textColor = UIColor(rgb: 0x212121)
45 45
46 // price 46 // price
47 - priceLabel.textColor = UIColor(rgb: 0x435563) 47 + priceLabel.textColor = UIColor(rgb: 0x212121)
48 48
49 // subtitle 49 // subtitle
50 - subtitleLabel.textColor = UIColor(rgb: 0x8B97A3) 50 + subtitleLabel.textColor = UIColor(rgb: 0x9D9D9C)
51 } 51 }
52 } 52 }
53 53
......
...@@ -106,11 +106,13 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -106,11 +106,13 @@ class HistoryViewController: AnalysisChildViewController {
106 } 106 }
107 107
108 override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { 108 override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
109 - if (indexPath.section == 0) { 109 +// if (indexPath.section == 0) {
110 - return hasMessage ? (items.count > 0 ? 380.0 : 480.0) : 280 110 +//// return hasMessage ? (items.count > 0 ? 380.0 : 480.0) : 280
111 - } 111 +// return hasMessage ? UITableView.automaticDimension : 280
112 - 112 +// }
113 - return 140.0 113 +//
114 +//// return 140.0
115 + return UITableView.automaticDimension
114 } 116 }
115 override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { 117 override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
116 118
...@@ -147,4 +149,97 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -147,4 +149,97 @@ class HistoryViewController: AnalysisChildViewController {
147 self.tableView.reloadData() 149 self.tableView.reloadData()
148 } 150 }
149 } 151 }
152 +
153 + override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
154 + if (section == 0){
155 + return nil
156 +
157 + } else if (section == 1) {
158 + if (self.items.count > 0) {
159 + let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
160 +
161 + let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
162 + viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
163 +
164 + viewBorder.layer.cornerRadius = 16.5
165 + viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
166 +
167 + let viewInner = UIView(frame: CGRect(x: 1, y: 1, width: viewBorder.frame.width-2, height: viewBorder.frame.height-1))
168 + viewInner.backgroundColor = .white
169 +
170 + viewInner.layer.cornerRadius = 16.5
171 + viewInner.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
172 +
173 + let titleLabel = UILabel(frame: CGRect(x: 20, y: 20, width: viewInner.frame.width - 40, height: 20))
174 + titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20)
175 + titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
176 + titleLabel.text = "Αναλυτικά"
177 +
178 + view.addSubview(viewBorder)
179 + viewBorder.addSubview(viewInner)
180 + viewInner.addSubview(titleLabel)
181 + return view
182 + } else {
183 + return nil
184 + }
185 +
186 +
187 + } else {
188 + return nil
189 + }
190 + }
191 +
192 + override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
193 + if (section == 0) {
194 + return 0.0
195 +
196 + } else if (section == 1) {
197 + if (self.items.count > 0) {
198 + return 50.0
199 + } else {
200 + return 0.0
201 + }
202 +
203 + } else {
204 + return 0.0
205 + }
206 + }
207 +
208 + override func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
209 +// return CGFloat.leastNormalMagnitude
210 + if (section == 1 && self.items.count > 0) {
211 + return 20.0
212 + } else {
213 + return 0.0
214 + }
215 + }
216 +
217 + override func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
218 + if (section == 1) {
219 + if (self.items.count > 0) {
220 + let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
221 +
222 + let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
223 + viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
224 +
225 + viewBorder.layer.cornerRadius = 16.5
226 + viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
227 +
228 + let viewInner = UIView(frame: CGRect(x: 1, y: 0, width: viewBorder.frame.width-2, height: viewBorder.frame.height-1))
229 + viewInner.backgroundColor = .white
230 +
231 + viewInner.layer.cornerRadius = 16.5
232 + viewInner.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
233 +
234 + view.addSubview(viewBorder)
235 + viewBorder.addSubview(viewInner)
236 + return view
237 + } else {
238 + return nil
239 + }
240 +
241 + } else {
242 + return nil
243 + }
244 + }
150 } 245 }
......
...@@ -31,18 +31,18 @@ import SwiftEventBus ...@@ -31,18 +31,18 @@ import SwiftEventBus
31 setNavigationTitle("Ανάλυση") 31 setNavigationTitle("Ανάλυση")
32 32
33 // tab 33 // tab
34 - leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 34 + leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
35 leftButton.setTitle("Εξαργυρωμένα", for:.normal) 35 leftButton.setTitle("Εξαργυρωμένα", for:.normal)
36 leftButton.backgroundColor = . clear 36 leftButton.backgroundColor = . clear
37 - leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 37 + leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
38 38
39 - rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 39 + rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 15)
40 rightButton.setTitle("Μοιρασμένα δώρα", for:.normal) 40 rightButton.setTitle("Μοιρασμένα δώρα", for:.normal)
41 rightButton.backgroundColor = . clear 41 rightButton.backgroundColor = . clear
42 - rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 42 + rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
43 43
44 - leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) 44 +// leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
45 - rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) 45 +// rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
46 46
47 leftLineView.isHidden = false 47 leftLineView.isHidden = false
48 rightLineView.isHidden = true 48 rightLineView.isHidden = true
...@@ -141,11 +141,11 @@ import SwiftEventBus ...@@ -141,11 +141,11 @@ import SwiftEventBus
141 self.leftLineView.isHidden = false 141 self.leftLineView.isHidden = false
142 self.rightLineView.isHidden = true 142 self.rightLineView.isHidden = true
143 143
144 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 144 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
145 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 145 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 15)
146 146
147 - self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 147 + self.leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
148 - self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 148 + self.rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
149 } 149 }
150 let analysisVC = self.viewControllerAt(0) 150 let analysisVC = self.viewControllerAt(0)
151 pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true) 151 pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true)
...@@ -161,11 +161,11 @@ import SwiftEventBus ...@@ -161,11 +161,11 @@ import SwiftEventBus
161 self.leftLineView.isHidden = true 161 self.leftLineView.isHidden = true
162 self.rightLineView.isHidden = false 162 self.rightLineView.isHidden = false
163 163
164 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 164 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 15)
165 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 165 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
166 166
167 - self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 167 + self.rightButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
168 - self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 168 + self.leftButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
169 } 169 }
170 let analysisVC = self.viewControllerAt(1) 170 let analysisVC = self.viewControllerAt(1)
171 pageController.setViewControllers([analysisVC!], direction:.forward, animated:true) 171 pageController.setViewControllers([analysisVC!], direction:.forward, animated:true)
...@@ -213,23 +213,22 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV ...@@ -213,23 +213,22 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV
213 return; 213 return;
214 } 214 }
215 215
216 -
217 if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] { 216 if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] {
218 let currentIndex = childVCs[0].index 217 let currentIndex = childVCs[0].index
219 if (currentIndex == 0) { 218 if (currentIndex == 0) {
220 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 219 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
221 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 220 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 15)
222 - self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 221 + self.leftButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
223 - self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 222 + self.rightButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
224 self.tabSelected = 0 223 self.tabSelected = 0
225 self.leftLineView.isHidden = false 224 self.leftLineView.isHidden = false
226 self.rightLineView.isHidden = true 225 self.rightLineView.isHidden = true
227 226
228 } else { 227 } else {
229 - self.leftButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 14) 228 + self.leftButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 15)
230 - self.rightButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 229 + self.rightButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
231 - self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) 230 + self.rightButton.setTitleColor(UIColor(rgb: 0x212121), for:.normal)
232 - self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) 231 + self.leftButton.setTitleColor(UIColor(rgb: 0x848484), for:.normal)
233 self.tabSelected = 1 232 self.tabSelected = 1
234 self.leftLineView.isHidden = true 233 self.leftLineView.isHidden = true
235 self.rightLineView.isHidden = false 234 self.rightLineView.isHidden = false
......
...@@ -5417,11 +5417,11 @@ public class swiftApi { ...@@ -5417,11 +5417,11 @@ public class swiftApi {
5417 } 5417 }
5418 } 5418 }
5419 5419
5420 - // Example "date": "Thu, Jun 23 2022 16:24:44", 5420 + // Example "date": "Mon, 28 Nov 2022 10:58:13 GMT"
5421 let dateString = dictionary["date"] as? String? ?? "" 5421 let dateString = dictionary["date"] as? String? ?? ""
5422 let dateFormatter = DateFormatter() 5422 let dateFormatter = DateFormatter()
5423 dateFormatter.locale = Locale(identifier: "en_US_POSSIX") 5423 dateFormatter.locale = Locale(identifier: "en_US_POSSIX")
5424 - dateFormatter.dateFormat = "E, MMM dd yyyy HH:mm:ss" 5424 + dateFormatter.dateFormat = "E, dd MMM yyyy HH:mm:ss 'GMT'"
5425 if let date = dateFormatter.date(from: dateString ?? "") { 5425 if let date = dateFormatter.date(from: dateString ?? "") {
5426 dateFormatter.dateFormat = "dd/MM/yyyy" 5426 dateFormatter.dateFormat = "dd/MM/yyyy"
5427 let resultString = dateFormatter.string(from: date) 5427 let resultString = dateFormatter.string(from: date)
......