Manos Chorianopoulos

CouponViewController ui fixes

...@@ -100,19 +100,19 @@ import SwiftEventBus ...@@ -100,19 +100,19 @@ import SwiftEventBus
100 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00) 100 redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
101 redeemButton.layer.cornerRadius = 16.0 101 redeemButton.layer.cornerRadius = 16.0
102 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) 102 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
103 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) 103 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
104 // Fix width for ipad 104 // Fix width for ipad
105 if UIDevice.current.userInterfaceIdiom == .pad { 105 if UIDevice.current.userInterfaceIdiom == .pad {
106 // iPad 106 // iPad
107 - redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 20) 107 + redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 19)
108 // redeemButton.widthAnchor.constraint(equalToConstant: 250).isActive = true 108 // redeemButton.widthAnchor.constraint(equalToConstant: 250).isActive = true
109 } else { 109 } else {
110 // not iPad (iPhone, mac, tv, carPlay, unspecified) 110 // not iPad (iPhone, mac, tv, carPlay, unspecified)
111 - redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 18) 111 + redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 17)
112 // redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true 112 // redeemButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true
113 } 113 }
114 114
115 - termsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 16) 115 + termsButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
116 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) 116 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
117 termsButton.setTitle("Όροι χρήσης", for: .normal) 117 termsButton.setTitle("Όροι χρήσης", for: .normal)
118 termsButton.setTitleColor(UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00), for: .normal) 118 termsButton.setTitleColor(UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00), for: .normal)
...@@ -125,9 +125,9 @@ import SwiftEventBus ...@@ -125,9 +125,9 @@ import SwiftEventBus
125 125
126 let htmlText = couponset?.terms ?? "" 126 let htmlText = couponset?.terms ?? ""
127 termsTextView.attributedText = htmlText.htmlToAttributedString 127 termsTextView.attributedText = htmlText.htmlToAttributedString
128 - termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 15) 128 + termsTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
129 termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00) 129 termsTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
130 - termsTextView.textAlignment = .center 130 + termsTextView.textAlignment = .left
131 termsTextView.isScrollEnabled = false 131 termsTextView.isScrollEnabled = false
132 termsTextView.isUserInteractionEnabled = true 132 termsTextView.isUserInteractionEnabled = true
133 termsTextView.isEditable = false 133 termsTextView.isEditable = false
......
...@@ -4007,13 +4007,13 @@ ...@@ -4007,13 +4007,13 @@
4007 </constraints> 4007 </constraints>
4008 </imageView> 4008 </imageView>
4009 <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="isU-Qv-94G"> 4009 <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="isU-Qv-94G">
4010 - <rect key="frame" x="20" y="220" width="374" height="40"/> 4010 + <rect key="frame" x="20" y="230" width="374" height="39.5"/>
4011 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> 4011 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
4012 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 4012 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4013 <nil key="highlightedColor"/> 4013 <nil key="highlightedColor"/>
4014 </label> 4014 </label>
4015 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2YG-ey-cyw" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> 4015 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2YG-ey-cyw" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
4016 - <rect key="frame" x="20" y="275" width="374" height="0.0"/> 4016 + <rect key="frame" x="20" y="284.5" width="374" height="0.0"/>
4017 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 4017 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
4018 <constraints> 4018 <constraints>
4019 <constraint firstAttribute="height" id="GaK-QZ-z7W"/> 4019 <constraint firstAttribute="height" id="GaK-QZ-z7W"/>
...@@ -4023,9 +4023,9 @@ ...@@ -4023,9 +4023,9 @@
4023 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> 4023 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
4024 </textView> 4024 </textView>
4025 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FCd-hv-dHg"> 4025 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FCd-hv-dHg">
4026 - <rect key="frame" x="161" y="375" width="92" height="44"/> 4026 + <rect key="frame" x="158" y="384.5" width="98" height="55"/>
4027 <constraints> 4027 <constraints>
4028 - <constraint firstAttribute="height" constant="44" id="n2w-Tx-hhO"/> 4028 + <constraint firstAttribute="height" constant="55" id="n2w-Tx-hhO"/>
4029 </constraints> 4029 </constraints>
4030 <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="16"/> 4030 <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="16"/>
4031 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 4031 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
...@@ -4037,7 +4037,7 @@ ...@@ -4037,7 +4037,7 @@
4037 </connections> 4037 </connections>
4038 </button> 4038 </button>
4039 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KvN-fk-rlm"> 4039 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KvN-fk-rlm">
4040 - <rect key="frame" x="103.5" y="439" width="207" height="50"/> 4040 + <rect key="frame" x="103.5" y="459.5" width="207" height="50"/>
4041 <constraints> 4041 <constraints>
4042 <constraint firstAttribute="height" constant="50" id="O7T-ug-rTB"/> 4042 <constraint firstAttribute="height" constant="50" id="O7T-ug-rTB"/>
4043 </constraints> 4043 </constraints>
...@@ -4052,7 +4052,7 @@ ...@@ -4052,7 +4052,7 @@
4052 </connections> 4052 </connections>
4053 </button> 4053 </button>
4054 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="siA-c8-Ub8" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> 4054 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="siA-c8-Ub8" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
4055 - <rect key="frame" x="20" y="499" width="374" height="0.0"/> 4055 + <rect key="frame" x="20" y="519.5" width="374" height="0.0"/>
4056 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 4056 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
4057 <constraints> 4057 <constraints>
4058 <constraint firstAttribute="height" id="BWJ-i6-UeO"/> 4058 <constraint firstAttribute="height" id="BWJ-i6-UeO"/>
...@@ -4082,7 +4082,7 @@ ...@@ -4082,7 +4082,7 @@
4082 <constraint firstItem="2YG-ey-cyw" firstAttribute="top" secondItem="isU-Qv-94G" secondAttribute="bottom" constant="15" id="mbx-ls-aMK"/> 4082 <constraint firstItem="2YG-ey-cyw" firstAttribute="top" secondItem="isU-Qv-94G" secondAttribute="bottom" constant="15" id="mbx-ls-aMK"/>
4083 <constraint firstItem="3SX-fR-ph2" firstAttribute="leading" secondItem="uTN-Qr-wBi" secondAttribute="leading" id="nBV-nm-wOq"/> 4083 <constraint firstItem="3SX-fR-ph2" firstAttribute="leading" secondItem="uTN-Qr-wBi" secondAttribute="leading" id="nBV-nm-wOq"/>
4084 <constraint firstItem="3SX-fR-ph2" firstAttribute="top" secondItem="uTN-Qr-wBi" secondAttribute="top" id="oaX-KH-TEh"/> 4084 <constraint firstItem="3SX-fR-ph2" firstAttribute="top" secondItem="uTN-Qr-wBi" secondAttribute="top" id="oaX-KH-TEh"/>
4085 - <constraint firstItem="isU-Qv-94G" firstAttribute="top" secondItem="3SX-fR-ph2" secondAttribute="bottom" constant="20" id="vQf-lC-GgG"/> 4085 + <constraint firstItem="isU-Qv-94G" firstAttribute="top" secondItem="3SX-fR-ph2" secondAttribute="bottom" constant="30" id="vQf-lC-GgG"/>
4086 </constraints> 4086 </constraints>
4087 </view> 4087 </view>
4088 </subviews> 4088 </subviews>
......