open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
82881eef 1 parent 44222a96

redesign feedback 2 part 2

Expand all
Inline Side-by-side
Showing 10 changed files with 40 additions and 18 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>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>
......
...@@ -55,8 +55,8 @@ import UIKit ...@@ -55,8 +55,8 @@ import UIKit
55 self.layer.shadowRadius = 1.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 // activeCodeView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor 60 // activeCodeView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
61 // activeCodeView.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) 61 // activeCodeView.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
62 // activeCodeView.layer.shadowOpacity = 1.0 62 // activeCodeView.layer.shadowOpacity = 1.0
......
...@@ -34,14 +34,14 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -34,14 +34,14 @@ 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
42 // messageLabel.text = "Μέχρι τώρα έχεις κερδίσει " + totalCouponDiscountString + "€ σε προσφορές από " + String(loyaltyBadge._couponCount) + " κουπόνια!" 42 // messageLabel.text = "Μέχρι τώρα έχεις κερδίσει " + totalCouponDiscountString + "€ σε προσφορές από " + String(loyaltyBadge._couponCount) + " κουπόνια!"
43 -
44 } 43 }
44 +
45 } 45 }
46 46
47 extension AnalysisHeaderMessageViewCell { 47 extension AnalysisHeaderMessageViewCell {
......
...@@ -47,7 +47,7 @@ class AnalysisItemViewCell: UITableViewCell { ...@@ -47,7 +47,7 @@ class AnalysisItemViewCell: UITableViewCell {
47 priceLabel.textColor = UIColor(rgb: 0x212121) 47 priceLabel.textColor = UIColor(rgb: 0x212121)
48 48
49 // subtitle 49 // subtitle
50 - subtitleLabel.textColor = UIColor(rgb: 0x9D9D9C) 50 + subtitleLabel.textColor = UIColor(rgb: 0x212121)
51 } 51 }
52 } 52 }
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
...@@ -175,6 +182,12 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -175,6 +182,12 @@ class HistoryViewController: AnalysisChildViewController {
175 titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) 182 titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
176 titleLabel.text = "Αναλυτικά" 183 titleLabel.text = "Αναλυτικά"
177 184
185 + // Add shadow
186 +// view.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
187 +// view.layer.shadowOffset = CGSize(width: 0.0, height: -1.0)
188 +// view.layer.shadowOpacity = 1.0
189 +// view.layer.shadowRadius = 1.0
190 +
178 view.addSubview(viewBorder) 191 view.addSubview(viewBorder)
179 viewBorder.addSubview(viewInner) 192 viewBorder.addSubview(viewInner)
180 viewInner.addSubview(titleLabel) 193 viewInner.addSubview(titleLabel)
...@@ -220,17 +233,18 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -220,17 +233,18 @@ class HistoryViewController: AnalysisChildViewController {
220 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30)) 233 let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
221 234
222 let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height)) 235 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) 236 + viewBorder.backgroundColor = .white
237 +// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
224 238
225 viewBorder.layer.cornerRadius = 16.5 239 viewBorder.layer.cornerRadius = 16.5
226 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius 240 viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
227 241
228 let viewInner = UIView(frame: CGRect(x: 1, y: 0, width: viewBorder.frame.width-2, height: viewBorder.frame.height-1)) 242 let viewInner = UIView(frame: CGRect(x: 1, y: 0, width: viewBorder.frame.width-2, height: viewBorder.frame.height-1))
229 - viewInner.backgroundColor = .white 243 + viewInner.backgroundColor = .white
230 244
231 viewInner.layer.cornerRadius = 16.5 245 viewInner.layer.cornerRadius = 16.5
232 viewInner.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius 246 viewInner.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
233 - 247 +
234 view.addSubview(viewBorder) 248 view.addSubview(viewBorder)
235 viewBorder.addSubview(viewInner) 249 viewBorder.addSubview(viewInner)
236 return view 250 return view
......
...@@ -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
......
...@@ -178,8 +178,8 @@ import SwiftEventBus ...@@ -178,8 +178,8 @@ import SwiftEventBus
178 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 178 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
179 179
180 dfyEarnBannerInnerView.layer.cornerRadius = 16.5 180 dfyEarnBannerInnerView.layer.cornerRadius = 16.5
181 - dfyEarnBannerInnerView.layer.borderWidth = 1 181 +// dfyEarnBannerInnerView.layer.borderWidth = 1
182 - dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 182 +// dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
183 183
184 // Add shadow 184 // Add shadow
185 dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 185 dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
...@@ -242,8 +242,8 @@ import SwiftEventBus ...@@ -242,8 +242,8 @@ import SwiftEventBus
242 } 242 }
243 243
244 couponEarnInnerView.layer.cornerRadius = 16.5 244 couponEarnInnerView.layer.cornerRadius = 16.5
245 - couponEarnInnerView.layer.borderWidth = 1 245 +// couponEarnInnerView.layer.borderWidth = 1
246 - couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 246 +// couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
247 247
248 // Add shadow 248 // Add shadow
249 couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor 249 couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
......