Manos Chorianopoulos

merge redesign feedback part 2

Showing 23 changed files with 85 additions and 53 deletions
Pod::Spec.new do |spec|
spec.name = "SwiftWarplyFramework"
spec.version = "0.2.19"
spec.version = "0.2.20"
spec.summary = "A framework used for several functionalities."
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|
spec.platform = :ios, "11.0"
spec.source = { :git => "https://git.warp.ly/open-source/warply_sdk_framework.git", :tag => "0.2.19" }
spec.source = { :git => "https://git.warp.ly/open-source/warply_sdk_framework.git", :tag => "0.2.20" }
# spec.public_header_files = "SwiftWarplyFramework.framework/Headers/*.h"
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}"
# 'SwiftWarplyFramework/**/*',
......
......@@ -7,7 +7,7 @@
<key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
......
......@@ -7,7 +7,7 @@
<key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
......
......@@ -52,11 +52,11 @@ import UIKit
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
self.layer.shadowRadius = 1.0
activeCodeView.layer.cornerRadius = 16.5
activeCodeView.layer.borderWidth = 1
activeCodeView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// activeCodeView.layer.borderWidth = 1
// activeCodeView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
activeCodeImage.image = UIImage(named: "active_code_logo_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......
......@@ -34,8 +34,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
// message
messageLabel.textColor = UIColor(rgb: 0x212121)
messageLabelView.layer.borderWidth = 1.0
messageLabelView.layer.borderColor = UIColor(rgb: 0xE6E6E6).cgColor
// messageLabelView.layer.borderWidth = 1.0
// messageLabelView.layer.borderColor = UIColor(rgb: 0xE6E6E6).cgColor
messageLabelView.layer.cornerRadius = 16.5
messageLabelView.backgroundColor = .white
......
......@@ -76,8 +76,8 @@ import SwiftEventBus
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
// Fix width for ipad
// if UIDevice.current.userInterfaceIdiom == .pad {
// // iPad
......
......@@ -203,8 +203,8 @@ import AVFoundation
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
// Fix width for ipad
// if UIDevice.current.userInterfaceIdiom == .pad {
// // iPad
......@@ -218,8 +218,8 @@ import AVFoundation
mapButton.setTitle("Δες τα καταστήματα", for: .normal)
mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
mapButton.layer.cornerRadius = 15.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50)
mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
mapButton.backgroundColor = .clear
mapButton.layer.borderWidth = 2
mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
......
......@@ -99,8 +99,8 @@ import SwiftEventBus
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
// Fix width for ipad
if UIDevice.current.userInterfaceIdiom == .pad {
// iPad
......
......@@ -47,7 +47,7 @@ import UIKit
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
self.layer.shadowRadius = 1.0
couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......
......@@ -23,6 +23,12 @@ class HistoryViewController: AnalysisChildViewController {
self.tableView.delegate = self
self.tableView.dataSource = self
// Add shadow
self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.tableView.layer.shadowOpacity = 1.0
self.tableView.layer.shadowRadius = 1.0
self.refreshControl = UIRefreshControl()
self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
......@@ -159,7 +165,8 @@ class HistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
......@@ -220,7 +227,8 @@ class HistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
......@@ -38,7 +38,7 @@ import UIKit
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
self.layer.shadowRadius = 1.0
inboxView.layer.cornerRadius = 16.0
inboxView.clipsToBounds = true
......
......@@ -44,7 +44,7 @@ import UIKit
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
self.layer.shadowRadius = 1.0
newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
curvedBgImage.image = UIImage(named: "curved_bg_white_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......
This diff could not be displayed because it is too large.
......@@ -22,6 +22,12 @@ class MarketHistoryViewController: AnalysisChildViewController {
self.tableView.delegate = self
self.tableView.dataSource = self
// Add shadow
self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.tableView.layer.shadowOpacity = 1.0
self.tableView.layer.shadowRadius = 1.0
self.refreshControl = UIRefreshControl()
self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
......@@ -159,7 +165,8 @@ class MarketHistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
......@@ -220,7 +227,8 @@ class MarketHistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
......@@ -24,6 +24,12 @@ class MarketSharingHistoryViewController: AnalysisChildViewController {
self.tableView.delegate = self
self.tableView.dataSource = self
// Add shadow
self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.tableView.layer.shadowOpacity = 1.0
self.tableView.layer.shadowRadius = 1.0
self.refreshControl = UIRefreshControl()
self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
......@@ -153,7 +159,8 @@ class MarketSharingHistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
......@@ -214,7 +221,8 @@ class MarketSharingHistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
......@@ -104,8 +104,8 @@ import SwiftEventBus
redeemButton.setTitleColor(.white, for: .normal)
redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
redeemButton.layer.cornerRadius = 16.0
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 50)
redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
// Fix width for ipad
// if UIDevice.current.userInterfaceIdiom == .pad {
// // iPad
......
......@@ -24,6 +24,12 @@ class SharingHistoryViewController: AnalysisChildViewController {
self.tableView.delegate = self
self.tableView.dataSource = self
// Add shadow
self.tableView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.tableView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.tableView.layer.shadowOpacity = 1.0
self.tableView.layer.shadowRadius = 1.0
self.refreshControl = UIRefreshControl()
self.refreshControl?.addTarget(self, action: #selector(handleRefresh(_:)), for: .valueChanged)
......@@ -153,7 +159,8 @@ class SharingHistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMinYCorner] // Top left, bottom right corner radius
......@@ -214,7 +221,8 @@ class SharingHistoryViewController: AnalysisChildViewController {
let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 30))
let viewBorder = UIView(frame: CGRect(x: 10, y: 0, width: view.frame.width-20, height: view.frame.height))
viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.backgroundColor = .white
// viewBorder.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
viewBorder.layer.cornerRadius = 16.5
viewBorder.layer.maskedCorners = [ .layerMinXMaxYCorner, .layerMaxXMaxYCorner] // bottom left, bottom right corner radius
......
......@@ -96,8 +96,8 @@ import SwiftEventBus
activateButton.setTitleColor(.white, for: .normal)
activateButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
activateButton.layer.cornerRadius = 16.0
activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 55)
activateButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 50)
activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
// Fix width for ipad
// if UIDevice.current.userInterfaceIdiom == .pad {
......
......@@ -29,8 +29,8 @@ import AVFoundation
mapButton.setTitleColor(UIColor(red: 1.00, green: 1.00, blue: 1.00, alpha: 1.00), for: .normal)
mapButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
mapButton.layer.cornerRadius = 15.0
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 50)
mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
// mapButton.isHidden = true
// mapButtonHeight.constant = 0
......
......@@ -25,7 +25,7 @@ import UIKit
self.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
self.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
self.layer.shadowOpacity = 1.0
self.layer.shadowRadius = 3.0
self.layer.shadowRadius = 1.0
couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
couponImage.image = UIImage(named: "coupon_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......
......@@ -51,41 +51,41 @@ import UIKit
marketBadgeImage.image = UIImage(named: "wallet_market_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
sumBannerInnerView.layer.cornerRadius = 16.5
sumBannerInnerView.layer.borderWidth = 1
sumBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// sumBannerInnerView.layer.borderWidth = 1
// sumBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
dfyBannerInnerView.layer.cornerRadius = 16.5
dfyBannerInnerView.layer.borderWidth = 1
dfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// dfyBannerInnerView.layer.borderWidth = 1
// dfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
gfyBannerInnerView.layer.cornerRadius = 16.5
gfyBannerInnerView.layer.borderWidth = 1
gfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// gfyBannerInnerView.layer.borderWidth = 1
// gfyBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
marketBannerInnerView.layer.cornerRadius = 16.5
marketBannerInnerView.layer.borderWidth = 1
marketBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// marketBannerInnerView.layer.borderWidth = 1
// marketBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// Add shadow
sumBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
sumBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
sumBannerInnerView.layer.shadowOpacity = 1.0
sumBannerInnerView.layer.shadowRadius = 3.0
sumBannerInnerView.layer.shadowRadius = 1.0
dfyBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
dfyBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
dfyBannerInnerView.layer.shadowOpacity = 1.0
dfyBannerInnerView.layer.shadowRadius = 3.0
dfyBannerInnerView.layer.shadowRadius = 1.0
gfyBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
gfyBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
gfyBannerInnerView.layer.shadowOpacity = 1.0
gfyBannerInnerView.layer.shadowRadius = 3.0
gfyBannerInnerView.layer.shadowRadius = 1.0
marketBannerInnerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
marketBannerInnerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
marketBannerInnerView.layer.shadowOpacity = 1.0
marketBannerInnerView.layer.shadowRadius = 3.0
marketBannerInnerView.layer.shadowRadius = 1.0
dfyBannerView.isHidden = true
dfyBannerHeight.constant = 0.0
......
......@@ -180,14 +180,14 @@ import SwiftEventBus
questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
dfyEarnBannerInnerView.layer.cornerRadius = 16.5
dfyEarnBannerInnerView.layer.borderWidth = 1
dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// dfyEarnBannerInnerView.layer.borderWidth = 1
// dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// Add shadow
dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
dfyEarnBannerView.layer.shadowOpacity = 1.0
dfyEarnBannerView.layer.shadowRadius = 3.0
dfyEarnBannerView.layer.shadowRadius = 1.0
// var totalCouponValue = swiftApi().getDealsCouponsSum()
......@@ -244,14 +244,14 @@ import SwiftEventBus
}
couponEarnInnerView.layer.cornerRadius = 16.5
couponEarnInnerView.layer.borderWidth = 1
couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// couponEarnInnerView.layer.borderWidth = 1
// couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
// Add shadow
couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor
couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
couponEarnView.layer.shadowOpacity = 1.0
couponEarnView.layer.shadowRadius = 3.0
couponEarnView.layer.shadowRadius = 1.0
// let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100)
var totalCouponDiscountString = "0"
......