CouponBarcodeViewController ui fixes

Manos Chorianopoulos
Commit ebbf7aa69f498f42e72b08ed11a6d31c3427371f ebbf7aa6 1 parent 17fe3f27
Showing 3 changed files with 22 additions and 17 deletions
SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate
SwiftWarplyFramework/SwiftWarplyFramework/CouponBarcodeViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
--- a/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate
View file @ebbf7aa
+++ b/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate
View file @ebbf7aa
--- a/SwiftWarplyFramework/SwiftWarplyFramework/CouponBarcodeViewController.swift
View file @ebbf7aa
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/CouponBarcodeViewController.swift
View file @ebbf7aa
@@ -46,6 +46,7 @@ import AVFoundation
     @IBOutlet weak var mapButtonTopSpace: NSLayoutConstraint!
     @IBOutlet weak var showBarcodeButtonHeight: NSLayoutConstraint!
     @IBOutlet weak var showBarcodeButtonTopSpace: NSLayoutConstraint!
+    @IBOutlet weak var couponCodeLabelTopSpace: NSLayoutConstraint!
     let uiscreen: CGRect = UIScreen.main.bounds
@@ -110,6 +111,7 @@ import AVFoundation
         merchantDescrTextViewTopSpace.constant = CGFloat(0)
         merchantDescrTextViewHeight.constant = CGFloat(0)
         merchantDescrTextView.isHidden = true
+        couponCodeLabelTopSpace.constant = CGFloat(35)
         let merchantList:Array<swiftApi.MerchantModel> = swiftApi().getMerchantList()
@@ -129,9 +131,11 @@ import AVFoundation
                     merchantDescrTextView.dataDetectorTypes = [.link]
                     merchantDescrTextView.isHidden = false
-                    merchantDescrTextViewTopSpace.constant = CGFloat(15)
+                    merchantDescrTextViewTopSpace.constant = CGFloat(10)
                     let targetSize = CGSize(width: merchantDescrTextView.frame.width, height: CGFloat(MAXFLOAT))
                     merchantDescrTextViewHeight.constant = merchantDescrTextView.sizeThatFits(targetSize).height
+                    
+                    couponCodeLabelTopSpace.constant = CGFloat(0)
                 }
                 break;
--- a/SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @ebbf7aa
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @ebbf7aa
@@ -3334,7 +3334,7 @@
                                                         <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="359" width="374" height="0.0"/>
+                                                        <rect key="frame" x="20" y="354" width="374" height="0.0"/>
                                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" id="7ch-2U-9oE"/>
@@ -3344,13 +3344,13 @@
                                                         <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="394" width="374" height="21"/>
+                                                        <rect key="frame" x="20" y="389" 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="155.5" y="425" width="103" height="55"/>
+                                                        <rect key="frame" x="155.5" y="420" 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="12.5" width="63" height="30"/>
@@ -3368,20 +3368,20 @@
                                                         </constraints>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrM-7n-fSw" userLabel="Border View">
-                                                        <rect key="frame" x="20" y="500" width="374" height="1"/>
+                                                        <rect key="frame" x="20" y="495" 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="511" width="354" height="110"/>
+                                                        <rect key="frame" x="30" y="506" 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="631" width="374" height="26.5"/>
+                                                        <rect key="frame" x="20" y="626" 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="672.5" width="374" height="1"/>
+                                                        <rect key="frame" x="20" y="667.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="683.5" width="207" height="50"/>
+                                                        <rect key="frame" x="103.5" y="678.5" width="207" height="50"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="50" id="ZSP-NX-0a7"/>
                                                         </constraints>
@@ -3412,13 +3412,13 @@
                                                         </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="768.5" width="374" height="16"/>
+                                                        <rect key="frame" x="20" y="758.5" width="374" height="16"/>
                                                         <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="167.5" y="819.5" width="79" height="55"/>
+                                                        <rect key="frame" x="167.5" y="794.5" width="79" height="55"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="55" id="ccg-NP-FIH"/>
                                                         </constraints>
@@ -3432,7 +3432,7 @@
                                                         </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="128" y="884.5" width="158" height="55"/>
+                                                        <rect key="frame" x="128" y="859.5" width="158" height="55"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="55" id="3pq-y5-f66"/>
                                                         </constraints>
@@ -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="959.5" width="207" height="50"/>
+                                                        <rect key="frame" x="103.5" y="934.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="1019.5" width="374" height="0.0"/>
+                                                        <rect key="frame" x="20" y="994.5" width="374" height="0.0"/>
                                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" id="3GU-tg-S3t"/>
