open-source / warply_sdk_framework

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

redesign feedback 2 part 1

Expand all
Inline Side-by-side
Showing 11 changed files with 22 additions and 22 deletions
...@@ -52,7 +52,7 @@ import UIKit ...@@ -52,7 +52,7 @@ 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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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 {
......
...@@ -128,16 +128,16 @@ import SwiftEventBus ...@@ -128,16 +128,16 @@ import SwiftEventBus
128 128
129 if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") { 129 if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") {
130 130
131 - profileImage.layer.cornerRadius = 19
132 - profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
133 - profileImage.layer.borderWidth = 1
134 - profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
135 -
136 profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache()) 131 profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache())
137 } else { 132 } else {
138 profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 133 profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
139 } 134 }
140 135
136 + profileImage.layer.cornerRadius = 19
137 + profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
138 + profileImage.layer.borderWidth = 1
139 + profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
140 +
141 print("Profile Name: " + (profile?._firstname ?? "") + " " + (profile?._lastname ?? "")) 141 print("Profile Name: " + (profile?._firstname ?? "") + " " + (profile?._lastname ?? ""))
142 142
143 profileNameLabel.text = (profile?._firstname ?? "") + " " + (profile?._lastname ?? "") 143 profileNameLabel.text = (profile?._firstname ?? "") + " " + (profile?._lastname ?? "")
...@@ -185,7 +185,7 @@ import SwiftEventBus ...@@ -185,7 +185,7 @@ import SwiftEventBus
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
186 dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) 186 dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
187 dfyEarnBannerView.layer.shadowOpacity = 1.0 187 dfyEarnBannerView.layer.shadowOpacity = 1.0
188 - dfyEarnBannerView.layer.shadowRadius = 3.0 188 + dfyEarnBannerView.layer.shadowRadius = 1.0
189 189
190 // var totalCouponValue = swiftApi().getDealsCouponsSum() 190 // var totalCouponValue = swiftApi().getDealsCouponsSum()
191 191
...@@ -249,7 +249,7 @@ import SwiftEventBus ...@@ -249,7 +249,7 @@ import SwiftEventBus
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
250 couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) 250 couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
251 couponEarnView.layer.shadowOpacity = 1.0 251 couponEarnView.layer.shadowOpacity = 1.0
252 - couponEarnView.layer.shadowRadius = 3.0 252 + couponEarnView.layer.shadowRadius = 1.0
253 253
254 // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) 254 // let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100)
255 var totalCouponDiscountString = "0" 255 var totalCouponDiscountString = "0"
......