open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
e357bd6f 1 parent 10f194d3

PopupMerchantsViewController fixes

Inline Side-by-side
Showing 4 changed files with 8 additions and 4 deletions
...@@ -6552,7 +6552,7 @@ ...@@ -6552,7 +6552,7 @@
6552 <constraints> 6552 <constraints>
6553 <constraint firstItem="MNf-7L-OWL" firstAttribute="leading" secondItem="cSR-WK-qb0" secondAttribute="leading" constant="20" id="0UF-Fk-tDs"/> 6553 <constraint firstItem="MNf-7L-OWL" firstAttribute="leading" secondItem="cSR-WK-qb0" secondAttribute="leading" constant="20" id="0UF-Fk-tDs"/>
6554 <constraint firstAttribute="trailing" secondItem="MNf-7L-OWL" secondAttribute="trailing" constant="20" id="3aK-Rx-22N"/> 6554 <constraint firstAttribute="trailing" secondItem="MNf-7L-OWL" secondAttribute="trailing" constant="20" id="3aK-Rx-22N"/>
6555 - <constraint firstAttribute="bottom" secondItem="vet-Po-Bmf" secondAttribute="bottom" constant="30" id="B03-fG-aC2"/> 6555 + <constraint firstAttribute="bottom" secondItem="vet-Po-Bmf" secondAttribute="bottom" id="B03-fG-aC2"/>
6556 <constraint firstItem="vet-Po-Bmf" firstAttribute="leading" secondItem="cSR-WK-qb0" secondAttribute="leading" id="F8e-cg-wdq"/> 6556 <constraint firstItem="vet-Po-Bmf" firstAttribute="leading" secondItem="cSR-WK-qb0" secondAttribute="leading" id="F8e-cg-wdq"/>
6557 <constraint firstItem="MNf-7L-OWL" firstAttribute="top" secondItem="cSR-WK-qb0" secondAttribute="top" constant="15" id="N8O-in-CB3"/> 6557 <constraint firstItem="MNf-7L-OWL" firstAttribute="top" secondItem="cSR-WK-qb0" secondAttribute="top" constant="15" id="N8O-in-CB3"/>
6558 <constraint firstItem="vet-Po-Bmf" firstAttribute="top" secondItem="MNf-7L-OWL" secondAttribute="bottom" constant="15" id="hl9-87-bJ7"/> 6558 <constraint firstItem="vet-Po-Bmf" firstAttribute="top" secondItem="MNf-7L-OWL" secondAttribute="bottom" constant="15" id="hl9-87-bJ7"/>
...@@ -6563,9 +6563,9 @@ ...@@ -6563,9 +6563,9 @@
6563 <color key="backgroundColor" red="0.1529411765" green="0.1529411765" blue="0.1529411765" alpha="0.57999999999999996" colorSpace="calibratedRGB"/> 6563 <color key="backgroundColor" red="0.1529411765" green="0.1529411765" blue="0.1529411765" alpha="0.57999999999999996" colorSpace="calibratedRGB"/>
6564 <constraints> 6564 <constraints>
6565 <constraint firstAttribute="trailing" secondItem="cSR-WK-qb0" secondAttribute="trailing" id="G7t-Dj-L0z"/> 6565 <constraint firstAttribute="trailing" secondItem="cSR-WK-qb0" secondAttribute="trailing" id="G7t-Dj-L0z"/>
6566 + <constraint firstAttribute="bottom" secondItem="cSR-WK-qb0" secondAttribute="bottom" id="PgS-E9-7aE"/>
6566 <constraint firstItem="cSR-WK-qb0" firstAttribute="leading" secondItem="iUx-aw-MaF" secondAttribute="leading" id="WuY-gU-rja"/> 6567 <constraint firstItem="cSR-WK-qb0" firstAttribute="leading" secondItem="iUx-aw-MaF" secondAttribute="leading" id="WuY-gU-rja"/>
6567 <constraint firstItem="cSR-WK-qb0" firstAttribute="height" relation="lessThanOrEqual" secondItem="iUx-aw-MaF" secondAttribute="height" multiplier="0.7" id="ZRT-Sj-HhH"/> 6568 <constraint firstItem="cSR-WK-qb0" firstAttribute="height" relation="lessThanOrEqual" secondItem="iUx-aw-MaF" secondAttribute="height" multiplier="0.7" id="ZRT-Sj-HhH"/>
6568 - <constraint firstAttribute="bottom" secondItem="cSR-WK-qb0" secondAttribute="bottom" id="cN3-Su-boG"/>
6569 </constraints> 6569 </constraints>
6570 </view> 6570 </view>
6571 </subviews> 6571 </subviews>
......
...@@ -78,7 +78,7 @@ class MerchantTableViewCell: UITableViewCell { ...@@ -78,7 +78,7 @@ class MerchantTableViewCell: UITableViewCell {
78 buttonTitleLable.text = buttonTitle 78 buttonTitleLable.text = buttonTitle
79 79
80 if let iconImage { 80 if let iconImage {
81 - self.buttonIconImage.image = UIImage(named: iconImage) 81 + self.buttonIconImage.image = UIImage(named: iconImage, in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
82 self.buttonIconImage.isHidden = false 82 self.buttonIconImage.isHidden = false
83 } else { 83 } else {
84 self.buttonIconImage.isHidden = true 84 self.buttonIconImage.isHidden = true
......
...@@ -27,7 +27,7 @@ class PopupMerchantsViewController: UIViewController { ...@@ -27,7 +27,7 @@ class PopupMerchantsViewController: UIViewController {
27 tableView.delegate = self 27 tableView.delegate = self
28 tableView.dataSource = self 28 tableView.dataSource = self
29 29
30 - tableView.contentInset.top = 75 30 + tableView.contentInset.top = 50
31 31
32 popupView.clipsToBounds = true 32 popupView.clipsToBounds = true
33 popupView.layer.cornerRadius = 16 33 popupView.layer.cornerRadius = 16
...@@ -45,6 +45,7 @@ class PopupMerchantsViewController: UIViewController { ...@@ -45,6 +45,7 @@ class PopupMerchantsViewController: UIViewController {
45 45
46 // MARK: - UIButton Actions 46 // MARK: - UIButton Actions
47 @IBAction func closeButtonAction(_ sender: Any) { 47 @IBAction func closeButtonAction(_ sender: Any) {
48 + self.dismiss(animated: true, completion: {})
48 } 49 }
49 50
50 } 51 }
...@@ -83,6 +84,9 @@ extension PopupMerchantsViewController: UITableViewDelegate, UITableViewDataSour ...@@ -83,6 +84,9 @@ extension PopupMerchantsViewController: UITableViewDelegate, UITableViewDataSour
83 let cell = tableView.dequeueReusableCell(withIdentifier: "MerchantTableViewCellId", for: indexPath) as! MerchantTableViewCell 84 let cell = tableView.dequeueReusableCell(withIdentifier: "MerchantTableViewCellId", for: indexPath) as! MerchantTableViewCell
84 cell.configureCell(merchant: merchantList[indexPath.row], buttonTitle: self.buttonTitle ?? "Βρες το", iconImage: buttonIcon) 85 cell.configureCell(merchant: merchantList[indexPath.row], buttonTitle: self.buttonTitle ?? "Βρες το", iconImage: buttonIcon)
85 86
87 + // Set the delegate to self
88 + cell.delegate = self
89 +
86 return cell 90 return cell
87 91
88 } else { 92 } else {
......