open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
21d13385 1 parent 4142dabf

sharing history fixes

Inline Side-by-side
Showing 4 changed files with 11 additions and 11 deletions
...@@ -10,7 +10,7 @@ import UIKit ...@@ -10,7 +10,7 @@ import UIKit
10 class HistoryViewController: AnalysisChildViewController { 10 class HistoryViewController: AnalysisChildViewController {
11 11
12 var loading: Bool = false 12 var loading: Bool = false
13 - var items: Array<swiftApi.CouponItemModel> = swiftApi().getCouponList() 13 + var items: Array<swiftApi.CouponItemModel> = swiftApi().getOldCouponList()
14 14
15 // TODO: remove this when configuring model 15 // TODO: remove this when configuring model
16 let hasMessage = true 16 let hasMessage = true
...@@ -100,13 +100,13 @@ class HistoryViewController: AnalysisChildViewController { ...@@ -100,13 +100,13 @@ 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! AnalysisHeaderMessageViewCell 103 + return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderMessageViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderMessageViewCell
104 } 104 }
105 105
106 - return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderViewCell", for: indexPath) as! AnalysisHeaderViewCell 106 + return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderViewCell
107 } 107 }
108 108
109 - let cell = tableView.dequeueReusableCell(withIdentifier: "AnalysisItemViewCell", for: indexPath) as! AnalysisItemViewCell 109 + let cell = tableView.dequeueReusableCell(withIdentifier: "AnalysisItemViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisItemViewCell
110 cell.configureCell(item: items[indexPath.row]) 110 cell.configureCell(item: items[indexPath.row])
111 111
112 return cell 112 return cell
......
...@@ -60,16 +60,16 @@ import UIKit ...@@ -60,16 +60,16 @@ import UIKit
60 //////////////////////////////////////////////////////////////////////////////// 60 ////////////////////////////////////////////////////////////////////////////////
61 private func viewControllerAt(_ index:Int) -> AnalysisChildViewController? 61 private func viewControllerAt(_ index:Int) -> AnalysisChildViewController?
62 { 62 {
63 - let storyboard = UIStoryboard(name: "Main", bundle: nil) 63 + let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self))
64 64
65 if (index == 1) { 65 if (index == 1) {
66 - let analysisVC = storyboard.instantiateViewController(withIdentifier:"SharingHistoryViewController") as! SharingHistoryViewController 66 + let analysisVC = storyboard.instantiateViewController(withIdentifier:"SharingHistoryViewController") as! SwiftWarplyFramework.SharingHistoryViewController
67 analysisVC.index = index; 67 analysisVC.index = index;
68 68
69 return analysisVC; 69 return analysisVC;
70 } 70 }
71 71
72 - let analysisVC = storyboard.instantiateViewController(withIdentifier:"HistoryViewController") as! HistoryViewController 72 + let analysisVC = storyboard.instantiateViewController(withIdentifier:"HistoryViewController") as! SwiftWarplyFramework.HistoryViewController
73 analysisVC.index = index; 73 analysisVC.index = index;
74 74
75 return analysisVC; 75 return analysisVC;
......
...@@ -166,7 +166,7 @@ extension NumberPopupViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -166,7 +166,7 @@ extension NumberPopupViewController: UITableViewDelegate, UITableViewDataSource{
166 // print("Coupon Description clicked: " + (couponSetData?.short_description ?? "")) 166 // print("Coupon Description clicked: " + (couponSetData?.short_description ?? ""))
167 // print("Coupon Expiration clicked: " + (coupons[indexPath.row].expiration ?? "")) 167 // print("Coupon Expiration clicked: " + (coupons[indexPath.row].expiration ?? ""))
168 // 168 //
169 -// let storyboard = UIStoryboard(name: "Main", bundle: nil) 169 +// let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self))
170 // let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as! CouponBarcodeViewController 170 // let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as! CouponBarcodeViewController
171 // vc.coupon = coupons[indexPath.row] 171 // vc.coupon = coupons[indexPath.row]
172 // self.navigationController?.pushViewController(vc, animated: true) 172 // self.navigationController?.pushViewController(vc, animated: true)
......
...@@ -98,13 +98,13 @@ class SharingHistoryViewController: AnalysisChildViewController { ...@@ -98,13 +98,13 @@ class SharingHistoryViewController: AnalysisChildViewController {
98 // header 98 // header
99 if (indexPath.section == 0) { 99 if (indexPath.section == 0) {
100 if (hasMessage) { 100 if (hasMessage) {
101 - return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderMessageViewCell", for: indexPath) as! AnalysisHeaderMessageViewCell 101 + return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderMessageViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderMessageViewCell
102 } 102 }
103 103
104 - return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderViewCell", for: indexPath) as! AnalysisHeaderViewCell 104 + return tableView.dequeueReusableCell(withIdentifier: "AnalysisHeaderViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisHeaderViewCell
105 } 105 }
106 106
107 - let cell = tableView.dequeueReusableCell(withIdentifier: "AnalysisItemViewCell", for: indexPath) as! AnalysisItemViewCell 107 + let cell = tableView.dequeueReusableCell(withIdentifier: "AnalysisItemViewCell", for: indexPath) as! SwiftWarplyFramework.AnalysisItemViewCell
108 cell.configureCell(item: items[indexPath.row]) 108 cell.configureCell(item: items[indexPath.row])
109 109
110 return cell 110 return cell
......