Manos Chorianopoulos

redesign ContextualViewController

...@@ -47,22 +47,22 @@ import SwiftEventBus ...@@ -47,22 +47,22 @@ import SwiftEventBus
47 // scrollView.layer.cornerRadius = 30 47 // scrollView.layer.cornerRadius = 30
48 // scrollView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius 48 // scrollView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius
49 49
50 - let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)! 50 +// let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)!
51 - var aspectR: CGFloat = 0.0 51 +// var aspectR: CGFloat = 0.0
52 - 52 +//
53 - aspectR = image.size.width/image.size.height 53 +// aspectR = image.size.width/image.size.height
54 - 54 +//
55 - topBorderLine.translatesAutoresizingMaskIntoConstraints = false 55 +// topBorderLine.translatesAutoresizingMaskIntoConstraints = false
56 - topBorderLine.image = image 56 +// topBorderLine.image = image
57 - topBorderLine.contentMode = .scaleAspectFill 57 +// topBorderLine.contentMode = .scaleAspectFill
58 - 58 +//
59 - NSLayoutConstraint.activate([ 59 +// NSLayoutConstraint.activate([
60 - topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0), 60 +// topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0),
61 - topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0), 61 +// topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0),
62 - topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0), 62 +// topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0),
63 - topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width), 63 +// topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width),
64 - topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR) 64 +// topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR)
65 - ]) 65 +// ])
66 66
67 couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) 67 couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache())
68 couponImage.contentMode = .scaleAspectFill 68 couponImage.contentMode = .scaleAspectFill
...@@ -74,7 +74,7 @@ import SwiftEventBus ...@@ -74,7 +74,7 @@ import SwiftEventBus
74 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 17) 74 redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 17)
75 redeemButton.setTitle("Ενεργοποίηση", for: .normal) 75 redeemButton.setTitle("Ενεργοποίηση", for: .normal)
76 redeemButton.setTitleColor(.white, for: .normal) 76 redeemButton.setTitleColor(.white, for: .normal)
77 - redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 77 + redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
78 redeemButton.layer.cornerRadius = 16.0 78 redeemButton.layer.cornerRadius = 16.0
79 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55) 79 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 55)
80 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28) 80 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
......
...@@ -4788,23 +4788,23 @@ ...@@ -4788,23 +4788,23 @@
4788 </constraints> 4788 </constraints>
4789 </imageView> 4789 </imageView>
4790 <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="8BE-qj-xn5"> 4790 <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="8BE-qj-xn5">
4791 - <rect key="frame" x="20" y="220" width="374" height="40"/> 4791 + <rect key="frame" x="20" y="230" width="374" height="39.5"/>
4792 - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> 4792 + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
4793 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 4793 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4794 <nil key="highlightedColor"/> 4794 <nil key="highlightedColor"/>
4795 </label> 4795 </label>
4796 <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="mbx-MR-VPL"> 4796 <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="mbx-MR-VPL">
4797 - <rect key="frame" x="20" y="275" width="374" height="59.5"/> 4797 + <rect key="frame" x="20" y="284.5" width="374" height="59.5"/>
4798 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="17"/> 4798 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
4799 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 4799 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4800 <nil key="highlightedColor"/> 4800 <nil key="highlightedColor"/>
4801 </label> 4801 </label>
4802 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qnn-bi-fLK"> 4802 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qnn-bi-fLK">
4803 - <rect key="frame" x="161" y="434.5" width="92" height="44"/> 4803 + <rect key="frame" x="155" y="444" width="104" height="55"/>
4804 <constraints> 4804 <constraints>
4805 - <constraint firstAttribute="height" constant="44" id="aPk-mJ-VfN"/> 4805 + <constraint firstAttribute="height" constant="55" id="aPk-mJ-VfN"/>
4806 </constraints> 4806 </constraints>
4807 - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="16"/> 4807 + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="17"/>
4808 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 4808 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
4809 <state key="normal" title="Απόκτησέ το"> 4809 <state key="normal" title="Απόκτησέ το">
4810 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 4810 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
...@@ -4827,7 +4827,7 @@ ...@@ -4827,7 +4827,7 @@
4827 <constraint firstAttribute="trailing" secondItem="8BE-qj-xn5" secondAttribute="trailing" constant="20" id="n53-MH-KG1"/> 4827 <constraint firstAttribute="trailing" secondItem="8BE-qj-xn5" secondAttribute="trailing" constant="20" id="n53-MH-KG1"/>
4828 <constraint firstItem="I4T-wN-u9w" firstAttribute="top" secondItem="NHe-cF-AMf" secondAttribute="top" id="osK-5K-XQJ"/> 4828 <constraint firstItem="I4T-wN-u9w" firstAttribute="top" secondItem="NHe-cF-AMf" secondAttribute="top" id="osK-5K-XQJ"/>
4829 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qnn-bi-fLK" secondAttribute="bottom" constant="30" id="uLb-eO-qwF"/> 4829 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qnn-bi-fLK" secondAttribute="bottom" constant="30" id="uLb-eO-qwF"/>
4830 - <constraint firstItem="8BE-qj-xn5" firstAttribute="top" secondItem="I4T-wN-u9w" secondAttribute="bottom" constant="20" id="wFo-Wh-noH"/> 4830 + <constraint firstItem="8BE-qj-xn5" firstAttribute="top" secondItem="I4T-wN-u9w" secondAttribute="bottom" constant="30" id="wFo-Wh-noH"/>
4831 </constraints> 4831 </constraints>
4832 </view> 4832 </view>
4833 </subviews> 4833 </subviews>
...@@ -4841,7 +4841,7 @@ ...@@ -4841,7 +4841,7 @@
4841 <viewLayoutGuide key="contentLayoutGuide" id="SCq-zB-WYb"/> 4841 <viewLayoutGuide key="contentLayoutGuide" id="SCq-zB-WYb"/>
4842 <viewLayoutGuide key="frameLayoutGuide" id="Ian-NJ-q5c"/> 4842 <viewLayoutGuide key="frameLayoutGuide" id="Ian-NJ-q5c"/>
4843 </scrollView> 4843 </scrollView>
4844 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2cS-C7-kUz"> 4844 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2cS-C7-kUz">
4845 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> 4845 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/>
4846 </imageView> 4846 </imageView>
4847 </subviews> 4847 </subviews>
...@@ -4863,6 +4863,7 @@ ...@@ -4863,6 +4863,7 @@
4863 <variation key="default"> 4863 <variation key="default">
4864 <mask key="subviews"> 4864 <mask key="subviews">
4865 <exclude reference="7rs-yJ-Kvn"/> 4865 <exclude reference="7rs-yJ-Kvn"/>
4866 + <exclude reference="2cS-C7-kUz"/>
4866 </mask> 4867 </mask>
4867 </variation> 4868 </variation>
4868 </view> 4869 </view>
......