open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
dc4626f1 1 parent 069db5b7

redesigns TelcoViewController

Expand all
Inline Side-by-side
Showing 2 changed files with 26 additions and 26 deletions
...@@ -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()
......