open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
0b389058 1 parent 452cd814

fix badge v4

Inline Side-by-side
Showing 6 changed files with 5 additions and 59 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>
......
...@@ -22,40 +22,8 @@ import SwiftEventBus ...@@ -22,40 +22,8 @@ import SwiftEventBus
22 public override func viewDidLoad() { 22 public override func viewDidLoad() {
23 super.viewDidLoad() 23 super.viewDidLoad()
24 24
25 - print("=== gifts viewDidLoad invoked ===")
26 -
27 self.hidesBottomBarWhenPushed = true 25 self.hidesBottomBarWhenPushed = true
28 26
29 - // var tempCampaigns:Array<swiftApi.CampaignItemModel> = []
30 -
31 - // if (seasonalList.count > 0) {
32 - // for seasonalItem in seasonalList {
33 - // let newCampaign = swiftApi.CampaignItemModel()
34 - // newCampaign._title = seasonalItem._title
35 - // newCampaign._logo_url = seasonalItem._imageUrl
36 - // newCampaign._loyaltyPackageId = seasonalItem._loyaltyPackageId
37 - // tempCampaigns.append(newCampaign)
38 - // }
39 - // }
40 -
41 - // if (ccmsList.count > 0) {
42 - // for ccmsItem in ccmsList {
43 - // if (((ccmsItem._loyaltyCampaignId == "") || (ccmsItem._loyaltyCampaignId == "NA")) && (ccmsItem._zone == "COSMOTE_APP_GIFTS4U")) {
44 - // let newCampaign = swiftApi.CampaignItemModel()
45 - // newCampaign._title = ccmsItem._title
46 - // newCampaign._logo_url = ccmsItem._imageUrl
47 - // newCampaign._ccms = ccmsItem
48 - // tempCampaigns.append(newCampaign)
49 - // }
50 - // }
51 - // }
52 -
53 - // if (loyaltyList.count > 0) {
54 - // tempCampaigns = tempCampaigns + loyaltyList
55 - // }
56 -
57 - // campaigns = tempCampaigns
58 -
59 setBackButton() 27 setBackButton()
60 setNavigationTitle("GIFTS for YOU", "bold") 28 setNavigationTitle("GIFTS for YOU", "bold")
61 29
...@@ -99,8 +67,6 @@ import SwiftEventBus ...@@ -99,8 +67,6 @@ import SwiftEventBus
99 public override func viewWillAppear(_ animated: Bool) { 67 public override func viewWillAppear(_ animated: Bool) {
100 super.viewWillAppear(animated) 68 super.viewWillAppear(animated)
101 69
102 - print("=== gifts viewWillAppear invoked ===")
103 -
104 self.refreshData() 70 self.refreshData()
105 } 71 }
106 72
......
...@@ -52,8 +52,10 @@ import UIKit ...@@ -52,8 +52,10 @@ import UIKit
52 descriptionLabel.text = campaign.message ?? "" 52 descriptionLabel.text = campaign.message ?? ""
53 descriptionLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 14) 53 descriptionLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
54 54
55 - if (campaign.is_new ?? false) { 55 + if (campaign.is_new == true) {
56 newBadgeImage.isHidden = false 56 newBadgeImage.isHidden = false
57 + } else{
58 + newBadgeImage.isHidden = true
57 } 59 }
58 } 60 }
59 61
......
...@@ -21,28 +21,8 @@ import SwiftEventBus ...@@ -21,28 +21,8 @@ import SwiftEventBus
21 public override func viewDidLoad() { 21 public override func viewDidLoad() {
22 super.viewDidLoad() 22 super.viewDidLoad()
23 23
24 - print("=== mfy viewDidLoad invoked ===")
25 -
26 self.hidesBottomBarWhenPushed = true 24 self.hidesBottomBarWhenPushed = true
27 25
28 - // var tempCampaigns:Array<swiftApi.CampaignItemModel> = loyaltyList
29 -
30 - // if (ccmsList.count > 0) {
31 - // for ccmsItem in ccmsList {
32 - // if (((ccmsItem._loyaltyCampaignId == "") || (ccmsItem._loyaltyCampaignId == "NA")) && (ccmsItem._zone == "COSMOTE_APP_MORE4U")) {
33 - // let newCampaign = swiftApi.CampaignItemModel()
34 - // newCampaign._title = ccmsItem._title
35 - // newCampaign._logo_url = ccmsItem._imageUrl
36 - // newCampaign._subtitle = ccmsItem._subtitle
37 - // newCampaign._message = ccmsItem._message
38 - // newCampaign._ccms = ccmsItem
39 - // tempCampaigns.append(newCampaign)
40 - // }
41 - // }
42 - // }
43 -
44 - // campaigns = tempCampaigns
45 -
46 setBackButton() 26 setBackButton()
47 setNavigationTitle("MORE for YOU", "bold") 27 setNavigationTitle("MORE for YOU", "bold")
48 28
...@@ -75,8 +55,6 @@ import SwiftEventBus ...@@ -75,8 +55,6 @@ import SwiftEventBus
75 public override func viewWillAppear(_ animated: Bool) { 55 public override func viewWillAppear(_ animated: Bool) {
76 super.viewWillAppear(animated) 56 super.viewWillAppear(animated)
77 57
78 - print("=== mfy viewWillAppear invoked ===")
79 -
80 self.refreshData() 58 self.refreshData()
81 } 59 }
82 60
......