mirror of
https://github.com/SideStore/SideStore.git
synced 2026-02-15 17:53:31 +01:00
- Fix: Use "EXPIRED" marker in MyApps screen instead of -ve interval
This commit is contained in:
@@ -367,8 +367,12 @@ private extension MyAppsViewController
|
|||||||
|
|
||||||
formatter.maximumUnitCount = 1
|
formatter.maximumUnitCount = 1
|
||||||
|
|
||||||
|
var timeInterval: String? = "expired"
|
||||||
let timeInterval = formatter.string(from: currentDate, to: installedApp.expirationDate)
|
let expirationDate = installedApp.expirationDate
|
||||||
|
let isExpired = currentDate > expirationDate
|
||||||
|
if(!isExpired) {
|
||||||
|
timeInterval = formatter.string(from: currentDate, to: expirationDate)
|
||||||
|
}
|
||||||
cell.bannerView.button.setTitle(timeInterval?.uppercased(), for: .normal)
|
cell.bannerView.button.setTitle(timeInterval?.uppercased(), for: .normal)
|
||||||
|
|
||||||
cell.bannerView.button.isIndicatingActivity = false
|
cell.bannerView.button.isIndicatingActivity = false
|
||||||
@@ -376,7 +380,7 @@ private extension MyAppsViewController
|
|||||||
|
|
||||||
cell.bannerView.iconImageView.isIndicatingActivity = true
|
cell.bannerView.iconImageView.isIndicatingActivity = true
|
||||||
|
|
||||||
cell.bannerView.buttonLabel.isHidden = false
|
cell.bannerView.buttonLabel.isHidden = isExpired
|
||||||
cell.bannerView.buttonLabel.text = NSLocalizedString("Expires in", comment: "")
|
cell.bannerView.buttonLabel.text = NSLocalizedString("Expires in", comment: "")
|
||||||
|
|
||||||
cell.bannerView.button.removeTarget(self, action: nil, for: .primaryActionTriggered)
|
cell.bannerView.button.removeTarget(self, action: nil, for: .primaryActionTriggered)
|
||||||
|
|||||||
Reference in New Issue
Block a user