Showing
2 changed files
with
86 additions
and
77 deletions
... | @@ -6138,85 +6138,98 @@ | ... | @@ -6138,85 +6138,98 @@ |
6138 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | 6138 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
6139 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 6139 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
6140 | <subviews> | 6140 | <subviews> |
6141 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ehx-JG-A7m"> | 6141 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gdC-Cm-zRe"> |
6142 | - <rect key="frame" x="36" y="53" width="342" height="233.5"/> | 6142 | + <rect key="frame" x="16" y="93" width="382" height="211"/> |
6143 | <subviews> | 6143 | <subviews> |
6144 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1to-ht-Vk8" userLabel="Header View"> | 6144 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ehx-JG-A7m"> |
6145 | - <rect key="frame" x="24" y="30" width="294" height="20"/> | 6145 | + <rect key="frame" x="0.0" y="0.0" width="382" height="211"/> |
6146 | <subviews> | 6146 | <subviews> |
6147 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SUPERMARKET DEALS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JEh-zR-MnJ"> | 6147 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1to-ht-Vk8" userLabel="Header View"> |
6148 | - <rect key="frame" x="0.0" y="0.0" width="244" height="20"/> | 6148 | + <rect key="frame" x="24" y="30" width="334" height="20"/> |
6149 | - <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> | 6149 | + <subviews> |
6150 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SUPERMARKET DEALS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JEh-zR-MnJ"> | ||
6151 | + <rect key="frame" x="0.0" y="0.0" width="284" height="20"/> | ||
6152 | + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> | ||
6153 | + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | ||
6154 | + <nil key="highlightedColor"/> | ||
6155 | + </label> | ||
6156 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M8y-6I-J6x"> | ||
6157 | + <rect key="frame" x="304" y="-5" width="30" height="30"/> | ||
6158 | + <constraints> | ||
6159 | + <constraint firstAttribute="width" constant="30" id="V5H-6n-5Pt"/> | ||
6160 | + <constraint firstAttribute="height" constant="30" id="jXV-Lb-fSI"/> | ||
6161 | + </constraints> | ||
6162 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
6163 | + <state key="normal" image="ic_close_2"/> | ||
6164 | + <connections> | ||
6165 | + <action selector="closeButtonAction:" destination="86r-jf-E5J" eventType="touchUpInside" id="VtF-gM-KEf"/> | ||
6166 | + <action selector="headerCloseButtonAction:" destination="Vbn-op-hH3" eventType="touchUpInside" id="jcM-Lt-u89"/> | ||
6167 | + </connections> | ||
6168 | + </button> | ||
6169 | + </subviews> | ||
6170 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
6171 | + <constraints> | ||
6172 | + <constraint firstItem="M8y-6I-J6x" firstAttribute="leading" secondItem="JEh-zR-MnJ" secondAttribute="trailing" constant="20" id="4hl-Cn-B5V"/> | ||
6173 | + <constraint firstItem="M8y-6I-J6x" firstAttribute="centerY" secondItem="1to-ht-Vk8" secondAttribute="centerY" id="daz-VI-SZh"/> | ||
6174 | + <constraint firstAttribute="bottom" secondItem="JEh-zR-MnJ" secondAttribute="bottom" id="eqe-23-maI"/> | ||
6175 | + <constraint firstItem="JEh-zR-MnJ" firstAttribute="top" secondItem="1to-ht-Vk8" secondAttribute="top" id="etw-Ds-7rI"/> | ||
6176 | + <constraint firstItem="JEh-zR-MnJ" firstAttribute="leading" secondItem="1to-ht-Vk8" secondAttribute="leading" id="j7x-Xz-PSi"/> | ||
6177 | + <constraint firstAttribute="trailing" secondItem="M8y-6I-J6x" secondAttribute="trailing" id="oSv-5h-3Z7"/> | ||
6178 | + </constraints> | ||
6179 | + </view> | ||
6180 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ly9-LO-Xmv"> | ||
6181 | + <rect key="frame" x="24" y="67" width="334" height="79"/> | ||
6182 | + <string key="text">Δημιούργησε το δικό σου ενιαίο κουπόνι προσφορών, και εξαργύρωσέ το στα supermarket της επιλογής σου γρήγορα και εύκολα με ένα μόνο κωδικό κουπονιού!</string> | ||
6183 | + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> | ||
6150 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | 6184 | <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> |
6151 | <nil key="highlightedColor"/> | 6185 | <nil key="highlightedColor"/> |
6152 | </label> | 6186 | </label> |
6153 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M8y-6I-J6x"> | 6187 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rCv-5F-ecY"> |
6154 | - <rect key="frame" x="264" y="-5" width="30" height="30"/> | 6188 | + <rect key="frame" x="319" y="166" width="39" height="30"/> |
6155 | - <constraints> | 6189 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
6156 | - <constraint firstAttribute="width" constant="30" id="V5H-6n-5Pt"/> | 6190 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="14"/> |
6157 | - <constraint firstAttribute="height" constant="30" id="jXV-Lb-fSI"/> | ||
6158 | - </constraints> | ||
6159 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | 6191 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> |
6160 | - <state key="normal" image="ic_close_2"/> | 6192 | + <state key="normal" title="Τέλος"> |
6193 | + <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | ||
6194 | + </state> | ||
6161 | <connections> | 6195 | <connections> |
6162 | - <action selector="closeButtonAction:" destination="86r-jf-E5J" eventType="touchUpInside" id="VtF-gM-KEf"/> | 6196 | + <action selector="submitButtonAction:" destination="Vbn-op-hH3" eventType="touchUpInside" id="vlr-lh-WuC"/> |
6163 | - <action selector="headerCloseButtonAction:" destination="Vbn-op-hH3" eventType="touchUpInside" id="jcM-Lt-u89"/> | ||
6164 | </connections> | 6197 | </connections> |
6165 | </button> | 6198 | </button> |
6166 | </subviews> | 6199 | </subviews> |
6167 | - <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 6200 | + <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> |
6168 | <constraints> | 6201 | <constraints> |
6169 | - <constraint firstItem="M8y-6I-J6x" firstAttribute="leading" secondItem="JEh-zR-MnJ" secondAttribute="trailing" constant="20" id="4hl-Cn-B5V"/> | 6202 | + <constraint firstItem="Ly9-LO-Xmv" firstAttribute="top" secondItem="1to-ht-Vk8" secondAttribute="bottom" constant="17" id="8nE-IM-1jS"/> |
6170 | - <constraint firstItem="M8y-6I-J6x" firstAttribute="centerY" secondItem="1to-ht-Vk8" secondAttribute="centerY" id="daz-VI-SZh"/> | 6203 | + <constraint firstAttribute="trailing" secondItem="1to-ht-Vk8" secondAttribute="trailing" constant="24" id="8nH-dw-rXK"/> |
6171 | - <constraint firstAttribute="bottom" secondItem="JEh-zR-MnJ" secondAttribute="bottom" id="eqe-23-maI"/> | 6204 | + <constraint firstAttribute="trailing" secondItem="rCv-5F-ecY" secondAttribute="trailing" constant="24" id="AEH-FO-xUb"/> |
6172 | - <constraint firstItem="JEh-zR-MnJ" firstAttribute="top" secondItem="1to-ht-Vk8" secondAttribute="top" id="etw-Ds-7rI"/> | 6205 | + <constraint firstAttribute="trailing" secondItem="Ly9-LO-Xmv" secondAttribute="trailing" constant="24" id="BV0-uq-SHR"/> |
6173 | - <constraint firstItem="JEh-zR-MnJ" firstAttribute="leading" secondItem="1to-ht-Vk8" secondAttribute="leading" id="j7x-Xz-PSi"/> | 6206 | + <constraint firstItem="1to-ht-Vk8" firstAttribute="top" secondItem="ehx-JG-A7m" secondAttribute="top" constant="30" id="DzL-bD-6Pq"/> |
6174 | - <constraint firstAttribute="trailing" secondItem="M8y-6I-J6x" secondAttribute="trailing" id="oSv-5h-3Z7"/> | 6207 | + <constraint firstAttribute="bottom" secondItem="rCv-5F-ecY" secondAttribute="bottom" constant="15" id="frf-D2-GXY"/> |
6208 | + <constraint firstItem="rCv-5F-ecY" firstAttribute="top" secondItem="Ly9-LO-Xmv" secondAttribute="bottom" constant="20" id="pRj-95-8YL"/> | ||
6209 | + <constraint firstItem="Ly9-LO-Xmv" firstAttribute="leading" secondItem="ehx-JG-A7m" secondAttribute="leading" constant="24" id="piV-wD-l5m"/> | ||
6210 | + <constraint firstItem="1to-ht-Vk8" firstAttribute="leading" secondItem="ehx-JG-A7m" secondAttribute="leading" constant="24" id="zjd-7A-WvN"/> | ||
6175 | </constraints> | 6211 | </constraints> |
6176 | </view> | 6212 | </view> |
6177 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ly9-LO-Xmv"> | ||
6178 | - <rect key="frame" x="24" y="67" width="294" height="98.5"/> | ||
6179 | - <string key="text">Δημιούργησε το δικό σου ενιαίο κουπόνι προσφορών, και εξαργύρωσέ το στα supermarket της επιλογής σου γρήγορα και εύκολα με ένα μόνο κωδικό κουπονιού!</string> | ||
6180 | - <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> | ||
6181 | - <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | ||
6182 | - <nil key="highlightedColor"/> | ||
6183 | - </label> | ||
6184 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rCv-5F-ecY"> | ||
6185 | - <rect key="frame" x="279" y="185.5" width="39" height="30"/> | ||
6186 | - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
6187 | - <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="14"/> | ||
6188 | - <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
6189 | - <state key="normal" title="Τέλος"> | ||
6190 | - <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> | ||
6191 | - </state> | ||
6192 | - <connections> | ||
6193 | - <action selector="submitButtonAction:" destination="Vbn-op-hH3" eventType="touchUpInside" id="vlr-lh-WuC"/> | ||
6194 | - </connections> | ||
6195 | - </button> | ||
6196 | </subviews> | 6213 | </subviews> |
6197 | - <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 6214 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
6198 | <constraints> | 6215 | <constraints> |
6199 | - <constraint firstItem="Ly9-LO-Xmv" firstAttribute="top" secondItem="1to-ht-Vk8" secondAttribute="bottom" constant="17" id="8nE-IM-1jS"/> | 6216 | + <constraint firstItem="ehx-JG-A7m" firstAttribute="leading" secondItem="gdC-Cm-zRe" secondAttribute="leading" id="7B0-qt-OB5"/> |
6200 | - <constraint firstAttribute="trailing" secondItem="1to-ht-Vk8" secondAttribute="trailing" constant="24" id="8nH-dw-rXK"/> | 6217 | + <constraint firstAttribute="bottom" secondItem="ehx-JG-A7m" secondAttribute="bottom" id="Wdj-t5-SH3"/> |
6201 | - <constraint firstAttribute="trailing" secondItem="rCv-5F-ecY" secondAttribute="trailing" constant="24" id="AEH-FO-xUb"/> | 6218 | + <constraint firstAttribute="trailing" secondItem="ehx-JG-A7m" secondAttribute="trailing" id="ZBA-Ev-WAA"/> |
6202 | - <constraint firstAttribute="trailing" secondItem="Ly9-LO-Xmv" secondAttribute="trailing" constant="24" id="BV0-uq-SHR"/> | 6219 | + <constraint firstItem="ehx-JG-A7m" firstAttribute="top" secondItem="gdC-Cm-zRe" secondAttribute="top" id="erN-bt-18X"/> |
6203 | - <constraint firstItem="1to-ht-Vk8" firstAttribute="top" secondItem="ehx-JG-A7m" secondAttribute="top" constant="30" id="DzL-bD-6Pq"/> | ||
6204 | - <constraint firstAttribute="bottom" secondItem="rCv-5F-ecY" secondAttribute="bottom" constant="18" id="frf-D2-GXY"/> | ||
6205 | - <constraint firstItem="rCv-5F-ecY" firstAttribute="top" secondItem="Ly9-LO-Xmv" secondAttribute="bottom" constant="20" id="pRj-95-8YL"/> | ||
6206 | - <constraint firstItem="Ly9-LO-Xmv" firstAttribute="leading" secondItem="ehx-JG-A7m" secondAttribute="leading" constant="24" id="piV-wD-l5m"/> | ||
6207 | - <constraint firstItem="1to-ht-Vk8" firstAttribute="leading" secondItem="ehx-JG-A7m" secondAttribute="leading" constant="24" id="zjd-7A-WvN"/> | ||
6208 | </constraints> | 6220 | </constraints> |
6209 | </view> | 6221 | </view> |
6210 | </subviews> | 6222 | </subviews> |
6211 | <viewLayoutGuide key="safeArea" id="Uda-xn-kJz"/> | 6223 | <viewLayoutGuide key="safeArea" id="Uda-xn-kJz"/> |
6212 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 6224 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
6213 | <constraints> | 6225 | <constraints> |
6214 | - <constraint firstItem="ehx-JG-A7m" firstAttribute="leading" secondItem="iDh-Ie-Yrc" secondAttribute="leadingMargin" constant="16" id="E19-z8-RLQ"/> | 6226 | + <constraint firstItem="gdC-Cm-zRe" firstAttribute="leading" secondItem="Uda-xn-kJz" secondAttribute="leading" constant="16" id="0WQ-K5-iI0"/> |
6215 | - <constraint firstItem="ehx-JG-A7m" firstAttribute="top" secondItem="Uda-xn-kJz" secondAttribute="top" constant="5" id="KI7-KQ-Wr1"/> | 6227 | + <constraint firstItem="gdC-Cm-zRe" firstAttribute="top" secondItem="Uda-xn-kJz" secondAttribute="top" constant="45" id="bcA-o1-n78"/> |
6216 | - <constraint firstAttribute="trailingMargin" secondItem="ehx-JG-A7m" secondAttribute="trailing" constant="16" id="Tk9-CM-6Us"/> | 6228 | + <constraint firstItem="Uda-xn-kJz" firstAttribute="trailing" secondItem="gdC-Cm-zRe" secondAttribute="trailing" constant="16" id="q8p-FD-ngA"/> |
6217 | </constraints> | 6229 | </constraints> |
6218 | </view> | 6230 | </view> |
6219 | <connections> | 6231 | <connections> |
6232 | + <outlet property="containerView" destination="gdC-Cm-zRe" id="HVc-5J-csd"/> | ||
6220 | <outlet property="headerCloseButton" destination="M8y-6I-J6x" id="196-sa-QAW"/> | 6233 | <outlet property="headerCloseButton" destination="M8y-6I-J6x" id="196-sa-QAW"/> |
6221 | <outlet property="headerLabel" destination="JEh-zR-MnJ" id="uqR-Sm-raV"/> | 6234 | <outlet property="headerLabel" destination="JEh-zR-MnJ" id="uqR-Sm-raV"/> |
6222 | <outlet property="infoLabel" destination="Ly9-LO-Xmv" id="KzH-DA-Res"/> | 6235 | <outlet property="infoLabel" destination="Ly9-LO-Xmv" id="KzH-DA-Res"/> | ... | ... |
... | @@ -8,6 +8,7 @@ | ... | @@ -8,6 +8,7 @@ |
8 | import UIKit | 8 | import UIKit |
9 | 9 | ||
10 | class PopupInfoViewController: UIViewController { | 10 | class PopupInfoViewController: UIViewController { |
11 | + @IBOutlet weak var containerView: UIView! | ||
11 | @IBOutlet weak var popupView: UIView! | 12 | @IBOutlet weak var popupView: UIView! |
12 | @IBOutlet weak var headerLabel: UILabel! | 13 | @IBOutlet weak var headerLabel: UILabel! |
13 | @IBOutlet weak var headerCloseButton: UIButton! | 14 | @IBOutlet weak var headerCloseButton: UIButton! |
... | @@ -18,29 +19,33 @@ class PopupInfoViewController: UIViewController { | ... | @@ -18,29 +19,33 @@ class PopupInfoViewController: UIViewController { |
18 | super.viewDidLoad() | 19 | super.viewDidLoad() |
19 | 20 | ||
20 | // Add arrow programmatically | 21 | // Add arrow programmatically |
21 | - let arrowSize = CGSize(width: 30, height: 15) // Width and height of the arrow | 22 | + let arrowSize = CGSize(width: 15, height: 7.5) // Width and height of the arrow |
22 | - let arrowView = ArrowView(frame: CGRect(x: (self.view.frame.width - arrowSize.width) / 2, | 23 | + let arrowView = ArrowView(frame: CGRect( |
23 | - y: popupView.frame.minY - arrowSize.height, | 24 | + x: (popupView.frame.width - arrowSize.width - 35), |
24 | - width: arrowSize.width, | 25 | + y: popupView.frame.minY - arrowSize.height, |
25 | - height: arrowSize.height)) | 26 | + width: arrowSize.width, |
27 | + height: arrowSize.height)) | ||
26 | 28 | ||
27 | - self.view.addSubview(arrowView) | 29 | + containerView.addSubview(arrowView) |
28 | - self.view.bringSubviewToFront(popupView) | 30 | +// containerView.bringSubviewToFront(popupView) |
31 | + | ||
32 | + // Add shadow | ||
33 | + containerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.57).cgColor | ||
34 | + containerView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) | ||
35 | + containerView.layer.shadowOpacity = 1.0 | ||
36 | + containerView.layer.shadowRadius = 20.0 | ||
37 | + containerView.layer.masksToBounds = false | ||
38 | + containerView.backgroundColor = .clear | ||
29 | 39 | ||
30 | popupView.backgroundColor = UIColor(rgb: 0xE6E6E6) | 40 | popupView.backgroundColor = UIColor(rgb: 0xE6E6E6) |
31 | popupView.layer.cornerRadius = 14 | 41 | popupView.layer.cornerRadius = 14 |
32 | - // Add shadow | ||
33 | - popupView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.57).cgColor | ||
34 | - popupView.layer.shadowOffset = CGSize(width: 0.0, height: 3.0) | ||
35 | - popupView.layer.shadowOpacity = 1.0 | ||
36 | - popupView.layer.shadowRadius = 20.0 | ||
37 | 42 | ||
38 | headerLabel.font = UIFont(name: "BTCosmo-Bold", size: 17) | 43 | headerLabel.font = UIFont(name: "BTCosmo-Bold", size: 17) |
39 | headerLabel.textColor = UIColor(rgb: 0x212121) | 44 | headerLabel.textColor = UIColor(rgb: 0x212121) |
40 | headerLabel.text = "SUPERMARKET DEALS" | 45 | headerLabel.text = "SUPERMARKET DEALS" |
41 | 46 | ||
42 | headerCloseButton.setImage(UIImage(named: "ic_close_3.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 47 | headerCloseButton.setImage(UIImage(named: "ic_close_3.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
43 | - headerCloseButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 48 | + headerCloseButton.imageView?.layer.transform = CATransform3DMakeScale(1.3, 1.3, 1.3) |
44 | 49 | ||
45 | infoLabel.font = UIFont(name: "PeridotPE-Regular", size: 16.0) | 50 | infoLabel.font = UIFont(name: "PeridotPE-Regular", size: 16.0) |
46 | infoLabel.textColor = UIColor(rgb: 0x212121) | 51 | infoLabel.textColor = UIColor(rgb: 0x212121) |
... | @@ -52,15 +57,6 @@ class PopupInfoViewController: UIViewController { | ... | @@ -52,15 +57,6 @@ class PopupInfoViewController: UIViewController { |
52 | submitButton.frame.size.width = submitButton.intrinsicContentSize.width | 57 | submitButton.frame.size.width = submitButton.intrinsicContentSize.width |
53 | } | 58 | } |
54 | 59 | ||
55 | - func adaptivePresentationStyle(for controller: UIPresentationController) -> UIModalPresentationStyle { | ||
56 | - return UIModalPresentationStyle.none | ||
57 | - } | ||
58 | - | ||
59 | - func adaptivePresentationStyle(for controller: UIPresentationController, traitCollection: UITraitCollection) -> UIModalPresentationStyle { | ||
60 | - // return UIModalPresentationStyle.FullScreen | ||
61 | - return UIModalPresentationStyle.none | ||
62 | - } | ||
63 | - | ||
64 | // MARK: - Actions | 60 | // MARK: - Actions |
65 | @IBAction func headerCloseButtonAction(_ sender: Any) { | 61 | @IBAction func headerCloseButtonAction(_ sender: Any) { |
66 | self.dismiss(animated: true, completion: {}) | 62 | self.dismiss(animated: true, completion: {}) | ... | ... |
-
Please register or login to post a comment