open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
281068d5 1 parent e22e19cd

redesign feedback

Inline Side-by-side
Showing 13 changed files with 59 additions and 31 deletions
......@@ -48,6 +48,12 @@ 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
......@@ -184,4 +190,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)
}
}
......
......@@ -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 ?? ""
......
......@@ -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
......
......@@ -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
......@@ -191,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)
......
......@@ -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
......
......@@ -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)
......
......@@ -99,7 +99,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hWa-mr-cXD">
<rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/>
<fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
<color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......@@ -111,7 +111,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kdt-I2-GtS">
<rect key="frame" x="119" y="59" width="255" height="15"/>
<fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
<color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......@@ -1836,7 +1836,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk">
<rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/>
<fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
<color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......@@ -1848,7 +1848,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td">
<rect key="frame" x="119" y="59" width="255" height="15"/>
<fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
<color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......@@ -3414,7 +3414,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Το κουπόνι ισχύει έως 05/12/2022" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UhC-Lj-tfN">
<rect key="frame" x="20" y="758.5" width="374" height="16"/>
<fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="13"/>
<color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ">
......@@ -3466,7 +3466,7 @@
<constraints>
<constraint firstAttribute="height" id="3GU-tg-S3t"/>
</constraints>
<color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
......
......@@ -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 ?? ""
......
......@@ -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
......
......@@ -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 = "Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών."
......
......@@ -181,10 +181,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()
......@@ -244,10 +245,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"
......@@ -803,7 +805,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
......