neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates PillButton appearance

Browse Source
This commit is contained in:
Riley Testut
2019-10-23 14:20:01 -07:00
parent 6ea8503c3d
commit 6f58cb9579
6 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AltStore/App Detail/AppViewController.swift
View File

@@ -347,12 +347,10 @@ private extension AppViewController
if self.app.installedApp == nil
{
button.setTitle(NSLocalizedString("FREE", comment: ""), for: .normal)
button.isInverted = false
}
else
{
button.setTitle(NSLocalizedString("OPEN", comment: ""), for: .normal)
button.isInverted = true
}
let progress = AppManager.shared.installationProgress(for: self.app)

2
AltStore/Browse/BrowseViewController.swift
View File

@@ -100,7 +100,6 @@ private extension BrowseViewController
let progress = AppManager.shared.installationProgress(for: app)
cell.bannerView.button.progress = progress
cell.bannerView.button.isInverted = false
if Date() < app.versionDate
{
@@ -115,7 +114,6 @@ private extension BrowseViewController
{
cell.bannerView.button.setTitle(NSLocalizedString("OPEN", comment: ""), for: .normal)
cell.bannerView.button.progress = nil
cell.bannerView.button.isInverted = true
cell.bannerView.button.countdownDate = nil
}
}

16
AltStore/Components/PillButton.swift
View File

@@ -11,13 +11,15 @@ import UIKit
class PillButton: UIButton
{
var progress: Progress? {
didSet {
didSet {
self.progressView.progress = Float(self.progress?.fractionCompleted ?? 0)
self.progressView.observedProgress = self.progress
let isUserInteractionEnabled = self.isUserInteractionEnabled
self.isIndicatingActivity = (self.progress != nil)
self.isUserInteractionEnabled = isUserInteractionEnabled
self.update()
}
}
@@ -30,12 +32,6 @@ class PillButton: UIButton
}
}
var isInverted: Bool = false {
didSet {
self.update()
}
}
var countdownDate: Date? {
didSet {
self.isEnabled = (self.countdownDate == nil)
@@ -120,18 +116,18 @@ private extension PillButton
{
func update()
{
if self.isInverted
if self.progress == nil
{
self.setTitleColor(.white, for: .normal)
self.backgroundColor = self.tintColor
self.progressView.progressTintColor = self.tintColor.withAlphaComponent(0.15)
}
else
{
self.setTitleColor(self.tintColor, for: .normal)
self.backgroundColor = self.tintColor.withAlphaComponent(0.15)
self.progressView.progressTintColor = self.tintColor
}
self.progressView.progressTintColor = self.tintColor
}
@objc func updateCountdown()

1
AltStore/My Apps/MyAppsViewController.swift
View File

@@ -268,7 +268,6 @@ private extension MyAppsViewController
cell.bannerView.iconImageView.isIndicatingActivity = true
cell.bannerView.betaBadgeView.isHidden = !(installedApp.storeApp?.isBeta ?? false)
cell.bannerView.button.isInverted = true
cell.bannerView.button.isIndicatingActivity = false
cell.bannerView.button.addTarget(self, action: #selector(MyAppsViewController.refreshApp(_:)), for: .primaryActionTriggered)

1
AltStore/My Apps/UpdateCollectionViewCell.swift
View File

@@ -94,7 +94,6 @@ private extension UpdateCollectionViewCell
self.versionDescriptionTitleLabel.textColor = self.tintColor
self.blurView.backgroundColor = self.tintColor
self.bannerView.button.isInverted = true
self.bannerView.button.tintColor = self.tintColor
self.bannerView.button.progressTintColor = self.tintColor

2
AltStore/News/NewsViewController.swift
View File

@@ -344,7 +344,6 @@ extension NewsViewController
let progress = AppManager.shared.installationProgress(for: storeApp)
footerView.bannerView.button.progress = progress
footerView.bannerView.button.isInverted = false
if Date() < storeApp.versionDate
{
@@ -359,7 +358,6 @@ extension NewsViewController
{
footerView.bannerView.button.setTitle(NSLocalizedString("OPEN", comment: ""), for: .normal)
footerView.bannerView.button.progress = nil
footerView.bannerView.button.isInverted = true
footerView.bannerView.button.countdownDate = nil
}