Manos Chorianopoulos

GFY, WalletVC ui fixes redesign

...@@ -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>
......
...@@ -63,7 +63,7 @@ import SwiftEventBus ...@@ -63,7 +63,7 @@ import SwiftEventBus
63 // tableView.clipsToBounds = true 63 // tableView.clipsToBounds = true
64 // tableView.layer.cornerRadius = 30 64 // tableView.layer.cornerRadius = 30
65 // tableView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius 65 // tableView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius
66 - tableView.contentInset.top = 50 66 + tableView.contentInset.top = 25
67 67
68 // Add Top left corner radius 68 // Add Top left corner radius
69 // mainView.clipsToBounds = true 69 // mainView.clipsToBounds = true
......
...@@ -224,6 +224,13 @@ import SwiftEventBus ...@@ -224,6 +224,13 @@ import SwiftEventBus
224 224
225 dfyEarnAmountLabel.text = totalCouponValueString + "€" 225 dfyEarnAmountLabel.text = totalCouponValueString + "€"
226 // dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 14) 226 // dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 14)
227 +
228 + let totalCouponValueIntCount = String(Int(totalCouponValue)).count
229 + if (totalCouponValueIntCount >= 3) {
230 + dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 11)
231 + } else {
232 + dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 13)
233 + }
227 234
228 if (loyaltyBadge._couponCount == 0) { 235 if (loyaltyBadge._couponCount == 0) {
229 couponEarnView.isHidden = true 236 couponEarnView.isHidden = true
...@@ -276,6 +283,13 @@ import SwiftEventBus ...@@ -276,6 +283,13 @@ import SwiftEventBus
276 couponEarnLabel.attributedText = coupAttributedString 283 couponEarnLabel.attributedText = coupAttributedString
277 284
278 couponEarnAmountLabel.text = totalCouponDiscountString + "€" 285 couponEarnAmountLabel.text = totalCouponDiscountString + "€"
286 +
287 + let totalCouponDiscountIntCount = String(Int(totalCouponDiscount)).count
288 + if (totalCouponDiscountIntCount >= 3) {
289 + couponEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 11)
290 + } else {
291 + couponEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 13)
292 + }
279 293
280 print("Loyalty Badge Value: " + totalCouponDiscountString) 294 print("Loyalty Badge Value: " + totalCouponDiscountString)
281 print("Loyalty Badge Count: " + String(loyaltyBadge._couponCount)) 295 print("Loyalty Badge Count: " + String(loyaltyBadge._couponCount))
......