Showing
3 changed files
with
185 additions
and
25 deletions
No preview for this file type
... | @@ -36,14 +36,23 @@ import SwiftEventBus | ... | @@ -36,14 +36,23 @@ import SwiftEventBus |
36 | @IBOutlet weak var couponBadgeLabel: UILabel! | 36 | @IBOutlet weak var couponBadgeLabel: UILabel! |
37 | @IBOutlet weak var gfyBannerLabel: UILabel! | 37 | @IBOutlet weak var gfyBannerLabel: UILabel! |
38 | 38 | ||
39 | + @IBOutlet weak var boxBannerParentView: UIView! | ||
40 | + @IBOutlet weak var boxBannerInnerParentView: UIView! | ||
41 | + @IBOutlet weak var boxBannerInnerView: UIView! | ||
42 | + @IBOutlet weak var boxBadgeImage: UIImageView! | ||
43 | + @IBOutlet weak var boxBadgeLabel: UILabel! | ||
44 | + @IBOutlet weak var boxBannerLabel: UILabel! | ||
45 | + | ||
39 | public var coupons:Array<swiftApi.CouponItemModel> = swiftApi().getCouponList() | 46 | public var coupons:Array<swiftApi.CouponItemModel> = swiftApi().getCouponList() |
40 | public var dfyCoupons:Array<swiftApi.ActiveDFYCouponModel> = swiftApi().getActiveDFYCoupons() | 47 | public var dfyCoupons:Array<swiftApi.ActiveDFYCouponModel> = swiftApi().getActiveDFYCoupons() |
41 | public var unifiedCoupons:Array<swiftApi.UnifiedCouponModel> = [] | 48 | public var unifiedCoupons:Array<swiftApi.UnifiedCouponModel> = [] |
42 | public var loyaltyBadge:swiftApi.LoyaltyBadgeModel = swiftApi().getLoyaltyBadge() | 49 | public var loyaltyBadge:swiftApi.LoyaltyBadgeModel = swiftApi().getLoyaltyBadge() |
50 | + public var boxCoupons:Array<swiftApi.ActiveBoxCouponModel> = swiftApi().getActiveBoxCoupons() | ||
43 | 51 | ||
44 | var totalCouponValue = swiftApi().getDealsCouponsSum() | 52 | var totalCouponValue = swiftApi().getDealsCouponsSum() |
45 | var totalCouponDiscount = Float(round(100 * swiftApi().getLoyaltyBadge()._value) / 100) | 53 | var totalCouponDiscount = Float(round(100 * swiftApi().getLoyaltyBadge()._value) / 100) |
46 | var unifiedCouponsDiscount:Float = 0.0 | 54 | var unifiedCouponsDiscount:Float = 0.0 |
55 | + var boxCouponValue = swiftApi().getBoxCouponsSum() | ||
47 | 56 | ||
48 | 57 | ||
49 | public override func viewDidLoad() { | 58 | public override func viewDidLoad() { |
... | @@ -91,6 +100,7 @@ import SwiftEventBus | ... | @@ -91,6 +100,7 @@ import SwiftEventBus |
91 | dfyBadgeImage.image = UIImage(named: "history_banner_dfy", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 100 | dfyBadgeImage.image = UIImage(named: "history_banner_dfy", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
92 | marketBadgeImage.image = UIImage(named: "history_banner_sm", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 101 | marketBadgeImage.image = UIImage(named: "history_banner_sm", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
93 | couponBadgeImage.image = UIImage(named: "history_banner_gfy", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 102 | couponBadgeImage.image = UIImage(named: "history_banner_gfy", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
103 | + boxBadgeImage.image = UIImage(named: "history_banner_box", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ||
94 | 104 | ||
95 | sectionTitleLabel.text = "Εξαργυρωμένα κουπόνια" | 105 | sectionTitleLabel.text = "Εξαργυρωμένα κουπόνια" |
96 | 106 | ||
... | @@ -118,6 +128,7 @@ import SwiftEventBus | ... | @@ -118,6 +128,7 @@ import SwiftEventBus |
118 | self.coupons = swiftApi().getCouponList() | 128 | self.coupons = swiftApi().getCouponList() |
119 | self.unifiedCoupons = swiftApi().getUnifiedCouponList() | 129 | self.unifiedCoupons = swiftApi().getUnifiedCouponList() |
120 | self.dfyCoupons = swiftApi().getActiveDFYCoupons() | 130 | self.dfyCoupons = swiftApi().getActiveDFYCoupons() |
131 | + self.boxCoupons = swiftApi().getActiveBoxCoupons() | ||
121 | 132 | ||
122 | self.matchOldSMCoupons() | 133 | self.matchOldSMCoupons() |
123 | self.updateMarketBadge() | 134 | self.updateMarketBadge() |
... | @@ -205,7 +216,7 @@ import SwiftEventBus | ... | @@ -205,7 +216,7 @@ import SwiftEventBus |
205 | 216 | ||
206 | // === SUM banner === // | 217 | // === SUM banner === // |
207 | 218 | ||
208 | - let sumRewards = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount | 219 | + let sumRewards = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount + boxCouponValue |
209 | 220 | ||
210 | // sumRewards = Float(round(100 * sumRewards) / 100) | 221 | // sumRewards = Float(round(100 * sumRewards) / 100) |
211 | var sumRewardsString = "0" | 222 | var sumRewardsString = "0" |
... | @@ -309,6 +320,40 @@ import SwiftEventBus | ... | @@ -309,6 +320,40 @@ import SwiftEventBus |
309 | gfyAttributedString.append(gfyBoldString) | 320 | gfyAttributedString.append(gfyBoldString) |
310 | gfyAttributedString.append(gfyNormalString) | 321 | gfyAttributedString.append(gfyNormalString) |
311 | gfyBannerLabel.attributedText = gfyAttributedString | 322 | gfyBannerLabel.attributedText = gfyAttributedString |
323 | + | ||
324 | + // === BOX banner === // | ||
325 | + | ||
326 | + boxBannerParentView.backgroundColor = .clear | ||
327 | + boxBannerInnerParentView.backgroundColor = .white | ||
328 | +// boxBannerInnerView.backgroundColor = UIColor(red: 0.46, green: 0.75, blue: 0.45, alpha: 0.05) | ||
329 | + boxBannerInnerView.backgroundColor = .white | ||
330 | + boxBannerInnerParentView.layer.cornerRadius = 16.0 | ||
331 | + boxBannerInnerView.layer.cornerRadius = 16.0 | ||
332 | + // boxBannerInnerView.layer.borderWidth = 1 | ||
333 | + // boxBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor | ||
334 | + | ||
335 | + boxBannerParentView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor | ||
336 | + boxBannerParentView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) | ||
337 | + boxBannerParentView.layer.shadowOpacity = 1.0 | ||
338 | + boxBannerParentView.layer.shadowRadius = 2.0 | ||
339 | + | ||
340 | + let boxCouponValueFixed = Float(round(100 * boxCouponValue) / 100) | ||
341 | + var boxCouponValueString = "0" | ||
342 | + boxCouponValueString = String(format: "%.2f", boxCouponValueFixed).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil) | ||
343 | + boxBadgeLabel.text = boxCouponValueString + "€" | ||
344 | + | ||
345 | + let boxNormalText1 = "Μέχρι τώρα έχεις όφελος " | ||
346 | + let boxBoldText = boxCouponValueString + "€" | ||
347 | + let boxNormalText2 = " από το BOX" | ||
348 | + | ||
349 | + let boxAttributedString = NSMutableAttributedString(string:boxNormalText1, attributes:attrRegular) | ||
350 | + let boxBoldString = NSMutableAttributedString(string: boxBoldText, attributes:attrBold) | ||
351 | + let boxNormalString = NSMutableAttributedString(string:boxNormalText2, attributes:attrRegular) | ||
352 | + | ||
353 | + boxAttributedString.append(boxBoldString) | ||
354 | + boxAttributedString.append(boxNormalString) | ||
355 | + boxBannerLabel.attributedText = boxAttributedString | ||
356 | + | ||
312 | } | 357 | } |
313 | 358 | ||
314 | // MARK: - Actions | 359 | // MARK: - Actions |
... | @@ -369,4 +414,24 @@ import SwiftEventBus | ... | @@ -369,4 +414,24 @@ import SwiftEventBus |
369 | self.navigationController?.pushViewController(vc, animated: true) | 414 | self.navigationController?.pushViewController(vc, animated: true) |
370 | // } | 415 | // } |
371 | } | 416 | } |
417 | + | ||
418 | + @IBAction func boxBannerButtonAction(_ sender: Any) { | ||
419 | + print("BOX coupon banner pressed!") | ||
420 | +// // box_analysis_pressed event | ||
421 | +// let dealsAnalysis = swiftApi.WarplyDealsAnalysisEventModel() | ||
422 | +// dealsAnalysis._isPressed = true | ||
423 | +// SwiftEventBus.post("box_analysis_pressed", sender: dealsAnalysis) | ||
424 | + | ||
425 | + // box_analysis_pressed event | ||
426 | + let dealsAnalysis = swiftApi.WarplyDealsAnalysisEventModel() | ||
427 | + dealsAnalysis._isPressed = true | ||
428 | + SwiftEventBus.post("box_analysis_pressed") | ||
429 | + | ||
430 | + let firebaseEvent = swiftApi.LoyaltySDKFirebaseEventModel() | ||
431 | + firebaseEvent._eventName = "did_tap_box_badge" | ||
432 | + firebaseEvent.setParameter = ("screen", "Loyalty History") | ||
433 | + SwiftEventBus.post("firebase", sender: firebaseEvent) | ||
434 | + | ||
435 | + swiftApi().logTrackersEvent("click", ("LoyaltyHistoryScreen:" + "BoxBanner")) | ||
436 | + } | ||
372 | } | 437 | } | ... | ... |
... | @@ -1675,7 +1675,7 @@ | ... | @@ -1675,7 +1675,7 @@ |
1675 | <nil key="highlightedColor"/> | 1675 | <nil key="highlightedColor"/> |
1676 | </label> | 1676 | </label> |
1677 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1a0-WF-wSk"> | 1677 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1a0-WF-wSk"> |
1678 | - <rect key="frame" x="20" y="20" width="374" height="395"/> | 1678 | + <rect key="frame" x="20" y="20" width="374" height="487"/> |
1679 | <subviews> | 1679 | <subviews> |
1680 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4Ej-do-8n0"> | 1680 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4Ej-do-8n0"> |
1681 | <rect key="frame" x="20" y="20" width="32" height="32"/> | 1681 | <rect key="frame" x="20" y="20" width="32" height="32"/> |
... | @@ -1927,6 +1927,91 @@ | ... | @@ -1927,6 +1927,91 @@ |
1927 | <constraint firstAttribute="trailing" secondItem="OQk-lc-BF2" secondAttribute="trailing" constant="10" id="nqc-ku-LtQ"/> | 1927 | <constraint firstAttribute="trailing" secondItem="OQk-lc-BF2" secondAttribute="trailing" constant="10" id="nqc-ku-LtQ"/> |
1928 | </constraints> | 1928 | </constraints> |
1929 | </view> | 1929 | </view> |
1930 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O35-Ln-hG5" userLabel="BoxBannerView"> | ||
1931 | + <rect key="frame" x="0.0" y="395" width="374" height="72"/> | ||
1932 | + <subviews> | ||
1933 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="peZ-R0-M9v"> | ||
1934 | + <rect key="frame" x="30" y="0.0" width="324" height="72"/> | ||
1935 | + <subviews> | ||
1936 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gw1-A6-saC"> | ||
1937 | + <rect key="frame" x="0.0" y="0.0" width="324" height="72"/> | ||
1938 | + <subviews> | ||
1939 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Έχεις κερδίσει 0,00€ με το BOX!" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8e8-3x-tWd"> | ||
1940 | + <rect key="frame" x="72" y="27.5" width="242" height="17.5"/> | ||
1941 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="14"/> | ||
1942 | + <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | ||
1943 | + <nil key="highlightedColor"/> | ||
1944 | + </label> | ||
1945 | + </subviews> | ||
1946 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
1947 | + <constraints> | ||
1948 | + <constraint firstAttribute="trailing" secondItem="8e8-3x-tWd" secondAttribute="trailing" constant="10" id="fMo-5M-8oj"/> | ||
1949 | + <constraint firstItem="8e8-3x-tWd" firstAttribute="centerY" secondItem="gw1-A6-saC" secondAttribute="centerY" id="frU-gU-WLn"/> | ||
1950 | + </constraints> | ||
1951 | + </view> | ||
1952 | + </subviews> | ||
1953 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
1954 | + <constraints> | ||
1955 | + <constraint firstAttribute="trailing" secondItem="gw1-A6-saC" secondAttribute="trailing" id="14o-bv-2Qt"/> | ||
1956 | + <constraint firstAttribute="bottom" secondItem="gw1-A6-saC" secondAttribute="bottom" id="IOu-Bc-p1V"/> | ||
1957 | + <constraint firstItem="gw1-A6-saC" firstAttribute="leading" secondItem="peZ-R0-M9v" secondAttribute="leading" id="MMe-C2-Lpn"/> | ||
1958 | + <constraint firstItem="gw1-A6-saC" firstAttribute="top" secondItem="peZ-R0-M9v" secondAttribute="top" id="VT0-g2-Fel"/> | ||
1959 | + </constraints> | ||
1960 | + </view> | ||
1961 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OvC-A0-xIg"> | ||
1962 | + <rect key="frame" x="20" y="0.0" width="72" height="72"/> | ||
1963 | + <subviews> | ||
1964 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="history_banner_box" translatesAutoresizingMaskIntoConstraints="NO" id="N64-1U-kqo"> | ||
1965 | + <rect key="frame" x="0.0" y="0.0" width="72" height="72"/> | ||
1966 | + </imageView> | ||
1967 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iA9-tR-Hgg"> | ||
1968 | + <rect key="frame" x="5" y="48" width="62" height="14"/> | ||
1969 | + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> | ||
1970 | + <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | ||
1971 | + <nil key="highlightedColor"/> | ||
1972 | + </label> | ||
1973 | + </subviews> | ||
1974 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
1975 | + <constraints> | ||
1976 | + <constraint firstItem="iA9-tR-Hgg" firstAttribute="leading" secondItem="OvC-A0-xIg" secondAttribute="leading" constant="5" id="1yy-h1-Pfv"/> | ||
1977 | + <constraint firstItem="N64-1U-kqo" firstAttribute="leading" secondItem="OvC-A0-xIg" secondAttribute="leading" id="Nez-Ii-HX9"/> | ||
1978 | + <constraint firstAttribute="trailing" secondItem="iA9-tR-Hgg" secondAttribute="trailing" constant="5" id="X5M-3j-fuS"/> | ||
1979 | + <constraint firstAttribute="trailing" secondItem="N64-1U-kqo" secondAttribute="trailing" id="ghF-K2-1dr"/> | ||
1980 | + <constraint firstAttribute="bottom" secondItem="iA9-tR-Hgg" secondAttribute="bottom" constant="10" id="h8W-gU-OvG"/> | ||
1981 | + <constraint firstItem="N64-1U-kqo" firstAttribute="top" secondItem="OvC-A0-xIg" secondAttribute="top" id="keo-6P-P08"/> | ||
1982 | + <constraint firstAttribute="width" constant="72" id="nle-Vs-HDs"/> | ||
1983 | + <constraint firstAttribute="height" constant="72" id="yq9-CM-3Di"/> | ||
1984 | + <constraint firstAttribute="bottom" secondItem="N64-1U-kqo" secondAttribute="bottom" id="zdE-RV-5yC"/> | ||
1985 | + </constraints> | ||
1986 | + </view> | ||
1987 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gob-8i-BFa" userLabel="BoxBannerButton"> | ||
1988 | + <rect key="frame" x="10" y="0.0" width="354" height="72"/> | ||
1989 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
1990 | + <state key="normal" title="Button"/> | ||
1991 | + <buttonConfiguration key="configuration" style="plain" title="Button"> | ||
1992 | + <color key="baseForegroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
1993 | + </buttonConfiguration> | ||
1994 | + <connections> | ||
1995 | + <action selector="boxBannerButtonAction:" destination="9Mc-48-V0s" eventType="touchUpInside" id="zq7-vv-rM0"/> | ||
1996 | + </connections> | ||
1997 | + </button> | ||
1998 | + </subviews> | ||
1999 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
2000 | + <constraints> | ||
2001 | + <constraint firstItem="peZ-R0-M9v" firstAttribute="leading" secondItem="O35-Ln-hG5" secondAttribute="leading" constant="30" id="8iw-lp-cUG"/> | ||
2002 | + <constraint firstItem="peZ-R0-M9v" firstAttribute="top" secondItem="O35-Ln-hG5" secondAttribute="top" id="JMx-As-B31"/> | ||
2003 | + <constraint firstAttribute="height" constant="72" id="KMv-Je-kZW"/> | ||
2004 | + <constraint firstAttribute="trailing" secondItem="Gob-8i-BFa" secondAttribute="trailing" constant="10" id="NNs-CH-FHg"/> | ||
2005 | + <constraint firstAttribute="bottom" secondItem="peZ-R0-M9v" secondAttribute="bottom" id="RyE-gZ-K8g"/> | ||
2006 | + <constraint firstItem="8e8-3x-tWd" firstAttribute="leading" secondItem="OvC-A0-xIg" secondAttribute="trailing" constant="10" id="Vj8-0I-dno"/> | ||
2007 | + <constraint firstItem="OvC-A0-xIg" firstAttribute="leading" secondItem="O35-Ln-hG5" secondAttribute="leading" constant="20" id="c5l-XQ-ggp"/> | ||
2008 | + <constraint firstAttribute="trailing" secondItem="peZ-R0-M9v" secondAttribute="trailing" constant="20" id="cFQ-3H-83n"/> | ||
2009 | + <constraint firstItem="Gob-8i-BFa" firstAttribute="top" secondItem="O35-Ln-hG5" secondAttribute="top" id="ecB-uA-xkx"/> | ||
2010 | + <constraint firstItem="OvC-A0-xIg" firstAttribute="centerY" secondItem="O35-Ln-hG5" secondAttribute="centerY" id="hrg-lL-a3X"/> | ||
2011 | + <constraint firstAttribute="bottom" secondItem="Gob-8i-BFa" secondAttribute="bottom" id="r8K-4I-N69"/> | ||
2012 | + <constraint firstItem="Gob-8i-BFa" firstAttribute="leading" secondItem="O35-Ln-hG5" secondAttribute="leading" constant="10" id="sNl-T6-HV6"/> | ||
2013 | + </constraints> | ||
2014 | + </view> | ||
1930 | </subviews> | 2015 | </subviews> |
1931 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 2016 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
1932 | <constraints> | 2017 | <constraints> |
... | @@ -1934,17 +2019,20 @@ | ... | @@ -1934,17 +2019,20 @@ |
1934 | <constraint firstAttribute="trailing" secondItem="gpg-vO-M3t" secondAttribute="trailing" id="84P-IQ-Ced"/> | 2019 | <constraint firstAttribute="trailing" secondItem="gpg-vO-M3t" secondAttribute="trailing" id="84P-IQ-Ced"/> |
1935 | <constraint firstItem="fvz-Hc-IR8" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="8Wy-db-aoc"/> | 2020 | <constraint firstItem="fvz-Hc-IR8" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="8Wy-db-aoc"/> |
1936 | <constraint firstItem="4Ej-do-8n0" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" constant="20" id="AJW-fA-fCw"/> | 2021 | <constraint firstItem="4Ej-do-8n0" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" constant="20" id="AJW-fA-fCw"/> |
1937 | - <constraint firstAttribute="bottom" secondItem="fvz-Hc-IR8" secondAttribute="bottom" constant="20" id="AN6-zn-AQ3"/> | 2022 | + <constraint firstItem="O35-Ln-hG5" firstAttribute="top" secondItem="fvz-Hc-IR8" secondAttribute="bottom" constant="20" id="AN6-zn-AQ3"/> |
1938 | <constraint firstItem="3OL-l2-fcp" firstAttribute="leading" secondItem="4Ej-do-8n0" secondAttribute="trailing" constant="10" id="ARP-Aw-rsn"/> | 2023 | <constraint firstItem="3OL-l2-fcp" firstAttribute="leading" secondItem="4Ej-do-8n0" secondAttribute="trailing" constant="10" id="ARP-Aw-rsn"/> |
1939 | <constraint firstAttribute="trailing" secondItem="3OL-l2-fcp" secondAttribute="trailing" constant="20" id="BPC-SL-5Yk"/> | 2024 | <constraint firstAttribute="trailing" secondItem="3OL-l2-fcp" secondAttribute="trailing" constant="20" id="BPC-SL-5Yk"/> |
2025 | + <constraint firstAttribute="bottom" secondItem="O35-Ln-hG5" secondAttribute="bottom" constant="20" id="BXj-NY-sad"/> | ||
1940 | <constraint firstItem="EQg-Ij-vWV" firstAttribute="top" secondItem="gpg-vO-M3t" secondAttribute="bottom" constant="20" id="Svn-VD-Fh6"/> | 2026 | <constraint firstItem="EQg-Ij-vWV" firstAttribute="top" secondItem="gpg-vO-M3t" secondAttribute="bottom" constant="20" id="Svn-VD-Fh6"/> |
1941 | <constraint firstItem="fvz-Hc-IR8" firstAttribute="top" secondItem="EQg-Ij-vWV" secondAttribute="bottom" constant="20" id="XKV-VL-aF3"/> | 2027 | <constraint firstItem="fvz-Hc-IR8" firstAttribute="top" secondItem="EQg-Ij-vWV" secondAttribute="bottom" constant="20" id="XKV-VL-aF3"/> |
1942 | <constraint firstAttribute="trailing" secondItem="wl0-Lr-Loe" secondAttribute="trailing" constant="20" id="aiI-ZR-TXT"/> | 2028 | <constraint firstAttribute="trailing" secondItem="wl0-Lr-Loe" secondAttribute="trailing" constant="20" id="aiI-ZR-TXT"/> |
1943 | <constraint firstItem="EQg-Ij-vWV" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="b8c-W8-6i1"/> | 2029 | <constraint firstItem="EQg-Ij-vWV" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="b8c-W8-6i1"/> |
1944 | <constraint firstAttribute="trailing" secondItem="EQg-Ij-vWV" secondAttribute="trailing" id="bkq-ZT-L5D"/> | 2030 | <constraint firstAttribute="trailing" secondItem="EQg-Ij-vWV" secondAttribute="trailing" id="bkq-ZT-L5D"/> |
1945 | <constraint firstItem="4Ej-do-8n0" firstAttribute="top" secondItem="1a0-WF-wSk" secondAttribute="top" constant="20" id="dKi-8g-2rR"/> | 2031 | <constraint firstItem="4Ej-do-8n0" firstAttribute="top" secondItem="1a0-WF-wSk" secondAttribute="top" constant="20" id="dKi-8g-2rR"/> |
2032 | + <constraint firstAttribute="trailing" secondItem="O35-Ln-hG5" secondAttribute="trailing" id="dZo-Ah-Lb9"/> | ||
1946 | <constraint firstAttribute="trailing" secondItem="fvz-Hc-IR8" secondAttribute="trailing" id="dcA-hN-4sS"/> | 2033 | <constraint firstAttribute="trailing" secondItem="fvz-Hc-IR8" secondAttribute="trailing" id="dcA-hN-4sS"/> |
1947 | <constraint firstItem="wl0-Lr-Loe" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" constant="20" id="ddW-yH-VZk"/> | 2034 | <constraint firstItem="wl0-Lr-Loe" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" constant="20" id="ddW-yH-VZk"/> |
2035 | + <constraint firstItem="O35-Ln-hG5" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="rBs-36-cvP"/> | ||
1948 | <constraint firstItem="gpg-vO-M3t" firstAttribute="top" secondItem="wl0-Lr-Loe" secondAttribute="bottom" constant="20" id="rBw-Vn-j1k"/> | 2036 | <constraint firstItem="gpg-vO-M3t" firstAttribute="top" secondItem="wl0-Lr-Loe" secondAttribute="bottom" constant="20" id="rBw-Vn-j1k"/> |
1949 | <constraint firstItem="gpg-vO-M3t" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="x9G-DZ-KTK"/> | 2037 | <constraint firstItem="gpg-vO-M3t" firstAttribute="leading" secondItem="1a0-WF-wSk" secondAttribute="leading" id="x9G-DZ-KTK"/> |
1950 | <constraint firstItem="3OL-l2-fcp" firstAttribute="centerY" secondItem="4Ej-do-8n0" secondAttribute="centerY" id="ydb-s4-HWn"/> | 2038 | <constraint firstItem="3OL-l2-fcp" firstAttribute="centerY" secondItem="4Ej-do-8n0" secondAttribute="centerY" id="ydb-s4-HWn"/> |
... | @@ -1999,6 +2087,12 @@ | ... | @@ -1999,6 +2087,12 @@ |
1999 | </constraints> | 2087 | </constraints> |
2000 | </view> | 2088 | </view> |
2001 | <connections> | 2089 | <connections> |
2090 | + <outlet property="boxBadgeImage" destination="N64-1U-kqo" id="3na-N4-CId"/> | ||
2091 | + <outlet property="boxBadgeLabel" destination="iA9-tR-Hgg" id="ODX-ZK-p5o"/> | ||
2092 | + <outlet property="boxBannerInnerParentView" destination="peZ-R0-M9v" id="PeH-6i-Z09"/> | ||
2093 | + <outlet property="boxBannerInnerView" destination="gw1-A6-saC" id="YxH-rb-cvw"/> | ||
2094 | + <outlet property="boxBannerLabel" destination="8e8-3x-tWd" id="Wec-Qi-Mdo"/> | ||
2095 | + <outlet property="boxBannerParentView" destination="O35-Ln-hG5" id="n8H-Sk-PZM"/> | ||
2002 | <outlet property="couponBadgeImage" destination="BZx-LK-Ed2" id="2Li-Je-iAU"/> | 2096 | <outlet property="couponBadgeImage" destination="BZx-LK-Ed2" id="2Li-Je-iAU"/> |
2003 | <outlet property="couponBadgeLabel" destination="Yka-zq-f4R" id="w1j-eu-8kD"/> | 2097 | <outlet property="couponBadgeLabel" destination="Yka-zq-f4R" id="w1j-eu-8kD"/> |
2004 | <outlet property="dfyBadgeImage" destination="zGH-5Y-xb0" id="DD4-ef-4YZ"/> | 2098 | <outlet property="dfyBadgeImage" destination="zGH-5Y-xb0" id="DD4-ef-4YZ"/> |
... | @@ -3375,22 +3469,22 @@ | ... | @@ -3375,22 +3469,22 @@ |
3375 | <autoresizingMask key="autoresizingMask"/> | 3469 | <autoresizingMask key="autoresizingMask"/> |
3376 | <subviews> | 3470 | <subviews> |
3377 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t2C-9l-nWs" userLabel="ParentView"> | 3471 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t2C-9l-nWs" userLabel="ParentView"> |
3378 | - <rect key="frame" x="0.0" y="0.0" width="414" height="175"/> | 3472 | + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
3379 | <subviews> | 3473 | <subviews> |
3380 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gO0-Pa-kWS" userLabel="SectionHeaderView"> | 3474 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gO0-Pa-kWS" userLabel="SectionHeaderView"> |
3381 | - <rect key="frame" x="20" y="0.0" width="374" height="72"/> | 3475 | + <rect key="frame" x="20" y="0.0" width="374" height="0.0"/> |
3382 | <subviews> | 3476 | <subviews> |
3383 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Κουπόνια" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IXl-Ba-HgN"> | 3477 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Κουπόνια" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IXl-Ba-HgN"> |
3384 | - <rect key="frame" x="0.0" y="25" width="330" height="22"/> | 3478 | + <rect key="frame" x="0.0" y="25" width="330" height="0.0"/> |
3385 | <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="19"/> | 3479 | <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="19"/> |
3386 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | 3480 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> |
3387 | <nil key="highlightedColor"/> | 3481 | <nil key="highlightedColor"/> |
3388 | </label> | 3482 | </label> |
3389 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P3a-gV-vNS"> | 3483 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P3a-gV-vNS"> |
3390 | - <rect key="frame" x="330" y="0.0" width="44" height="72"/> | 3484 | + <rect key="frame" x="330" y="0.0" width="44" height="0.0"/> |
3391 | <subviews> | 3485 | <subviews> |
3392 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XbI-ey-mgh"> | 3486 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XbI-ey-mgh"> |
3393 | - <rect key="frame" x="10" y="24" width="24" height="24"/> | 3487 | + <rect key="frame" x="10" y="-12" width="24" height="24"/> |
3394 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3488 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
3395 | <constraints> | 3489 | <constraints> |
3396 | <constraint firstAttribute="height" constant="24" id="c60-7W-8Dq"/> | 3490 | <constraint firstAttribute="height" constant="24" id="c60-7W-8Dq"/> |
... | @@ -3398,7 +3492,7 @@ | ... | @@ -3398,7 +3492,7 @@ |
3398 | </constraints> | 3492 | </constraints> |
3399 | </imageView> | 3493 | </imageView> |
3400 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YMc-Qb-txy"> | 3494 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YMc-Qb-txy"> |
3401 | - <rect key="frame" x="0.0" y="0.0" width="44" height="72"/> | 3495 | + <rect key="frame" x="0.0" y="0.0" width="44" height="0.0"/> |
3402 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3496 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
3403 | <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/> | 3497 | <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/> |
3404 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | 3498 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> |
... | @@ -3434,27 +3528,27 @@ | ... | @@ -3434,27 +3528,27 @@ |
3434 | </constraints> | 3528 | </constraints> |
3435 | </view> | 3529 | </view> |
3436 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ago-Pf-BGo"> | 3530 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ago-Pf-BGo"> |
3437 | - <rect key="frame" x="20" y="75" width="111.5" height="97"/> | 3531 | + <rect key="frame" x="20" y="3" width="111.5" height="38"/> |
3438 | <subviews> | 3532 | <subviews> |
3439 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Phm-pC-5YX"> | 3533 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Phm-pC-5YX"> |
3440 | - <rect key="frame" x="0.0" y="0.0" width="111.5" height="97"/> | 3534 | + <rect key="frame" x="0.0" y="0.0" width="111.5" height="38"/> |
3441 | <subviews> | 3535 | <subviews> |
3442 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wLH-YV-5Bn"> | 3536 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wLH-YV-5Bn"> |
3443 | - <rect key="frame" x="29.5" y="15" width="52" height="32"/> | 3537 | + <rect key="frame" x="29.5" y="15" width="52" height="0.0"/> |
3444 | <constraints> | 3538 | <constraints> |
3445 | <constraint firstAttribute="height" constant="32" id="EtR-nn-mGe"/> | 3539 | <constraint firstAttribute="height" constant="32" id="EtR-nn-mGe"/> |
3446 | <constraint firstAttribute="width" constant="52" id="cGb-tB-T1G"/> | 3540 | <constraint firstAttribute="width" constant="52" id="cGb-tB-T1G"/> |
3447 | </constraints> | 3541 | </constraints> |
3448 | </imageView> | 3542 | </imageView> |
3449 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wBk-nW-MGe" userLabel="LineView1"> | 3543 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wBk-nW-MGe" userLabel="LineView1"> |
3450 | - <rect key="frame" x="10" y="57" width="91.5" height="1"/> | 3544 | + <rect key="frame" x="10" y="25" width="91.5" height="0.0"/> |
3451 | <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> | 3545 | <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> |
3452 | <constraints> | 3546 | <constraints> |
3453 | <constraint firstAttribute="height" constant="1" id="sfB-Gv-awg"/> | 3547 | <constraint firstAttribute="height" constant="1" id="sfB-Gv-awg"/> |
3454 | </constraints> | 3548 | </constraints> |
3455 | </view> | 3549 | </view> |
3456 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DEALS for YOU" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZr-sg-ajR"> | 3550 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DEALS for YOU" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZr-sg-ajR"> |
3457 | - <rect key="frame" x="5" y="68" width="101.5" height="14"/> | 3551 | + <rect key="frame" x="5" y="23" width="101.5" height="0.0"/> |
3458 | <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> | 3552 | <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> |
3459 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | 3553 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
3460 | <nil key="highlightedColor"/> | 3554 | <nil key="highlightedColor"/> |
... | @@ -3478,7 +3572,7 @@ | ... | @@ -3478,7 +3572,7 @@ |
3478 | </constraints> | 3572 | </constraints> |
3479 | </view> | 3573 | </view> |
3480 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gr4-DX-CHP"> | 3574 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gr4-DX-CHP"> |
3481 | - <rect key="frame" x="0.0" y="0.0" width="111.5" height="97"/> | 3575 | + <rect key="frame" x="0.0" y="0.0" width="111.5" height="38"/> |
3482 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3576 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
3483 | <state key="normal" title="Button"/> | 3577 | <state key="normal" title="Button"/> |
3484 | <buttonConfiguration key="configuration" style="plain" title="Button"> | 3578 | <buttonConfiguration key="configuration" style="plain" title="Button"> |
... | @@ -3518,24 +3612,24 @@ | ... | @@ -3518,24 +3612,24 @@ |
3518 | </constraints> | 3612 | </constraints> |
3519 | </view> | 3613 | </view> |
3520 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gZG-f4-H22"> | 3614 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gZG-f4-H22"> |
3521 | - <rect key="frame" x="151.5" y="75" width="111" height="97"/> | 3615 | + <rect key="frame" x="151.5" y="3" width="111" height="38"/> |
3522 | <subviews> | 3616 | <subviews> |
3523 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qYJ-x0-9v3"> | 3617 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qYJ-x0-9v3"> |
3524 | - <rect key="frame" x="39.5" y="15" width="32" height="32"/> | 3618 | + <rect key="frame" x="39.5" y="15" width="32" height="0.0"/> |
3525 | <constraints> | 3619 | <constraints> |
3526 | <constraint firstAttribute="height" constant="32" id="Eam-Dq-yk8"/> | 3620 | <constraint firstAttribute="height" constant="32" id="Eam-Dq-yk8"/> |
3527 | <constraint firstAttribute="width" constant="32" id="T94-6W-v1V"/> | 3621 | <constraint firstAttribute="width" constant="32" id="T94-6W-v1V"/> |
3528 | </constraints> | 3622 | </constraints> |
3529 | </imageView> | 3623 | </imageView> |
3530 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f0n-5v-nTc" userLabel="LineView2"> | 3624 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f0n-5v-nTc" userLabel="LineView2"> |
3531 | - <rect key="frame" x="10" y="57" width="91" height="1"/> | 3625 | + <rect key="frame" x="10" y="25" width="91" height="0.0"/> |
3532 | <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> | 3626 | <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> |
3533 | <constraints> | 3627 | <constraints> |
3534 | <constraint firstAttribute="height" constant="1" id="2h1-Yb-N6x"/> | 3628 | <constraint firstAttribute="height" constant="1" id="2h1-Yb-N6x"/> |
3535 | </constraints> | 3629 | </constraints> |
3536 | </view> | 3630 | </view> |
3537 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Super Market" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fPZ-hU-LRI"> | 3631 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Super Market" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fPZ-hU-LRI"> |
3538 | - <rect key="frame" x="5" y="68" width="101" height="14"/> | 3632 | + <rect key="frame" x="5" y="23" width="101" height="0.0"/> |
3539 | <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> | 3633 | <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> |
3540 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | 3634 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> |
3541 | <nil key="highlightedColor"/> | 3635 | <nil key="highlightedColor"/> |
... | @@ -3559,7 +3653,7 @@ | ... | @@ -3559,7 +3653,7 @@ |
3559 | </constraints> | 3653 | </constraints> |
3560 | </view> | 3654 | </view> |
3561 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tCp-jb-GB2"> | 3655 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tCp-jb-GB2"> |
3562 | - <rect key="frame" x="0.0" y="0.0" width="111" height="97"/> | 3656 | + <rect key="frame" x="0.0" y="0.0" width="111" height="38"/> |
3563 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3657 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
3564 | <state key="normal" title="Button"/> | 3658 | <state key="normal" title="Button"/> |
3565 | <buttonConfiguration key="configuration" style="plain" title="Button"> | 3659 | <buttonConfiguration key="configuration" style="plain" title="Button"> |
... | @@ -3590,24 +3684,24 @@ | ... | @@ -3590,24 +3684,24 @@ |
3590 | </constraints> | 3684 | </constraints> |
3591 | </view> | 3685 | </view> |
3592 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hW7-Fh-jaW"> | 3686 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hW7-Fh-jaW"> |
3593 | - <rect key="frame" x="282.5" y="75" width="111.5" height="97"/> | 3687 | + <rect key="frame" x="282.5" y="3" width="111.5" height="38"/> |
3594 | <subviews> | 3688 | <subviews> |
3595 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="JSL-ST-Uzv"> | 3689 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="JSL-ST-Uzv"> |
3596 | - <rect key="frame" x="40" y="15" width="32" height="32"/> | 3690 | + <rect key="frame" x="40" y="15" width="32" height="0.0"/> |
3597 | <constraints> | 3691 | <constraints> |
3598 | <constraint firstAttribute="width" constant="32" id="hUR-TJ-yVm"/> | 3692 | <constraint firstAttribute="width" constant="32" id="hUR-TJ-yVm"/> |
3599 | <constraint firstAttribute="height" constant="32" id="ll3-xS-hwd"/> | 3693 | <constraint firstAttribute="height" constant="32" id="ll3-xS-hwd"/> |
3600 | </constraints> | 3694 | </constraints> |
3601 | </imageView> | 3695 | </imageView> |
3602 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="90x-B7-1Hx" userLabel="LineView3"> | 3696 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="90x-B7-1Hx" userLabel="LineView3"> |
3603 | - <rect key="frame" x="10" y="57" width="91.5" height="1"/> | 3697 | + <rect key="frame" x="10" y="25" width="91.5" height="0.0"/> |
3604 | <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> | 3698 | <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/> |
3605 | <constraints> | 3699 | <constraints> |
3606 | <constraint firstAttribute="height" constant="1" id="ojI-ru-A13"/> | 3700 | <constraint firstAttribute="height" constant="1" id="ojI-ru-A13"/> |
3607 | </constraints> | 3701 | </constraints> |
3608 | </view> | 3702 | </view> |
3609 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GIFTS for YOU" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVo-4f-20j"> | 3703 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GIFTS for YOU" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVo-4f-20j"> |
3610 | - <rect key="frame" x="5" y="68" width="101.5" height="14"/> | 3704 | + <rect key="frame" x="5" y="23" width="101.5" height="0.0"/> |
3611 | <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> | 3705 | <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/> |
3612 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | 3706 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> |
3613 | <nil key="highlightedColor"/> | 3707 | <nil key="highlightedColor"/> |
... | @@ -3631,7 +3725,7 @@ | ... | @@ -3631,7 +3725,7 @@ |
3631 | </constraints> | 3725 | </constraints> |
3632 | </view> | 3726 | </view> |
3633 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CeN-GT-tVP"> | 3727 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CeN-GT-tVP"> |
3634 | - <rect key="frame" x="0.0" y="0.0" width="111.5" height="97"/> | 3728 | + <rect key="frame" x="0.0" y="0.0" width="111.5" height="38"/> |
3635 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3729 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
3636 | <state key="normal" title="Button"/> | 3730 | <state key="normal" title="Button"/> |
3637 | <buttonConfiguration key="configuration" style="plain" title="Button"> | 3731 | <buttonConfiguration key="configuration" style="plain" title="Button"> |
... | @@ -6628,6 +6722,7 @@ | ... | @@ -6628,6 +6722,7 @@ |
6628 | <image name="coupons_scrollview_white" width="214" height="462"/> | 6722 | <image name="coupons_scrollview_white" width="214" height="462"/> |
6629 | <image name="curved_bg_white" width="159.5" height="118.5"/> | 6723 | <image name="curved_bg_white" width="159.5" height="118.5"/> |
6630 | <image name="dfy_logo_white" width="1611" height="395"/> | 6724 | <image name="dfy_logo_white" width="1611" height="395"/> |
6725 | + <image name="history_banner_box" width="71" height="71"/> | ||
6631 | <image name="history_banner_dfy" width="71" height="71"/> | 6726 | <image name="history_banner_dfy" width="71" height="71"/> |
6632 | <image name="history_banner_gfy" width="71" height="71"/> | 6727 | <image name="history_banner_gfy" width="71" height="71"/> |
6633 | <image name="history_banner_sm" width="71" height="71"/> | 6728 | <image name="history_banner_sm" width="71" height="71"/> | ... | ... |
-
Please register or login to post a comment