open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
55766d53 1 parent 9da1edf1

add empty view at HistoryViewController

Inline Side-by-side
Showing 6 changed files with 29 additions and 10 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>
......
...@@ -13,6 +13,7 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -13,6 +13,7 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
13 @IBOutlet weak var itemImage: UIImageView! 13 @IBOutlet weak var itemImage: UIImageView!
14 @IBOutlet weak var messageLabel: UILabel! 14 @IBOutlet weak var messageLabel: UILabel!
15 @IBOutlet weak var titleLabel: UILabel! 15 @IBOutlet weak var titleLabel: UILabel!
16 + @IBOutlet weak var emptyLabel: UILabel!
16 17
17 public var loyaltyBadge:swiftApi.LoyaltyBadgeModel = swiftApi().getLoyaltyBadge() 18 public var loyaltyBadge:swiftApi.LoyaltyBadgeModel = swiftApi().getLoyaltyBadge()
18 19
...@@ -63,8 +64,13 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -63,8 +64,13 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
63 } 64 }
64 65
65 extension AnalysisHeaderMessageViewCell { 66 extension AnalysisHeaderMessageViewCell {
66 - func configureCell(item: AnalysisItem) { 67 + func configureCell(isEmpty: Bool) {
68 +
69 + if (isEmpty == true) {
70 + emptyLabel.isHidden = false
71 + } else {
72 + emptyLabel.isHidden = true
73 + }
67 74
68 - // TODO: TO BE IMPLEMENTED
69 } 75 }
70 } 76 }
......
...@@ -89,7 +89,7 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -89,7 +89,7 @@ class HistoryViewController: AnalysisChildViewController {
89 89
90 override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { 90 override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
91 if (indexPath.section == 0) { 91 if (indexPath.section == 0) {
92 - return hasMessage ? 380.0 : 280 92 + return hasMessage ? (items.count > 0 ? 380.0 : 480.0) : 280
93 } 93 }
94 94
95 return 140.0 95 return 140.0
...@@ -100,7 +100,9 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -100,7 +100,9 @@ class HistoryViewController: AnalysisChildViewController {
100 // header 100 // header
101 if (indexPath.section == 0) { 101 if (indexPath.section == 0) {
102 if (hasMessage) { 102 if (hasMessage) {
103 - return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderMessageViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderMessageViewCell 103 + let cell = tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderMessageViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderMessageViewCell
104 + cell.configureCell(isEmpty: items.count == 0)
105 + return cell
104 } 106 }
105 107
106 return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderViewCell 108 return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderViewCell
......
...@@ -2239,7 +2239,7 @@ ...@@ -2239,7 +2239,7 @@
2239 <autoresizingMask key="autoresizingMask"/> 2239 <autoresizingMask key="autoresizingMask"/>
2240 <subviews> 2240 <subviews>
2241 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Μέχρι τώρα έχεις κερδίσει 20,00€ σε προσφορές από 3 κουπόνια!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yth-0S-P60"> 2241 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Μέχρι τώρα έχεις κερδίσει 20,00€ σε προσφορές από 3 κουπόνια!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yth-0S-P60">
2242 - <rect key="frame" x="50" y="237" width="314" height="60"/> 2242 + <rect key="frame" x="50" y="220" width="314" height="60"/>
2243 <constraints> 2243 <constraints>
2244 <constraint firstAttribute="height" constant="60" id="Ams-n8-yUP"/> 2244 <constraint firstAttribute="height" constant="60" id="Ams-n8-yUP"/>
2245 </constraints> 2245 </constraints>
...@@ -2248,14 +2248,14 @@ ...@@ -2248,14 +2248,14 @@
2248 <nil key="highlightedColor"/> 2248 <nil key="highlightedColor"/>
2249 </label> 2249 </label>
2250 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QY9-ar-jbw"> 2250 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QY9-ar-jbw">
2251 - <rect key="frame" x="124" y="31" width="166" height="166"/> 2251 + <rect key="frame" x="124" y="31" width="166" height="149"/>
2252 <constraints> 2252 <constraints>
2253 <constraint firstAttribute="width" constant="166" id="ZuH-X9-Nie"/> 2253 <constraint firstAttribute="width" constant="166" id="ZuH-X9-Nie"/>
2254 <constraint firstAttribute="height" constant="166" id="dUQ-Ou-Apu"/> 2254 <constraint firstAttribute="height" constant="166" id="dUQ-Ou-Apu"/>
2255 </constraints> 2255 </constraints>
2256 </imageView> 2256 </imageView>
2257 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzx-D5-LHo"> 2257 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Αναλυτικά:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzx-D5-LHo">
2258 - <rect key="frame" x="169" y="339" width="76" height="20"/> 2258 + <rect key="frame" x="169" y="320" width="76" height="20"/>
2259 <constraints> 2259 <constraints>
2260 <constraint firstAttribute="height" constant="20" id="K9D-vL-Saj"/> 2260 <constraint firstAttribute="height" constant="20" id="K9D-vL-Saj"/>
2261 </constraints> 2261 </constraints>
...@@ -2263,18 +2263,29 @@ ...@@ -2263,18 +2263,29 @@
2263 <nil key="textColor"/> 2263 <nil key="textColor"/>
2264 <nil key="highlightedColor"/> 2264 <nil key="highlightedColor"/>
2265 </label> 2265 </label>
2266 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Δεν έχεις εξαργυρώσει ακόμη κουπόνια" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AYW-hj-qMf">
2267 + <rect key="frame" x="20" y="370" width="374" height="0.0"/>
2268 + <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="17"/>
2269 + <color key="textColor" red="0.5450980392" green="0.59215686270000001" blue="0.63921568630000003" alpha="1" colorSpace="calibratedRGB"/>
2270 + <nil key="highlightedColor"/>
2271 + </label>
2266 </subviews> 2272 </subviews>
2267 <constraints> 2273 <constraints>
2268 <constraint firstAttribute="trailingMargin" secondItem="Yth-0S-P60" secondAttribute="trailing" constant="30" id="6SE-2z-kcV"/> 2274 <constraint firstAttribute="trailingMargin" secondItem="Yth-0S-P60" secondAttribute="trailing" constant="30" id="6SE-2z-kcV"/>
2269 <constraint firstItem="QY9-ar-jbw" firstAttribute="top" secondItem="Kcf-Zv-eMe" secondAttribute="topMargin" constant="20" id="7r7-Q0-rq4"/> 2275 <constraint firstItem="QY9-ar-jbw" firstAttribute="top" secondItem="Kcf-Zv-eMe" secondAttribute="topMargin" constant="20" id="7r7-Q0-rq4"/>
2270 <constraint firstItem="nzx-D5-LHo" firstAttribute="centerX" secondItem="Kcf-Zv-eMe" secondAttribute="centerX" id="9MU-dy-Lh7"/> 2276 <constraint firstItem="nzx-D5-LHo" firstAttribute="centerX" secondItem="Kcf-Zv-eMe" secondAttribute="centerX" id="9MU-dy-Lh7"/>
2277 + <constraint firstItem="AYW-hj-qMf" firstAttribute="leading" secondItem="Kcf-Zv-eMe" secondAttribute="leading" constant="20" id="E5C-gs-Xj8"/>
2278 + <constraint firstItem="AYW-hj-qMf" firstAttribute="top" relation="greaterThanOrEqual" secondItem="nzx-D5-LHo" secondAttribute="bottom" constant="30" id="Hfg-5j-zgZ"/>
2279 + <constraint firstAttribute="bottom" secondItem="AYW-hj-qMf" secondAttribute="bottom" constant="10" id="Nky-gl-3bT"/>
2271 <constraint firstItem="Yth-0S-P60" firstAttribute="top" secondItem="QY9-ar-jbw" secondAttribute="bottom" constant="40" id="f7j-JG-hqO"/> 2280 <constraint firstItem="Yth-0S-P60" firstAttribute="top" secondItem="QY9-ar-jbw" secondAttribute="bottom" constant="40" id="f7j-JG-hqO"/>
2272 <constraint firstItem="Yth-0S-P60" firstAttribute="leading" secondItem="Kcf-Zv-eMe" secondAttribute="leadingMargin" constant="30" id="qsD-vg-jYM"/> 2281 <constraint firstItem="Yth-0S-P60" firstAttribute="leading" secondItem="Kcf-Zv-eMe" secondAttribute="leadingMargin" constant="30" id="qsD-vg-jYM"/>
2273 - <constraint firstAttribute="bottomMargin" secondItem="nzx-D5-LHo" secondAttribute="bottom" constant="10" id="tgQ-Ov-G72"/> 2282 + <constraint firstItem="nzx-D5-LHo" firstAttribute="top" secondItem="Yth-0S-P60" secondAttribute="bottom" constant="40" id="sii-nx-rxY"/>
2283 + <constraint firstAttribute="trailing" secondItem="AYW-hj-qMf" secondAttribute="trailing" constant="20" id="wO2-z6-BhQ"/>
2274 <constraint firstItem="QY9-ar-jbw" firstAttribute="centerX" secondItem="Kcf-Zv-eMe" secondAttribute="centerX" id="xiH-Cs-G6E"/> 2284 <constraint firstItem="QY9-ar-jbw" firstAttribute="centerX" secondItem="Kcf-Zv-eMe" secondAttribute="centerX" id="xiH-Cs-G6E"/>
2275 </constraints> 2285 </constraints>
2276 </tableViewCellContentView> 2286 </tableViewCellContentView>
2277 <connections> 2287 <connections>
2288 + <outlet property="emptyLabel" destination="AYW-hj-qMf" id="28Y-xJ-JlC"/>
2278 <outlet property="itemImage" destination="QY9-ar-jbw" id="UHu-bz-9Uk"/> 2289 <outlet property="itemImage" destination="QY9-ar-jbw" id="UHu-bz-9Uk"/>
2279 <outlet property="messageLabel" destination="Yth-0S-P60" id="tVN-jB-FvL"/> 2290 <outlet property="messageLabel" destination="Yth-0S-P60" id="tVN-jB-FvL"/>
2280 <outlet property="titleLabel" destination="nzx-D5-LHo" id="cU7-6c-HiO"/> 2291 <outlet property="titleLabel" destination="nzx-D5-LHo" id="cU7-6c-HiO"/>
......