Manos Chorianopoulos

redesigns TelcoViewController

...@@ -4555,9 +4555,9 @@ ...@@ -4555,9 +4555,9 @@
4555 <rect key="frame" x="20" y="220" width="70" height="70"/> 4555 <rect key="frame" x="20" y="220" width="70" height="70"/>
4556 <subviews> 4556 <subviews>
4557 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G7w-Tk-Yfm"> 4557 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G7w-Tk-Yfm">
4558 - <rect key="frame" x="10" y="24" width="50" height="22.5"/> 4558 + <rect key="frame" x="10" y="23.5" width="50" height="23.5"/>
4559 - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="19"/> 4559 + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="19"/>
4560 - <color key="textColor" red="0.13333333333333333" green="0.66274509803921566" blue="0.70980392156862748" alpha="1" colorSpace="calibratedRGB"/> 4560 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4561 <nil key="highlightedColor"/> 4561 <nil key="highlightedColor"/>
4562 </label> 4562 </label>
4563 </subviews> 4563 </subviews>
...@@ -4572,25 +4572,25 @@ ...@@ -4572,25 +4572,25 @@
4572 </constraints> 4572 </constraints>
4573 </view> 4573 </view>
4574 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yXI-Ds-V0T"> 4574 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yXI-Ds-V0T">
4575 - <rect key="frame" x="100" y="246.5" width="294" height="17.5"/> 4575 + <rect key="frame" x="100" y="246" width="294" height="18.5"/>
4576 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="15"/> 4576 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
4577 - <color key="textColor" red="0.25490196078431371" green="0.33333333333333331" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> 4577 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4578 <nil key="highlightedColor"/> 4578 <nil key="highlightedColor"/>
4579 </label> 4579 </label>
4580 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Bc-ly-ehN"> 4580 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Bc-ly-ehN">
4581 - <rect key="frame" x="0.0" y="324.5" width="414" height="2"/> 4581 + <rect key="frame" x="0.0" y="325" width="414" height="2"/>
4582 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 4582 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
4583 <constraints> 4583 <constraints>
4584 <constraint firstAttribute="height" constant="2" id="sgv-gT-iEr"/> 4584 <constraint firstAttribute="height" constant="2" id="sgv-gT-iEr"/>
4585 </constraints> 4585 </constraints>
4586 </view> 4586 </view>
4587 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xfg-Zl-DTT"> 4587 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xfg-Zl-DTT">
4588 - <rect key="frame" x="178.5" y="310" width="57" height="30.5"/> 4588 + <rect key="frame" x="178" y="310" width="58.5" height="31.5"/>
4589 <subviews> 4589 <subviews>
4590 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vZf-KA-Yki"> 4590 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vZf-KA-Yki">
4591 - <rect key="frame" x="10" y="8" width="37" height="17.5"/> 4591 + <rect key="frame" x="10" y="8" width="38.5" height="18.5"/>
4592 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="15"/> 4592 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
4593 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 4593 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4594 <nil key="highlightedColor"/> 4594 <nil key="highlightedColor"/>
4595 </label> 4595 </label>
4596 </subviews> 4596 </subviews>
...@@ -4603,9 +4603,9 @@ ...@@ -4603,9 +4603,9 @@
4603 </constraints> 4603 </constraints>
4604 </view> 4604 </view>
4605 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XJ0-lK-2fk"> 4605 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XJ0-lK-2fk">
4606 - <rect key="frame" x="20" y="370.5" width="374" height="20"/> 4606 + <rect key="frame" x="20" y="371.5" width="374" height="21"/>
4607 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="17"/> 4607 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="17"/>
4608 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 4608 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4609 <nil key="highlightedColor"/> 4609 <nil key="highlightedColor"/>
4610 </label> 4610 </label>
4611 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="description" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Toi-hN-Bn7"> 4611 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="description" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Toi-hN-Bn7">
...@@ -4615,11 +4615,11 @@ ...@@ -4615,11 +4615,11 @@
4615 <nil key="highlightedColor"/> 4615 <nil key="highlightedColor"/>
4616 </label> 4616 </label>
4617 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uDO-0Z-xFa"> 4617 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uDO-0Z-xFa">
4618 - <rect key="frame" x="156.5" y="450.5" width="101" height="44"/> 4618 + <rect key="frame" x="149" y="452.5" width="116" height="55"/>
4619 <constraints> 4619 <constraints>
4620 - <constraint firstAttribute="height" constant="44" id="Mve-Wm-jeX"/> 4620 + <constraint firstAttribute="height" constant="55" id="Mve-Wm-jeX"/>
4621 </constraints> 4621 </constraints>
4622 - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="16"/> 4622 + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="17"/>
4623 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 4623 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
4624 <state key="normal" title="Ενεργοποίηση"> 4624 <state key="normal" title="Ενεργοποίηση">
4625 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 4625 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
...@@ -4629,14 +4629,14 @@ ...@@ -4629,14 +4629,14 @@
4629 </connections> 4629 </connections>
4630 </button> 4630 </button>
4631 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ulI-Td-g6v"> 4631 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ulI-Td-g6v">
4632 - <rect key="frame" x="103.5" y="514.5" width="207" height="40"/> 4632 + <rect key="frame" x="103.5" y="527.5" width="207" height="40"/>
4633 <constraints> 4633 <constraints>
4634 <constraint firstAttribute="height" constant="40" id="72j-BL-Ejm"/> 4634 <constraint firstAttribute="height" constant="40" id="72j-BL-Ejm"/>
4635 </constraints> 4635 </constraints>
4636 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> 4636 + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/>
4637 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/> 4637 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/>
4638 <state key="normal" title="Δες Περισσότερα" image="ic_down_dark"> 4638 <state key="normal" title="Δες Περισσότερα" image="ic_down_dark">
4639 - <color key="titleColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 4639 + <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
4640 <preferredSymbolConfiguration key="preferredSymbolConfiguration"/> 4640 <preferredSymbolConfiguration key="preferredSymbolConfiguration"/>
4641 </state> 4641 </state>
4642 <connections> 4642 <connections>
...@@ -4644,13 +4644,13 @@ ...@@ -4644,13 +4644,13 @@
4644 </connections> 4644 </connections>
4645 </button> 4645 </button>
4646 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mCl-kM-ssj"> 4646 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mCl-kM-ssj">
4647 - <rect key="frame" x="20" y="564.5" width="374" height="0.0"/> 4647 + <rect key="frame" x="20" y="577.5" width="374" height="0.0"/>
4648 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 4648 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
4649 <constraints> 4649 <constraints>
4650 <constraint firstAttribute="height" id="Uys-zo-ERe"/> 4650 <constraint firstAttribute="height" id="Uys-zo-ERe"/>
4651 </constraints> 4651 </constraints>
4652 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 4652 + <color key="textColor" red="0.61568627450980395" green="0.61568627450980395" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
4653 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="13"/> 4653 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
4654 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> 4654 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
4655 </textView> 4655 </textView>
4656 </subviews> 4656 </subviews>
...@@ -4703,7 +4703,7 @@ ...@@ -4703,7 +4703,7 @@
4703 <viewLayoutGuide key="contentLayoutGuide" id="BMi-Lt-iHA"/> 4703 <viewLayoutGuide key="contentLayoutGuide" id="BMi-Lt-iHA"/>
4704 <viewLayoutGuide key="frameLayoutGuide" id="lpe-11-PKD"/> 4704 <viewLayoutGuide key="frameLayoutGuide" id="lpe-11-PKD"/>
4705 </scrollView> 4705 </scrollView>
4706 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WsP-XD-haT"> 4706 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WsP-XD-haT">
4707 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> 4707 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/>
4708 </imageView> 4708 </imageView>
4709 </subviews> 4709 </subviews>
...@@ -4721,6 +4721,7 @@ ...@@ -4721,6 +4721,7 @@
4721 <variation key="default"> 4721 <variation key="default">
4722 <mask key="subviews"> 4722 <mask key="subviews">
4723 <exclude reference="6ch-LK-yKY"/> 4723 <exclude reference="6ch-LK-yKY"/>
4724 + <exclude reference="WsP-XD-haT"/>
4724 </mask> 4725 </mask>
4725 </variation> 4726 </variation>
4726 </view> 4727 </view>
......
...@@ -54,22 +54,22 @@ import SwiftEventBus ...@@ -54,22 +54,22 @@ import SwiftEventBus
54 54
55 backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 55 backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
56 56
57 - let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)! 57 +// let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)!
58 - var aspectR: CGFloat = 0.0 58 +// var aspectR: CGFloat = 0.0
59 - 59 +//
60 - aspectR = image.size.width/image.size.height 60 +// aspectR = image.size.width/image.size.height
61 - 61 +//
62 - topBorderLine.translatesAutoresizingMaskIntoConstraints = false 62 +// topBorderLine.translatesAutoresizingMaskIntoConstraints = false
63 - topBorderLine.image = image 63 +// topBorderLine.image = image
64 - topBorderLine.contentMode = .scaleAspectFill 64 +// topBorderLine.contentMode = .scaleAspectFill
65 - 65 +//
66 - NSLayoutConstraint.activate([ 66 +// NSLayoutConstraint.activate([
67 - topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0), 67 +// topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0),
68 - topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0), 68 +// topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0),
69 - topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0), 69 +// topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0),
70 - topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width), 70 +// topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width),
71 - topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR) 71 +// topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR)
72 - ]) 72 +// ])
73 73
74 // scrollView.clipsToBounds = true 74 // scrollView.clipsToBounds = true
75 // scrollView.layer.cornerRadius = 30 75 // scrollView.layer.cornerRadius = 30
...@@ -91,13 +91,13 @@ import SwiftEventBus ...@@ -91,13 +91,13 @@ import SwiftEventBus
91 91
92 borderLineView.applyGradient(colours: [UIColor(rgb: 0x0AA3CD), UIColor(rgb: 0x6ECA43)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) 92 borderLineView.applyGradient(colours: [UIColor(rgb: 0x0AA3CD), UIColor(rgb: 0x6ECA43)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0)
93 93
94 - activateButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18) 94 + activateButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 17)
95 activateButton.setTitle("Ενεργοποίηση", for: .normal) 95 activateButton.setTitle("Ενεργοποίηση", for: .normal)
96 activateButton.setTitleColor(.white, for: .normal) 96 activateButton.setTitleColor(.white, for: .normal)
97 - activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 97 + activateButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
98 - activateButton.layer.cornerRadius = 8.0 98 + activateButton.layer.cornerRadius = 16.0
99 - activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 44) 99 + activateButton.frame = CGRect(x: 0.0, y: 0.0, width: activateButton.intrinsicContentSize.width, height: 55)
100 - activateButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) 100 + activateButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 28, bottom: 0, right: 28)
101 101
102 // Fix width for ipad 102 // Fix width for ipad
103 // if UIDevice.current.userInterfaceIdiom == .pad { 103 // if UIDevice.current.userInterfaceIdiom == .pad {
...@@ -108,13 +108,13 @@ import SwiftEventBus ...@@ -108,13 +108,13 @@ import SwiftEventBus
108 // activateButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true 108 // activateButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true
109 // } 109 // }
110 110
111 - moreButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Regular", size: 16) 111 + moreButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
112 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) 112 // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
113 moreButton.setTitle("Δες Περισσότερα", for: .normal) 113 moreButton.setTitle("Δες Περισσότερα", for: .normal)
114 moreButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) 114 moreButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal)
115 moreButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) 115 moreButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal)
116 moreButton.semanticContentAttribute = .forceRightToLeft 116 moreButton.semanticContentAttribute = .forceRightToLeft
117 - moreButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) 117 + moreButton.tintColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 1.00)
118 moreButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); 118 moreButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0);
119 moreButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); 119 moreButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5);
120 moreButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) 120 moreButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8)
...@@ -122,9 +122,9 @@ import SwiftEventBus ...@@ -122,9 +122,9 @@ import SwiftEventBus
122 // let htmlText = ccms?._description ?? "" 122 // let htmlText = ccms?._description ?? ""
123 // moreTextView.attributedText = htmlText.htmlToAttributedString 123 // moreTextView.attributedText = htmlText.htmlToAttributedString
124 moreTextView.text = ccms?._termsAndConditions ?? "" 124 moreTextView.text = ccms?._termsAndConditions ?? ""
125 - moreTextView.font = UIFont(name: "PFSquareSansPro-Regular", size: 13) 125 + moreTextView.font = UIFont(name: "PeridotPE-Regular", size: 16)
126 - moreTextView.textColor = UIColor(rgb: 0x415564) 126 + moreTextView.textColor = UIColor(red: 0.62, green: 0.62, blue: 0.61, alpha: 1.00)
127 -// moreTextView.textAlignment = .center 127 + moreTextView.textAlignment = .left
128 moreTextView.isScrollEnabled = false 128 moreTextView.isScrollEnabled = false
129 129
130 toggleMore() 130 toggleMore()
......