redesign feedback merge

 Pod::Spec.new do |spec|
 
   spec.name         = "SwiftWarplyFramework"
-  spec.version      = "0.2.18"
+  spec.version      = "0.2.19"
   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.18" }
+  spec.source       = { :git => "https://git.warp.ly/open-source/warply_sdk_framework.git", :tag => "0.2.19" }
   # 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/**/*', 

@@ -48,13 +48,15 @@ import UIKit
     //     dfyCoupons = swiftApi().getActiveDFYCoupons()
         // TODO: DELETE <===
         
+        // Add shadow
+        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
+
         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.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
-//        activeCodeView.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
-//        activeCodeView.layer.shadowOpacity = 1.0
-//        activeCodeView.layer.shadowRadius = 6.0
         
         activeCodeImage.image = UIImage(named: "active_code_logo_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
         
@@ -184,4 +186,11 @@ import UIKit
         // Configure the view for the selected state
     }
 
+    public override func layoutSubviews() {
+        super.layoutSubviews()
+        //set the values for top,left,bottom,right margins
+        let margins = UIEdgeInsets(top: 2, left: 0, bottom: 4, right: 0)
+        contentView.frame = contentView.frame.inset(by: margins)
+    }
+
 }

@@ -24,6 +24,8 @@ var timer2: DispatchSourceTimer?
         if (!showHeader) {
             // navigationController?.setNavigationBarHidden(true, animated: animated)
             self.navigationController?.isNavigationBarHidden = true
+        } else {
+            self.navigationController?.hideHairline()
         }
     }
 

@@ -66,7 +66,7 @@ import SwiftEventBus
         
         couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache())
         couponImage.contentMode = .scaleAspectFill
-        couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
+        couponImageHeight.constant =  255 //230 // 253 // self.uiscreen.height * 0.25
 
         nameLabel.text = ccms?._titleOffer ?? ""
         descriptionLabel.text = ccms?._description ?? ""
@@ -94,6 +94,7 @@ import SwiftEventBus
         
         swiftApi().logTrackersEvent("screen", "ContextualScreen")
         
+        self.navigationController?.hideHairline()
     }
 
     

@@ -102,7 +102,7 @@ import AVFoundation
         
         couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
         couponImage.contentMode = .scaleAspectFill
-        couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
+        couponImageHeight.constant =  255 //230 // 253 // self.uiscreen.height * 0.25
         
         nameLabel.text = couponSetData?.name ?? ""
         discriptionLabel.text = couponSetData?.short_description ?? ""
@@ -286,7 +286,7 @@ import AVFoundation
         let htmlText = couponSetData?.terms ?? ""
         termsTextView.attributedText = htmlText.htmlToAttributedString
         termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
-        termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
+        termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
         termsTextView.textAlignment = .left
         termsTextView.isScrollEnabled = false
         
@@ -312,6 +312,7 @@ import AVFoundation
         
         swiftApi().logTrackersEvent("screen", "CouponScreen")
         
+        self.navigationController?.hideHairline()
     }
     
     public func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {

@@ -77,7 +77,7 @@ import SwiftEventBus
         
         couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
         couponImage.contentMode = .scaleAspectFill
-        couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
+        couponImageHeight.constant =  255 //230 // 253 // self.uiscreen.height * 0.25
 
         nameLabel.text = couponset?.name ?? ""
         let htmlDescrText = couponset?.description ?? ""
@@ -126,7 +126,7 @@ import SwiftEventBus
         let htmlText = couponset?.terms ?? ""
         termsTextView.attributedText = htmlText.htmlToAttributedString
         termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
-        termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
+        termsTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
         termsTextView.textAlignment = .left
         termsTextView.isScrollEnabled = false
         termsTextView.isUserInteractionEnabled = true
@@ -143,6 +143,7 @@ import SwiftEventBus
         
         swiftApi().logTrackersEvent("screen", "CouponsetScreen")
         
+        self.navigationController?.hideHairline()
     }
     
     public func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
@@ -190,9 +191,14 @@ import SwiftEventBus
 
     func showSpinner() {
         // add the spinner view controller
+        // addChild(spinner)
+        // spinner.view.frame = view.frame
+        // view.addSubview(spinner.view)
+        // spinner.didMove(toParent: self)
+
         addChild(spinner)
-        spinner.view.frame = view.frame
-        view.addSubview(spinner.view)
+        spinner.view.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height)
+        self.view.addSubview(spinner.view)
         spinner.didMove(toParent: self)
     }
     

@@ -43,6 +43,12 @@ import UIKit
         super.awakeFromNib()
         // Initialization code
 
+        // Add shadow
+        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
+        
         couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
         
         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
         self.coupons = swiftApi().getCouponList()
         self.tableView.reloadData()
 
+        self.navigationController?.hideHairline()
     }
     
 

@@ -34,7 +34,7 @@ import SwiftEventBus
         self.hidesBottomBarWhenPushed = true
 
         setBackButton()
-        setNavigationTitle("GIFTS for YOU", "bold")
+        setNavigationTitle("GIFTS FOR YOU", "bold")
         
         tableView.delegate = self
         tableView.dataSource = self
@@ -98,6 +98,8 @@ import SwiftEventBus
         self.refreshData()
 
         self.startTimer()
