open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
c4d04700 1 parent c55330fc

fix attributedStrings crushing

Inline Side-by-side
Showing 4 changed files with 24 additions and 27 deletions
...@@ -45,8 +45,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -45,8 +45,8 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
45 let coupBoldText2 = String(loyaltyBadge._couponCount) 45 let coupBoldText2 = String(loyaltyBadge._couponCount)
46 let coupNormalText3 = " κουπόνια!" 46 let coupNormalText3 = " κουπόνια!"
47 47
48 - let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17)] 48 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16)]
49 - let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17)] 49 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16)]
50 50
51 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular) 51 let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular)
52 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold) 52 let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold)
......
...@@ -948,46 +948,46 @@ ...@@ -948,46 +948,46 @@
948 </view> 948 </view>
949 <prototypes> 949 <prototypes>
950 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="PUP-z1-zvb" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> 950 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CouponsTableViewCellId" id="PUP-z1-zvb" customClass="CouponsTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target">
951 - <rect key="frame" x="0.0" y="707.5" width="414" height="44"/> 951 + <rect key="frame" x="0.0" y="707.5" width="414" height="105"/>
952 <autoresizingMask key="autoresizingMask"/> 952 <autoresizingMask key="autoresizingMask"/>
953 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PUP-z1-zvb" id="dt2-2B-okP"> 953 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PUP-z1-zvb" id="dt2-2B-okP">
954 - <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> 954 + <rect key="frame" x="0.0" y="0.0" width="414" height="105"/>
955 <autoresizingMask key="autoresizingMask"/> 955 <autoresizingMask key="autoresizingMask"/>
956 <subviews> 956 <subviews>
957 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FsY-Dp-PUQ"> 957 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FsY-Dp-PUQ">
958 - <rect key="frame" x="10" y="0.0" width="394" height="44"/> 958 + <rect key="frame" x="10" y="0.0" width="394" height="105"/>
959 <subviews> 959 <subviews>
960 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="vZ4-HF-lwK"> 960 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="vZ4-HF-lwK">
961 - <rect key="frame" x="0.0" y="0.0" width="394" height="44"/> 961 + <rect key="frame" x="0.0" y="0.0" width="394" height="105"/>
962 </imageView> 962 </imageView>
963 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f2f-Lm-to3"> 963 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f2f-Lm-to3">
964 - <rect key="frame" x="20" y="10" width="79" height="24"/> 964 + <rect key="frame" x="20" y="10" width="79" height="85"/>
965 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 965 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
966 </imageView> 966 </imageView>
967 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zth-sP-rUI"> 967 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zth-sP-rUI">
968 - <rect key="frame" x="104" y="5" width="10" height="34"/> 968 + <rect key="frame" x="104" y="5" width="10" height="95"/>
969 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 969 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
970 <constraints> 970 <constraints>
971 <constraint firstAttribute="width" constant="10" id="0jX-bF-I3k"/> 971 <constraint firstAttribute="width" constant="10" id="0jX-bF-I3k"/>
972 </constraints> 972 </constraints>
973 </view> 973 </view>
974 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0"> 974 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0">
975 - <rect key="frame" x="119" y="15" width="255" height="0.0"/> 975 + <rect key="frame" x="119" y="15" width="255" height="17"/>
976 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> 976 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/>
977 <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> 977 <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
978 <nil key="highlightedColor"/> 978 <nil key="highlightedColor"/>
979 </label> 979 </label>
980 - <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3"> 980 + <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3">
981 - <rect key="frame" x="119" y="20" width="255" height="4"/> 981 + <rect key="frame" x="119" y="37" width="255" height="31"/>
982 <subviews> 982 <subviews>
983 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt"> 983 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt">
984 - <rect key="frame" x="0.0" y="0.0" width="127.5" height="4"/> 984 + <rect key="frame" x="0.0" y="0.0" width="127.5" height="31"/>
985 <fontDescription key="fontDescription" name="PFSquareSansPro-Bold" family="PF Square Sans Pro" pointSize="31"/> 985 <fontDescription key="fontDescription" name="PFSquareSansPro-Bold" family="PF Square Sans Pro" pointSize="31"/>
986 <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> 986 <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
987 <nil key="highlightedColor"/> 987 <nil key="highlightedColor"/>
988 </label> 988 </label>
989 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk"> 989 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk">
990 - <rect key="frame" x="132.5" y="0.0" width="122.5" height="4"/> 990 + <rect key="frame" x="132.5" y="0.0" width="122.5" height="31"/>
991 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> 991 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/>
992 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> 992 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
993 <nil key="highlightedColor"/> 993 <nil key="highlightedColor"/>
...@@ -998,8 +998,8 @@ ...@@ -998,8 +998,8 @@
998 <constraint firstItem="wBw-w0-bGt" firstAttribute="width" secondItem="RJe-Li-bx3" secondAttribute="width" multiplier="0.5" id="amQ-Xa-Dxm"/> 998 <constraint firstItem="wBw-w0-bGt" firstAttribute="width" secondItem="RJe-Li-bx3" secondAttribute="width" multiplier="0.5" id="amQ-Xa-Dxm"/>
999 </constraints> 999 </constraints>
1000 </stackView> 1000 </stackView>
1001 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td"> 1001 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td">
1002 - <rect key="frame" x="119" y="29" width="255" height="0.0"/> 1002 + <rect key="frame" x="119" y="78" width="255" height="12"/>
1003 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> 1003 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/>
1004 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> 1004 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
1005 <nil key="highlightedColor"/> 1005 <nil key="highlightedColor"/>
......
...@@ -132,8 +132,8 @@ import SwiftEventBus ...@@ -132,8 +132,8 @@ import SwiftEventBus
132 let boldText = totalCouponValueString + "€" 132 let boldText = totalCouponValueString + "€"
133 let normalText2 = " με το DEALS for YOU!" 133 let normalText2 = " με το DEALS for YOU!"
134 134
135 - let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17)] 135 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Regular", size: 17) ?? UIFont.systemFont(ofSize: 16)]
136 - let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17)] 136 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PFSquareSansPro-Bold", size: 17) ?? UIFont.boldSystemFont(ofSize: 16)]
137 137
138 let attributedString = NSMutableAttributedString(string:normalText1, attributes:attrRegular) 138 let attributedString = NSMutableAttributedString(string:normalText1, attributes:attrRegular)
139 let boldString = NSMutableAttributedString(string: boldText, attributes:attrBold) 139 let boldString = NSMutableAttributedString(string: boldText, attributes:attrBold)
...@@ -262,8 +262,6 @@ import SwiftEventBus ...@@ -262,8 +262,6 @@ import SwiftEventBus
262 dfyLogoImageTopSpace.constant = 0 262 dfyLogoImageTopSpace.constant = 0
263 } 263 }
264 264
265 - print("======= 1 =======")
266 -
267 myPresentsLabel.text = "Τα δώρα μου" 265 myPresentsLabel.text = "Τα δώρα μου"
268 if (coupons.count > 0) { 266 if (coupons.count > 0) {
269 myPresentsLabel.isHidden = false 267 myPresentsLabel.isHidden = false
...@@ -279,7 +277,6 @@ import SwiftEventBus ...@@ -279,7 +277,6 @@ import SwiftEventBus
279 emptyView.isHidden = true 277 emptyView.isHidden = true
280 } 278 }
281 279
282 - print("======= 2 =======")
283 } 280 }
284 281
285 public override func viewWillAppear(_ animated: Bool) { 282 public override func viewWillAppear(_ animated: Bool) {
......