CouponBarcodeViewController ui fixes

Manos Chorianopoulos
Commit 19fc8669c210fa5400a546baf286b0a1175f49a1 19fc8669 1 parent d235f772
Showing 2 changed files with 30 additions and 30 deletions
SwiftWarplyFramework/SwiftWarplyFramework/CouponBarcodeViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
--- a/SwiftWarplyFramework/SwiftWarplyFramework/CouponBarcodeViewController.swift
View file @19fc866
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/CouponBarcodeViewController.swift
View file @19fc866
@@ -194,13 +194,13 @@ import AVFoundation
         expirationLabel.text = "Το κουπόνι ισχύει έως " + (coupon?.expiration ?? "")
-        redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 18)
+        redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 17)
         redeemButton.setTitle("Δώρισέ το", for: .normal)
         redeemButton.setTitleColor(.white, for: .normal)
         redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
         redeemButton.layer.cornerRadius = 16.0
-        redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
+        redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
-        redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
+        redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
         // Fix width for ipad
 //        if UIDevice.current.userInterfaceIdiom == .pad {
 //             // iPad
@@ -210,12 +210,12 @@ import AVFoundation
 //             redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true
 //         }
-        mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 18)
+        mapButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 17)
         mapButton.setTitle("Δες τα καταστήματα", for: .normal)
         mapButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
         mapButton.layer.cornerRadius = 15.0
-        mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44)
+        mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 55)
-        mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
+        mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
         mapButton.backgroundColor = .clear
         mapButton.layer.borderWidth = 2
         mapButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
@@ -268,7 +268,7 @@ import AVFoundation
 //             mapButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true
 //         }
-        termsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 16)
+        termsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
 //        termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
         termsButton.setTitle("Όροι χρήσης", for: .normal)
         termsButton.setTitleColor(UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00), for: .normal)
@@ -281,9 +281,9 @@ import AVFoundation
         let htmlText = couponSetData?.terms ?? ""
         termsTextView.attributedText = htmlText.htmlToAttributedString
-        termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 15)
+        termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
         termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
-        termsTextView.textAlignment = .center
+        termsTextView.textAlignment = .left
         termsTextView.isScrollEnabled = false
         termsTextView.isUserInteractionEnabled = true
--- a/SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @19fc866
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @19fc866
@@ -3322,19 +3322,19 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xz4-EE-EzJ">
-                                                        <rect key="frame" x="20" y="220" width="374" height="40"/>
+                                                        <rect key="frame" x="20" y="230" width="374" height="39.5"/>
                                                         <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
                                                         <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mri-Wl-spg">
-                                                        <rect key="frame" x="20" y="275" width="374" height="56"/>
+                                                        <rect key="frame" x="20" y="284.5" width="374" height="59.5"/>
                                                         <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
                                                         <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tzW-b9-Rbx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
-                                                        <rect key="frame" x="20" y="346" width="374" height="0.0"/>
+                                                        <rect key="frame" x="20" y="359" width="374" height="0.0"/>
                                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" id="7ch-2U-9oE"/>
@@ -3344,17 +3344,17 @@
                                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                                     </textView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Κωδικός Κουπονιού" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sg1-QU-FY1">
-                                                        <rect key="frame" x="20" y="381" width="374" height="20"/>
+                                                        <rect key="frame" x="20" y="394" width="374" height="21"/>
                                                         <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/>
                                                         <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View">
-                                                        <rect key="frame" x="152.5" y="411" width="109" height="55"/>
+                                                        <rect key="frame" x="155.5" y="425" width="103" height="55"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BJS-kk-CBZ" customClass="CopyableLabel" customModule="SwiftWarplyFramework" customModuleProvider="target">
-                                                                <rect key="frame" x="20" y="11" width="69" height="33"/>
+                                                                <rect key="frame" x="20" y="12.5" width="63" height="30"/>
-                                                                <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="28"/>
+                                                                <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="24"/>
                                                                 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
@@ -3368,20 +3368,20 @@
                                                         </constraints>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrM-7n-fSw" userLabel="Border View">
-                                                        <rect key="frame" x="20" y="486" width="374" height="1"/>
+                                                        <rect key="frame" x="20" y="500" width="374" height="1"/>
                                                         <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="1" id="eF3-7T-hMu"/>
                                                         </constraints>
                                                     </view>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="huh-zh-82C">
