Manos Chorianopoulos

PopupMerchantsViewController fixes

......@@ -6552,7 +6552,7 @@
<constraints>
<constraint firstItem="MNf-7L-OWL" firstAttribute="leading" secondItem="cSR-WK-qb0" secondAttribute="leading" constant="20" id="0UF-Fk-tDs"/>
<constraint firstAttribute="trailing" secondItem="MNf-7L-OWL" secondAttribute="trailing" constant="20" id="3aK-Rx-22N"/>
<constraint firstAttribute="bottom" secondItem="vet-Po-Bmf" secondAttribute="bottom" constant="30" id="B03-fG-aC2"/>
<constraint firstAttribute="bottom" secondItem="vet-Po-Bmf" secondAttribute="bottom" id="B03-fG-aC2"/>
<constraint firstItem="vet-Po-Bmf" firstAttribute="leading" secondItem="cSR-WK-qb0" secondAttribute="leading" id="F8e-cg-wdq"/>
<constraint firstItem="MNf-7L-OWL" firstAttribute="top" secondItem="cSR-WK-qb0" secondAttribute="top" constant="15" id="N8O-in-CB3"/>
<constraint firstItem="vet-Po-Bmf" firstAttribute="top" secondItem="MNf-7L-OWL" secondAttribute="bottom" constant="15" id="hl9-87-bJ7"/>
......@@ -6563,9 +6563,9 @@
<color key="backgroundColor" red="0.1529411765" green="0.1529411765" blue="0.1529411765" alpha="0.57999999999999996" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="cSR-WK-qb0" secondAttribute="trailing" id="G7t-Dj-L0z"/>
<constraint firstAttribute="bottom" secondItem="cSR-WK-qb0" secondAttribute="bottom" id="PgS-E9-7aE"/>
<constraint firstItem="cSR-WK-qb0" firstAttribute="leading" secondItem="iUx-aw-MaF" secondAttribute="leading" id="WuY-gU-rja"/>
<constraint firstItem="cSR-WK-qb0" firstAttribute="height" relation="lessThanOrEqual" secondItem="iUx-aw-MaF" secondAttribute="height" multiplier="0.7" id="ZRT-Sj-HhH"/>
<constraint firstAttribute="bottom" secondItem="cSR-WK-qb0" secondAttribute="bottom" id="cN3-Su-boG"/>
</constraints>
</view>
</subviews>
......
......@@ -78,7 +78,7 @@ class MerchantTableViewCell: UITableViewCell {
buttonTitleLable.text = buttonTitle
if let iconImage {
self.buttonIconImage.image = UIImage(named: iconImage)
self.buttonIconImage.image = UIImage(named: iconImage, in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
self.buttonIconImage.isHidden = false
} else {
self.buttonIconImage.isHidden = true
......
......@@ -27,7 +27,7 @@ class PopupMerchantsViewController: UIViewController {
tableView.delegate = self
tableView.dataSource = self
tableView.contentInset.top = 75
tableView.contentInset.top = 50
popupView.clipsToBounds = true
popupView.layer.cornerRadius = 16
......@@ -45,6 +45,7 @@ class PopupMerchantsViewController: UIViewController {
// MARK: - UIButton Actions
@IBAction func closeButtonAction(_ sender: Any) {
self.dismiss(animated: true, completion: {})
}
}
......@@ -83,6 +84,9 @@ extension PopupMerchantsViewController: UITableViewDelegate, UITableViewDataSour
let cell = tableView.dequeueReusableCell(withIdentifier: "MerchantTableViewCellId", for: indexPath) as! MerchantTableViewCell
cell.configureCell(merchant: merchantList[indexPath.row], buttonTitle: self.buttonTitle ?? "Βρες το", iconImage: buttonIcon)
// Set the delegate to self
cell.delegate = self
return cell
} else {
......