open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
06639709 1 parent b4a12901

merge redesign feedback part 2

Inline Side-by-side
Showing 23 changed files with 85 additions and 53 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.19" 4 + spec.version = "0.2.20"
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.19" } 20 + spec.source = { :git => "https://git.warp.ly/open-source/warply_sdk_framework.git", :tag => "0.2.20" }
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/**/*',
......
...@@ -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>1</integer> 10 + <integer>0</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>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -52,11 +52,11 @@ import UIKit ...@@ -52,11 +52,11 @@ import UIKit
52 self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 53 self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
54 self.layer.shadowOpacity = 1.0 54 self.layer.shadowOpacity = 1.0
55 - self.layer.shadowRadius = 3.0 55 + self.layer.shadowRadius = 1.0
56 56
57 activeCodeView.layer.cornerRadius = 16.5 57 activeCodeView.layer.cornerRadius = 16.5
58 - activeCodeView.layer.borderWidth = 1 58 + // activeCodeView.layer.borderWidth = 1
59 - 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
60 60
61 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)
62 62
......
...@@ -34,8 +34,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -34,8 +34,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
34 34
35 // message 35 // message
36 messageLabel.textColor = UIColor(rgb: 0x212121) 36 messageLabel.textColor = UIColor(rgb: 0x212121)
37 - messageLabelView.layer.borderWidth = 1.0 37 + // messageLabelView.layer.borderWidth = 1.0
38 - messageLabelView.layer.borderColor = UIColor(rgb: 0xE6E6E6).cgColor 38 + // messageLabelView.layer.borderColor = UIColor(rgb: 0xE6E6E6).cgColor
39 messageLabelView.layer.cornerRadius = 16.5 39 messageLabelView.layer.cornerRadius = 16.5
40 messageLabelView.backgroundColor = .white 40 messageLabelView.backgroundColor = .white
41 41
......
...@@ -76,8 +76,8 @@ import SwiftEventBus ...@@ -76,8 +76,8 @@ import SwiftEventBus
76 redeemButton.setTitleColor(.white, for: .normal) 76 redeemButton.setTitleColor(.white, for: .normal)
77 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 77 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
78 redeemButton.layer.cornerRadius = 16.0 78 redeemButton.layer.cornerRadius = 16.0
79 - redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 79 + redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
80 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 80 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
81 // Fix width for ipad 81 // Fix width for ipad
82 // if UIDevice.current.userInterfaceIdiom == .pad { 82 // if UIDevice.current.userInterfaceIdiom == .pad {
83 // // iPad 83 // // iPad
......
...@@ -203,8 +203,8 @@ import AVFoundation ...@@ -203,8 +203,8 @@ import AVFoundation
203 redeemButton.setTitleColor(.white, for: .normal) 203 redeemButton.setTitleColor(.white, for: .normal)
204 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 204 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
205 redeemButton.layer.cornerRadius = 16.0 205 redeemButton.layer.cornerRadius = 16.0
206 - redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 206 + redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
207 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 207 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
208 // Fix width for ipad 208 // Fix width for ipad
209 // if UIDevice.current.userInterfaceIdiom == .pad { 209 // if UIDevice.current.userInterfaceIdiom == .pad {
210 // // iPad 210 // // iPad
...@@ -218,8 +218,8 @@ import AVFoundation ...@@ -218,8 +218,8 @@ import AVFoundation
218 mapButton.setTitle("Δες τα καταστήματα", for: .normal) 218 mapButton.setTitle("Δες τα καταστήματα", for: .normal)
219 mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal) 219 mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
220 mapButton.layer.cornerRadius = 15.0 220 mapButton.layer.cornerRadius = 15.0
221 - mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55) 221 + mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50)
222 - mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 222 + mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
223 mapButton.backgroundColor = .clear 223 mapButton.backgroundColor = .clear
224 mapButton.layer.borderWidth = 2 224 mapButton.layer.borderWidth = 2
225 mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 225 mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
......
...@@ -99,8 +99,8 @@ import SwiftEventBus ...@@ -99,8 +99,8 @@ import SwiftEventBus
99 redeemButton.setTitleColor(.white, for: .normal) 99 redeemButton.setTitleColor(.white, for: .normal)
100 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 100 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
101 redeemButton.layer.cornerRadius = 16.0 101 redeemButton.layer.cornerRadius = 16.0
102 - redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 102 + redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
103 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 103 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
104 // Fix width for ipad 104 // Fix width for ipad
105 if UIDevice.current.userInterfaceIdiom == .pad { 105 if UIDevice.current.userInterfaceIdiom == .pad {
106 // iPad 106 // iPad
......
...@@ -47,7 +47,7 @@ import UIKit ...@@ -47,7 +47,7 @@ import UIKit
47 self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 48 self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
49 self.layer.shadowOpacity = 1.0 49 self.layer.shadowOpacity = 1.0
50 - self.layer.shadowRadius = 3.0 50 + self.layer.shadowRadius = 1.0
51 51
52 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)
53 53
......
...@@ -23,6 +23,12 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -23,6 +23,12 @@ class HistoryViewController: AnalysisChildViewController {
23 self.tableView.delegate = self 23 self.tableView.delegate = self
24 self.tableView.dataSource = self 24 self.tableView.dataSource = self
25 25
26 + // Add shadow
27 + self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
28 + self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
29 + self.tableView.layer.shadowOpacity = 1.0
30 + self.tableView.layer.shadowRadius = 1.0
31 +
26 self.refreshControl = UIRefreshControl() 32 self.refreshControl = UIRefreshControl()
27 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged) 33 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
28 34
...@@ -159,7 +165,8 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -159,7 +165,8 @@ class HistoryViewController: AnalysisChildViewController {
159 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50)) 165 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
160 166
161 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 167 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) 168 + viewBorder.backgroundColor = .white
169 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
163 170
164 viewBorder.layer.cornerRadius = 16.5 171 viewBorder.layer.cornerRadius = 16.5
165 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius 172 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
...@@ -220,7 +227,8 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -220,7 +227,8 @@ class HistoryViewController: AnalysisChildViewController {
220 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30)) 227 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
221 228
222 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 229 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) 230 + viewBorder.backgroundColor = .white
231 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
224 232
225 viewBorder.layer.cornerRadius = 16.5 233 viewBorder.layer.cornerRadius = 16.5
226 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius 234 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
...@@ -38,7 +38,7 @@ import UIKit ...@@ -38,7 +38,7 @@ import UIKit
38 self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 39 self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
40 self.layer.shadowOpacity = 1.0 40 self.layer.shadowOpacity = 1.0
41 - self.layer.shadowRadius = 3.0 41 + self.layer.shadowRadius = 1.0
42 42
43 inboxView.layer.cornerRadius = 16.0 43 inboxView.layer.cornerRadius = 16.0
44 inboxView.clipsToBounds = true 44 inboxView.clipsToBounds = true
......
...@@ -44,7 +44,7 @@ import UIKit ...@@ -44,7 +44,7 @@ import UIKit
44 self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 45 self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
46 self.layer.shadowOpacity = 1.0 46 self.layer.shadowOpacity = 1.0
47 - self.layer.shadowRadius = 3.0 47 + self.layer.shadowRadius = 1.0
48 48
49 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)
50 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)
......
This diff could not be displayed because it is too large.
...@@ -23,6 +23,12 @@ class MarketHistoryViewController: AnalysisChildViewController { ...@@ -23,6 +23,12 @@ class MarketHistoryViewController: AnalysisChildViewController {
23 self.tableView.delegate = self 23 self.tableView.delegate = self
24 self.tableView.dataSource = self 24 self.tableView.dataSource = self
25 25
26 + // Add shadow
27 + self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
28 + self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
29 + self.tableView.layer.shadowOpacity = 1.0
30 + self.tableView.layer.shadowRadius = 1.0
31 +
26 self.refreshControl = UIRefreshControl() 32 self.refreshControl = UIRefreshControl()
27 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged) 33 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
28 34
...@@ -159,7 +165,8 @@ class MarketHistoryViewController: AnalysisChildViewController { ...@@ -159,7 +165,8 @@ class MarketHistoryViewController: AnalysisChildViewController {
159 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50)) 165 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
160 166
161 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 167 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) 168 + viewBorder.backgroundColor = .white
169 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
163 170
164 viewBorder.layer.cornerRadius = 16.5 171 viewBorder.layer.cornerRadius = 16.5
165 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius 172 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
...@@ -220,7 +227,8 @@ class MarketHistoryViewController: AnalysisChildViewController { ...@@ -220,7 +227,8 @@ class MarketHistoryViewController: AnalysisChildViewController {
220 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30)) 227 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
221 228
222 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 229 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) 230 + viewBorder.backgroundColor = .white
231 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
224 232
225 viewBorder.layer.cornerRadius = 16.5 233 viewBorder.layer.cornerRadius = 16.5
226 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius 234 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
...@@ -25,6 +25,12 @@ class MarketSharingHistoryViewController: AnalysisChildViewController { ...@@ -25,6 +25,12 @@ class MarketSharingHistoryViewController: AnalysisChildViewController {
25 self.tableView.delegate = self 25 self.tableView.delegate = self
26 self.tableView.dataSource = self 26 self.tableView.dataSource = self
27 27
28 + // Add shadow
29 + self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
30 + self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
31 + self.tableView.layer.shadowOpacity = 1.0
32 + self.tableView.layer.shadowRadius = 1.0
33 +
28 self.refreshControl = UIRefreshControl() 34 self.refreshControl = UIRefreshControl()
29 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged) 35 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
30 36
...@@ -153,7 +159,8 @@ class MarketSharingHistoryViewController: AnalysisChildViewController { ...@@ -153,7 +159,8 @@ class MarketSharingHistoryViewController: AnalysisChildViewController {
153 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50)) 159 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
154 160
155 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 161 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
156 - viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 162 + viewBorder.backgroundColor = .white
163 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
157 164
158 viewBorder.layer.cornerRadius = 16.5 165 viewBorder.layer.cornerRadius = 16.5
159 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius 166 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
...@@ -214,7 +221,8 @@ class MarketSharingHistoryViewController: AnalysisChildViewController { ...@@ -214,7 +221,8 @@ class MarketSharingHistoryViewController: AnalysisChildViewController {
214 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30)) 221 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
215 222
216 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 223 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
217 - viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 224 + viewBorder.backgroundColor = .white
225 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
218 226
219 viewBorder.layer.cornerRadius = 16.5 227 viewBorder.layer.cornerRadius = 16.5
220 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius 228 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
...@@ -104,8 +104,8 @@ import SwiftEventBus ...@@ -104,8 +104,8 @@ import SwiftEventBus
104 redeemButton.setTitleColor(.white, for: .normal) 104 redeemButton.setTitleColor(.white, for: .normal)
105 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 105 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
106 redeemButton.layer.cornerRadius = 16.0 106 redeemButton.layer.cornerRadius = 16.0
107 - redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 107 + redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
108 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 108 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
109 // Fix width for ipad 109 // Fix width for ipad
110 // if UIDevice.current.userInterfaceIdiom == .pad { 110 // if UIDevice.current.userInterfaceIdiom == .pad {
111 // // iPad 111 // // iPad
......
...@@ -25,6 +25,12 @@ class SharingHistoryViewController: AnalysisChildViewController { ...@@ -25,6 +25,12 @@ class SharingHistoryViewController: AnalysisChildViewController {
25 self.tableView.delegate = self 25 self.tableView.delegate = self
26 self.tableView.dataSource = self 26 self.tableView.dataSource = self
27 27
28 + // Add shadow
29 + self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
30 + self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
31 + self.tableView.layer.shadowOpacity = 1.0
32 + self.tableView.layer.shadowRadius = 1.0
33 +
28 self.refreshControl = UIRefreshControl() 34 self.refreshControl = UIRefreshControl()
29 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged) 35 self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
30 36
...@@ -153,7 +159,8 @@ class SharingHistoryViewController: AnalysisChildViewController { ...@@ -153,7 +159,8 @@ class SharingHistoryViewController: AnalysisChildViewController {
153 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50)) 159 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
154 160
155 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 161 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
156 - viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 162 + viewBorder.backgroundColor = .white
163 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
157 164
158 viewBorder.layer.cornerRadius = 16.5 165 viewBorder.layer.cornerRadius = 16.5
159 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius 166 viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
...@@ -214,7 +221,8 @@ class SharingHistoryViewController: AnalysisChildViewController { ...@@ -214,7 +221,8 @@ class SharingHistoryViewController: AnalysisChildViewController {
214 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30)) 221 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
215 222
216 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 223 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
217 - viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 224 + viewBorder.backgroundColor = .white
225 + // viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
218 226
219 viewBorder.layer.cornerRadius = 16.5 227 viewBorder.layer.cornerRadius = 16.5
220 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius 228 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
...@@ -96,8 +96,8 @@ import SwiftEventBus ...@@ -96,8 +96,8 @@ import SwiftEventBus
96 activateButton.setTitleColor(.white, for: .normal) 96 activateButton.setTitleColor(.white, for: .normal)
97 activateButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 97 activateButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
98 activateButton.layer.cornerRadius = 16.0 98 activateButton.layer.cornerRadius = 16.0
99 - activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 55) 99 + activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 50)
100 - activateButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 100 + activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
101 101
102 // Fix width for ipad 102 // Fix width for ipad
103 // if UIDevice.current.userInterfaceIdiom == .pad { 103 // if UIDevice.current.userInterfaceIdiom == .pad {
......
...@@ -29,8 +29,8 @@ import AVFoundation ...@@ -29,8 +29,8 @@ import AVFoundation
29 mapButton.setTitleColor(UIColor(red: 1.00, green: 1.00, blue: 1.00, alpha: 1.00), for: .normal) 29 mapButton.setTitleColor(UIColor(red: 1.00, green: 1.00, blue: 1.00, alpha: 1.00), for: .normal)
30 mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 30 mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
31 mapButton.layer.cornerRadius = 15.0 31 mapButton.layer.cornerRadius = 15.0
32 - mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55) 32 + mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50)
33 - mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 33 + mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
34 34
35 // mapButton.isHidden = true 35 // mapButton.isHidden = true
36 // mapButtonHeight.constant = 0 36 // mapButtonHeight.constant = 0
......
...@@ -25,7 +25,7 @@ import UIKit ...@@ -25,7 +25,7 @@ import UIKit
25 self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 26 self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
27 self.layer.shadowOpacity = 1.0 27 self.layer.shadowOpacity = 1.0
28 - self.layer.shadowRadius = 3.0 28 + self.layer.shadowRadius = 1.0
29 29
30 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)
31 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)
......
...@@ -51,41 +51,41 @@ import UIKit ...@@ -51,41 +51,41 @@ import UIKit
51 marketBadgeImage.image = UIImage(named: "wallet_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 51 marketBadgeImage.image = UIImage(named: "wallet_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
52 52
53 sumBannerInnerView.layer.cornerRadius = 16.5 53 sumBannerInnerView.layer.cornerRadius = 16.5
54 - sumBannerInnerView.layer.borderWidth = 1 54 + // sumBannerInnerView.layer.borderWidth = 1
55 - sumBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 55 + // sumBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
56 56
57 dfyBannerInnerView.layer.cornerRadius = 16.5 57 dfyBannerInnerView.layer.cornerRadius = 16.5
58 - dfyBannerInnerView.layer.borderWidth = 1 58 + // dfyBannerInnerView.layer.borderWidth = 1
59 - dfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 59 + // dfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
60 60
61 gfyBannerInnerView.layer.cornerRadius = 16.5 61 gfyBannerInnerView.layer.cornerRadius = 16.5
62 - gfyBannerInnerView.layer.borderWidth = 1 62 + // gfyBannerInnerView.layer.borderWidth = 1
63 - gfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 63 + // gfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
64 64
65 marketBannerInnerView.layer.cornerRadius = 16.5 65 marketBannerInnerView.layer.cornerRadius = 16.5
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 69 // Add shadow
70 sumBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 71 sumBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
72 sumBannerInnerView.layer.shadowOpacity = 1.0 72 sumBannerInnerView.layer.shadowOpacity = 1.0
73 - sumBannerInnerView.layer.shadowRadius = 3.0 73 + sumBannerInnerView.layer.shadowRadius = 1.0
74 74
75 dfyBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 76 dfyBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
77 dfyBannerInnerView.layer.shadowOpacity = 1.0 77 dfyBannerInnerView.layer.shadowOpacity = 1.0
78 - dfyBannerInnerView.layer.shadowRadius = 3.0 78 + dfyBannerInnerView.layer.shadowRadius = 1.0
79 79
80 gfyBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 81 gfyBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
82 gfyBannerInnerView.layer.shadowOpacity = 1.0 82 gfyBannerInnerView.layer.shadowOpacity = 1.0
83 - gfyBannerInnerView.layer.shadowRadius = 3.0 83 + gfyBannerInnerView.layer.shadowRadius = 1.0
84 84
85 marketBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 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) 86 marketBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
87 marketBannerInnerView.layer.shadowOpacity = 1.0 87 marketBannerInnerView.layer.shadowOpacity = 1.0
88 - marketBannerInnerView.layer.shadowRadius = 3.0 88 + marketBannerInnerView.layer.shadowRadius = 1.0
89 89
90 dfyBannerView.isHidden = true 90 dfyBannerView.isHidden = true
91 dfyBannerHeight.constant = 0.0 91 dfyBannerHeight.constant = 0.0
......
...@@ -180,14 +180,14 @@ import SwiftEventBus ...@@ -180,14 +180,14 @@ import SwiftEventBus
180 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 180 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
181 181
182 dfyEarnBannerInnerView.layer.cornerRadius = 16.5 182 dfyEarnBannerInnerView.layer.cornerRadius = 16.5
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 // Add shadow 186 // Add shadow
187 dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 187 dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
188 dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) 188 dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
189 dfyEarnBannerView.layer.shadowOpacity = 1.0 189 dfyEarnBannerView.layer.shadowOpacity = 1.0
190 - dfyEarnBannerView.layer.shadowRadius = 3.0 190 + dfyEarnBannerView.layer.shadowRadius = 1.0
191 191
192 // var totalCouponValue = swiftApi().getDealsCouponsSum() 192 // var totalCouponValue = swiftApi().getDealsCouponsSum()
193 193
...@@ -244,14 +244,14 @@ import SwiftEventBus ...@@ -244,14 +244,14 @@ import SwiftEventBus
244 } 244 }
245 245
246 couponEarnInnerView.layer.cornerRadius = 16.5 246 couponEarnInnerView.layer.cornerRadius = 16.5
247 - couponEarnInnerView.layer.borderWidth = 1 247 + // couponEarnInnerView.layer.borderWidth = 1
248 - 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
249 249
250 // Add shadow 250 // Add shadow
251 couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 251 couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
252 couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) 252 couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
253 couponEarnView.layer.shadowOpacity = 1.0 253 couponEarnView.layer.shadowOpacity = 1.0
254 - couponEarnView.layer.shadowRadius = 3.0 254 + couponEarnView.layer.shadowRadius = 1.0
255 255
256 // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) 256 // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100)
257 var totalCouponDiscountString = "0" 257 var totalCouponDiscountString = "0"
......