+
+        self.navigationController?.hideHairline()
     }
 
     public override func viewWillDisappear(_ animated: Bool) {

@@ -34,11 +34,13 @@ import UIKit
     public override func awakeFromNib() {
         super.awakeFromNib()
 
+        // Add shadow
+        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
+        
         inboxView.layer.cornerRadius = 16.0
-        inboxView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
-        inboxView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
-        inboxView.layer.shadowOpacity = 1.0
-        inboxView.layer.shadowRadius = 15.0
         inboxView.clipsToBounds = true
         
         newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)

@@ -67,6 +67,8 @@ import SwiftEventBus
         swiftApi().logTrackersEvent("screen", "LoyaltyHistoryScreen")
         
         self.startTimer()
+
+        self.navigationController?.hideHairline()
     }
 
     public override func viewWillDisappear(_ animated: Bool) {

@@ -89,6 +89,8 @@ import SwiftEventBus
         self.refreshData()
 
         self.startTimer()
+
+        self.navigationController?.hideHairline()
     }
 
     public override func viewWillDisappear(_ animated: Bool) {

@@ -108,6 +108,7 @@ import MapKit
         
         swiftApi().logTrackersEvent("screen", "ShopsScreen")
         
+        self.navigationController?.hideHairline()
     }
     
     // mvp

@@ -68,6 +68,8 @@ import SwiftEventBus
         swiftApi().logTrackersEvent("screen", "LoyaltyHistoryScreen")
         
         self.startTimer()
+
+        self.navigationController?.hideHairline()
     }
 
     public override func viewWillDisappear(_ animated: Bool) {

@@ -81,7 +81,7 @@ import SwiftEventBus
         
         couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
         couponImage.contentMode = .scaleAspectFill
-        couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
+        couponImageHeight.constant =  255 //230 // 253 // self.uiscreen.height * 0.25
         
         nameLabel.text = couponSetData?.name ?? ""
         // descriptionLabel.text = couponSetData?.short_description ?? ""
@@ -122,6 +122,7 @@ import SwiftEventBus
         
         swiftApi().logTrackersEvent("screen", "CouponShareScreen")
         
+        self.navigationController?.hideHairline()
     }
     
     deinit {

@@ -77,7 +77,7 @@ import SwiftEventBus
         
         heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache())
         heroImage.contentMode = .scaleAspectFill
-        heroImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
+        heroImageHeight.constant =  255 //230 // 253 // self.uiscreen.height * 0.25
         nameLabel.text = ccms?._description ?? ""
         // descriptionLabel.text = ccms?._subtitle ?? ""
 
@@ -123,7 +123,7 @@ import SwiftEventBus
 //        moreTextView.attributedText = htmlText.htmlToAttributedString
         moreTextView.text = ccms?._termsAndConditions ?? ""
         moreTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
-        moreTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
+        moreTextView.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
         moreTextView.textAlignment = .left
         moreTextView.isScrollEnabled = false
         
@@ -135,6 +135,7 @@ import SwiftEventBus
         
         swiftApi().logTrackersEvent("screen", "TelcoScreen")
         
+        self.navigationController?.hideHairline()
     }
     
     // MARK: - Functions

@@ -52,7 +52,7 @@ import AVFoundation
 //        couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
         couponImage.image = UIImage(named: "market_bg", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
         couponImage.contentMode = .scaleAspectFill
-        couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
+        couponImageHeight.constant =  255 //230 // 253 // self.uiscreen.height * 0.25
         
         nameLabel.text = "Εκπτωτικό κουπόνι COSMOTE SuperMarket Deals!"
         discriptionLabel.text = "Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών."

@@ -52,6 +52,7 @@ import AVFoundation
         
         swiftApi().logTrackersEvent("screen", "UnifiedCouponScreen")
         
+        self.navigationController?.hideHairline()
     }
     
     

@@ -66,6 +66,27 @@ import UIKit
         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
+        
+        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
+        
+        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
+        
+        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
+        
         dfyBannerView.isHidden = true
         dfyBannerHeight.constant = 0.0
         dfyBannerTopSpace.constant = 0.0

@@ -183,10 +183,11 @@ import SwiftEventBus
         dfyEarnBannerInnerView.layer.borderWidth = 1
         dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
 
-//        dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
-//        dfyEarnBannerView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
-//        dfyEarnBannerView.layer.shadowOpacity = 1.0
-//        dfyEarnBannerView.layer.shadowRadius = 3.0
+        // 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
         
 //        var totalCouponValue = swiftApi().getDealsCouponsSum()
 
@@ -246,10 +247,11 @@ import SwiftEventBus
         couponEarnInnerView.layer.borderWidth = 1
         couponEarnInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
         
-//        couponEarnView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
-//        couponEarnView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
-//        couponEarnView.layer.shadowOpacity = 1.0
-//        couponEarnView.layer.shadowRadius = 3.0
+        // 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
         
 //        let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100)
         var totalCouponDiscountString = "0"
@@ -432,6 +434,7 @@ import SwiftEventBus
         swiftApi().logTrackersEvent("screen", "LoyaltyWalletScreen")
 
         // addNavShadow()
+        self.navigationController?.hideHairline()
         
         let userTag = swiftApi().getUserTag()
         if (questionnaireButton.currentTitle != userTag) {
@@ -866,7 +869,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
                 let titleLabel = UILabel(frame: CGRect(x: 20, y: 30, width: view.frame.width - 40, height: 20))
                 titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 20)
                 titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
-                titleLabel.text = "GIFTS for YOU"
+                titleLabel.text = "GIFTS FOR YOU"
 
                 view.addSubview(titleLabel)
                 return view