CouponViewController ui fixes

Manos Chorianopoulos
Commit c4e6cce4263f8e5a81759f5f5442ca656a8d5880 c4e6cce4 1 parent a344cc40
Showing 3 changed files with 19 additions and 16 deletions
SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate
SwiftWarplyFramework/SwiftWarplyFramework/screens/CouponViewController/CouponViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/screens/CouponViewController/CouponViewController.xib
--- a/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate
View file @c4e6cce
+++ b/SwiftWarplyFramework/SwiftWarplyFramework.xcworkspace/xcuserdata/manos.xcuserdatad/UserInterfaceState.xcuserstate
View file @c4e6cce
--- a/SwiftWarplyFramework/SwiftWarplyFramework/screens/CouponViewController/CouponViewController.swift
View file @c4e6cce
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/screens/CouponViewController/CouponViewController.swift
View file @c4e6cce
@@ -98,9 +98,11 @@ import UIKit
         couponCodeContainerView.backgroundColor = UIColor(rgb: 0xFFFFFF)
         couponCodeContainerView.layer.cornerRadius = 8.0
+        couponCodeContainerView.clipsToBounds = true
         couponQRContainerView.backgroundColor = UIColor(rgb: 0xFFFFFF)
         couponQRContainerView.layer.cornerRadius = 8.0
+        couponQRContainerView.clipsToBounds = true
         termsButton.titleLabel?.font = UIFont(name: "PingLCG-Bold", size: 16)
 //        termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
@@ -116,12 +118,13 @@ import UIKit
         termsLabelHeight.constant = 0
         mapButton.titleLabel?.font = UIFont(name: "PingLCG-Bold", size: 16)
-        mapButton.setTitle("Όροι Χρήσης", for: .normal)
+        mapButton.setTitle("Καταστήματα κοντά μου", for: .normal)
         mapButton.setTitleColor(UIColor(rgb: 0xFFFFFF), for: .normal)
         mapButton.layer.cornerRadius = 4.0
+        websiteButton.backgroundColor = UIColor(rgb: 0x000F1E)
         websiteButton.titleLabel?.font = UIFont(name: "PingLCG-Bold", size: 16)
-        websiteButton.setTitle("Όροι Χρήσης", for: .normal)
+        websiteButton.setTitle("Δες το website", for: .normal)
         websiteButton.setTitleColor(UIColor(rgb: 0x000F1E), for: .normal)
         websiteButton.backgroundColor = .clear
         websiteButton.layer.borderWidth = 1
@@ -146,7 +149,7 @@ import UIKit
         subtitleLabel.textColor = UIColor(rgb: 0x020E1C)
         subtitleLabel.text = coupon.description
-        expirationLabel.font = UIFont(name: "PingLCG-Regular", size: 18)
+        expirationLabel.font = UIFont(name: "PingLCG-Regular", size: 14)
         expirationLabel.textColor = UIColor(rgb: 0x020E1C)
 //        expirationLabel.text = ("Η προσφορά ισχύει " + coupon.expirationDate)
         expirationLabel.text = "Η προσφορά ισχύει έως 30-09-2025"
@@ -155,13 +158,13 @@ import UIKit
         couponCodeTitleLabel.textColor = UIColor(rgb: 0x000F1E)
         couponCodeTitleLabel.text = "Κωδικός Κουπονιού"
-        couponCodeTitleLabel.font = UIFont(name: "PingLCG-Bold", size: 24)
+        couponCodeValueLabel.font = UIFont(name: "PingLCG-Bold", size: 24)
-        couponCodeTitleLabel.textColor = UIColor(rgb: 0x000F1E)
+        couponCodeValueLabel.textColor = UIColor(rgb: 0x000F1E)
-        couponCodeTitleLabel.text = "coupons_ab"
+        couponCodeValueLabel.text = "coupons_ab"
-        couponCodeTitleLabel.font = UIFont(name: "PingLCG-Regular", size: 16)
+        couponQRTitleLabel.font = UIFont(name: "PingLCG-Regular", size: 16)
-        couponCodeTitleLabel.textColor = UIColor(rgb: 0x000F1E)
+        couponQRTitleLabel.textColor = UIColor(rgb: 0x000F1E)
-        couponCodeTitleLabel.text = "QR Κουπονιού"
+        couponQRTitleLabel.text = "QR Κουπονιού"
         termsLabel.font = UIFont(name: "PingLCG-Regular", size: 16)
         termsLabel.textColor = UIColor(rgb: 0x020E1C)