@@ -3484,11 +3484,11 @@
                                                     <constraint firstItem="mri-Wl-spg" firstAttribute="top" secondItem="Xz4-EE-EzJ" secondAttribute="bottom" constant="15" id="9W8-fX-IzR"/>
                                                     <constraint firstItem="xjX-HZ-MpD" firstAttribute="leading" secondItem="1ec-eH-fkX" secondAttribute="leading" constant="20" id="AIW-Kf-tkQ"/>
                                                     <constraint firstItem="Zw5-Wj-WD5" firstAttribute="centerX" secondItem="1ec-eH-fkX" secondAttribute="centerX" id="BgT-3L-aZo"/>
-                                                    <constraint firstItem="tzW-b9-Rbx" firstAttribute="top" secondItem="mri-Wl-spg" secondAttribute="bottom" constant="15" id="Cep-Md-KJT"/>
+                                                    <constraint firstItem="tzW-b9-Rbx" firstAttribute="top" secondItem="mri-Wl-spg" secondAttribute="bottom" constant="10" id="Cep-Md-KJT"/>
                                                     <constraint firstItem="jrM-7n-fSw" firstAttribute="top" secondItem="Zdf-1r-FdJ" secondAttribute="bottom" constant="20" id="G5W-a3-pag"/>
                                                     <constraint firstItem="huh-zh-82C" firstAttribute="top" secondItem="jrM-7n-fSw" secondAttribute="bottom" constant="10" id="GQF-H5-SZp"/>
                                                     <constraint firstItem="iiM-5P-m5s" firstAttribute="top" secondItem="1ec-eH-fkX" secondAttribute="top" id="H9I-TB-xig"/>
-                                                    <constraint firstItem="8cR-Rc-YMJ" firstAttribute="top" secondItem="UhC-Lj-tfN" secondAttribute="bottom" constant="35" id="I87-km-KEb"/>
+                                                    <constraint firstItem="8cR-Rc-YMJ" firstAttribute="top" secondItem="UhC-Lj-tfN" secondAttribute="bottom" constant="20" id="I87-km-KEb"/>
                                                     <constraint firstItem="Zdf-1r-FdJ" firstAttribute="top" secondItem="Sg1-QU-FY1" secondAttribute="bottom" constant="10" id="KZi-Jl-Yyz"/>
                                                     <constraint firstItem="UhC-Lj-tfN" firstAttribute="leading" secondItem="1ec-eH-fkX" secondAttribute="leading" constant="20" id="MSg-iF-tt9"/>
                                                     <constraint firstAttribute="trailing" secondItem="6rV-2m-QMZ" secondAttribute="trailing" constant="20" id="NGe-PV-pQl"/>
@@ -3518,7 +3518,7 @@
                                                     <constraint firstAttribute="trailing" secondItem="UhC-Lj-tfN" secondAttribute="trailing" constant="20" id="lM1-ep-Zec"/>
                                                     <constraint firstItem="Xz4-EE-EzJ" firstAttribute="leading" secondItem="1ec-eH-fkX" secondAttribute="leading" constant="20" id="lMf-pF-Bp6"/>
                                                     <constraint firstItem="tzW-b9-Rbx" firstAttribute="leading" secondItem="1ec-eH-fkX" secondAttribute="leading" constant="20" id="oYF-cS-wt4"/>
-                                                    <constraint firstItem="UhC-Lj-tfN" firstAttribute="top" secondItem="Zw5-Wj-WD5" secondAttribute="bottom" constant="35" id="ora-fw-TKe"/>
+                                                    <constraint firstItem="UhC-Lj-tfN" firstAttribute="top" secondItem="Zw5-Wj-WD5" secondAttribute="bottom" constant="30" id="ora-fw-TKe"/>
                                                     <constraint firstAttribute="trailing" secondItem="iiM-5P-m5s" secondAttribute="trailing" id="qWA-17-dEY"/>
                                                     <constraint firstAttribute="trailing" secondItem="xjX-HZ-MpD" secondAttribute="trailing" constant="20" id="rIc-bw-vfp"/>
                                                     <constraint firstAttribute="trailing" secondItem="huh-zh-82C" secondAttribute="trailing" constant="30" id="ySg-6E-isO"/>
@@ -3583,6 +3583,7 @@
                         <outlet property="border2TopSpace" destination="hL4-rX-9aa" id="87h-tF-CnT"/>
                         <outlet property="borderView2Height" destination="DVl-3B-zqo" id="USP-Iq-ZAd"/>
                         <outlet property="borderViewHeight" destination="eF3-7T-hMu" id="Wt2-MV-eTg"/>
+                        <outlet property="couponCodeLabelTopSpace" destination="WWh-BA-7qP" id="7ba-Oy-kc3"/>
                         <outlet property="couponImage" destination="iiM-5P-m5s" id="oKZ-Up-sI3"/>
                         <outlet property="couponImageHeight" destination="kL0-u7-VI9" id="QJ9-gs-XUh"/>
                         <outlet property="couponNumberLabel" destination="BJS-kk-CBZ" id="Sdz-3a-Jvq"/>