open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
997bc25c 1 parent ef34d033

bundle fixes

Inline Side-by-side
Showing 9 changed files with 15 additions and 14 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>0</integer> 10 + <integer>1</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>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -42,7 +42,7 @@ import AVFoundation ...@@ -42,7 +42,7 @@ import AVFoundation
42 setBackButton() 42 setBackButton()
43 setNavigationTitle("Εκπτωτικό κουπόνι") 43 setNavigationTitle("Εκπτωτικό κουπόνι")
44 44
45 - backgroundImage.image = UIImage(named: "coupons_scrollview_white") 45 + backgroundImage.image = UIImage(named: "coupons_scrollview_white", bundle: Bundle(for: MyEmptyClass.self))
46 46
47 scrollView.clipsToBounds = true 47 scrollView.clipsToBounds = true
48 scrollView.layer.cornerRadius = 30 48 scrollView.layer.cornerRadius = 30
...@@ -99,12 +99,12 @@ import AVFoundation ...@@ -99,12 +99,12 @@ import AVFoundation
99 let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) 99 let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT))
100 termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height 100 termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height
101 101
102 - termsButton.setImage(UIImage(named: "ic_up_dark.png"), for: .normal) 102 + termsButton.setImage(UIImage(named: "ic_up_dark.png", bundle: Bundle(for: MyEmptyClass.self)), for: .normal)
103 } else { 103 } else {
104 termsTextView.isHidden = true 104 termsTextView.isHidden = true
105 termsTextViewHeight.constant = CGFloat(0) 105 termsTextViewHeight.constant = CGFloat(0)
106 106
107 - termsButton.setImage(UIImage(named: "ic_down_dark.png"), for: .normal) 107 + termsButton.setImage(UIImage(named: "ic_down_dark.png", bundle: Bundle(for: MyEmptyClass.self)), for: .normal)
108 } 108 }
109 } 109 }
110 110
......
...@@ -29,7 +29,7 @@ import UIKit ...@@ -29,7 +29,7 @@ import UIKit
29 setBackButton() 29 setBackButton()
30 setNavigationTitle("Εκπτωτικό κουπόνι") 30 setNavigationTitle("Εκπτωτικό κουπόνι")
31 31
32 - backgroundImage.image = UIImage(named: "coupons_scrollview_white") 32 + backgroundImage.image = UIImage(named: "coupons_scrollview_white", bundle: Bundle(for: MyEmptyClass.self))
33 33
34 scrollView.clipsToBounds = true 34 scrollView.clipsToBounds = true
35 scrollView.layer.cornerRadius = 30 35 scrollView.layer.cornerRadius = 30
...@@ -60,12 +60,12 @@ import UIKit ...@@ -60,12 +60,12 @@ import UIKit
60 let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) 60 let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT))
61 termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height 61 termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height
62 62
63 - termsButton.setImage(UIImage(named: "ic_up_dark.png"), for: .normal) 63 + termsButton.setImage(UIImage(named: "ic_up_dark.png", bundle: Bundle(for: MyEmptyClass.self)), for: .normal)
64 } else { 64 } else {
65 termsTextView.isHidden = true 65 termsTextView.isHidden = true
66 termsTextViewHeight.constant = CGFloat(0) 66 termsTextViewHeight.constant = CGFloat(0)
67 67
68 - termsButton.setImage(UIImage(named: "ic_down_dark.png"), for: .normal) 68 + termsButton.setImage(UIImage(named: "ic_down_dark.png", bundle: Bundle(for: MyEmptyClass.self)), for: .normal)
69 } 69 }
70 } 70 }
71 71
......
...@@ -23,7 +23,7 @@ import WarplySDKFrameworkIOS ...@@ -23,7 +23,7 @@ import WarplySDKFrameworkIOS
23 super.awakeFromNib() 23 super.awakeFromNib()
24 // Initialization code 24 // Initialization code
25 25
26 - couponBgImage.image = UIImage(named: "coupon_bg") 26 + couponBgImage.image = UIImage(named: "coupon_bg", bundle: Bundle(for: MyEmptyClass.self))
27 27
28 borderView.addDashedBorderVertical(color: UIColor(red: 0.44, green: 0.44, blue: 0.44, alpha: 1.00), width: 1.0, height: 110.0) 28 borderView.addDashedBorderVertical(color: UIColor(red: 0.44, green: 0.44, blue: 0.44, alpha: 1.00), width: 1.0, height: 110.0)
29 } 29 }
......
...@@ -23,7 +23,7 @@ import WarplySDKFrameworkIOS ...@@ -23,7 +23,7 @@ import WarplySDKFrameworkIOS
23 setBackButton() 23 setBackButton()
24 setNavigationTitle("Ενεργά κουπόνια") 24 setNavigationTitle("Ενεργά κουπόνια")
25 25
26 - backgroundImage.image = UIImage(named: "coupons_scrollview_dark") 26 + backgroundImage.image = UIImage(named: "coupons_scrollview_dark", bundle: Bundle(for: MyEmptyClass.self))
27 27
28 tableView.delegate = self 28 tableView.delegate = self
29 tableView.dataSource = self 29 tableView.dataSource = self
...@@ -83,10 +83,10 @@ extension CouponsViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -83,10 +83,10 @@ extension CouponsViewController: UITableViewDelegate, UITableViewDataSource{
83 83
84 func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { 84 func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
85 85
86 - // TODO: navigate to CouponBarcode 86 + let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self))
87 - // let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) 87 + let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as UIViewController
88 - // let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as UIViewController 88 + vc.coupon = coupons[indexPath.row]
89 - // self.navigationController?.pushViewController(vc, animated: true) 89 + self.navigationController?.pushViewController(vc, animated: true)
90 } 90 }
91 91
92 } 92 }
......
...@@ -23,6 +23,7 @@ import UIKit ...@@ -23,6 +23,7 @@ import UIKit
23 @IBAction func navigateToCampaign(_ sender: Any) { 23 @IBAction func navigateToCampaign(_ sender: Any) {
24 let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) 24 let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self))
25 let vc = storyboard.instantiateViewController(withIdentifier: "CampaignViewController") as UIViewController 25 let vc = storyboard.instantiateViewController(withIdentifier: "CampaignViewController") as UIViewController
26 + vc.campaignUrl = "https://www.google.com"
26 self.navigationController?.pushViewController(vc, animated: true) 27 self.navigationController?.pushViewController(vc, animated: true)
27 } 28 }
28 29
......