open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
e825ab15 1 parent 0ab1a189

redesign ShareViewController

Inline Side-by-side
Showing 3 changed files with 47 additions and 44 deletions
...@@ -3499,42 +3499,42 @@ ...@@ -3499,42 +3499,42 @@
3499 </constraints> 3499 </constraints>
3500 </imageView> 3500 </imageView>
3501 <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="a9N-Ea-LNm"> 3501 <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="a9N-Ea-LNm">
3502 - <rect key="frame" x="20" y="220" width="374" height="34"/> 3502 + <rect key="frame" x="20" y="220" width="374" height="39.5"/>
3503 - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/> 3503 + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
3504 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 3504 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
3505 <nil key="highlightedColor"/> 3505 <nil key="highlightedColor"/>
3506 </label> 3506 </label>
3507 <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="EV0-Fh-Tdo"> 3507 <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="EV0-Fh-Tdo">
3508 - <rect key="frame" x="20" y="269" width="374" height="51"/> 3508 + <rect key="frame" x="20" y="274.5" width="374" height="59.5"/>
3509 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="17"/> 3509 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
3510 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 3510 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
3511 <nil key="highlightedColor"/> 3511 <nil key="highlightedColor"/>
3512 </label> 3512 </label>
3513 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flv-Ik-YC2" userLabel="Sender View"> 3513 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flv-Ik-YC2" userLabel="Sender View">
3514 - <rect key="frame" x="20" y="370" width="374" height="46"/> 3514 + <rect key="frame" x="20" y="384" width="374" height="50"/>
3515 <subviews> 3515 <subviews>
3516 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αποστολέας" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GX7-IF-Gdd"> 3516 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αποστολέας" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GX7-IF-Gdd">
3517 - <rect key="frame" x="10" y="15" width="334" height="16"/> 3517 + <rect key="frame" x="10" y="15" width="334" height="20"/>
3518 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> 3518 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
3519 - <color key="textColor" red="0.25490196078431371" green="0.33333333333333331" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> 3519 + <color key="textColor" red="0.51764705882352935" green="0.51764705882352935" blue="0.51764705882352935" alpha="1" colorSpace="calibratedRGB"/>
3520 <nil key="highlightedColor"/> 3520 <nil key="highlightedColor"/>
3521 </label> 3521 </label>
3522 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_down_dark" translatesAutoresizingMaskIntoConstraints="NO" id="Ul8-d9-FfM"> 3522 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_down_dark" translatesAutoresizingMaskIntoConstraints="NO" id="Ul8-d9-FfM">
3523 - <rect key="frame" x="354" y="15.5" width="15" height="15"/> 3523 + <rect key="frame" x="354" y="17.5" width="15" height="15"/>
3524 <constraints> 3524 <constraints>
3525 <constraint firstAttribute="height" constant="15" id="7Cv-XL-7ld"/> 3525 <constraint firstAttribute="height" constant="15" id="7Cv-XL-7ld"/>
3526 <constraint firstAttribute="width" constant="15" id="bga-Xk-Jqu"/> 3526 <constraint firstAttribute="width" constant="15" id="bga-Xk-Jqu"/>
3527 </constraints> 3527 </constraints>
3528 </imageView> 3528 </imageView>
3529 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uwc-Al-475" userLabel="Border View"> 3529 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uwc-Al-475" userLabel="Border View">
3530 - <rect key="frame" x="0.0" y="45" width="374" height="1"/> 3530 + <rect key="frame" x="0.0" y="49" width="374" height="1"/>
3531 - <color key="backgroundColor" red="0.75294117647058822" green="0.7803921568627451" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/> 3531 + <color key="backgroundColor" red="0.4392156862745098" green="0.4392156862745098" blue="0.4392156862745098" alpha="1" colorSpace="calibratedRGB"/>
3532 <constraints> 3532 <constraints>
3533 <constraint firstAttribute="height" constant="1" id="AIa-Cf-WAf"/> 3533 <constraint firstAttribute="height" constant="1" id="AIa-Cf-WAf"/>
3534 </constraints> 3534 </constraints>
3535 </view> 3535 </view>
3536 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YD8-9K-Fp9"> 3536 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YD8-9K-Fp9">
3537 - <rect key="frame" x="0.0" y="0.0" width="374" height="46"/> 3537 + <rect key="frame" x="0.0" y="0.0" width="374" height="50"/>
3538 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 3538 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
3539 </button> 3539 </button>
3540 </subviews> 3540 </subviews>
...@@ -3556,7 +3556,7 @@ ...@@ -3556,7 +3556,7 @@
3556 </constraints> 3556 </constraints>
3557 </view> 3557 </view>
3558 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bsb-ps-GWu"> 3558 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bsb-ps-GWu">
3559 - <rect key="frame" x="165" y="574.5" width="84" height="44"/> 3559 + <rect key="frame" x="165" y="596.5" width="84" height="44"/>
3560 <constraints> 3560 <constraints>
3561 <constraint firstAttribute="height" constant="44" id="ge6-VF-hRu"/> 3561 <constraint firstAttribute="height" constant="44" id="ge6-VF-hRu"/>
3562 </constraints> 3562 </constraints>
...@@ -3570,17 +3570,17 @@ ...@@ -3570,17 +3570,17 @@
3570 </connections> 3570 </connections>
3571 </button> 3571 </button>
3572 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uf8-tj-KCP" userLabel="Number Input View"> 3572 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uf8-tj-KCP" userLabel="Number Input View">
3573 - <rect key="frame" x="20" y="456" width="374" height="48.5"/> 3573 + <rect key="frame" x="20" y="474" width="374" height="52.5"/>
3574 <subviews> 3574 <subviews>
3575 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Καταχώρηση τηλεφώνου" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MYX-E6-emS"> 3575 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Καταχώρηση τηλεφώνου" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MYX-E6-emS">
3576 - <rect key="frame" x="10" y="15" width="354" height="17.5"/> 3576 + <rect key="frame" x="10" y="15" width="354" height="21.5"/>
3577 - <color key="textColor" red="0.25490196078431371" green="0.33333333333333331" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> 3577 + <color key="textColor" red="0.51764705882352935" green="0.51764705882352935" blue="0.51764705882352935" alpha="1" colorSpace="calibratedRGB"/>
3578 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> 3578 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
3579 <textInputTraits key="textInputTraits"/> 3579 <textInputTraits key="textInputTraits"/>
3580 </textField> 3580 </textField>
3581 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZfV-Yt-Nsb" userLabel="Border View"> 3581 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZfV-Yt-Nsb" userLabel="Border View">
3582 - <rect key="frame" x="0.0" y="47.5" width="374" height="1"/> 3582 + <rect key="frame" x="0.0" y="51.5" width="374" height="1"/>
3583 - <color key="backgroundColor" red="0.75294117650000003" green="0.78039215689999997" blue="0.80392156859999997" alpha="1" colorSpace="calibratedRGB"/> 3583 + <color key="backgroundColor" red="0.4392156862745098" green="0.4392156862745098" blue="0.4392156862745098" alpha="1" colorSpace="calibratedRGB"/>
3584 <constraints> 3584 <constraints>
3585 <constraint firstAttribute="height" constant="1" id="XVw-LC-VSt"/> 3585 <constraint firstAttribute="height" constant="1" id="XVw-LC-VSt"/>
3586 </constraints> 3586 </constraints>
...@@ -3631,7 +3631,7 @@ ...@@ -3631,7 +3631,7 @@
3631 <viewLayoutGuide key="contentLayoutGuide" id="fXc-vI-HgW"/> 3631 <viewLayoutGuide key="contentLayoutGuide" id="fXc-vI-HgW"/>
3632 <viewLayoutGuide key="frameLayoutGuide" id="wi0-bn-nU4"/> 3632 <viewLayoutGuide key="frameLayoutGuide" id="wi0-bn-nU4"/>
3633 </scrollView> 3633 </scrollView>
3634 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ndy-dK-SEh"> 3634 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ndy-dK-SEh">
3635 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> 3635 <rect key="frame" x="0.0" y="420" width="414" height="11.5"/>
3636 </imageView> 3636 </imageView>
3637 </subviews> 3637 </subviews>
...@@ -3653,6 +3653,7 @@ ...@@ -3653,6 +3653,7 @@
3653 <variation key="default"> 3653 <variation key="default">
3654 <mask key="subviews"> 3654 <mask key="subviews">
3655 <exclude reference="QF0-ih-7ii"/> 3655 <exclude reference="QF0-ih-7ii"/>
3656 + <exclude reference="Ndy-dK-SEh"/>
3656 </mask> 3657 </mask>
3657 </variation> 3658 </variation>
3658 </view> 3659 </view>
......
...@@ -57,22 +57,22 @@ import SwiftEventBus ...@@ -57,22 +57,22 @@ import SwiftEventBus
57 // scrollView.layer.cornerRadius = 30 57 // scrollView.layer.cornerRadius = 30
58 // scrollView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius 58 // scrollView.layer.maskedCorners = [ .layerMinXMinYCorner] // Top left corner radius
59 59
60 - let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)! 60 +// let image = UIImage(named: "top_border_line", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)!
61 - var aspectR: CGFloat = 0.0 61 +// var aspectR: CGFloat = 0.0
62 - 62 +//
63 - aspectR = image.size.width/image.size.height 63 +// aspectR = image.size.width/image.size.height
64 - 64 +//
65 - topBorderLine.translatesAutoresizingMaskIntoConstraints = false 65 +// topBorderLine.translatesAutoresizingMaskIntoConstraints = false
66 - topBorderLine.image = image 66 +// topBorderLine.image = image
67 - topBorderLine.contentMode = .scaleAspectFill 67 +// topBorderLine.contentMode = .scaleAspectFill
68 - 68 +//
69 - NSLayoutConstraint.activate([ 69 +// NSLayoutConstraint.activate([
70 - topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0), 70 +// topBorderLine.topAnchor.constraint(equalTo: mainView.topAnchor, constant: 0),
71 - topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0), 71 +// topBorderLine.leadingAnchor.constraint(equalTo: mainView.leadingAnchor, constant: 0),
72 - topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0), 72 +// topBorderLine.trailingAnchor.constraint(equalTo: mainView.trailingAnchor, constant: 0),
73 - topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width), 73 +// topBorderLine.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width),
74 - topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR) 74 +// topBorderLine.heightAnchor.constraint(equalTo: topBorderLine.widthAnchor, multiplier: 1/aspectR)
75 - ]) 75 +// ])
76 76
77 // COUPONSET: desc, img_preview, name, terms 77 // COUPONSET: desc, img_preview, name, terms
78 // COUPON: coupon, expiration, discount, status 78 // COUPON: coupon, expiration, discount, status
...@@ -88,21 +88,22 @@ import SwiftEventBus ...@@ -88,21 +88,22 @@ import SwiftEventBus
88 descriptionLabel.text = "Επίλεξε το κινητό από το οποίο θα γίνει η αποστολή και συμπλήρωσε το COSMOTE κινητό που θα λάβει το δώρο." 88 descriptionLabel.text = "Επίλεξε το κινητό από το οποίο θα γίνει η αποστολή και συμπλήρωσε το COSMOTE κινητό που θα λάβει το δώρο."
89 89
90 senderLabel.text = "Αποστολέας" 90 senderLabel.text = "Αποστολέας"
91 + senderLabel.textColor = UIColor(red: 0.52, green: 0.52, blue: 0.52, alpha: 1.00)
91 senderArrowImage.image = UIImage(named: "ic_down_dark_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 92 senderArrowImage.image = UIImage(named: "ic_down_dark_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
92 93
93 senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside) 94 senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside)
94 95
95 - numberTextField.font = UIFont(name: "PFSquareSansPro-Regular", size: 16) 96 + numberTextField.font = UIFont(name: "PeridotPE-Regular", size: 16)
96 - numberTextField.textColor = UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00) 97 + numberTextField.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
97 - numberTextField.attributedPlaceholder = NSAttributedString(string: "Καταχώρηση τηλεφώνου", attributes: [NSAttributedString.Key.foregroundColor: UIColor(red: 0.68, green: 0.68, blue: 0.68, alpha: 1.00)]) 98 + numberTextField.attributedPlaceholder = NSAttributedString(string: "Καταχώρηση τηλεφώνου", attributes: [NSAttributedString.Key.foregroundColor: UIColor(red: 0.52, green: 0.52, blue: 0.52, alpha: 1.00)])
98 numberTextField.keyboardType = .asciiCapableNumberPad 99 numberTextField.keyboardType = .asciiCapableNumberPad
99 numberTextField.addDoneButtonOnKeyboard() 100 numberTextField.addDoneButtonOnKeyboard()
100 101
101 - redeemButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 18) 102 + redeemButton.titleLabel?.font = UIFont(name: "PeridotPE-SemiBold", size: 17)
102 redeemButton.setTitle("Αποστολή με SMS", for: .normal) 103 redeemButton.setTitle("Αποστολή με SMS", for: .normal)
103 redeemButton.setTitleColor(.white, for: .normal) 104 redeemButton.setTitleColor(.white, for: .normal)
104 - redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 105 + redeemButton.backgroundColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00)
105 - redeemButton.layer.cornerRadius = 8.0 106 + redeemButton.layer.cornerRadius = 16.0
106 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) 107 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
107 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16) 108 redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
108 // Fix width for ipad 109 // Fix width for ipad
...@@ -346,6 +347,7 @@ extension ShareViewController: NumbersPopupDelegate { ...@@ -346,6 +347,7 @@ extension ShareViewController: NumbersPopupDelegate {
346 // Code for when option is selected 347 // Code for when option is selected
347 selectedNumber = option 348 selectedNumber = option
348 senderLabel.text = option 349 senderLabel.text = option
350 + senderLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
349 } 351 }
350 } 352 }
351 353
......