Showing
5 changed files
with
122 additions
and
73 deletions
No preview for this file type
... | @@ -30,13 +30,34 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { | ... | @@ -30,13 +30,34 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { |
30 | // message | 30 | // message |
31 | messageLabel.textColor = UIColor(rgb: 0x435563) | 31 | messageLabel.textColor = UIColor(rgb: 0x435563) |
32 | messageLabel.layer.borderWidth = 1.0 | 32 | messageLabel.layer.borderWidth = 1.0 |
33 | - messageLabel.layer.borderColor = UIColor(rgb: 0xB2CE69).cgColor | 33 | + messageLabel.layer.borderColor = UIColor(rgb: 0x1DA6B9).cgColor |
34 | 34 | ||
35 | let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) | 35 | let totalCouponDiscount = Float(round(100 * loyaltyBadge._value) / 100) |
36 | var totalCouponDiscountString = "0" | 36 | var totalCouponDiscountString = "0" |
37 | totalCouponDiscountString = String(format: "%.2f", totalCouponDiscount).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil) | 37 | totalCouponDiscountString = String(format: "%.2f", totalCouponDiscount).replacingOccurrences(of: ".", with: ",", options: .literal, range: nil) |
38 | 38 | ||
39 | - messageLabel.text = "Μέχρι τώρα έχεις κερδίσει " + totalCouponDiscountString + "€ σε προσφορές από " + String(loyaltyBadge._couponCount) + " κουπόνια!" | 39 | +// messageLabel.text = "Μέχρι τώρα έχεις κερδίσει " + totalCouponDiscountString + "€ σε προσφορές από " + String(loyaltyBadge._couponCount) + " κουπόνια!" |
40 | + | ||
41 | + let coupNormalText1 = "Μέχρι τώρα έχεις κερδίσει " | ||
42 | + let coupBoldText = totalCouponDiscountString + "€" | ||
43 | + let coupNormalText2 = " σε προσφορές από " | ||
44 | + let coupBoldText2 = String(loyaltyBadge._couponCount) | ||
45 | + let coupNormalText3 = " κουπόνια!" | ||
46 | + | ||
47 | + let attrRegular = [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)] | ||
48 | + let attrBold = [NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 16)] | ||
49 | + | ||
50 | + let coupAttributedString = NSMutableAttributedString(string:coupNormalText1, attributes:attrRegular) | ||
51 | + let coupBoldString = NSMutableAttributedString(string: coupBoldText, attributes:attrBold) | ||
52 | + let coupNormalString2 = NSMutableAttributedString(string:coupNormalText2, attributes:attrRegular) | ||
53 | + let coupBoldString2 = NSMutableAttributedString(string: coupBoldText2, attributes:attrBold) | ||
54 | + let coupNormalString3 = NSMutableAttributedString(string:coupNormalText3, attributes:attrRegular) | ||
55 | + | ||
56 | + coupAttributedString.append(coupBoldString) | ||
57 | + coupAttributedString.append(coupNormalString2) | ||
58 | + coupAttributedString.append(coupBoldString2) | ||
59 | + coupAttributedString.append(coupNormalString3) | ||
60 | + messageLabel.attributedText = coupAttributedString | ||
40 | } | 61 | } |
41 | } | 62 | } |
42 | 63 | ... | ... |
... | @@ -11,9 +11,11 @@ import UIKit | ... | @@ -11,9 +11,11 @@ import UIKit |
11 | 11 | ||
12 | @IBOutlet weak var leftButton: UIButton! | 12 | @IBOutlet weak var leftButton: UIButton! |
13 | @IBOutlet weak var rightButton: UIButton! | 13 | @IBOutlet weak var rightButton: UIButton! |
14 | - @IBOutlet weak var lineView: UIView! | 14 | + @IBOutlet weak var leftLineView: UIView! |
15 | + @IBOutlet weak var rightLineView: UIView! | ||
15 | @IBOutlet weak var contentView: UIView! | 16 | @IBOutlet weak var contentView: UIView! |
16 | var pageController: UIPageViewController! | 17 | var pageController: UIPageViewController! |
18 | + var tabSelected = 0 | ||
17 | 19 | ||
18 | public override func viewDidLoad() { | 20 | public override func viewDidLoad() { |
19 | super.viewDidLoad() | 21 | super.viewDidLoad() |
... | @@ -25,23 +27,21 @@ import UIKit | ... | @@ -25,23 +27,21 @@ import UIKit |
25 | setNavigationTitle("Ανάλυση") | 27 | setNavigationTitle("Ανάλυση") |
26 | 28 | ||
27 | // tab | 29 | // tab |
30 | + leftButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular) | ||
28 | leftButton.setTitle("Εξαργυρωμένα", for:.normal) | 31 | leftButton.setTitle("Εξαργυρωμένα", for:.normal) |
29 | leftButton.backgroundColor = . clear | 32 | leftButton.backgroundColor = . clear |
30 | leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) | 33 | leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) |
31 | 34 | ||
35 | + rightButton.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular) | ||
32 | rightButton.setTitle("Μοιρασμένα δώρα", for:.normal) | 36 | rightButton.setTitle("Μοιρασμένα δώρα", for:.normal) |
33 | rightButton.backgroundColor = . clear | 37 | rightButton.backgroundColor = . clear |
34 | - rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) | 38 | + rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) |
35 | 39 | ||
40 | + leftLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) | ||
41 | + rightLineView.applyGradient(colours: [UIColor(rgb: 0x1DA6B9), UIColor(rgb: 0xB2CE69)], gradient: GradientOrientation.horizontal, cornerRadius: 0.0) | ||
36 | 42 | ||
37 | - let gl = CAGradientLayer() | 43 | + leftLineView.isHidden = false |
38 | - let colorLeft = UIColor(rgb: 0x1DA6B9).cgColor | 44 | + rightLineView.isHidden = true |
39 | - let colorRight = UIColor(rgb: 0xB2CE69).cgColor | ||
40 | - gl.colors = [colorLeft, colorRight] | ||
41 | - gl.locations = [0.0, 1.0] | ||
42 | - lineView.layer.addSublayer(gl) | ||
43 | - let halfWidth = self.view.frame.width/2 | ||
44 | - lineView.frame = CGRect(x: 0, y: lineView.frame.minY, width: halfWidth, height: 2.0) | ||
45 | 45 | ||
46 | // pages | 46 | // pages |
47 | pageController = UIPageViewController(transitionStyle:.scroll, navigationOrientation:.horizontal) | 47 | pageController = UIPageViewController(transitionStyle:.scroll, navigationOrientation:.horizontal) |
... | @@ -77,23 +77,37 @@ import UIKit | ... | @@ -77,23 +77,37 @@ import UIKit |
77 | 77 | ||
78 | // MARK: - Handlers | 78 | // MARK: - Handlers |
79 | @IBAction func handleLeft() { | 79 | @IBAction func handleLeft() { |
80 | - | 80 | + if (tabSelected != 0) { |
81 | - UIView.animate(withDuration: 2.0, delay: 0.0) { | 81 | + self.tabSelected = 0 |
82 | - let halfWidth = self.view.frame.width/2 | 82 | + |
83 | - self.lineView.frame = CGRect(x: 0, y: self.lineView.frame.minY, width: halfWidth, height: 2.0) | 83 | + UIView.animate(withDuration: 2.0, delay: 0.0) { |
84 | + | ||
85 | + self.leftLineView.isHidden = false | ||
86 | + self.rightLineView.isHidden = true | ||
87 | + | ||
88 | + self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) | ||
89 | + self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) | ||
90 | + } | ||
91 | + let analysisVC = self.viewControllerAt(0) | ||
92 | + pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true) | ||
84 | } | 93 | } |
85 | - let analysisVC = self.viewControllerAt(0) | ||
86 | - pageController.setViewControllers([analysisVC!], direction:.reverse, animated:true) | ||
87 | } | 94 | } |
88 | 95 | ||
89 | @IBAction func handleRight() { | 96 | @IBAction func handleRight() { |
90 | - | 97 | + if (tabSelected != 1) { |
91 | - UIView.animate(withDuration: 2.0, delay: 0.0) { | 98 | + self.tabSelected = 1 |
92 | - let halfWidth = self.view.frame.width/2 | 99 | + |
93 | - self.lineView.frame = CGRect(x: halfWidth, y: self.lineView.frame.minY, width: halfWidth, height: 2.0) | 100 | + UIView.animate(withDuration: 2.0, delay: 0.0) { |
101 | + | ||
102 | + self.leftLineView.isHidden = true | ||
103 | + self.rightLineView.isHidden = false | ||
104 | + | ||
105 | + self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) | ||
106 | + self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) | ||
107 | + } | ||
108 | + let analysisVC = self.viewControllerAt(1) | ||
109 | + pageController.setViewControllers([analysisVC!], direction:.forward, animated:true) | ||
94 | } | 110 | } |
95 | - let analysisVC = self.viewControllerAt(1) | ||
96 | - pageController.setViewControllers([analysisVC!], direction:.forward, animated:true) | ||
97 | } | 111 | } |
98 | } | 112 | } |
99 | 113 | ||
... | @@ -104,26 +118,26 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV | ... | @@ -104,26 +118,26 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV |
104 | 118 | ||
105 | if let analysisVC = viewController as? AnalysisChildViewController { | 119 | if let analysisVC = viewController as? AnalysisChildViewController { |
106 | var index = analysisVC.index | 120 | var index = analysisVC.index |
107 | - if (index == 1) { | 121 | + if (index == 0) { |
108 | return nil; | 122 | return nil; |
109 | } | 123 | } |
110 | 124 | ||
111 | - index += 1; | 125 | + index -= 1; |
112 | return viewControllerAt(index); | 126 | return viewControllerAt(index); |
113 | } | 127 | } |
114 | 128 | ||
115 | return nil; | 129 | return nil; |
116 | } | 130 | } |
117 | 131 | ||
118 | - public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { | 132 | + public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { |
119 | 133 | ||
120 | if let analysisVC = viewController as? AnalysisChildViewController { | 134 | if let analysisVC = viewController as? AnalysisChildViewController { |
121 | var index = analysisVC.index | 135 | var index = analysisVC.index |
122 | - if (index == 0) { | 136 | + if (index == 1) { |
123 | return nil; | 137 | return nil; |
124 | } | 138 | } |
125 | 139 | ||
126 | - index -= 1; | 140 | + index += 1; |
127 | return viewControllerAt(index); | 141 | return viewControllerAt(index); |
128 | } | 142 | } |
129 | 143 | ||
... | @@ -141,11 +155,18 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV | ... | @@ -141,11 +155,18 @@ extension LoyaltyAnalysisViewController: UIPageViewControllerDataSource, UIPageV |
141 | if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] { | 155 | if let childVCs = pageViewController.viewControllers as? [AnalysisChildViewController] { |
142 | let currentIndex = childVCs[0].index | 156 | let currentIndex = childVCs[0].index |
143 | if (currentIndex == 0) { | 157 | if (currentIndex == 0) { |
144 | - leftButton.isSelected = true | 158 | + self.leftButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) |
145 | - rightButton.isSelected = false | 159 | + self.rightButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) |
160 | + self.tabSelected = 0 | ||
161 | + self.leftLineView.isHidden = false | ||
162 | + self.rightLineView.isHidden = true | ||
163 | + | ||
146 | } else { | 164 | } else { |
147 | - leftButton.isSelected = false | 165 | + self.rightButton.setTitleColor(UIColor(rgb: 0x2EAFB9), for:.normal) |
148 | - rightButton.isSelected = true | 166 | + self.leftButton.setTitleColor(UIColor(rgb: 0x394A5B), for:.normal) |
167 | + self.tabSelected = 1 | ||
168 | + self.leftLineView.isHidden = true | ||
169 | + self.rightLineView.isHidden = false | ||
149 | } | 170 | } |
150 | } | 171 | } |
151 | } | 172 | } | ... | ... |
... | @@ -404,13 +404,13 @@ | ... | @@ -404,13 +404,13 @@ |
404 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | 404 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
405 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 405 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
406 | <subviews> | 406 | <subviews> |
407 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z7V-En-7Tl"> | 407 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z7V-En-7Tl" userLabel="Buttons View"> |
408 | <rect key="frame" x="0.0" y="44" width="414" height="50"/> | 408 | <rect key="frame" x="0.0" y="44" width="414" height="50"/> |
409 | <subviews> | 409 | <subviews> |
410 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="liP-dN-sf3"> | 410 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="liP-dN-sf3"> |
411 | <rect key="frame" x="0.0" y="0.0" width="206.5" height="50"/> | 411 | <rect key="frame" x="0.0" y="0.0" width="206.5" height="50"/> |
412 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
412 | <state key="normal" title="Button"/> | 413 | <state key="normal" title="Button"/> |
413 | - <buttonConfiguration key="configuration" style="plain" title="Button"/> | ||
414 | <connections> | 414 | <connections> |
415 | <action selector="handleLeft" destination="duB-b9-cnh" eventType="touchUpInside" id="eCq-GW-QAg"/> | 415 | <action selector="handleLeft" destination="duB-b9-cnh" eventType="touchUpInside" id="eCq-GW-QAg"/> |
416 | </connections> | 416 | </connections> |
... | @@ -424,17 +424,24 @@ | ... | @@ -424,17 +424,24 @@ |
424 | </view> | 424 | </view> |
425 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BNZ-3e-HXp"> | 425 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BNZ-3e-HXp"> |
426 | <rect key="frame" x="207.5" y="0.0" width="206.5" height="50"/> | 426 | <rect key="frame" x="207.5" y="0.0" width="206.5" height="50"/> |
427 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
427 | <state key="normal" title="Button"/> | 428 | <state key="normal" title="Button"/> |
428 | - <buttonConfiguration key="configuration" style="plain" title="Button"/> | ||
429 | <connections> | 429 | <connections> |
430 | <action selector="handleRight" destination="duB-b9-cnh" eventType="touchUpInside" id="bo6-x4-8Ld"/> | 430 | <action selector="handleRight" destination="duB-b9-cnh" eventType="touchUpInside" id="bo6-x4-8Ld"/> |
431 | </connections> | 431 | </connections> |
432 | </button> | 432 | </button> |
433 | - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f3E-Cc-8zN"> | 433 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mJZ-t9-fQV"> |
434 | - <rect key="frame" x="0.0" y="48" width="240" height="2"/> | 434 | + <rect key="frame" x="20" y="48" width="167" height="2"/> |
435 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 435 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
436 | <constraints> | 436 | <constraints> |
437 | - <constraint firstAttribute="height" constant="2" id="KlY-J5-5RO"/> | 437 | + <constraint firstAttribute="height" constant="2" id="Ih6-Kv-cBv"/> |
438 | + </constraints> | ||
439 | + </view> | ||
440 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Fb-j6-N73"> | ||
441 | + <rect key="frame" x="227" y="48" width="167" height="2"/> | ||
442 | + <color key="backgroundColor" systemColor="systemBackgroundColor"/> | ||
443 | + <constraints> | ||
444 | + <constraint firstAttribute="height" constant="2" id="3Q8-IW-ZeI"/> | ||
438 | </constraints> | 445 | </constraints> |
439 | </view> | 446 | </view> |
440 | </subviews> | 447 | </subviews> |
... | @@ -443,13 +450,18 @@ | ... | @@ -443,13 +450,18 @@ |
443 | <constraint firstItem="kAf-Oi-EnQ" firstAttribute="leading" secondItem="liP-dN-sf3" secondAttribute="trailing" id="7Eg-e7-UZK"/> | 450 | <constraint firstItem="kAf-Oi-EnQ" firstAttribute="leading" secondItem="liP-dN-sf3" secondAttribute="trailing" id="7Eg-e7-UZK"/> |
444 | <constraint firstItem="liP-dN-sf3" firstAttribute="leading" secondItem="Z7V-En-7Tl" secondAttribute="leading" id="CRR-X1-VXy"/> | 451 | <constraint firstItem="liP-dN-sf3" firstAttribute="leading" secondItem="Z7V-En-7Tl" secondAttribute="leading" id="CRR-X1-VXy"/> |
445 | <constraint firstAttribute="trailing" secondItem="BNZ-3e-HXp" secondAttribute="trailing" id="FUC-Xt-vrx"/> | 452 | <constraint firstAttribute="trailing" secondItem="BNZ-3e-HXp" secondAttribute="trailing" id="FUC-Xt-vrx"/> |
453 | + <constraint firstItem="3Fb-j6-N73" firstAttribute="leading" secondItem="mJZ-t9-fQV" secondAttribute="trailing" constant="40" id="GKc-ug-Baw"/> | ||
446 | <constraint firstAttribute="bottom" secondItem="liP-dN-sf3" secondAttribute="bottom" id="HX4-Xg-GBR"/> | 454 | <constraint firstAttribute="bottom" secondItem="liP-dN-sf3" secondAttribute="bottom" id="HX4-Xg-GBR"/> |
447 | - <constraint firstAttribute="bottom" secondItem="f3E-Cc-8zN" secondAttribute="bottom" id="Hyu-sp-nAT"/> | ||
448 | <constraint firstItem="liP-dN-sf3" firstAttribute="top" secondItem="Z7V-En-7Tl" secondAttribute="top" id="O5V-e5-NPf"/> | 455 | <constraint firstItem="liP-dN-sf3" firstAttribute="top" secondItem="Z7V-En-7Tl" secondAttribute="top" id="O5V-e5-NPf"/> |
456 | + <constraint firstAttribute="bottom" secondItem="3Fb-j6-N73" secondAttribute="bottom" id="UM1-Pr-0iS"/> | ||
449 | <constraint firstAttribute="height" constant="50" id="W4o-5O-kfL"/> | 457 | <constraint firstAttribute="height" constant="50" id="W4o-5O-kfL"/> |
450 | <constraint firstItem="BNZ-3e-HXp" firstAttribute="top" secondItem="Z7V-En-7Tl" secondAttribute="top" id="WtA-PL-BZy"/> | 458 | <constraint firstItem="BNZ-3e-HXp" firstAttribute="top" secondItem="Z7V-En-7Tl" secondAttribute="top" id="WtA-PL-BZy"/> |
451 | <constraint firstItem="kAf-Oi-EnQ" firstAttribute="centerX" secondItem="Z7V-En-7Tl" secondAttribute="centerX" id="jG4-gb-zWB"/> | 459 | <constraint firstItem="kAf-Oi-EnQ" firstAttribute="centerX" secondItem="Z7V-En-7Tl" secondAttribute="centerX" id="jG4-gb-zWB"/> |
460 | + <constraint firstAttribute="trailing" secondItem="3Fb-j6-N73" secondAttribute="trailing" constant="20" id="kii-Wz-HYa"/> | ||
452 | <constraint firstAttribute="bottom" secondItem="BNZ-3e-HXp" secondAttribute="bottom" id="kzL-YN-Vkn"/> | 461 | <constraint firstAttribute="bottom" secondItem="BNZ-3e-HXp" secondAttribute="bottom" id="kzL-YN-Vkn"/> |
462 | + <constraint firstItem="mJZ-t9-fQV" firstAttribute="leading" secondItem="Z7V-En-7Tl" secondAttribute="leading" constant="20" id="mTb-aN-46v"/> | ||
463 | + <constraint firstItem="mJZ-t9-fQV" firstAttribute="width" secondItem="3Fb-j6-N73" secondAttribute="width" id="pvU-F4-LKl"/> | ||
464 | + <constraint firstAttribute="bottom" secondItem="mJZ-t9-fQV" secondAttribute="bottom" id="vZ9-ad-8vz"/> | ||
453 | <constraint firstItem="BNZ-3e-HXp" firstAttribute="leading" secondItem="kAf-Oi-EnQ" secondAttribute="trailing" id="zPD-7c-CdH"/> | 465 | <constraint firstItem="BNZ-3e-HXp" firstAttribute="leading" secondItem="kAf-Oi-EnQ" secondAttribute="trailing" id="zPD-7c-CdH"/> |
454 | <constraint firstItem="kAf-Oi-EnQ" firstAttribute="top" secondItem="Z7V-En-7Tl" secondAttribute="top" id="zq1-qp-f9S"/> | 466 | <constraint firstItem="kAf-Oi-EnQ" firstAttribute="top" secondItem="Z7V-En-7Tl" secondAttribute="top" id="zq1-qp-f9S"/> |
455 | <constraint firstAttribute="bottom" secondItem="kAf-Oi-EnQ" secondAttribute="bottom" id="zsL-bI-ChP"/> | 467 | <constraint firstAttribute="bottom" secondItem="kAf-Oi-EnQ" secondAttribute="bottom" id="zsL-bI-ChP"/> |
... | @@ -475,8 +487,9 @@ | ... | @@ -475,8 +487,9 @@ |
475 | <connections> | 487 | <connections> |
476 | <outlet property="contentView" destination="FyK-3t-liP" id="lBC-DU-jIb"/> | 488 | <outlet property="contentView" destination="FyK-3t-liP" id="lBC-DU-jIb"/> |
477 | <outlet property="leftButton" destination="liP-dN-sf3" id="PSM-x1-lPV"/> | 489 | <outlet property="leftButton" destination="liP-dN-sf3" id="PSM-x1-lPV"/> |
478 | - <outlet property="lineView" destination="f3E-Cc-8zN" id="wqb-H2-aDz"/> | 490 | + <outlet property="leftLineView" destination="mJZ-t9-fQV" id="VVZ-UU-ChZ"/> |
479 | <outlet property="rightButton" destination="BNZ-3e-HXp" id="NDe-B7-wIV"/> | 491 | <outlet property="rightButton" destination="BNZ-3e-HXp" id="NDe-B7-wIV"/> |
492 | + <outlet property="rightLineView" destination="3Fb-j6-N73" id="Ufm-Sx-fMj"/> | ||
480 | </connections> | 493 | </connections> |
481 | </viewController> | 494 | </viewController> |
482 | <placeholder placeholderIdentifier="IBFirstResponder" id="jF4-GM-aCp" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> | 495 | <placeholder placeholderIdentifier="IBFirstResponder" id="jF4-GM-aCp" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> |
... | @@ -487,7 +500,7 @@ | ... | @@ -487,7 +500,7 @@ |
487 | <scene sceneID="Yng-iu-80u"> | 500 | <scene sceneID="Yng-iu-80u"> |
488 | <objects> | 501 | <objects> |
489 | <tableViewController storyboardIdentifier="SharingHistoryViewController" id="xOZ-Af-1Nw" customClass="SharingHistoryViewController" customModule="SwiftWarplyFramework" customModuleProvider="target" sceneMemberID="viewController"> | 502 | <tableViewController storyboardIdentifier="SharingHistoryViewController" id="xOZ-Af-1Nw" customClass="SharingHistoryViewController" customModule="SwiftWarplyFramework" customModuleProvider="target" sceneMemberID="viewController"> |
490 | - <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="160" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="IAk-m8-ZIC"> | 503 | + <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="160" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="IAk-m8-ZIC"> |
491 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | 504 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
492 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 505 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
493 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 506 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
... | @@ -515,7 +528,7 @@ | ... | @@ -515,7 +528,7 @@ |
515 | <constraint firstAttribute="width" constant="28" id="hEI-zc-TX4"/> | 528 | <constraint firstAttribute="width" constant="28" id="hEI-zc-TX4"/> |
516 | </constraints> | 529 | </constraints> |
517 | </imageView> | 530 | </imageView> |
518 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4,00€" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pyr-Jo-zxl" userLabel="Price"> | 531 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="4,00€" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pyr-Jo-zxl" userLabel="Price"> |
519 | <rect key="frame" x="349.5" y="50" width="44.5" height="20"/> | 532 | <rect key="frame" x="349.5" y="50" width="44.5" height="20"/> |
520 | <constraints> | 533 | <constraints> |
521 | <constraint firstAttribute="height" constant="20" id="WPI-8H-zbd"/> | 534 | <constraint firstAttribute="height" constant="20" id="WPI-8H-zbd"/> |
... | @@ -524,17 +537,14 @@ | ... | @@ -524,17 +537,14 @@ |
524 | <nil key="textColor"/> | 537 | <nil key="textColor"/> |
525 | <nil key="highlightedColor"/> | 538 | <nil key="highlightedColor"/> |
526 | </label> | 539 | </label> |
527 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="BOX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hqA-F6-n9s" userLabel="Title"> | 540 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="BOX" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hqA-F6-n9s" userLabel="Title"> |
528 | - <rect key="frame" x="42" y="50" width="303.5" height="20"/> | 541 | + <rect key="frame" x="42" y="51" width="303.5" height="18"/> |
529 | - <constraints> | ||
530 | - <constraint firstAttribute="height" constant="20" id="D6h-47-exa"/> | ||
531 | - </constraints> | ||
532 | <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/> | 542 | <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/> |
533 | <nil key="textColor"/> | 543 | <nil key="textColor"/> |
534 | <nil key="highlightedColor"/> | 544 | <nil key="highlightedColor"/> |
535 | </label> | 545 | </label> |
536 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="Έκπτωτικό κουπόνι" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xac-fs-J8S" userLabel="Subtitle"> | 546 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="Έκπτωτικό κουπόνι" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xac-fs-J8S" userLabel="Subtitle"> |
537 | - <rect key="frame" x="42" y="72" width="303.5" height="18"/> | 547 | + <rect key="frame" x="42" y="71" width="303.5" height="18"/> |
538 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 548 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
539 | <nil key="textColor"/> | 549 | <nil key="textColor"/> |
540 | <nil key="highlightedColor"/> | 550 | <nil key="highlightedColor"/> |
... | @@ -579,11 +589,11 @@ | ... | @@ -579,11 +589,11 @@ |
579 | </constraints> | 589 | </constraints> |
580 | </imageView> | 590 | </imageView> |
581 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LKw-8l-mRY"> | 591 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LKw-8l-mRY"> |
582 | - <rect key="frame" x="162" y="248" width="90" height="22"/> | 592 | + <rect key="frame" x="165.5" y="248" width="83" height="22"/> |
583 | <constraints> | 593 | <constraints> |
584 | <constraint firstAttribute="height" constant="22" id="T1B-pX-6hx"/> | 594 | <constraint firstAttribute="height" constant="22" id="T1B-pX-6hx"/> |
585 | </constraints> | 595 | </constraints> |
586 | - <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> | 596 | + <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> |
587 | <nil key="textColor"/> | 597 | <nil key="textColor"/> |
588 | <nil key="highlightedColor"/> | 598 | <nil key="highlightedColor"/> |
589 | </label> | 599 | </label> |
... | @@ -612,7 +622,7 @@ | ... | @@ -612,7 +622,7 @@ |
612 | <constraints> | 622 | <constraints> |
613 | <constraint firstAttribute="height" constant="60" id="ZEz-dt-NJa"/> | 623 | <constraint firstAttribute="height" constant="60" id="ZEz-dt-NJa"/> |
614 | </constraints> | 624 | </constraints> |
615 | - <fontDescription key="fontDescription" type="system" pointSize="17"/> | 625 | + <fontDescription key="fontDescription" type="system" pointSize="16"/> |
616 | <nil key="textColor"/> | 626 | <nil key="textColor"/> |
617 | <nil key="highlightedColor"/> | 627 | <nil key="highlightedColor"/> |
618 | </label> | 628 | </label> |
... | @@ -624,11 +634,11 @@ | ... | @@ -624,11 +634,11 @@ |
624 | </constraints> | 634 | </constraints> |
625 | </imageView> | 635 | </imageView> |
626 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9MF-rh-eec"> | 636 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9MF-rh-eec"> |
627 | - <rect key="frame" x="166" y="339" width="82" height="20"/> | 637 | + <rect key="frame" x="165.5" y="339" width="83" height="20"/> |
628 | <constraints> | 638 | <constraints> |
629 | <constraint firstAttribute="height" constant="20" id="XkT-At-XWY"/> | 639 | <constraint firstAttribute="height" constant="20" id="XkT-At-XWY"/> |
630 | </constraints> | 640 | </constraints> |
631 | - <fontDescription key="fontDescription" type="system" pointSize="17"/> | 641 | + <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> |
632 | <nil key="textColor"/> | 642 | <nil key="textColor"/> |
633 | <nil key="highlightedColor"/> | 643 | <nil key="highlightedColor"/> |
634 | </label> | 644 | </label> |
... | @@ -864,19 +874,19 @@ | ... | @@ -864,19 +874,19 @@ |
864 | <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="MCY-xv-vpg"> | 874 | <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="MCY-xv-vpg"> |
865 | <rect key="frame" x="20" y="20" width="254" height="60.5"/> | 875 | <rect key="frame" x="20" y="20" width="254" height="60.5"/> |
866 | <subviews> | 876 | <subviews> |
867 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ενεργός κωδικός:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ucC-u4-AQL"> | 877 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Ενεργός κωδικός:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ucC-u4-AQL"> |
868 | <rect key="frame" x="0.0" y="0.0" width="254" height="21.5"/> | 878 | <rect key="frame" x="0.0" y="0.0" width="254" height="21.5"/> |
869 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> | 879 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> |
870 | <color key="textColor" red="0.23529411759999999" green="0.32549019610000002" blue="0.39607843139999999" alpha="1" colorSpace="calibratedRGB"/> | 880 | <color key="textColor" red="0.23529411759999999" green="0.32549019610000002" blue="0.39607843139999999" alpha="1" colorSpace="calibratedRGB"/> |
871 | <nil key="highlightedColor"/> | 881 | <nil key="highlightedColor"/> |
872 | </label> | 882 | </label> |
873 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="961544809" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qBe-Jw-QUx"> | 883 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="961544809" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qBe-Jw-QUx"> |
874 | <rect key="frame" x="0.0" y="23.5" width="254" height="21.5"/> | 884 | <rect key="frame" x="0.0" y="23.5" width="254" height="21.5"/> |
875 | <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="18"/> | 885 | <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="18"/> |
876 | <color key="textColor" red="0.23529411759999999" green="0.32549019610000002" blue="0.39607843139999999" alpha="1" colorSpace="calibratedRGB"/> | 886 | <color key="textColor" red="0.23529411759999999" green="0.32549019610000002" blue="0.39607843139999999" alpha="1" colorSpace="calibratedRGB"/> |
877 | <nil key="highlightedColor"/> | 887 | <nil key="highlightedColor"/> |
878 | </label> | 888 | </label> |
879 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Λήγει σε 4 ημέρες" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qL0-3b-eqA"> | 889 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Λήγει σε 4 ημέρες" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qL0-3b-eqA"> |
880 | <rect key="frame" x="0.0" y="47" width="254" height="13.5"/> | 890 | <rect key="frame" x="0.0" y="47" width="254" height="13.5"/> |
881 | <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/> | 891 | <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/> |
882 | <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> | 892 | <color key="textColor" red="0.2274509804" green="0.32156862749999998" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> |
... | @@ -2084,7 +2094,7 @@ | ... | @@ -2084,7 +2094,7 @@ |
2084 | <scene sceneID="KER-Da-ryV"> | 2094 | <scene sceneID="KER-Da-ryV"> |
2085 | <objects> | 2095 | <objects> |
2086 | <tableViewController storyboardIdentifier="HistoryViewController" id="ze6-Kr-Io4" customClass="HistoryViewController" customModule="SwiftWarplyFramework" customModuleProvider="target" sceneMemberID="viewController"> | 2096 | <tableViewController storyboardIdentifier="HistoryViewController" id="ze6-Kr-Io4" customClass="HistoryViewController" customModule="SwiftWarplyFramework" customModuleProvider="target" sceneMemberID="viewController"> |
2087 | - <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="160" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="qD1-U4-LYx"> | 2097 | + <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="160" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="qD1-U4-LYx"> |
2088 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | 2098 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
2089 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 2099 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
2090 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 2100 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
... | @@ -2112,7 +2122,7 @@ | ... | @@ -2112,7 +2122,7 @@ |
2112 | <constraint firstAttribute="height" constant="28" id="OZS-QM-eof"/> | 2122 | <constraint firstAttribute="height" constant="28" id="OZS-QM-eof"/> |
2113 | </constraints> | 2123 | </constraints> |
2114 | </imageView> | 2124 | </imageView> |
2115 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4,00€" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZGs-RN-c7E" userLabel="Price"> | 2125 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="4,00€" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZGs-RN-c7E" userLabel="Price"> |
2116 | <rect key="frame" x="349.5" y="50" width="44.5" height="20"/> | 2126 | <rect key="frame" x="349.5" y="50" width="44.5" height="20"/> |
2117 | <constraints> | 2127 | <constraints> |
2118 | <constraint firstAttribute="height" constant="20" id="VS4-Dn-eBF"/> | 2128 | <constraint firstAttribute="height" constant="20" id="VS4-Dn-eBF"/> |
... | @@ -2121,17 +2131,14 @@ | ... | @@ -2121,17 +2131,14 @@ |
2121 | <nil key="textColor"/> | 2131 | <nil key="textColor"/> |
2122 | <nil key="highlightedColor"/> | 2132 | <nil key="highlightedColor"/> |
2123 | </label> | 2133 | </label> |
2124 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="BOX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ag-Sp-uXt" userLabel="Title"> | 2134 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="BOX" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ag-Sp-uXt" userLabel="Title"> |
2125 | - <rect key="frame" x="42" y="50" width="303.5" height="20"/> | 2135 | + <rect key="frame" x="42" y="51" width="303.5" height="18"/> |
2126 | - <constraints> | ||
2127 | - <constraint firstAttribute="height" constant="20" id="U6X-e9-8w7"/> | ||
2128 | - </constraints> | ||
2129 | <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/> | 2136 | <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/> |
2130 | <nil key="textColor"/> | 2137 | <nil key="textColor"/> |
2131 | <nil key="highlightedColor"/> | 2138 | <nil key="highlightedColor"/> |
2132 | </label> | 2139 | </label> |
2133 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="Έκπτωτικό κουπόνι" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4bA-Ab-3q1" userLabel="Subtitle"> | 2140 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="Έκπτωτικό κουπόνι" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4bA-Ab-3q1" userLabel="Subtitle"> |
2134 | - <rect key="frame" x="42" y="72" width="303.5" height="18"/> | 2141 | + <rect key="frame" x="42" y="71" width="303.5" height="18"/> |
2135 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 2142 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
2136 | <nil key="textColor"/> | 2143 | <nil key="textColor"/> |
2137 | <nil key="highlightedColor"/> | 2144 | <nil key="highlightedColor"/> |
... | @@ -2176,11 +2183,11 @@ | ... | @@ -2176,11 +2183,11 @@ |
2176 | </constraints> | 2183 | </constraints> |
2177 | </imageView> | 2184 | </imageView> |
2178 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XjQ-Dg-ucn"> | 2185 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XjQ-Dg-ucn"> |
2179 | - <rect key="frame" x="162" y="248" width="90" height="22"/> | 2186 | + <rect key="frame" x="165.5" y="248" width="83" height="22"/> |
2180 | <constraints> | 2187 | <constraints> |
2181 | <constraint firstAttribute="height" constant="22" id="Ccg-Xm-m6C"/> | 2188 | <constraint firstAttribute="height" constant="22" id="Ccg-Xm-m6C"/> |
2182 | </constraints> | 2189 | </constraints> |
2183 | - <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> | 2190 | + <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> |
2184 | <nil key="textColor"/> | 2191 | <nil key="textColor"/> |
2185 | <nil key="highlightedColor"/> | 2192 | <nil key="highlightedColor"/> |
2186 | </label> | 2193 | </label> |
... | @@ -2209,7 +2216,7 @@ | ... | @@ -2209,7 +2216,7 @@ |
2209 | <constraints> | 2216 | <constraints> |
2210 | <constraint firstAttribute="height" constant="60" id="Ams-n8-yUP"/> | 2217 | <constraint firstAttribute="height" constant="60" id="Ams-n8-yUP"/> |
2211 | </constraints> | 2218 | </constraints> |
2212 | - <fontDescription key="fontDescription" type="system" pointSize="17"/> | 2219 | + <fontDescription key="fontDescription" type="system" pointSize="16"/> |
2213 | <nil key="textColor"/> | 2220 | <nil key="textColor"/> |
2214 | <nil key="highlightedColor"/> | 2221 | <nil key="highlightedColor"/> |
2215 | </label> | 2222 | </label> |
... | @@ -2221,11 +2228,11 @@ | ... | @@ -2221,11 +2228,11 @@ |
2221 | </constraints> | 2228 | </constraints> |
2222 | </imageView> | 2229 | </imageView> |
2223 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzx-D5-LHo"> | 2230 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzx-D5-LHo"> |
2224 | - <rect key="frame" x="166" y="339" width="82" height="20"/> | 2231 | + <rect key="frame" x="165.5" y="339" width="83" height="20"/> |
2225 | <constraints> | 2232 | <constraints> |
2226 | <constraint firstAttribute="height" constant="20" id="K9D-vL-Saj"/> | 2233 | <constraint firstAttribute="height" constant="20" id="K9D-vL-Saj"/> |
2227 | </constraints> | 2234 | </constraints> |
2228 | - <fontDescription key="fontDescription" type="system" pointSize="17"/> | 2235 | + <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> |
2229 | <nil key="textColor"/> | 2236 | <nil key="textColor"/> |
2230 | <nil key="highlightedColor"/> | 2237 | <nil key="highlightedColor"/> |
2231 | </label> | 2238 | </label> | ... | ... |
... | @@ -183,7 +183,7 @@ import SwiftEventBus | ... | @@ -183,7 +183,7 @@ import SwiftEventBus |
183 | coupAttributedString.append(coupNormalString2) | 183 | coupAttributedString.append(coupNormalString2) |
184 | coupAttributedString.append(coupBoldString2) | 184 | coupAttributedString.append(coupBoldString2) |
185 | coupAttributedString.append(coupNormalString3) | 185 | coupAttributedString.append(coupNormalString3) |
186 | - couponEarnLabel.attributedText = attributedString | 186 | + couponEarnLabel.attributedText = coupAttributedString |
187 | 187 | ||
188 | couponEarnAmountLabel.text = totalCouponDiscountString + "€" | 188 | couponEarnAmountLabel.text = totalCouponDiscountString + "€" |
189 | 189 | ... | ... |
-
Please register or login to post a comment