open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
eb36db0f 1 parent 655f4043

WalletViewController refactor part 1

Expand all
Inline Side-by-side
Showing 3 changed files with 17 additions and 4 deletions
...@@ -14,6 +14,8 @@ import SwiftEventBus ...@@ -14,6 +14,8 @@ import SwiftEventBus
14 @IBOutlet weak var profileImage: UIImageView! 14 @IBOutlet weak var profileImage: UIImageView!
15 @IBOutlet weak var profileNameLabel: UILabel! 15 @IBOutlet weak var profileNameLabel: UILabel!
16 @IBOutlet weak var questionnaireButton: UIButton! 16 @IBOutlet weak var questionnaireButton: UIButton!
17 + @IBOutlet weak var historyButtonView: UIView!
18 + @IBOutlet weak var historyButtonImage: UIImageView!
17 @IBOutlet weak var dfyEarnBannerView: UIView! 19 @IBOutlet weak var dfyEarnBannerView: UIView!
18 @IBOutlet weak var dfyEarnBannerHeight: NSLayoutConstraint! 20 @IBOutlet weak var dfyEarnBannerHeight: NSLayoutConstraint!
19 @IBOutlet weak var dfyEarnBannerTopSpace: NSLayoutConstraint! 21 @IBOutlet weak var dfyEarnBannerTopSpace: NSLayoutConstraint!
...@@ -164,6 +166,7 @@ import SwiftEventBus ...@@ -164,6 +166,7 @@ import SwiftEventBus
164 } 166 }
165 167
166 headerImage.image = UIImage(named: "ic_background_straight", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 168 headerImage.image = UIImage(named: "ic_background_straight", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
169 + historyButtonImage.image = UIImage(named: "ic_time_forward_blue", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
167 dfyEarnImage.image = UIImage(named: "wallet_dfy_3", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 170 dfyEarnImage.image = UIImage(named: "wallet_dfy_3", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
168 couponEarnImage.image = UIImage(named: "wallet_coupons_4", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 171 couponEarnImage.image = UIImage(named: "wallet_coupons_4", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
169 dfyLogoImage.image = UIImage(named: "dfy_logo_colored", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 172 dfyLogoImage.image = UIImage(named: "dfy_logo_colored", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
...@@ -216,10 +219,15 @@ import SwiftEventBus ...@@ -216,10 +219,15 @@ import SwiftEventBus
216 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42) 219 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
217 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20) 220 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
218 221
219 - questionnaireButton.layer.cornerRadius = 15.0 222 + questionnaireButton.layer.cornerRadius = 16.0
220 - questionnaireButton.layer.borderWidth = 2 223 + questionnaireButton.layer.borderWidth = 1
221 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 224 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
222 225
226 + historyButtonView.backgroundColor = .clear
227 + historyButtonView.layer.cornerRadius = 16.0
228 + historyButtonView.layer.borderWidth = 1
229 + historyButtonView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
230 +
223 dfyEarnBannerInnerView.layer.cornerRadius = 16.5 231 dfyEarnBannerInnerView.layer.cornerRadius = 16.5
224 // dfyEarnBannerInnerView.layer.borderWidth = 1 232 // dfyEarnBannerInnerView.layer.borderWidth = 1
225 // dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 233 // dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
...@@ -538,8 +546,8 @@ import SwiftEventBus ...@@ -538,8 +546,8 @@ import SwiftEventBus
538 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42) 546 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
539 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20) 547 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
540 548
541 - questionnaireButton.layer.cornerRadius = 15.0 549 + questionnaireButton.layer.cornerRadius = 16.0
542 - questionnaireButton.layer.borderWidth = 2 550 + questionnaireButton.layer.borderWidth = 1
543 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 551 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
544 } 552 }
545 553
...@@ -743,6 +751,11 @@ import SwiftEventBus ...@@ -743,6 +751,11 @@ import SwiftEventBus
743 swiftApi().openQuestionnaire(self); 751 swiftApi().openQuestionnaire(self);
744 } 752 }
745 753
754 + @IBAction func historyButtonAction(_ sender: Any) {
755 + // TODO: Open new HistoryVC
756 + print("=== historyButton Pressed ===")
757 + }
758 +
746 @IBAction func dfyEarnButtonAction(_ sender: Any) { 759 @IBAction func dfyEarnButtonAction(_ sender: Any) {
747 print("DFY coupon banner pressed!") 760 print("DFY coupon banner pressed!")
748 // analysis_pressed event 761 // analysis_pressed event
......