open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
e94e45bf 1 parent 415fffa1

ui fixes v2

Inline Side-by-side
Showing 6 changed files with 13 additions and 13 deletions
...@@ -66,7 +66,7 @@ import SwiftEventBus ...@@ -66,7 +66,7 @@ import SwiftEventBus
66 66
67 couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache()) 67 couponImage.load(link: ccms?._imageUrl ?? "", placeholder: UIImage(), cache: URLCache())
68 couponImage.contentMode = .scaleAspectFill 68 couponImage.contentMode = .scaleAspectFill
69 - couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 69 + couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
70 70
71 nameLabel.text = ccms?._title ?? "" 71 nameLabel.text = ccms?._title ?? ""
72 descriptionLabel.text = ccms?._subtitle ?? "" 72 descriptionLabel.text = ccms?._subtitle ?? ""
...@@ -77,7 +77,7 @@ import SwiftEventBus ...@@ -77,7 +77,7 @@ import SwiftEventBus
77 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 77 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
78 redeemButton.layer.cornerRadius = 8.0 78 redeemButton.layer.cornerRadius = 8.0
79 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) 79 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
80 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 80 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
81 // Fix width for ipad 81 // Fix width for ipad
82 // if UIDevice.current.userInterfaceIdiom == .pad { 82 // if UIDevice.current.userInterfaceIdiom == .pad {
83 // // iPad 83 // // iPad
......
...@@ -95,7 +95,7 @@ import AVFoundation ...@@ -95,7 +95,7 @@ import AVFoundation
95 95
96 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 96 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
97 couponImage.contentMode = .scaleAspectFill 97 couponImage.contentMode = .scaleAspectFill
98 - couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 98 + couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
99 99
100 nameLabel.text = couponSetData?.name ?? "" 100 nameLabel.text = couponSetData?.name ?? ""
101 discriptionLabel.text = couponSetData?.short_description ?? "" 101 discriptionLabel.text = couponSetData?.short_description ?? ""
...@@ -162,7 +162,7 @@ import AVFoundation ...@@ -162,7 +162,7 @@ import AVFoundation
162 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 162 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
163 redeemButton.layer.cornerRadius = 8.0 163 redeemButton.layer.cornerRadius = 8.0
164 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) 164 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
165 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 165 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
166 // Fix width for ipad 166 // Fix width for ipad
167 // if UIDevice.current.userInterfaceIdiom == .pad { 167 // if UIDevice.current.userInterfaceIdiom == .pad {
168 // // iPad 168 // // iPad
...@@ -178,7 +178,7 @@ import AVFoundation ...@@ -178,7 +178,7 @@ import AVFoundation
178 mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 178 mapButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
179 mapButton.layer.cornerRadius = 8.0 179 mapButton.layer.cornerRadius = 8.0
180 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) 180 mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44)
181 - mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 181 + mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
182 182
183 // mapButton.isHidden = true 183 // mapButton.isHidden = true
184 // mapButtonHeight.constant = 0 184 // mapButtonHeight.constant = 0
...@@ -191,7 +191,7 @@ import AVFoundation ...@@ -191,7 +191,7 @@ import AVFoundation
191 // if (merchant._show_map == true) { 191 // if (merchant._show_map == true) {
192 // mapButton.setTitle("Δες τα καταστήματα", for: .normal) 192 // mapButton.setTitle("Δες τα καταστήματα", for: .normal)
193 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) 193 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44)
194 - // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 194 + // mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
195 // mapButton.isHidden = false 195 // mapButton.isHidden = false
196 // mapBtnVisible = true 196 // mapBtnVisible = true
197 // eshopBtnVisible = false 197 // eshopBtnVisible = false
...@@ -200,7 +200,7 @@ import AVFoundation ...@@ -200,7 +200,7 @@ import AVFoundation
200 // } else if (merchant._eshop == true) { 200 // } else if (merchant._eshop == true) {
201 // mapButton.setTitle("Δες το eshop", for: .normal) 201 // mapButton.setTitle("Δες το eshop", for: .normal)
202 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44) 202 // mapButton.frame = CGRect(x: 0.0, y: 0.0, width: mapButton.intrinsicContentSize.width, height: 44)
203 - // mapButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 203 + // mapButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
204 // mapButton.isHidden = false 204 // mapButton.isHidden = false
205 // mapBtnVisible = false 205 // mapBtnVisible = false
206 // eshopBtnVisible = true 206 // eshopBtnVisible = true
......
...@@ -72,7 +72,7 @@ import SwiftEventBus ...@@ -72,7 +72,7 @@ import SwiftEventBus
72 72
73 couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 73 couponImage.load(link: couponset?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
74 couponImage.contentMode = .scaleAspectFill 74 couponImage.contentMode = .scaleAspectFill
75 - couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 75 + couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
76 76
77 nameLabel.text = couponset?.name ?? "" 77 nameLabel.text = couponset?.name ?? ""
78 let htmlDescrText = couponset?.description ?? "" 78 let htmlDescrText = couponset?.description ?? ""
...@@ -83,7 +83,7 @@ import SwiftEventBus ...@@ -83,7 +83,7 @@ import SwiftEventBus
83 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 83 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
84 redeemButton.layer.cornerRadius = 8.0 84 redeemButton.layer.cornerRadius = 8.0
85 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) 85 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
86 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 86 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
87 // Fix width for ipad 87 // Fix width for ipad
88 if UIDevice.current.userInterfaceIdiom == .pad { 88 if UIDevice.current.userInterfaceIdiom == .pad {
89 // iPad 89 // iPad
......
...@@ -81,7 +81,7 @@ import SwiftEventBus ...@@ -81,7 +81,7 @@ import SwiftEventBus
81 81
82 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache()) 82 couponImage.load(link: couponSetData?.img_preview ?? "", placeholder: UIImage(), cache: URLCache())
83 couponImage.contentMode = .scaleAspectFill 83 couponImage.contentMode = .scaleAspectFill
84 - couponImageHeight.constant = 253 // self.uiscreen.height * 0.25 84 + couponImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
85 85
86 nameLabel.text = couponSetData?.name ?? "" 86 nameLabel.text = couponSetData?.name ?? ""
87 // descriptionLabel.text = couponSetData?.short_description ?? "" 87 // descriptionLabel.text = couponSetData?.short_description ?? ""
...@@ -104,7 +104,7 @@ import SwiftEventBus ...@@ -104,7 +104,7 @@ import SwiftEventBus
104 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 104 redeemButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
105 redeemButton.layer.cornerRadius = 8.0 105 redeemButton.layer.cornerRadius = 8.0
106 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44) 106 redeemButton.frame = CGRect(x: 0.0, y: 0.0, width: redeemButton.intrinsicContentSize.width, height: 44)
107 - redeemButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 107 + redeemButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
108 // Fix width for ipad 108 // Fix width for ipad
109 // if UIDevice.current.userInterfaceIdiom == .pad { 109 // if UIDevice.current.userInterfaceIdiom == .pad {
110 // // iPad 110 // // iPad
......
...@@ -77,7 +77,7 @@ import SwiftEventBus ...@@ -77,7 +77,7 @@ import SwiftEventBus
77 77
78 heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache()) 78 heroImage.load(link: ccms?._imageOfferUrl ?? "", placeholder: UIImage(), cache: URLCache())
79 heroImage.contentMode = .scaleAspectFill 79 heroImage.contentMode = .scaleAspectFill
80 - heroImageHeight.constant = self.uiscreen.height * 0.25 80 + heroImageHeight.constant = 230 // 253 // self.uiscreen.height * 0.25
81 nameLabel.text = ccms?._description ?? "" 81 nameLabel.text = ccms?._description ?? ""
82 // descriptionLabel.text = ccms?._subtitle ?? "" 82 // descriptionLabel.text = ccms?._subtitle ?? ""
83 83
...@@ -97,7 +97,7 @@ import SwiftEventBus ...@@ -97,7 +97,7 @@ import SwiftEventBus
97 activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00) 97 activateButton.backgroundColor = UIColor(red: 0.47, green: 0.75, blue: 0.08, alpha: 1.00)
98 activateButton.layer.cornerRadius = 8.0 98 activateButton.layer.cornerRadius = 8.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: 44)
100 - activateButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16) 100 + activateButton.contentEdgeInsets = UIEdgeInsets(top: 1, left: 16, bottom: 0, right: 16)
101 101
102 // Fix width for ipad 102 // Fix width for ipad
103 // if UIDevice.current.userInterfaceIdiom == .pad { 103 // if UIDevice.current.userInterfaceIdiom == .pad {
......