open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
98b0211e 1 parent 7c8447c8

redesign feedback merge

Inline Side-by-side
Showing 21 changed files with 95 additions and 31 deletions
1 Pod::Spec.new do |spec| 1 Pod::Spec.new do |spec|
2 2
3 spec.name = "SwiftWarplyFramework" 3 spec.name = "SwiftWarplyFramework"
4 - spec.version = "0.2.18" 4 + spec.version = "0.2.19"
5 spec.summary = "A framework used for several functionalities." 5 spec.summary = "A framework used for several functionalities."
6 6
7 spec.description = "This is the Warply framework used for react native or swift apps for analytics, push notifications and the functionality of the app." 7 spec.description = "This is the Warply framework used for react native or swift apps for analytics, push notifications and the functionality of the app."
...@@ -17,7 +17,7 @@ Pod::Spec.new do |spec| ...@@ -17,7 +17,7 @@ Pod::Spec.new do |spec|
17 17
18 spec.platform = :ios, "11.0" 18 spec.platform = :ios, "11.0"
19 19
20 - spec.source = { :git => "https://git.warp.ly/open-source/warply_sdk_framework.git", :tag => "0.2.18" } 20 + spec.source = { :git => "https://git.warp.ly/open-source/warply_sdk_framework.git", :tag => "0.2.19" }
21 # spec.public_header_files = "SwiftWarplyFramework.framework/Headers/*.h" 21 # spec.public_header_files = "SwiftWarplyFramework.framework/Headers/*.h"
22 spec.source_files = 'SwiftWarplyFramework/*.xcassets', 'SwiftWarplyFramework/SwiftWarplyFramework/*.xcassets', "SwiftWarplyFramework/*.png", "SwiftWarplyFramework/*.xcassets", "SwiftWarplyFramework/SwiftWarplyFramework/*.xcassets","SwiftWarplyFramework/*.xib", "SwiftWarplyFramework/SwiftWarplyFramework/*.xib", "SwiftWarplyFramework/*.{h,m}", "SwiftWarplyFramework/*.{h,m}", "SwiftWarplyFramework/**/*.{h,m}", "SwiftWarplyFramework/**/**/*.{h,m}", "SwiftWarplyFramework/**/**/**/*.{h,m}", "SwiftWarplyFramework/*.swift", "*.swift", "SwiftWarplyFramework/SwiftWarplyFramework/*.swift", "SwiftWarplyFramework/SwiftWarplyFramework/SwiftWarplyFramework/*.swift", "SwiftWarplyFramework/**/*.{swift,storyboard,xib,otf,ttf,xcassets}" 22 spec.source_files = 'SwiftWarplyFramework/*.xcassets', 'SwiftWarplyFramework/SwiftWarplyFramework/*.xcassets', "SwiftWarplyFramework/*.png", "SwiftWarplyFramework/*.xcassets", "SwiftWarplyFramework/SwiftWarplyFramework/*.xcassets","SwiftWarplyFramework/*.xib", "SwiftWarplyFramework/SwiftWarplyFramework/*.xib", "SwiftWarplyFramework/*.{h,m}", "SwiftWarplyFramework/*.{h,m}", "SwiftWarplyFramework/**/*.{h,m}", "SwiftWarplyFramework/**/**/*.{h,m}", "SwiftWarplyFramework/**/**/**/*.{h,m}", "SwiftWarplyFramework/*.swift", "*.swift", "SwiftWarplyFramework/SwiftWarplyFramework/*.swift", "SwiftWarplyFramework/SwiftWarplyFramework/SwiftWarplyFramework/*.swift", "SwiftWarplyFramework/**/*.{swift,storyboard,xib,otf,ttf,xcassets}"
23 # 'SwiftWarplyFramework/**/*', 23 # 'SwiftWarplyFramework/**/*',
......
...@@ -48,13 +48,15 @@ import UIKit ...@@ -48,13 +48,15 @@ import UIKit
48 // dfyCoupons = swiftApi().getActiveDFYCoupons() 48 // dfyCoupons = swiftApi().getActiveDFYCoupons()
49 // TODO: DELETE <=== 49 // TODO: DELETE <===
50 50
51 + // Add shadow
52 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
53 + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
54 + self.layer.shadowOpacity = 1.0
55 + self.layer.shadowRadius = 3.0
56 +
51 activeCodeView.layer.cornerRadius = 16.5 57 activeCodeView.layer.cornerRadius = 16.5
52 activeCodeView.layer.borderWidth = 1 58 activeCodeView.layer.borderWidth = 1
53 activeCodeView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 59 activeCodeView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
54 -// activeCodeView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
55 -// activeCodeView.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
56 -// activeCodeView.layer.shadowOpacity = 1.0
57 -// activeCodeView.layer.shadowRadius = 6.0
58 60
59 activeCodeImage.image = UIImage(named: "active_code_logo_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 61 activeCodeImage.image = UIImage(named: "active_code_logo_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
60 62
...@@ -184,4 +186,11 @@ import UIKit ...@@ -184,4 +186,11 @@ import UIKit
184 // Configure the view for the selected state 186 // Configure the view for the selected state
185 } 187 }
186 188
189 + public override func layoutSubviews() {
190 + super.layoutSubviews()
191 + //set the values for top,left,bottom,right margins
192 + let margins = UIEdgeInsets(top: 2, left: 0, bottom: 4, right: 0)
193 + contentView.frame = contentView.frame.inset(by: margins)
194 + }
195 +
187 } 196 }
......
...@@ -24,6 +24,8 @@ var timer2: DispatchSourceTimer? ...@@ -24,6 +24,8 @@ var timer2: DispatchSourceTimer?
24 if (!showHeader) { 24 if (!showHeader) {
25 // navigationController?.setNavigationBarHidden(true, animated: animated) 25 // navigationController?.setNavigationBarHidden(true, animated: animated)
26 self.navigationController?.isNavigationBarHidden = true 26 self.navigationController?.isNavigationBarHidden = true
27 + } else {
28 + self.navigationController?.hideHairline()
27 } 29 }
28 } 30 }
29 31
......
...@@ -66,7 +66,7 @@ import SwiftEventBus ...@@ -66,7 +66,7 @@ import SwiftEventBus
66 66
67 couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) 67 couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache())
68 couponImage.contentMode = .scaleAspectFill 68 couponImage.contentMode = .scaleAspectFill
69 - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 69 + couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
70 70
71 nameLabel.text = ccms?._titleOffer ?? "" 71 nameLabel.text = ccms?._titleOffer ?? ""
72 descriptionLabel.text = ccms?._description ?? "" 72 descriptionLabel.text = ccms?._description ?? ""
...@@ -94,6 +94,7 @@ import SwiftEventBus ...@@ -94,6 +94,7 @@ import SwiftEventBus
94 94
95 swiftApi().logTrackersEvent("screen", "ContextualScreen") 95 swiftApi().logTrackersEvent("screen", "ContextualScreen")
96 96
97 + self.navigationController?.hideHairline()
97 } 98 }
98 99
99 100
......
...@@ -102,7 +102,7 @@ import AVFoundation ...@@ -102,7 +102,7 @@ import AVFoundation
102 102
103 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 103 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
104 couponImage.contentMode = .scaleAspectFill 104 couponImage.contentMode = .scaleAspectFill
105 - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 105 + couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
106 106
107 nameLabel.text = couponSetData?.name ?? "" 107 nameLabel.text = couponSetData?.name ?? ""
108 discriptionLabel.text = couponSetData?.short_description ?? "" 108 discriptionLabel.text = couponSetData?.short_description ?? ""
...@@ -286,7 +286,7 @@ import AVFoundation ...@@ -286,7 +286,7 @@ import AVFoundation
286 let htmlText = couponSetData?.terms ?? "" 286 let htmlText = couponSetData?.terms ?? ""
287 termsTextView.attributedText = htmlText.htmlToAttributedString 287 termsTextView.attributedText = htmlText.htmlToAttributedString
288 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) 288 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
289 - termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) 289 + termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
290 termsTextView.textAlignment = .left 290 termsTextView.textAlignment = .left
291 termsTextView.isScrollEnabled = false 291 termsTextView.isScrollEnabled = false
292 292
...@@ -312,6 +312,7 @@ import AVFoundation ...@@ -312,6 +312,7 @@ import AVFoundation
312 312
313 swiftApi().logTrackersEvent("screen", "CouponScreen") 313 swiftApi().logTrackersEvent("screen", "CouponScreen")
314 314
315 + self.navigationController?.hideHairline()
315 } 316 }
316 317
317 public func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool { 318 public func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
......
...@@ -77,7 +77,7 @@ import SwiftEventBus ...@@ -77,7 +77,7 @@ import SwiftEventBus
77 77
78 couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 78 couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
79 couponImage.contentMode = .scaleAspectFill 79 couponImage.contentMode = .scaleAspectFill
80 - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 80 + couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
81 81
82 nameLabel.text = couponset?.name ?? "" 82 nameLabel.text = couponset?.name ?? ""
83 let htmlDescrText = couponset?.description ?? "" 83 let htmlDescrText = couponset?.description ?? ""
...@@ -126,7 +126,7 @@ import SwiftEventBus ...@@ -126,7 +126,7 @@ import SwiftEventBus
126 let htmlText = couponset?.terms ?? "" 126 let htmlText = couponset?.terms ?? ""
127 termsTextView.attributedText = htmlText.htmlToAttributedString 127 termsTextView.attributedText = htmlText.htmlToAttributedString
128 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) 128 termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
129 - termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) 129 + termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
130 termsTextView.textAlignment = .left 130 termsTextView.textAlignment = .left
131 termsTextView.isScrollEnabled = false 131 termsTextView.isScrollEnabled = false
132 termsTextView.isUserInteractionEnabled = true 132 termsTextView.isUserInteractionEnabled = true
...@@ -143,6 +143,7 @@ import SwiftEventBus ...@@ -143,6 +143,7 @@ import SwiftEventBus
143 143
144 swiftApi().logTrackersEvent("screen", "CouponsetScreen") 144 swiftApi().logTrackersEvent("screen", "CouponsetScreen")
145 145
146 + self.navigationController?.hideHairline()
146 } 147 }
147 148
148 public func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool { 149 public func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
...@@ -190,9 +191,14 @@ import SwiftEventBus ...@@ -190,9 +191,14 @@ import SwiftEventBus
190 191
191 func showSpinner() { 192 func showSpinner() {
192 // add the spinner view controller 193 // add the spinner view controller
194 + // addChild(spinner)
195 + // spinner.view.frame = view.frame
196 + // view.addSubview(spinner.view)
197 + // spinner.didMove(toParent: self)
198 +
193 addChild(spinner) 199 addChild(spinner)
194 - spinner.view.frame = view.frame 200 + spinner.view.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height)
195 - view.addSubview(spinner.view) 201 + self.view.addSubview(spinner.view)
196 spinner.didMove(toParent: self) 202 spinner.didMove(toParent: self)
197 } 203 }
198 204
......
...@@ -43,6 +43,12 @@ import UIKit ...@@ -43,6 +43,12 @@ import UIKit
43 super.awakeFromNib() 43 super.awakeFromNib()
44 // Initialization code 44 // Initialization code
45 45
46 + // Add shadow
47 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
48 + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
49 + self.layer.shadowOpacity = 1.0
50 + self.layer.shadowRadius = 3.0
51 +
46 couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 52 couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
47 53
48 borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0) 54 borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0)
......
...@@ -44,6 +44,7 @@ import SwiftEventBus ...@@ -44,6 +44,7 @@ import SwiftEventBus
44 self.coupons = swiftApi().getCouponList() 44 self.coupons = swiftApi().getCouponList()
45 self.tableView.reloadData() 45 self.tableView.reloadData()
46 46
47 + self.navigationController?.hideHairline()
47 } 48 }
48 49
49 50
......
...@@ -34,7 +34,7 @@ import SwiftEventBus ...@@ -34,7 +34,7 @@ import SwiftEventBus
34 self.hidesBottomBarWhenPushed = true 34 self.hidesBottomBarWhenPushed = true
35 35
36 setBackButton() 36 setBackButton()
37 - setNavigationTitle("GIFTS for YOU", "bold") 37 + setNavigationTitle("GIFTS FOR YOU", "bold")
38 38
39 tableView.delegate = self 39 tableView.delegate = self
40 tableView.dataSource = self 40 tableView.dataSource = self
...@@ -98,6 +98,8 @@ import SwiftEventBus ...@@ -98,6 +98,8 @@ import SwiftEventBus
98 self.refreshData() 98 self.refreshData()
99 99
100 self.startTimer() 100 self.startTimer()
101 +
102 + self.navigationController?.hideHairline()
101 } 103 }
102 104
103 public override func viewWillDisappear(_ animated: Bool) { 105 public override func viewWillDisappear(_ animated: Bool) {
......
...@@ -34,11 +34,13 @@ import UIKit ...@@ -34,11 +34,13 @@ import UIKit
34 public override func awakeFromNib() { 34 public override func awakeFromNib() {
35 super.awakeFromNib() 35 super.awakeFromNib()
36 36
37 + // Add shadow
38 + self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
39 + self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
40 + self.layer.shadowOpacity = 1.0
41 + self.layer.shadowRadius = 3.0
42 +
37 inboxView.layer.cornerRadius = 16.0 43 inboxView.layer.cornerRadius = 16.0
38 - inboxView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
39 - inboxView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
40 - inboxView.layer.shadowOpacity = 1.0
41 - inboxView.layer.shadowRadius = 15.0
42 inboxView.clipsToBounds = true 44 inboxView.clipsToBounds = true
43 45
44 newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 46 newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......
...@@ -67,6 +67,8 @@ import SwiftEventBus ...@@ -67,6 +67,8 @@ import SwiftEventBus
67 swiftApi().logTrackersEvent("screen", "LoyaltyHistoryScreen") 67 swiftApi().logTrackersEvent("screen", "LoyaltyHistoryScreen")
68 68
69 self.startTimer() 69 self.startTimer()
70 +
71 + self.navigationController?.hideHairline()
70 } 72 }
71 73
72 public override func viewWillDisappear(_ animated: Bool) { 74 public override func viewWillDisappear(_ animated: Bool) {
......
...@@ -89,6 +89,8 @@ import SwiftEventBus ...@@ -89,6 +89,8 @@ import SwiftEventBus
89 self.refreshData() 89 self.refreshData()
90 90
91 self.startTimer() 91 self.startTimer()
92 +
93 + self.navigationController?.hideHairline()
92 } 94 }
93 95
94 public override func viewWillDisappear(_ animated: Bool) { 96 public override func viewWillDisappear(_ animated: Bool) {
......
...@@ -108,6 +108,7 @@ import MapKit ...@@ -108,6 +108,7 @@ import MapKit
108 108
109 swiftApi().logTrackersEvent("screen", "ShopsScreen") 109 swiftApi().logTrackersEvent("screen", "ShopsScreen")
110 110
111 + self.navigationController?.hideHairline()
111 } 112 }
112 113
113 // mvp 114 // mvp
......
...@@ -68,6 +68,8 @@ import SwiftEventBus ...@@ -68,6 +68,8 @@ import SwiftEventBus
68 swiftApi().logTrackersEvent("screen", "LoyaltyHistoryScreen") 68 swiftApi().logTrackersEvent("screen", "LoyaltyHistoryScreen")
69 69
70 self.startTimer() 70 self.startTimer()
71 +
72 + self.navigationController?.hideHairline()
71 } 73 }
72 74
73 public override func viewWillDisappear(_ animated: Bool) { 75 public override func viewWillDisappear(_ animated: Bool) {
......
...@@ -81,7 +81,7 @@ import SwiftEventBus ...@@ -81,7 +81,7 @@ import SwiftEventBus
81 81
82 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 82 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
83 couponImage.contentMode = .scaleAspectFill 83 couponImage.contentMode = .scaleAspectFill
84 - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 84 + couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
85 85
86 nameLabel.text = couponSetData?.name ?? "" 86 nameLabel.text = couponSetData?.name ?? ""
87 // descriptionLabel.text = couponSetData?.short_description ?? "" 87 // descriptionLabel.text = couponSetData?.short_description ?? ""
...@@ -122,6 +122,7 @@ import SwiftEventBus ...@@ -122,6 +122,7 @@ import SwiftEventBus
122 122
123 swiftApi().logTrackersEvent("screen", "CouponShareScreen") 123 swiftApi().logTrackersEvent("screen", "CouponShareScreen")
124 124
125 + self.navigationController?.hideHairline()
125 } 126 }
126 127
127 deinit { 128 deinit {
......
...@@ -77,7 +77,7 @@ import SwiftEventBus ...@@ -77,7 +77,7 @@ import SwiftEventBus
77 77
78 heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache()) 78 heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache())
79 heroImage.contentMode = .scaleAspectFill 79 heroImage.contentMode = .scaleAspectFill
80 - heroImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 80 + heroImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
81 nameLabel.text = ccms?._description ?? "" 81 nameLabel.text = ccms?._description ?? ""
82 // descriptionLabel.text = ccms?._subtitle ?? "" 82 // descriptionLabel.text = ccms?._subtitle ?? ""
83 83
...@@ -123,7 +123,7 @@ import SwiftEventBus ...@@ -123,7 +123,7 @@ import SwiftEventBus
123 // moreTextView.attributedText = htmlText.htmlToAttributedString 123 // moreTextView.attributedText = htmlText.htmlToAttributedString
124 moreTextView.text = ccms?._termsAndConditions ?? "" 124 moreTextView.text = ccms?._termsAndConditions ?? ""
125 moreTextView.font = UIFont(name: "PeridotPE-Regular", size: 16) 125 moreTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
126 - moreTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) 126 + moreTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
127 moreTextView.textAlignment = .left 127 moreTextView.textAlignment = .left
128 moreTextView.isScrollEnabled = false 128 moreTextView.isScrollEnabled = false
129 129
...@@ -135,6 +135,7 @@ import SwiftEventBus ...@@ -135,6 +135,7 @@ import SwiftEventBus
135 135
136 swiftApi().logTrackersEvent("screen", "TelcoScreen") 136 swiftApi().logTrackersEvent("screen", "TelcoScreen")
137 137
138 + self.navigationController?.hideHairline()
138 } 139 }
139 140
140 // MARK: - Functions 141 // MARK: - Functions
......
...@@ -52,7 +52,7 @@ import AVFoundation ...@@ -52,7 +52,7 @@ import AVFoundation
52 // couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 52 // couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
53 couponImage.image = UIImage(named: "market_bg", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 53 couponImage.image = UIImage(named: "market_bg", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
54 couponImage.contentMode = .scaleAspectFill 54 couponImage.contentMode = .scaleAspectFill
55 - couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25 55 + couponImageHeight.constant = 255 //230 // 253 // self.uiscreen.height * 0.25
56 56
57 nameLabel.text = "Εκπτωτικό κουπόνι COSMOTE SuperMarket Deals!" 57 nameLabel.text = "Εκπτωτικό κουπόνι COSMOTE SuperMarket Deals!"
58 discriptionLabel.text = "Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών." 58 discriptionLabel.text = "Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών."
......
...@@ -52,6 +52,7 @@ import AVFoundation ...@@ -52,6 +52,7 @@ import AVFoundation
52 52
53 swiftApi().logTrackersEvent("screen", "UnifiedCouponScreen") 53 swiftApi().logTrackersEvent("screen", "UnifiedCouponScreen")
54 54
55 + self.navigationController?.hideHairline()
55 } 56 }
56 57
57 58
......
...@@ -66,6 +66,27 @@ import UIKit ...@@ -66,6 +66,27 @@ import UIKit
66 marketBannerInnerView.layer.borderWidth = 1 66 marketBannerInnerView.layer.borderWidth = 1
67 marketBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 67 marketBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
68 68
69 + // Add shadow
70 + sumBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
71 + sumBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
72 + sumBannerInnerView.layer.shadowOpacity = 1.0
73 + sumBannerInnerView.layer.shadowRadius = 3.0
74 +
75 + dfyBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
76 + dfyBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
77 + dfyBannerInnerView.layer.shadowOpacity = 1.0
78 + dfyBannerInnerView.layer.shadowRadius = 3.0
79 +
80 + gfyBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
81 + gfyBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
82 + gfyBannerInnerView.layer.shadowOpacity = 1.0
83 + gfyBannerInnerView.layer.shadowRadius = 3.0
84 +
85 + marketBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
86 + marketBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
87 + marketBannerInnerView.layer.shadowOpacity = 1.0
88 + marketBannerInnerView.layer.shadowRadius = 3.0
89 +
69 dfyBannerView.isHidden = true 90 dfyBannerView.isHidden = true
70 dfyBannerHeight.constant = 0.0 91 dfyBannerHeight.constant = 0.0
71 dfyBannerTopSpace.constant = 0.0 92 dfyBannerTopSpace.constant = 0.0
......
...@@ -183,10 +183,11 @@ import SwiftEventBus ...@@ -183,10 +183,11 @@ import SwiftEventBus
183 dfyEarnBannerInnerView.layer.borderWidth = 1 183 dfyEarnBannerInnerView.layer.borderWidth = 1
184 dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 184 dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
185 185
186 -// dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor 186 + // Add shadow
187 -// dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) 187 + dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
188 -// dfyEarnBannerView.layer.shadowOpacity = 1.0 188 + dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
189 -// dfyEarnBannerView.layer.shadowRadius = 3.0 189 + dfyEarnBannerView.layer.shadowOpacity = 1.0
190 + dfyEarnBannerView.layer.shadowRadius = 3.0
190 191
191 // var totalCouponValue = swiftApi().getDealsCouponsSum() 192 // var totalCouponValue = swiftApi().getDealsCouponsSum()
192 193
...@@ -246,10 +247,11 @@ import SwiftEventBus ...@@ -246,10 +247,11 @@ import SwiftEventBus
246 couponEarnInnerView.layer.borderWidth = 1 247 couponEarnInnerView.layer.borderWidth = 1
247 couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 248 couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
248 249
249 -// couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor 250 + // Add shadow
250 -// couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) 251 + couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
251 -// couponEarnView.layer.shadowOpacity = 1.0 252 + couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
252 -// couponEarnView.layer.shadowRadius = 3.0 253 + couponEarnView.layer.shadowOpacity = 1.0
254 + couponEarnView.layer.shadowRadius = 3.0
253 255
254 // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) 256 // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100)
255 var totalCouponDiscountString = "0" 257 var totalCouponDiscountString = "0"
...@@ -432,6 +434,7 @@ import SwiftEventBus ...@@ -432,6 +434,7 @@ import SwiftEventBus
432 swiftApi().logTrackersEvent("screen", "LoyaltyWalletScreen") 434 swiftApi().logTrackersEvent("screen", "LoyaltyWalletScreen")
433 435
434 // addNavShadow() 436 // addNavShadow()
437 + self.navigationController?.hideHairline()
435 438
436 let userTag = swiftApi().getUserTag() 439 let userTag = swiftApi().getUserTag()
437 if (questionnaireButton.currentTitle != userTag) { 440 if (questionnaireButton.currentTitle != userTag) {
...@@ -866,7 +869,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -866,7 +869,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
866 let titleLabel = UILabel(frame: CGRect(x: 20, y: 30, width: view.frame.width - 40, height: 20)) 869 let titleLabel = UILabel(frame: CGRect(x: 20, y: 30, width: view.frame.width - 40, height: 20))
867 titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20) 870 titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20)
868 titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) 871 titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
869 - titleLabel.text = "GIFTS for YOU" 872 + titleLabel.text = "GIFTS FOR YOU"
870 873
871 view.addSubview(titleLabel) 874 view.addSubview(titleLabel)
872 return view 875 return view
......