From 8881ebb0f247baf1720f18ffd4890bcb63d82773 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Sat, 7 Sep 2019 15:37:08 -0700 Subject: [PATCH] Displays countdown for unreleased apps --- AltStore/App Detail/AppViewController.swift | 11 +++ AltStore/Base.lproj/Main.storyboard | 5 +- AltStore/Browse/BrowseCollectionViewCell.xib | 2 +- AltStore/Browse/BrowseViewController.swift | 10 +++ AltStore/Components/AppBannerView.xib | 4 +- AltStore/Components/PillButton.swift | 83 +++++++++++++++++++ AltStore/News/NewsViewController.swift | 10 +++ .../Operations/FetchSourceOperation.swift | 27 +++++- AltStore/Resources/Apps-Staging.json | 4 +- 9 files changed, 145 insertions(+), 11 deletions(-) diff --git a/AltStore/App Detail/AppViewController.swift b/AltStore/App Detail/AppViewController.swift index 210bbd3a..adab9819 100644 --- a/AltStore/App Detail/AppViewController.swift +++ b/AltStore/App Detail/AppViewController.swift @@ -370,6 +370,17 @@ private extension AppViewController button.progress = progress } + if Date() < self.app.versionDate + { + self.downloadButton.countdownDate = self.app.versionDate + self.navigationBarDownloadButton.countdownDate = self.app.versionDate + } + else + { + self.downloadButton.countdownDate = nil + self.navigationBarDownloadButton.countdownDate = nil + } + let barButtonItem = self.navigationItem.rightBarButtonItem self.navigationItem.rightBarButtonItem = nil self.navigationItem.rightBarButtonItem = barButtonItem diff --git a/AltStore/Base.lproj/Main.storyboard b/AltStore/Base.lproj/Main.storyboard index 3612bef5..8f5a463c 100644 --- a/AltStore/Base.lproj/Main.storyboard +++ b/AltStore/Base.lproj/Main.storyboard @@ -173,7 +173,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -842,6 +842,7 @@ World + diff --git a/AltStore/Browse/BrowseCollectionViewCell.xib b/AltStore/Browse/BrowseCollectionViewCell.xib index 7569894e..41e216af 100644 --- a/AltStore/Browse/BrowseCollectionViewCell.xib +++ b/AltStore/Browse/BrowseCollectionViewCell.xib @@ -58,7 +58,7 @@ - + diff --git a/AltStore/Browse/BrowseViewController.swift b/AltStore/Browse/BrowseViewController.swift index f0ed87c0..70f81f8f 100644 --- a/AltStore/Browse/BrowseViewController.swift +++ b/AltStore/Browse/BrowseViewController.swift @@ -88,12 +88,22 @@ private extension BrowseViewController let progress = AppManager.shared.installationProgress(for: app) cell.actionButton.progress = progress cell.actionButton.isInverted = false + + if Date() < app.versionDate + { + cell.actionButton.countdownDate = app.versionDate + } + else + { + cell.actionButton.countdownDate = nil + } } else { cell.actionButton.setTitle(NSLocalizedString("OPEN", comment: ""), for: .normal) cell.actionButton.progress = nil cell.actionButton.isInverted = true + cell.actionButton.countdownDate = nil } } dataSource.prefetchHandler = { (storeApp, indexPath, completionHandler) -> Foundation.Operation? in diff --git a/AltStore/Components/AppBannerView.xib b/AltStore/Components/AppBannerView.xib index 13e7100b..932629ec 100644 --- a/AltStore/Components/AppBannerView.xib +++ b/AltStore/Components/AppBannerView.xib @@ -50,7 +50,7 @@ -