Showing
6 changed files
with
74 additions
and
73 deletions
No preview for this file type
... | @@ -45,7 +45,7 @@ import UIKit | ... | @@ -45,7 +45,7 @@ import UIKit |
45 | 45 | ||
46 | couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 46 | couponBgImage.image = UIImage(named: "coupon_bg_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
47 | 47 | ||
48 | - borderView.addDashedBorderVertical(color: UIColor(red: 0.44, green: 0.44, blue: 0.44, alpha: 1.00), width: 1.0, height: 110.0) | 48 | + borderView.addDashedBorderVertical(color: UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00), width: 1.0, height: 110.0) |
49 | } | 49 | } |
50 | 50 | ||
51 | public override func setSelected(_ selected: Bool, animated: Bool) { | 51 | public override func setSelected(_ selected: Bool, animated: Bool) { | ... | ... |
... | @@ -25,15 +25,15 @@ import SwiftEventBus | ... | @@ -25,15 +25,15 @@ import SwiftEventBus |
25 | setBackButton() | 25 | setBackButton() |
26 | setNavigationTitle("Ενεργά κουπόνια") | 26 | setNavigationTitle("Ενεργά κουπόνια") |
27 | 27 | ||
28 | - backgroundImage.image = UIImage(named: "coupons_scrollview_dark", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 28 | +// backgroundImage.image = UIImage(named: "coupons_scrollview_dark", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
29 | 29 | ||
30 | tableView.delegate = self | 30 | tableView.delegate = self |
31 | tableView.dataSource = self | 31 | tableView.dataSource = self |
32 | 32 | ||
33 | - tableView.clipsToBounds = true | 33 | +// tableView.clipsToBounds = true |
34 | - tableView.layer.cornerRadius = 30 | 34 | +// tableView.layer.cornerRadius = 30 |
35 | - tableView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius | 35 | +// tableView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius |
36 | - tableView.contentInset.top = 50 | 36 | + tableView.contentInset.top = 30 |
37 | } | 37 | } |
38 | 38 | ||
39 | public override func viewWillAppear(_ animated: Bool) { | 39 | public override func viewWillAppear(_ animated: Bool) { |
... | @@ -83,7 +83,7 @@ extension CouponsViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -83,7 +83,7 @@ extension CouponsViewController: UITableViewDelegate, UITableViewDataSource{ |
83 | } | 83 | } |
84 | 84 | ||
85 | public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { | 85 | public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { |
86 | - return 120.0 + 8.0 | 86 | + return 130.0 + 8.0 |
87 | // return UITableViewAutomaticDimension | 87 | // return UITableViewAutomaticDimension |
88 | } | 88 | } |
89 | 89 | ... | ... |
... | @@ -58,48 +58,48 @@ | ... | @@ -58,48 +58,48 @@ |
58 | <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 58 | <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
59 | <prototypes> | 59 | <prototypes> |
60 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="Ivk-7o-eVp" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> | 60 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="Ivk-7o-eVp" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> |
61 | - <rect key="frame" x="0.0" y="50" width="414" height="116.5"/> | 61 | + <rect key="frame" x="0.0" y="50" width="414" height="64.5"/> |
62 | <autoresizingMask key="autoresizingMask"/> | 62 | <autoresizingMask key="autoresizingMask"/> |
63 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Ivk-7o-eVp" id="OpF-ry-8Pc"> | 63 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Ivk-7o-eVp" id="OpF-ry-8Pc"> |
64 | - <rect key="frame" x="0.0" y="0.0" width="414" height="116.5"/> | 64 | + <rect key="frame" x="0.0" y="0.0" width="414" height="64.5"/> |
65 | <autoresizingMask key="autoresizingMask"/> | 65 | <autoresizingMask key="autoresizingMask"/> |
66 | <subviews> | 66 | <subviews> |
67 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JaN-ia-6ul"> | 67 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JaN-ia-6ul"> |
68 | - <rect key="frame" x="10" y="0.0" width="394" height="116.5"/> | 68 | + <rect key="frame" x="10" y="0.0" width="394" height="64.5"/> |
69 | <subviews> | 69 | <subviews> |
70 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="2YB-QL-me8"> | 70 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="2YB-QL-me8"> |
71 | - <rect key="frame" x="0.0" y="0.0" width="394" height="116.5"/> | 71 | + <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/> |
72 | </imageView> | 72 | </imageView> |
73 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qgV-LI-5lL"> | 73 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qgV-LI-5lL"> |
74 | - <rect key="frame" x="20" y="10" width="79" height="96.5"/> | 74 | + <rect key="frame" x="20" y="10" width="79" height="44.5"/> |
75 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 75 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
76 | </imageView> | 76 | </imageView> |
77 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kWi-pp-keF"> | 77 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kWi-pp-keF"> |
78 | - <rect key="frame" x="104" y="5" width="10" height="106.5"/> | 78 | + <rect key="frame" x="104" y="10" width="10" height="44.5"/> |
79 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 79 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
80 | <constraints> | 80 | <constraints> |
81 | <constraint firstAttribute="width" constant="10" id="UQ1-xk-Qqc"/> | 81 | <constraint firstAttribute="width" constant="10" id="UQ1-xk-Qqc"/> |
82 | </constraints> | 82 | </constraints> |
83 | </view> | 83 | </view> |
84 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWw-Mr-bn2"> | 84 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWw-Mr-bn2"> |
85 | - <rect key="frame" x="119" y="15" width="255" height="20"/> | 85 | + <rect key="frame" x="119" y="-15.5" width="255" height="21"/> |
86 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> | 86 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/> |
87 | - <color key="textColor" red="0.22745098039215686" green="0.32156862745098036" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> | 87 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
88 | <nil key="highlightedColor"/> | 88 | <nil key="highlightedColor"/> |
89 | </label> | 89 | </label> |
90 | - <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="URC-i5-9Gw"> | 90 | + <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="URC-i5-9Gw"> |
91 | - <rect key="frame" x="119" y="40" width="255" height="36.5"/> | 91 | + <rect key="frame" x="119" y="10.5" width="255" height="43.5"/> |
92 | <subviews> | 92 | <subviews> |
93 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ssk-9S-HMD"> | 93 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ssk-9S-HMD"> |
94 | - <rect key="frame" x="0.0" y="0.0" width="127.5" height="36.5"/> | 94 | + <rect key="frame" x="0.0" y="0.0" width="127.5" height="43.5"/> |
95 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Bold" family="PF Square Sans Pro" pointSize="31"/> | 95 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="35"/> |
96 | - <color key="textColor" red="0.22745098039215686" green="0.32156862745098036" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> | 96 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
97 | <nil key="highlightedColor"/> | 97 | <nil key="highlightedColor"/> |
98 | </label> | 98 | </label> |
99 | <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"> | 99 | <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"> |
100 | - <rect key="frame" x="132.5" y="0.0" width="122.5" height="36.5"/> | 100 | + <rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/> |
101 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> | 101 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
102 | - <color key="textColor" red="0.38039215686274508" green="0.44313725490196076" blue="0.50588235294117645" alpha="1" colorSpace="calibratedRGB"/> | 102 | + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> |
103 | <nil key="highlightedColor"/> | 103 | <nil key="highlightedColor"/> |
104 | </label> | 104 | </label> |
105 | </subviews> | 105 | </subviews> |
... | @@ -109,9 +109,9 @@ | ... | @@ -109,9 +109,9 @@ |
109 | </constraints> | 109 | </constraints> |
110 | </stackView> | 110 | </stackView> |
111 | <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"> | 111 | <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"> |
112 | - <rect key="frame" x="119" y="87.5" width="255" height="14"/> | 112 | + <rect key="frame" x="119" y="59" width="255" height="15"/> |
113 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> | 113 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
114 | - <color key="textColor" red="0.38039215686274508" green="0.44313725490196076" blue="0.50588235294117645" alpha="1" colorSpace="calibratedRGB"/> | 114 | + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> |
115 | <nil key="highlightedColor"/> | 115 | <nil key="highlightedColor"/> |
116 | </label> | 116 | </label> |
117 | </subviews> | 117 | </subviews> |
... | @@ -123,20 +123,18 @@ | ... | @@ -123,20 +123,18 @@ |
123 | <constraint firstItem="URC-i5-9Gw" firstAttribute="leading" secondItem="kWi-pp-keF" secondAttribute="trailing" constant="5" id="CAI-TE-31b"/> | 123 | <constraint firstItem="URC-i5-9Gw" firstAttribute="leading" secondItem="kWi-pp-keF" secondAttribute="trailing" constant="5" id="CAI-TE-31b"/> |
124 | <constraint firstItem="gWw-Mr-bn2" firstAttribute="leading" secondItem="kWi-pp-keF" secondAttribute="trailing" constant="5" id="DIf-jd-4i9"/> | 124 | <constraint firstItem="gWw-Mr-bn2" firstAttribute="leading" secondItem="kWi-pp-keF" secondAttribute="trailing" constant="5" id="DIf-jd-4i9"/> |
125 | <constraint firstItem="2YB-QL-me8" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" id="Kg9-3h-9yX"/> | 125 | <constraint firstItem="2YB-QL-me8" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" id="Kg9-3h-9yX"/> |
126 | - <constraint firstItem="gWw-Mr-bn2" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" constant="15" id="L2J-sA-Qyz"/> | ||
127 | <constraint firstAttribute="trailing" secondItem="2YB-QL-me8" secondAttribute="trailing" id="LKX-8Q-weK"/> | 126 | <constraint firstAttribute="trailing" secondItem="2YB-QL-me8" secondAttribute="trailing" id="LKX-8Q-weK"/> |
128 | - <constraint firstItem="kWi-pp-keF" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" constant="5" id="Nw1-Du-inS"/> | 127 | + <constraint firstItem="kWi-pp-keF" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" constant="10" id="Nw1-Du-inS"/> |
129 | <constraint firstAttribute="bottom" secondItem="2YB-QL-me8" secondAttribute="bottom" id="QuD-tm-o3p"/> | 128 | <constraint firstAttribute="bottom" secondItem="2YB-QL-me8" secondAttribute="bottom" id="QuD-tm-o3p"/> |
130 | <constraint firstItem="2YB-QL-me8" firstAttribute="leading" secondItem="JaN-ia-6ul" secondAttribute="leading" id="RGp-Mx-kq9"/> | 129 | <constraint firstItem="2YB-QL-me8" firstAttribute="leading" secondItem="JaN-ia-6ul" secondAttribute="leading" id="RGp-Mx-kq9"/> |
131 | <constraint firstAttribute="trailing" secondItem="URC-i5-9Gw" secondAttribute="trailing" constant="20" id="X88-Je-614"/> | 130 | <constraint firstAttribute="trailing" secondItem="URC-i5-9Gw" secondAttribute="trailing" constant="20" id="X88-Je-614"/> |
132 | - <constraint firstAttribute="bottom" secondItem="Kdt-I2-GtS" secondAttribute="bottom" constant="15" id="YOO-8b-oBD"/> | ||
133 | <constraint firstItem="qgV-LI-5lL" firstAttribute="leading" secondItem="JaN-ia-6ul" secondAttribute="leading" constant="20" id="Zz2-s3-Lli"/> | 131 | <constraint firstItem="qgV-LI-5lL" firstAttribute="leading" secondItem="JaN-ia-6ul" secondAttribute="leading" constant="20" id="Zz2-s3-Lli"/> |
134 | - <constraint firstItem="URC-i5-9Gw" firstAttribute="top" relation="greaterThanOrEqual" secondItem="gWw-Mr-bn2" secondAttribute="bottom" constant="5" id="gv1-5w-f05"/> | 132 | + <constraint firstItem="URC-i5-9Gw" firstAttribute="top" secondItem="gWw-Mr-bn2" secondAttribute="bottom" constant="5" id="gv1-5w-f05"/> |
135 | <constraint firstItem="URC-i5-9Gw" firstAttribute="centerY" secondItem="JaN-ia-6ul" secondAttribute="centerY" id="lCc-I4-VSe"/> | 133 | <constraint firstItem="URC-i5-9Gw" firstAttribute="centerY" secondItem="JaN-ia-6ul" secondAttribute="centerY" id="lCc-I4-VSe"/> |
136 | - <constraint firstAttribute="bottom" secondItem="kWi-pp-keF" secondAttribute="bottom" constant="5" id="mqK-8D-WIR"/> | 134 | + <constraint firstAttribute="bottom" secondItem="kWi-pp-keF" secondAttribute="bottom" constant="10" id="mqK-8D-WIR"/> |
137 | <constraint firstAttribute="trailing" secondItem="gWw-Mr-bn2" secondAttribute="trailing" constant="20" id="oL8-6u-dOS"/> | 135 | <constraint firstAttribute="trailing" secondItem="gWw-Mr-bn2" secondAttribute="trailing" constant="20" id="oL8-6u-dOS"/> |
138 | <constraint firstItem="qgV-LI-5lL" firstAttribute="width" secondItem="JaN-ia-6ul" secondAttribute="width" multiplier="0.2" id="pqq-lg-4bn"/> | 136 | <constraint firstItem="qgV-LI-5lL" firstAttribute="width" secondItem="JaN-ia-6ul" secondAttribute="width" multiplier="0.2" id="pqq-lg-4bn"/> |
139 | - <constraint firstItem="Kdt-I2-GtS" firstAttribute="top" relation="greaterThanOrEqual" secondItem="URC-i5-9Gw" secondAttribute="bottom" constant="5" id="rGz-OI-ook"/> | 137 | + <constraint firstItem="Kdt-I2-GtS" firstAttribute="top" secondItem="URC-i5-9Gw" secondAttribute="bottom" constant="5" id="rGz-OI-ook"/> |
140 | <constraint firstAttribute="bottom" secondItem="qgV-LI-5lL" secondAttribute="bottom" constant="10" id="ryN-Yr-NRM"/> | 138 | <constraint firstAttribute="bottom" secondItem="qgV-LI-5lL" secondAttribute="bottom" constant="10" id="ryN-Yr-NRM"/> |
141 | <constraint firstItem="qgV-LI-5lL" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" constant="10" id="z0W-2B-JKp"/> | 139 | <constraint firstItem="qgV-LI-5lL" firstAttribute="top" secondItem="JaN-ia-6ul" secondAttribute="top" constant="10" id="z0W-2B-JKp"/> |
142 | </constraints> | 140 | </constraints> |
... | @@ -168,7 +166,7 @@ | ... | @@ -168,7 +166,7 @@ |
168 | </connections> | 166 | </connections> |
169 | </tableView> | 167 | </tableView> |
170 | </subviews> | 168 | </subviews> |
171 | - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 169 | + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/> |
172 | <constraints> | 170 | <constraints> |
173 | <constraint firstItem="KhH-tg-FBN" firstAttribute="top" secondItem="FoX-v7-tak" secondAttribute="top" constant="2" id="DSl-zy-v7y"/> | 171 | <constraint firstItem="KhH-tg-FBN" firstAttribute="top" secondItem="FoX-v7-tak" secondAttribute="top" constant="2" id="DSl-zy-v7y"/> |
174 | <constraint firstAttribute="bottom" secondItem="KhH-tg-FBN" secondAttribute="bottom" id="Dk8-ID-x8T"/> | 172 | <constraint firstAttribute="bottom" secondItem="KhH-tg-FBN" secondAttribute="bottom" id="Dk8-ID-x8T"/> |
... | @@ -179,6 +177,11 @@ | ... | @@ -179,6 +177,11 @@ |
179 | <constraint firstItem="KhH-tg-FBN" firstAttribute="leading" secondItem="FoX-v7-tak" secondAttribute="leading" id="oXI-zv-0nB"/> | 177 | <constraint firstItem="KhH-tg-FBN" firstAttribute="leading" secondItem="FoX-v7-tak" secondAttribute="leading" id="oXI-zv-0nB"/> |
180 | <constraint firstAttribute="trailing" secondItem="KhH-tg-FBN" secondAttribute="trailing" id="tAn-PH-mZ8"/> | 178 | <constraint firstAttribute="trailing" secondItem="KhH-tg-FBN" secondAttribute="trailing" id="tAn-PH-mZ8"/> |
181 | </constraints> | 179 | </constraints> |
180 | + <variation key="default"> | ||
181 | + <mask key="subviews"> | ||
182 | + <exclude reference="5rB-1e-ygb"/> | ||
183 | + </mask> | ||
184 | + </variation> | ||
182 | </view> | 185 | </view> |
183 | </subviews> | 186 | </subviews> |
184 | <viewLayoutGuide key="safeArea" id="KbU-RX-se5"/> | 187 | <viewLayoutGuide key="safeArea" id="KbU-RX-se5"/> |
... | @@ -1685,48 +1688,48 @@ | ... | @@ -1685,48 +1688,48 @@ |
1685 | </view> | 1688 | </view> |
1686 | <prototypes> | 1689 | <prototypes> |
1687 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="PUP-z1-zvb" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> | 1690 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="PUP-z1-zvb" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> |
1688 | - <rect key="frame" x="0.0" y="718.5" width="414" height="105"/> | 1691 | + <rect key="frame" x="0.0" y="718.5" width="414" height="64.5"/> |
1689 | <autoresizingMask key="autoresizingMask"/> | 1692 | <autoresizingMask key="autoresizingMask"/> |
1690 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PUP-z1-zvb" id="dt2-2B-okP"> | 1693 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PUP-z1-zvb" id="dt2-2B-okP"> |
1691 | - <rect key="frame" x="0.0" y="0.0" width="414" height="105"/> | 1694 | + <rect key="frame" x="0.0" y="0.0" width="414" height="64.5"/> |
1692 | <autoresizingMask key="autoresizingMask"/> | 1695 | <autoresizingMask key="autoresizingMask"/> |
1693 | <subviews> | 1696 | <subviews> |
1694 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FsY-Dp-PUQ"> | 1697 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FsY-Dp-PUQ"> |
1695 | - <rect key="frame" x="10" y="0.0" width="394" height="105"/> | 1698 | + <rect key="frame" x="10" y="0.0" width="394" height="64.5"/> |
1696 | <subviews> | 1699 | <subviews> |
1697 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="vZ4-HF-lwK"> | 1700 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="vZ4-HF-lwK"> |
1698 | - <rect key="frame" x="0.0" y="0.0" width="394" height="105"/> | 1701 | + <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/> |
1699 | </imageView> | 1702 | </imageView> |
1700 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f2f-Lm-to3"> | 1703 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f2f-Lm-to3"> |
1701 | - <rect key="frame" x="20" y="10" width="79" height="85"/> | 1704 | + <rect key="frame" x="20" y="10" width="79" height="44.5"/> |
1702 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 1705 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
1703 | </imageView> | 1706 | </imageView> |
1704 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zth-sP-rUI"> | 1707 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zth-sP-rUI"> |
1705 | - <rect key="frame" x="104" y="5" width="10" height="95"/> | 1708 | + <rect key="frame" x="104" y="10" width="10" height="44.5"/> |
1706 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 1709 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
1707 | <constraints> | 1710 | <constraints> |
1708 | <constraint firstAttribute="width" constant="10" id="0jX-bF-I3k"/> | 1711 | <constraint firstAttribute="width" constant="10" id="0jX-bF-I3k"/> |
1709 | </constraints> | 1712 | </constraints> |
1710 | </view> | 1713 | </view> |
1711 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0"> | 1714 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0"> |
1712 | - <rect key="frame" x="119" y="15" width="255" height="17"/> | 1715 | + <rect key="frame" x="119" y="-15.5" width="255" height="21"/> |
1713 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> | 1716 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/> |
1714 | - <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> | 1717 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
1715 | <nil key="highlightedColor"/> | 1718 | <nil key="highlightedColor"/> |
1716 | </label> | 1719 | </label> |
1717 | - <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3"> | 1720 | + <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3"> |
1718 | - <rect key="frame" x="119" y="37" width="255" height="31"/> | 1721 | + <rect key="frame" x="119" y="10.5" width="255" height="43.5"/> |
1719 | <subviews> | 1722 | <subviews> |
1720 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt"> | 1723 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt"> |
1721 | - <rect key="frame" x="0.0" y="0.0" width="127.5" height="31"/> | 1724 | + <rect key="frame" x="0.0" y="0.0" width="127.5" height="43.5"/> |
1722 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Bold" family="PF Square Sans Pro" pointSize="31"/> | 1725 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="35"/> |
1723 | - <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> | 1726 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
1724 | <nil key="highlightedColor"/> | 1727 | <nil key="highlightedColor"/> |
1725 | </label> | 1728 | </label> |
1726 | <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"> | 1729 | <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"> |
1727 | - <rect key="frame" x="132.5" y="0.0" width="122.5" height="31"/> | 1730 | + <rect key="frame" x="132.5" y="14.5" width="122.5" height="15"/> |
1728 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> | 1731 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
1729 | - <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> | 1732 | + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> |
1730 | <nil key="highlightedColor"/> | 1733 | <nil key="highlightedColor"/> |
1731 | </label> | 1734 | </label> |
1732 | </subviews> | 1735 | </subviews> |
... | @@ -1736,32 +1739,30 @@ | ... | @@ -1736,32 +1739,30 @@ |
1736 | </constraints> | 1739 | </constraints> |
1737 | </stackView> | 1740 | </stackView> |
1738 | <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"> | 1741 | <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"> |
1739 | - <rect key="frame" x="119" y="78" width="255" height="12"/> | 1742 | + <rect key="frame" x="119" y="59" width="255" height="15"/> |
1740 | - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> | 1743 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> |
1741 | - <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> | 1744 | + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/> |
1742 | <nil key="highlightedColor"/> | 1745 | <nil key="highlightedColor"/> |
1743 | </label> | 1746 | </label> |
1744 | </subviews> | 1747 | </subviews> |
1745 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 1748 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
1746 | <constraints> | 1749 | <constraints> |
1747 | <constraint firstAttribute="trailing" secondItem="BAb-kn-pw0" secondAttribute="trailing" constant="20" id="1wy-YZ-1QM"/> | 1750 | <constraint firstAttribute="trailing" secondItem="BAb-kn-pw0" secondAttribute="trailing" constant="20" id="1wy-YZ-1QM"/> |
1748 | - <constraint firstAttribute="bottom" secondItem="zth-sP-rUI" secondAttribute="bottom" constant="5" id="2Bk-P7-vqZ"/> | 1751 | + <constraint firstAttribute="bottom" secondItem="zth-sP-rUI" secondAttribute="bottom" constant="10" id="2Bk-P7-vqZ"/> |
1749 | <constraint firstItem="RJe-Li-bx3" firstAttribute="leading" secondItem="zth-sP-rUI" secondAttribute="trailing" constant="5" id="44O-pO-Gow"/> | 1752 | <constraint firstItem="RJe-Li-bx3" firstAttribute="leading" secondItem="zth-sP-rUI" secondAttribute="trailing" constant="5" id="44O-pO-Gow"/> |
1750 | <constraint firstItem="EEj-3C-9Td" firstAttribute="leading" secondItem="zth-sP-rUI" secondAttribute="trailing" constant="5" id="5gC-oO-mvc"/> | 1753 | <constraint firstItem="EEj-3C-9Td" firstAttribute="leading" secondItem="zth-sP-rUI" secondAttribute="trailing" constant="5" id="5gC-oO-mvc"/> |
1751 | <constraint firstItem="vZ4-HF-lwK" firstAttribute="leading" secondItem="FsY-Dp-PUQ" secondAttribute="leading" id="5zH-Q8-HsV"/> | 1754 | <constraint firstItem="vZ4-HF-lwK" firstAttribute="leading" secondItem="FsY-Dp-PUQ" secondAttribute="leading" id="5zH-Q8-HsV"/> |
1752 | <constraint firstAttribute="bottom" secondItem="vZ4-HF-lwK" secondAttribute="bottom" id="8eo-h4-Qj6"/> | 1755 | <constraint firstAttribute="bottom" secondItem="vZ4-HF-lwK" secondAttribute="bottom" id="8eo-h4-Qj6"/> |
1753 | <constraint firstItem="f2f-Lm-to3" firstAttribute="width" secondItem="FsY-Dp-PUQ" secondAttribute="width" multiplier="0.2" id="HRY-vF-zWg"/> | 1756 | <constraint firstItem="f2f-Lm-to3" firstAttribute="width" secondItem="FsY-Dp-PUQ" secondAttribute="width" multiplier="0.2" id="HRY-vF-zWg"/> |
1754 | - <constraint firstItem="BAb-kn-pw0" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" constant="15" id="NUQ-Nc-NYR"/> | ||
1755 | <constraint firstItem="zth-sP-rUI" firstAttribute="leading" secondItem="f2f-Lm-to3" secondAttribute="trailing" constant="5" id="WT1-xO-rY7"/> | 1757 | <constraint firstItem="zth-sP-rUI" firstAttribute="leading" secondItem="f2f-Lm-to3" secondAttribute="trailing" constant="5" id="WT1-xO-rY7"/> |
1756 | - <constraint firstAttribute="bottom" secondItem="EEj-3C-9Td" secondAttribute="bottom" constant="15" id="XAX-q3-he4"/> | ||
1757 | <constraint firstItem="f2f-Lm-to3" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" constant="10" id="blg-R6-OfW"/> | 1758 | <constraint firstItem="f2f-Lm-to3" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" constant="10" id="blg-R6-OfW"/> |
1758 | - <constraint firstItem="EEj-3C-9Td" firstAttribute="top" relation="greaterThanOrEqual" secondItem="RJe-Li-bx3" secondAttribute="bottom" constant="5" id="fVV-hr-2Zm"/> | 1759 | + <constraint firstItem="EEj-3C-9Td" firstAttribute="top" secondItem="RJe-Li-bx3" secondAttribute="bottom" constant="5" id="fVV-hr-2Zm"/> |
1759 | <constraint firstItem="f2f-Lm-to3" firstAttribute="leading" secondItem="FsY-Dp-PUQ" secondAttribute="leading" constant="20" id="hyu-XF-i7o"/> | 1760 | <constraint firstItem="f2f-Lm-to3" firstAttribute="leading" secondItem="FsY-Dp-PUQ" secondAttribute="leading" constant="20" id="hyu-XF-i7o"/> |
1760 | - <constraint firstItem="RJe-Li-bx3" firstAttribute="top" relation="greaterThanOrEqual" secondItem="BAb-kn-pw0" secondAttribute="bottom" constant="5" id="iBr-HU-lqb"/> | 1761 | + <constraint firstItem="RJe-Li-bx3" firstAttribute="top" secondItem="BAb-kn-pw0" secondAttribute="bottom" constant="5" id="iBr-HU-lqb"/> |
1761 | <constraint firstAttribute="trailing" secondItem="vZ4-HF-lwK" secondAttribute="trailing" id="mNT-mP-5A5"/> | 1762 | <constraint firstAttribute="trailing" secondItem="vZ4-HF-lwK" secondAttribute="trailing" id="mNT-mP-5A5"/> |
1762 | <constraint firstAttribute="bottom" secondItem="f2f-Lm-to3" secondAttribute="bottom" constant="10" id="ngt-YA-MIZ"/> | 1763 | <constraint firstAttribute="bottom" secondItem="f2f-Lm-to3" secondAttribute="bottom" constant="10" id="ngt-YA-MIZ"/> |
1763 | <constraint firstAttribute="trailing" secondItem="EEj-3C-9Td" secondAttribute="trailing" constant="20" id="oxZ-th-4YZ"/> | 1764 | <constraint firstAttribute="trailing" secondItem="EEj-3C-9Td" secondAttribute="trailing" constant="20" id="oxZ-th-4YZ"/> |
1764 | - <constraint firstItem="zth-sP-rUI" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" constant="5" id="riW-4f-1J9"/> | 1765 | + <constraint firstItem="zth-sP-rUI" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" constant="10" id="riW-4f-1J9"/> |
1765 | <constraint firstItem="vZ4-HF-lwK" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" id="u5F-Ed-lvs"/> | 1766 | <constraint firstItem="vZ4-HF-lwK" firstAttribute="top" secondItem="FsY-Dp-PUQ" secondAttribute="top" id="u5F-Ed-lvs"/> |
1766 | <constraint firstItem="BAb-kn-pw0" firstAttribute="leading" secondItem="zth-sP-rUI" secondAttribute="trailing" constant="5" id="uzd-ax-gWN"/> | 1767 | <constraint firstItem="BAb-kn-pw0" firstAttribute="leading" secondItem="zth-sP-rUI" secondAttribute="trailing" constant="5" id="uzd-ax-gWN"/> |
1767 | <constraint firstAttribute="trailing" secondItem="RJe-Li-bx3" secondAttribute="trailing" constant="20" id="wrL-Zn-xXy"/> | 1768 | <constraint firstAttribute="trailing" secondItem="RJe-Li-bx3" secondAttribute="trailing" constant="20" id="wrL-Zn-xXy"/> |
... | @@ -1789,7 +1790,7 @@ | ... | @@ -1789,7 +1790,7 @@ |
1789 | </connections> | 1790 | </connections> |
1790 | </tableViewCell> | 1791 | </tableViewCell> |
1791 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ActiveCodeTableViewCellId" id="GBJ-mP-Cnk" customClass="ActiveCodeTableViewCell" customModule="SwiftWarplyFramework"> | 1792 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ActiveCodeTableViewCellId" id="GBJ-mP-Cnk" customClass="ActiveCodeTableViewCell" customModule="SwiftWarplyFramework"> |
1792 | - <rect key="frame" x="0.0" y="823.5" width="414" height="100"/> | 1793 | + <rect key="frame" x="0.0" y="783" width="414" height="100"/> |
1793 | <autoresizingMask key="autoresizingMask"/> | 1794 | <autoresizingMask key="autoresizingMask"/> |
1794 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="GBJ-mP-Cnk" id="jwr-DB-aSm"> | 1795 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="GBJ-mP-Cnk" id="jwr-DB-aSm"> |
1795 | <rect key="frame" x="0.0" y="0.0" width="414" height="100"/> | 1796 | <rect key="frame" x="0.0" y="0.0" width="414" height="100"/> |
... | @@ -1908,23 +1909,23 @@ | ... | @@ -1908,23 +1909,23 @@ |
1908 | </connections> | 1909 | </connections> |
1909 | </tableViewCell> | 1910 | </tableViewCell> |
1910 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponsTableViewCellId" id="DUH-nG-QWi" customClass="UnifiedCouponsTableViewCell" customModule="SwiftWarplyFramework"> | 1911 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponsTableViewCellId" id="DUH-nG-QWi" customClass="UnifiedCouponsTableViewCell" customModule="SwiftWarplyFramework"> |
1911 | - <rect key="frame" x="0.0" y="923.5" width="414" height="44"/> | 1912 | + <rect key="frame" x="0.0" y="883" width="414" height="64.5"/> |
1912 | <autoresizingMask key="autoresizingMask"/> | 1913 | <autoresizingMask key="autoresizingMask"/> |
1913 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DUH-nG-QWi" id="rx6-wA-MYI"> | 1914 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DUH-nG-QWi" id="rx6-wA-MYI"> |
1914 | - <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 1915 | + <rect key="frame" x="0.0" y="0.0" width="414" height="64.5"/> |
1915 | <autoresizingMask key="autoresizingMask"/> | 1916 | <autoresizingMask key="autoresizingMask"/> |
1916 | <subviews> | 1917 | <subviews> |
1917 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WW2-mP-ZJD"> | 1918 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WW2-mP-ZJD"> |
1918 | - <rect key="frame" x="10" y="0.0" width="394" height="44"/> | 1919 | + <rect key="frame" x="10" y="0.0" width="394" height="64.5"/> |
1919 | <subviews> | 1920 | <subviews> |
1920 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Gde-3J-Ew9"> | 1921 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Gde-3J-Ew9"> |
1921 | - <rect key="frame" x="0.0" y="0.0" width="394" height="44"/> | 1922 | + <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/> |
1922 | </imageView> | 1923 | </imageView> |
1923 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87q-5c-uea"> | 1924 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87q-5c-uea"> |
1924 | - <rect key="frame" x="20" y="10" width="79" height="24"/> | 1925 | + <rect key="frame" x="20" y="10" width="79" height="44.5"/> |
1925 | <subviews> | 1926 | <subviews> |
1926 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XsA-Nw-7Pr"> | 1927 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XsA-Nw-7Pr"> |
1927 | - <rect key="frame" x="18" y="18" width="43" height="0.0"/> | 1928 | + <rect key="frame" x="18" y="18" width="43" height="8.5"/> |
1928 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 1929 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
1929 | </imageView> | 1930 | </imageView> |
1930 | </subviews> | 1931 | </subviews> |
... | @@ -1937,7 +1938,7 @@ | ... | @@ -1937,7 +1938,7 @@ |
1937 | </constraints> | 1938 | </constraints> |
1938 | </view> | 1939 | </view> |
1939 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u97-5H-Y40"> | 1940 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u97-5H-Y40"> |
1940 | - <rect key="frame" x="104" y="5" width="10" height="34"/> | 1941 | + <rect key="frame" x="104" y="5" width="10" height="54.5"/> |
1941 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 1942 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
1942 | <constraints> | 1943 | <constraints> |
1943 | <constraint firstAttribute="width" constant="10" id="Tcx-FG-KC0"/> | 1944 | <constraint firstAttribute="width" constant="10" id="Tcx-FG-KC0"/> |
... | @@ -1950,13 +1951,13 @@ | ... | @@ -1950,13 +1951,13 @@ |
1950 | <nil key="highlightedColor"/> | 1951 | <nil key="highlightedColor"/> |
1951 | </label> | 1952 | </label> |
1952 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJD-Db-B4t"> | 1953 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJD-Db-B4t"> |
1953 | - <rect key="frame" x="292.5" y="16" width="81.5" height="12"/> | 1954 | + <rect key="frame" x="292.5" y="26.5" width="81.5" height="12"/> |
1954 | <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> | 1955 | <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> |
1955 | <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> | 1956 | <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> |
1956 | <nil key="highlightedColor"/> | 1957 | <nil key="highlightedColor"/> |
1957 | </label> | 1958 | </label> |
1958 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C5t-xz-oAO"> | 1959 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C5t-xz-oAO"> |
1959 | - <rect key="frame" x="119" y="17" width="255" height="12"/> | 1960 | + <rect key="frame" x="119" y="37.5" width="255" height="12"/> |
1960 | <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> | 1961 | <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> |
1961 | <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> | 1962 | <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> |
1962 | <nil key="highlightedColor"/> | 1963 | <nil key="highlightedColor"/> |
... | @@ -2006,7 +2007,7 @@ | ... | @@ -2006,7 +2007,7 @@ |
2006 | </connections> | 2007 | </connections> |
2007 | </tableViewCell> | 2008 | </tableViewCell> |
2008 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletBadgesTableViewCellId" id="TeS-tP-Ilh" customClass="WalletBadgesTableViewCell" customModule="SwiftWarplyFramework"> | 2009 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletBadgesTableViewCellId" id="TeS-tP-Ilh" customClass="WalletBadgesTableViewCell" customModule="SwiftWarplyFramework"> |
2009 | - <rect key="frame" x="0.0" y="967.5" width="414" height="44"/> | 2010 | + <rect key="frame" x="0.0" y="947.5" width="414" height="44"/> |
2010 | <autoresizingMask key="autoresizingMask"/> | 2011 | <autoresizingMask key="autoresizingMask"/> |
2011 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TeS-tP-Ilh" id="FFV-uA-HHA"> | 2012 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TeS-tP-Ilh" id="FFV-uA-HHA"> |
2012 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 2013 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | ... | ... |
... | @@ -193,7 +193,7 @@ extension UIView { | ... | @@ -193,7 +193,7 @@ extension UIView { |
193 | let lineLayer = CAShapeLayer() | 193 | let lineLayer = CAShapeLayer() |
194 | lineLayer.strokeColor = color | 194 | lineLayer.strokeColor = color |
195 | lineLayer.lineWidth = width | 195 | lineLayer.lineWidth = width |
196 | - lineLayer.lineDashPattern = [5,5] | 196 | + lineLayer.lineDashPattern = [10,10] |
197 | 197 | ||
198 | let path = CGMutablePath() | 198 | let path = CGMutablePath() |
199 | path.addLines(between: [CGPoint(x: frameSize.width/2, y: 0), CGPoint(x: frameSize.width/2, y: height)]) | 199 | path.addLines(between: [CGPoint(x: frameSize.width/2, y: 0), CGPoint(x: frameSize.width/2, y: height)]) | ... | ... |
... | @@ -741,7 +741,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -741,7 +741,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
741 | 741 | ||
742 | } else if (indexPath.section == 3) { | 742 | } else if (indexPath.section == 3) { |
743 | if (self.coupons.count > 0) { | 743 | if (self.coupons.count > 0) { |
744 | - return 120.0 + 8.0 | 744 | + return 130.0 + 8.0 |
745 | } else { | 745 | } else { |
746 | return 0.0 | 746 | return 0.0 |
747 | } | 747 | } | ... | ... |
-
Please register or login to post a comment