open-source / warply_sdk_framework

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

redesign ShareViewController

Expand all
Inline Side-by-side
Showing 3 changed files with 24 additions and 22 deletions
...@@ -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
......