Manos Chorianopoulos

fix badge v4

......@@ -7,7 +7,7 @@
<key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
......
......@@ -7,7 +7,7 @@
<key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
......
......@@ -22,40 +22,8 @@ import SwiftEventBus
public override func viewDidLoad() {
super.viewDidLoad()
print("=== gifts viewDidLoad invoked ===")
self.hidesBottomBarWhenPushed = true
// var tempCampaigns:Array<swiftApi.CampaignItemModel> = []
// if (seasonalList.count > 0) {
// for seasonalItem in seasonalList {
// let newCampaign = swiftApi.CampaignItemModel()
// newCampaign._title = seasonalItem._title
// newCampaign._logo_url = seasonalItem._imageUrl
// newCampaign._loyaltyPackageId = seasonalItem._loyaltyPackageId
// tempCampaigns.append(newCampaign)
// }
// }
// if (ccmsList.count > 0) {
// for ccmsItem in ccmsList {
// if (((ccmsItem._loyaltyCampaignId == "") || (ccmsItem._loyaltyCampaignId == "NA")) && (ccmsItem._zone == "COSMOTE_APP_GIFTS4U")) {
// let newCampaign = swiftApi.CampaignItemModel()
// newCampaign._title = ccmsItem._title
// newCampaign._logo_url = ccmsItem._imageUrl
// newCampaign._ccms = ccmsItem
// tempCampaigns.append(newCampaign)
// }
// }
// }
// if (loyaltyList.count > 0) {
// tempCampaigns = tempCampaigns + loyaltyList
// }
// campaigns = tempCampaigns
setBackButton()
setNavigationTitle("GIFTS for YOU", "bold")
......@@ -99,8 +67,6 @@ import SwiftEventBus
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
print("=== gifts viewWillAppear invoked ===")
self.refreshData()
}
......
......@@ -52,8 +52,10 @@ import UIKit
descriptionLabel.text = campaign.message ?? ""
descriptionLabel.font = UIFont(name: "PFSquareSansPro-Bold", size: 14)
if (campaign.is_new ?? false) {
if (campaign.is_new == true) {
newBadgeImage.isHidden = false
} else{
newBadgeImage.isHidden = true
}
}
......
......@@ -21,28 +21,8 @@ import SwiftEventBus
public override func viewDidLoad() {
super.viewDidLoad()
print("=== mfy viewDidLoad invoked ===")
self.hidesBottomBarWhenPushed = true
// var tempCampaigns:Array<swiftApi.CampaignItemModel> = loyaltyList
// if (ccmsList.count > 0) {
// for ccmsItem in ccmsList {
// if (((ccmsItem._loyaltyCampaignId == "") || (ccmsItem._loyaltyCampaignId == "NA")) && (ccmsItem._zone == "COSMOTE_APP_MORE4U")) {
// let newCampaign = swiftApi.CampaignItemModel()
// newCampaign._title = ccmsItem._title
// newCampaign._logo_url = ccmsItem._imageUrl
// newCampaign._subtitle = ccmsItem._subtitle
// newCampaign._message = ccmsItem._message
// newCampaign._ccms = ccmsItem
// tempCampaigns.append(newCampaign)
// }
// }
// }
// campaigns = tempCampaigns
setBackButton()
setNavigationTitle("MORE for YOU", "bold")
......@@ -75,8 +55,6 @@ import SwiftEventBus
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
print("=== mfy viewWillAppear invoked ===")
self.refreshData()
}
......