Manos Chorianopoulos

MarketPass changes

......@@ -475,7 +475,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="848"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4cB-Mm-sjZ" userLabel="ScrollContentView">
<rect key="frame" x="0.0" y="0.0" width="414" height="917.5"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="1012.5"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q7G-bb-pvF">
<rect key="frame" x="82" y="15" width="250" height="230"/>
......@@ -491,8 +491,36 @@
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3DN-zX-ngv" userLabel="ProductInfoView">
<rect key="frame" x="33" y="314" width="361" height="66"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WHZ-co-sYK">
<rect key="frame" x="5" y="0.0" width="41" height="41"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="41" id="Ddt-rr-zXB"/>
<constraint firstAttribute="width" constant="41" id="XzM-Do-o4J"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Επιλογή προϊόντων με εκπτωτικό κουπόνι SUPERMARKET DEALS για τις αγορές σου." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oGM-ep-i3d">
<rect key="frame" x="56" y="0.0" width="305" height="66"/>
<fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="19"/>
<color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="oGM-ep-i3d" secondAttribute="trailing" id="2EC-yl-0gv"/>
<constraint firstItem="oGM-ep-i3d" firstAttribute="top" secondItem="3DN-zX-ngv" secondAttribute="top" id="FeY-Xp-fJS"/>
<constraint firstItem="WHZ-co-sYK" firstAttribute="top" secondItem="3DN-zX-ngv" secondAttribute="top" id="N2j-vd-hZx"/>
<constraint firstAttribute="bottom" secondItem="oGM-ep-i3d" secondAttribute="bottom" id="bNg-qV-YJ0"/>
<constraint firstItem="oGM-ep-i3d" firstAttribute="leading" secondItem="WHZ-co-sYK" secondAttribute="trailing" constant="10" id="dbR-tv-73y"/>
<constraint firstItem="WHZ-co-sYK" firstAttribute="leading" secondItem="3DN-zX-ngv" secondAttribute="leading" constant="5" id="qYo-Sp-bAG"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RQ6-Ao-ZSE" userLabel="StoreInfoView">
<rect key="frame" x="33" y="314" width="361" height="136"/>
<rect key="frame" x="33" y="409" width="361" height="136"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cdX-tv-BAt">
<rect key="frame" x="5" y="0.0" width="41" height="41"/>
......@@ -529,7 +557,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YMb-aS-khb" userLabel="EshopInfoView">
<rect key="frame" x="33" y="479" width="361" height="114"/>
<rect key="frame" x="33" y="574" width="361" height="114"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gpt-rt-Tct">
<rect key="frame" x="5" y="0.0" width="41" height="41"/>
......@@ -567,7 +595,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BkT-Kn-CNF" userLabel="ABInfoView">
<rect key="frame" x="33" y="622" width="361" height="197.5"/>
<rect key="frame" x="33" y="717" width="361" height="197.5"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TSK-M9-ex7">
<rect key="frame" x="5" y="0.0" width="41" height="41"/>
......@@ -605,7 +633,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E3U-j8-3p0">
<rect key="frame" x="29" y="852.5" width="356" height="55"/>
<rect key="frame" x="29" y="947.5" width="356" height="55"/>
<constraints>
<constraint firstAttribute="height" constant="55" id="AD0-86-4Rz"/>
</constraints>
......@@ -628,11 +656,14 @@
<constraint firstItem="E3U-j8-3p0" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="29" id="F4v-ZX-h04"/>
<constraint firstItem="YMb-aS-khb" firstAttribute="top" secondItem="RQ6-Ao-ZSE" secondAttribute="bottom" constant="29" id="MQV-Wz-mKJ"/>
<constraint firstAttribute="trailing" secondItem="Pi8-if-AND" secondAttribute="trailing" constant="33" id="Nkf-1N-yXM"/>
<constraint firstItem="3DN-zX-ngv" firstAttribute="top" secondItem="Pi8-if-AND" secondAttribute="bottom" constant="34" id="Oa9-H1-jCu"/>
<constraint firstAttribute="trailing" secondItem="RQ6-Ao-ZSE" secondAttribute="trailing" constant="20" id="Ura-7W-bHW"/>
<constraint firstItem="RQ6-Ao-ZSE" firstAttribute="top" secondItem="Pi8-if-AND" secondAttribute="bottom" constant="34" id="VEQ-wH-agZ"/>
<constraint firstItem="RQ6-Ao-ZSE" firstAttribute="top" secondItem="3DN-zX-ngv" secondAttribute="bottom" constant="29" id="VEQ-wH-agZ"/>
<constraint firstItem="BkT-Kn-CNF" firstAttribute="top" secondItem="YMb-aS-khb" secondAttribute="bottom" constant="29" id="cq1-3M-wY3"/>
<constraint firstItem="E3U-j8-3p0" firstAttribute="top" secondItem="BkT-Kn-CNF" secondAttribute="bottom" constant="33" id="dsu-I3-Jdg"/>
<constraint firstItem="3DN-zX-ngv" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="fbz-ym-3D6"/>
<constraint firstItem="Pi8-if-AND" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="ghq-zb-Jc6"/>
<constraint firstAttribute="trailing" secondItem="3DN-zX-ngv" secondAttribute="trailing" constant="20" id="iAJ-2X-eaR"/>
<constraint firstItem="Q7G-bb-pvF" firstAttribute="top" secondItem="4cB-Mm-sjZ" secondAttribute="top" constant="15" id="iF9-DB-GQ7"/>
<constraint firstItem="YMb-aS-khb" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="nac-YS-9nd"/>
<constraint firstItem="RQ6-Ao-ZSE" firstAttribute="leading" secondItem="4cB-Mm-sjZ" secondAttribute="leading" constant="33" id="ndc-fy-Aqm"/>
......@@ -683,6 +714,8 @@
<outlet property="heroImage" destination="Q7G-bb-pvF" id="90F-4L-Q5j"/>
<outlet property="heroTitleLabel" destination="Pi8-if-AND" id="2j9-qH-nyZ"/>
<outlet property="okButton" destination="E3U-j8-3p0" id="zK4-8K-cDb"/>
<outlet property="productInfoImage" destination="WHZ-co-sYK" id="kbF-hj-IQ0"/>
<outlet property="productInfoTitleLabel" destination="oGM-ep-i3d" id="etH-F4-ayK"/>
<outlet property="storeInfoImage" destination="cdX-tv-BAt" id="D0f-vV-cVT"/>
<outlet property="storeInfoSubtitleLabel" destination="LaN-sW-jUd" id="30N-8d-9hc"/>
<outlet property="storeInfoTitleLabel" destination="N0n-0q-Ggu" id="DeO-A5-ct1"/>
......
......@@ -10,6 +10,8 @@ import UIKit
@objc public class MarketPassInfoViewController: UIViewController {
@IBOutlet weak var heroImage: UIImageView!
@IBOutlet weak var heroTitleLabel: UILabel!
@IBOutlet weak var productInfoImage: UIImageView!
@IBOutlet weak var productInfoTitleLabel: UILabel!
@IBOutlet weak var storeInfoImage: UIImageView!
@IBOutlet weak var storeInfoTitleLabel: UILabel!
@IBOutlet weak var storeInfoSubtitleLabel: UILabel!
......@@ -43,6 +45,7 @@ import UIKit
// MARK: - Functions
func setupUI() {
heroImage.image = UIImage(named: "pass_info_hero", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
productInfoImage.image = UIImage(named: "pass_info_product", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
storeInfoImage.image = UIImage(named: "pass_info_cart", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
eshopInfoImage.image = UIImage(named: "pass_info_globe", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
abInfoImage.image = UIImage(named: "pass_info_ab", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
......@@ -52,6 +55,11 @@ import UIKit
heroTitleLabel.textColor = UIColor(rgb: 0x212121)
// StoreInfoView
productInfoTitleLabel.text = "Επιλογή προϊόντων με εκπτωτικό κουπόνι SUPERMARKET DEALS για τις αγορές σου."
productInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0)
productInfoTitleLabel.textColor = UIColor(rgb: 0x212121)
// StoreInfoView
storeInfoTitleLabel.text = "Εξαργύρωση σε φυσικά καταστήματα"
storeInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0)
storeInfoTitleLabel.textColor = UIColor(rgb: 0x212121)
......@@ -74,7 +82,7 @@ import UIKit
abInfoTitleLabel.font = UIFont(name: "PeridotPE-Bold", size: 19.0)
abInfoTitleLabel.textColor = UIColor(rgb: 0x212121)
abInfoSubtitleLabel.text = "1. Eνεργοποίησε τον κωδικό στην κάρτα ΑΒ PLUS στο kiosk του καταστήματος ή μέσω eshop / app στην ενοτητα στην ενότητα Συνεργασίες – SUPERMARKET DEALS.\n\n2. Κάνε τις αγορές σου και κέρδισε απευθείας έκπτωση με χρήση της AB PLUS από τα διαθέσιμα κουπόνια."
abInfoSubtitleLabel.text = "1. Eνεργοποίησε τον κωδικό στην κάρτα ΑΒ PLUS στο kiosk του καταστήματος ή μέσω eshop / app στην ενότητα Συνεργασίες – SUPERMARKET DEALS.\n\n2. Κάνε τις αγορές σου και κέρδισε απευθείας έκπτωση με χρήση της AB PLUS από τα διαθέσιμα κουπόνια."
abInfoSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0)
abInfoSubtitleLabel.textColor = UIColor(rgb: 0x212121)
......
......@@ -87,7 +87,7 @@ import SwiftEventBus
passTitleLabel.font = UIFont(name: "BTCosmo-Bold", size: 22)
passTitleLabel.textColor = .white
passSubtitleLabel.text = "Χρησιμοποίησε τον κωδικό σου και κέρδισε έκπτωση στις αγορές σου!"
passSubtitleLabel.text = "Χρησιμοποίησε το μοναδικό κωδικό σου για να κερδίσεις έκπτωση σε επιλεγμένα προϊόντα. Ανακάλυψε τα κουπόνια στο For You."
passSubtitleLabel.font = UIFont(name: "PeridotPE-Regular", size: 17.0)
passSubtitleLabel.textColor = .white
......@@ -116,14 +116,15 @@ import SwiftEventBus
let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
let couponsValueNormalText1 = "Έχεις κουπόνια συνολικής αξίας "
let couponsValueBoldText = couponsValueString + "€"
let couponsValueNormalText1 = "Με τα διαθέσιμα κουπόνια μπορείς να εξοικονομήσεις έως και "
let couponsValueBoldText = couponsValueString + "€."
let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular)
let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold)
couponsValueAttributedString.append(couponsValueBoldString)
couponsValueLabel.attributedText = couponsValueAttributedString
couponsValueLabel.textAlignment = .left
mapButton.titleLabel?.font = UIFont(name: "PeridotPE-SBold", size: 16)
mapButton.setTitle("Δες στο χάρτη", for: .normal)
......@@ -223,14 +224,15 @@ import SwiftEventBus
let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
let attrBold = [NSAttributedString.Key.font : UIFont(name: "PeridotPE-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16), NSAttributedString.Key.foregroundColor: UIColor.white]
let couponsValueNormalText1 = "Έχεις κουπόνια συνολικής αξίας "
let couponsValueBoldText = couponsValueString + "€"
let couponsValueNormalText1 = "Με τα διαθέσιμα κουπόνια μπορείς να εξοικονομήσεις έως και "
let couponsValueBoldText = couponsValueString + "€."
let couponsValueAttributedString = NSMutableAttributedString(string:couponsValueNormalText1, attributes:attrRegular)
let couponsValueBoldString = NSMutableAttributedString(string: couponsValueBoldText, attributes:attrBold)
couponsValueAttributedString.append(couponsValueBoldString)
couponsValueLabel.attributedText = couponsValueAttributedString
couponsValueLabel.textAlignment = .left
let formattedCost = couponsValueString.replacingOccurrences(of: ".", with: ",")
couponsValueLabel.isAccessibilityElement = true
......
{
"images" : [
{
"filename" : "pass_info_product.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "pass_info_product 1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "pass_info_product 2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}