open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
6571e2ee 1 parent bae6d3c4

GFY, Wallet ui fixes

Inline Side-by-side
Showing 6 changed files with 31 additions and 3 deletions
...@@ -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
......
...@@ -168,6 +168,13 @@ import UIKit ...@@ -168,6 +168,13 @@ import UIKit
168 sumRewardsString = String(format: "%.2f", sumRewards).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil) 168 sumRewardsString = String(format: "%.2f", sumRewards).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil)
169 sumBadgeLabel.text = sumRewardsString + "€" 169 sumBadgeLabel.text = sumRewardsString + "€"
170 170
171 + let sumRewardsIntCount = String(Int(sumRewards)).count
172 + if (sumRewardsIntCount >= 3) {
173 + sumBadgeLabel.font = UIFont(name: "PeridotPE-Bold", size: 11)
174 + } else {
175 + sumBadgeLabel.font = UIFont(name: "PeridotPE-Bold", size: 13)
176 + }
177 +
171 let sumNormalText1 = "Μέχρι τώρα έχεις κερδίσει " 178 let sumNormalText1 = "Μέχρι τώρα έχεις κερδίσει "
172 let sumBoldText = sumRewardsString + "€" 179 let sumBoldText = sumRewardsString + "€"
173 let sumNormalText2 = " στο For You!" 180 let sumNormalText2 = " στο For You!"
...@@ -190,6 +197,13 @@ import UIKit ...@@ -190,6 +197,13 @@ import UIKit
190 totalCouponValueString = String(format: "%.2f", totalCouponValueFixed).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil) 197 totalCouponValueString = String(format: "%.2f", totalCouponValueFixed).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil)
191 dfyBadgeLabel.text = totalCouponValueString + "€" 198 dfyBadgeLabel.text = totalCouponValueString + "€"
192 199
200 +// let totalCouponValueIntCount = String(Int(totalCouponValueFixed)).count
201 +// if (totalCouponValueIntCount >= 3) {
202 +// dfyBadgeLabel.font = UIFont(name: "PeridotPE-Bold", size: 9)
203 +// } else {
204 +// dfyBadgeLabel.font = UIFont(name: "PeridotPE-Bold", size: 11)
205 +// }
206 +
193 let dfyNormalText1 = "Έχεις κερδίσει " 207 let dfyNormalText1 = "Έχεις κερδίσει "
194 let dfyBoldText = totalCouponValueString + "€" 208 let dfyBoldText = totalCouponValueString + "€"
195 let dfyNormalText2 = " με το DEALS for YOU!" 209 let dfyNormalText2 = " με το DEALS for YOU!"
......
...@@ -226,6 +226,13 @@ import SwiftEventBus ...@@ -226,6 +226,13 @@ import SwiftEventBus
226 226
227 dfyEarnAmountLabel.text = totalCouponValueString + "€" 227 dfyEarnAmountLabel.text = totalCouponValueString + "€"
228 // dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 14) 228 // dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 14)
229 +
230 + let totalCouponValueIntCount = String(Int(totalCouponValue)).count
231 + if (totalCouponValueIntCount >= 3) {
232 + dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 11)
233 + } else {
234 + dfyEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 13)
235 + }
229 236
230 if (loyaltyBadge._couponCount == 0) { 237 if (loyaltyBadge._couponCount == 0) {
231 couponEarnView.isHidden = true 238 couponEarnView.isHidden = true
...@@ -278,6 +285,13 @@ import SwiftEventBus ...@@ -278,6 +285,13 @@ import SwiftEventBus
278 couponEarnLabel.attributedText = coupAttributedString 285 couponEarnLabel.attributedText = coupAttributedString
279 286
280 couponEarnAmountLabel.text = totalCouponDiscountString + "€" 287 couponEarnAmountLabel.text = totalCouponDiscountString + "€"
288 +
289 + let totalCouponDiscountIntCount = String(Int(totalCouponDiscount)).count
290 + if (totalCouponDiscountIntCount >= 3) {
291 + couponEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 11)
292 + } else {
293 + couponEarnAmountLabel.font = UIFont(name: "PeridotPE-Bold", size: 13)
294 + }
281 295
282 print("Loyalty Badge Value: " + totalCouponDiscountString) 296 print("Loyalty Badge Value: " + totalCouponDiscountString)
283 print("Loyalty Badge Count: " + String(loyaltyBadge._couponCount)) 297 print("Loyalty Badge Count: " + String(loyaltyBadge._couponCount))
......