-                                                        <rect key="frame" x="30" y="497" width="354" height="110"/>
+                                                        <rect key="frame" x="30" y="511" width="354" height="110"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="110" id="LJq-uV-eb8"/>
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789101112" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EKv-Mx-6Yv">
-                                                        <rect key="frame" x="20" y="617" width="374" height="26.5"/>
+                                                        <rect key="frame" x="20" y="631" width="374" height="26.5"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="26.5" id="LfJ-bC-nLk"/>
                                                         </constraints>
@@ -3390,14 +3390,14 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6rV-2m-QMZ" userLabel="Border 2 View">
-                                                        <rect key="frame" x="20" y="658.5" width="374" height="1"/>
+                                                        <rect key="frame" x="20" y="672.5" width="374" height="1"/>
                                                         <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="1" id="DVl-3B-zqo"/>
                                                         </constraints>
                                                     </view>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zw5-Wj-WD5">
-                                                        <rect key="frame" x="103.5" y="669.5" width="207" height="50"/>
+                                                        <rect key="frame" x="103.5" y="683.5" width="207" height="50"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="50" id="ZSP-NX-0a7"/>
                                                         </constraints>
@@ -3412,15 +3412,15 @@
                                                         </connections>
                                                     </button>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Το κουπόνι ισχύει έως 05/12/2022" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UhC-Lj-tfN">
-                                                        <rect key="frame" x="20" y="754.5" width="374" height="17.5"/>
+                                                        <rect key="frame" x="20" y="768.5" width="374" height="16"/>
-                                                        <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
+                                                        <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="13"/>
                                                         <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cR-Rc-YMJ">
-                                                        <rect key="frame" x="170.5" y="807" width="73" height="44"/>
+                                                        <rect key="frame" x="167.5" y="819.5" width="79" height="55"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="44" id="ccg-NP-FIH"/>
+                                                            <constraint firstAttribute="height" constant="55" id="ccg-NP-FIH"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="16"/>
                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -3432,9 +3432,9 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W5f-1T-iW6">
-                                                        <rect key="frame" x="133.5" y="861" width="147" height="44"/>
+                                                        <rect key="frame" x="128" y="884.5" width="158" height="55"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="44" id="3pq-y5-f66"/>
+                                                            <constraint firstAttribute="height" constant="55" id="3pq-y5-f66"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="16"/>
                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -3446,7 +3446,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8UD-WL-JB7">
-                                                        <rect key="frame" x="103.5" y="925" width="207" height="50"/>
+                                                        <rect key="frame" x="103.5" y="959.5" width="207" height="50"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="50" id="xdq-YS-AL4"/>
                                                         </constraints>
@@ -3461,7 +3461,7 @@
                                                         </connections>
                                                     </button>
                                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xjX-HZ-MpD" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
-                                                        <rect key="frame" x="20" y="985" width="374" height="0.0"/>
+                                                        <rect key="frame" x="20" y="1019.5" width="374" height="0.0"/>
                                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" id="3GU-tg-S3t"/>
@@ -3498,7 +3498,7 @@
                                                     <constraint firstItem="W5f-1T-iW6" firstAttribute="centerX" secondItem="1ec-eH-fkX" secondAttribute="centerX" id="Pug-Ej-C69"/>
                                                     <constraint firstItem="W5f-1T-iW6" firstAttribute="top" secondItem="8cR-Rc-YMJ" secondAttribute="bottom" constant="10" id="Rbe-XQ-CIj"/>
                                                     <constraint firstAttribute="trailing" secondItem="jrM-7n-fSw" secondAttribute="trailing" constant="20" id="ReY-xR-F8V"/>
-                                                    <constraint firstItem="Xz4-EE-EzJ" firstAttribute="top" secondItem="iiM-5P-m5s" secondAttribute="bottom" constant="20" id="Ryr-v8-THU"/>
+                                                    <constraint firstItem="Xz4-EE-EzJ" firstAttribute="top" secondItem="iiM-5P-m5s" secondAttribute="bottom" constant="30" id="Ryr-v8-THU"/>
                                                     <constraint firstItem="Sg1-QU-FY1" firstAttribute="top" secondItem="tzW-b9-Rbx" secondAttribute="bottom" constant="35" id="WWh-BA-7qP"/>
                                                     <constraint firstItem="xjX-HZ-MpD" firstAttribute="top" secondItem="8UD-WL-JB7" secondAttribute="bottom" constant="10" id="XFI-ij-KkC"/>
                                                     <constraint firstItem="mri-Wl-spg" firstAttribute="leading" secondItem="1ec-eH-fkX" secondAttribute="leading" constant="20" id="YLo-Lg-Lda"/>