open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
5d644e8b 1 parent ae15cf7f

MerchantTableViewCell ui fixes

Inline Side-by-side
Showing 5 changed files with 11 additions and 8 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -6415,10 +6415,11 @@ ...@@ -6415,10 +6415,11 @@
6415 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TQn-b5-U6q"> 6415 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TQn-b5-U6q">
6416 <rect key="frame" x="18" y="0.0" width="378" height="56"/> 6416 <rect key="frame" x="18" y="0.0" width="378" height="56"/>
6417 <subviews> 6417 <subviews>
6418 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ldh-p8-Z1j"> 6418 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ldh-p8-Z1j">
6419 - <rect key="frame" x="30" y="10" width="129" height="36"/> 6419 + <rect key="frame" x="25" y="10" width="160" height="36"/>
6420 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 6420 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6421 <constraints> 6421 <constraints>
6422 + <constraint firstAttribute="width" constant="160" id="7YN-MD-1zb"/>
6422 <constraint firstAttribute="height" constant="36" id="p6j-w9-UR3"/> 6423 <constraint firstAttribute="height" constant="36" id="p6j-w9-UR3"/>
6423 </constraints> 6424 </constraints>
6424 </imageView> 6425 </imageView>
...@@ -6468,11 +6469,10 @@ ...@@ -6468,11 +6469,10 @@
6468 </subviews> 6469 </subviews>
6469 <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/> 6470 <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
6470 <constraints> 6471 <constraints>
6471 - <constraint firstItem="Ldh-p8-Z1j" firstAttribute="leading" secondItem="TQn-b5-U6q" secondAttribute="leading" constant="30" id="2aw-gT-BVN"/> 6472 + <constraint firstItem="Ldh-p8-Z1j" firstAttribute="leading" secondItem="TQn-b5-U6q" secondAttribute="leading" constant="25" id="2aw-gT-BVN"/>
6472 <constraint firstAttribute="height" constant="56" id="Xyd-6p-fo2"/> 6473 <constraint firstAttribute="height" constant="56" id="Xyd-6p-fo2"/>
6473 <constraint firstAttribute="trailing" secondItem="4sH-ua-n19" secondAttribute="trailing" constant="9" id="lbe-QE-jiR"/> 6474 <constraint firstAttribute="trailing" secondItem="4sH-ua-n19" secondAttribute="trailing" constant="9" id="lbe-QE-jiR"/>
6474 <constraint firstItem="4sH-ua-n19" firstAttribute="centerY" secondItem="TQn-b5-U6q" secondAttribute="centerY" id="wGb-H6-wLJ"/> 6475 <constraint firstItem="4sH-ua-n19" firstAttribute="centerY" secondItem="TQn-b5-U6q" secondAttribute="centerY" id="wGb-H6-wLJ"/>
6475 - <constraint firstItem="4sH-ua-n19" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Ldh-p8-Z1j" secondAttribute="trailing" constant="40" id="yXs-PY-sxL"/>
6476 <constraint firstItem="Ldh-p8-Z1j" firstAttribute="centerY" secondItem="TQn-b5-U6q" secondAttribute="centerY" id="zmN-GO-87t"/> 6476 <constraint firstItem="Ldh-p8-Z1j" firstAttribute="centerY" secondItem="TQn-b5-U6q" secondAttribute="centerY" id="zmN-GO-87t"/>
6477 </constraints> 6477 </constraints>
6478 </view> 6478 </view>
......
...@@ -76,8 +76,11 @@ class MerchantTableViewCell: UITableViewCell { ...@@ -76,8 +76,11 @@ class MerchantTableViewCell: UITableViewCell {
76 func configureCell(shop: swiftApi.ShopAvailabilityItemModel, buttonTitle: String, iconImage: String?, showEshops: Bool?) { 76 func configureCell(shop: swiftApi.ShopAvailabilityItemModel, buttonTitle: String, iconImage: String?, showEshops: Bool?) {
77 77
78 if (showEshops == true) { 78 if (showEshops == true) {
79 - // TODO: add static image 79 + if (shop._merchant_uuid == "ab") {
80 -// self.merchantImage.image = image 80 + self.merchantImage.image = UIImage(named: "eshop_ab", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
81 + } else if (shop._merchant_uuid == "masoutis") {
82 + self.merchantImage.image = UIImage(named: "eshop_masoutis", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
83 + }
81 84
82 } else { 85 } else {
83 for merchant in merchantList { 86 for merchant in merchantList {
......