--- a/SwiftWarplyFramework/SwiftWarplyFramework/screens/CouponViewController/CouponViewController.xib
View file @c4e6cce
+++ b/SwiftWarplyFramework/SwiftWarplyFramework/screens/CouponViewController/CouponViewController.xib
View file @c4e6cce
@@ -68,17 +68,17 @@
                                             </constraints>
                                         </imageView>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="89U-JU-Imv" userLabel="Info View">
-                                            <rect key="frame" x="248" y="17" width="129" height="20.666666666666671"/>
+                                            <rect key="frame" x="239" y="17" width="138" height="20.666666666666671"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tFA-1H-T5S" userLabel="Info Image View">
-                                                    <rect key="frame" x="1" y="3.6666666666666723" width="13.666666666666666" height="13.333333333333336"/>
+                                                    <rect key="frame" x="10" y="3.6666666666666723" width="13.666666666666664" height="13.333333333333336"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="13.5" id="uQt-vY-kbk"/>
                                                         <constraint firstAttribute="width" constant="13.5" id="yzR-99-6Vp"/>
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Περισσότερα" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K34-LM-bC1" userLabel="Info Label">
-                                                    <rect key="frame" x="19" y="-0.3333333333333286" width="100" height="21"/>
+                                                    <rect key="frame" x="28" y="-0.3333333333333286" width="100" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -91,7 +91,7 @@
                                                 <constraint firstItem="K34-LM-bC1" firstAttribute="leading" secondItem="tFA-1H-T5S" secondAttribute="trailing" constant="4.5" id="9BF-QB-VRC"/>
                                                 <constraint firstItem="K34-LM-bC1" firstAttribute="centerY" secondItem="89U-JU-Imv" secondAttribute="centerY" id="AJ7-80-sbu"/>
                                                 <constraint firstItem="tFA-1H-T5S" firstAttribute="top" secondItem="89U-JU-Imv" secondAttribute="top" constant="3.5" id="Nyk-Ax-H7g"/>
-                                                <constraint firstItem="tFA-1H-T5S" firstAttribute="leading" secondItem="89U-JU-Imv" secondAttribute="leading" constant="1" id="xHt-ua-5rb"/>
+                                                <constraint firstItem="tFA-1H-T5S" firstAttribute="leading" secondItem="89U-JU-Imv" secondAttribute="leading" constant="10" id="xHt-ua-5rb"/>
                                             </constraints>
                                         </view>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u54-xs-f5a" userLabel="Title Label">
@@ -277,7 +277,7 @@
                                                     <rect key="frame" x="0.0" y="55" width="345" height="250"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Z9w-Ue-Lij" userLabel="CouponQRImage">
-                                                            <rect key="frame" x="72.666666666666686" y="25" width="200" height="200"/>
+                                                            <rect key="frame" x="72.666666666666686" y="20" width="200" height="200"/>
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="200" id="UHz-Fg-n1x"/>
@@ -288,8 +288,8 @@
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
                                                         <constraint firstItem="Z9w-Ue-Lij" firstAttribute="centerX" secondItem="xqU-7k-Vxg" secondAttribute="centerX" id="3jb-mY-gez"/>
-                                                        <constraint firstAttribute="bottom" secondItem="Z9w-Ue-Lij" secondAttribute="bottom" constant="25" id="4Wr-Ld-HWz"/>
+                                                        <constraint firstAttribute="bottom" secondItem="Z9w-Ue-Lij" secondAttribute="bottom" constant="30" id="4Wr-Ld-HWz"/>
-                                                        <constraint firstItem="Z9w-Ue-Lij" firstAttribute="top" secondItem="xqU-7k-Vxg" secondAttribute="top" constant="25" id="DoG-pU-Ipv"/>
+                                                        <constraint firstItem="Z9w-Ue-Lij" firstAttribute="top" secondItem="xqU-7k-Vxg" secondAttribute="top" constant="20" id="DoG-pU-Ipv"/>
                                                         <constraint firstAttribute="height" constant="250" id="odW-jh-UiA"/>
                                                     </constraints>
                                                 </view>