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

Opens Error Log upon tapping ToastView showing logged error

Browse Source
This commit is contained in:
Riley Testut
2022-10-26 16:46:21 -05:00
parent 17f28439fe
commit 42d433a11d
7 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AltStore/App Detail/AppViewController.swift
View File

@@ -511,6 +511,7 @@ extension AppViewController
{
DispatchQueue.main.async {
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
}
}

1
AltStore/Browse/BrowseViewController.swift
View File

@@ -279,6 +279,7 @@ private extension BrowseViewController
case .failure(OperationError.cancelled): break // Ignore
case .failure(let error):
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
case .success: print("Installed app:", app.bundleIdentifier)

37
AltStore/Components/ToastView.swift
View File

@@ -16,10 +16,17 @@ extension TimeInterval
static let longToastViewDuration = 8.0
}
extension ToastView
{
static let openErrorLogNotification = Notification.Name("ALTOpenErrorLogNotification")
}
class ToastView: RSTToastView
{
var preferredDuration: TimeInterval
var opensErrorLog: Bool = false
override init(text: String, detailText detailedText: String?)
{
if detailedText == nil
@@ -43,7 +50,10 @@ class ToastView: RSTToastView
// RSTToastView does not expose stack view containing labels,
// so we access it indirectly as the labels' superview.
stackView.spacing = (detailedText != nil) ? 4.0 : 0.0
stackView.alignment = .leading
}
self.addTarget(self, action: #selector(ToastView.showErrorLog), for: .touchUpInside)
}
convenience init(error: Error)
@@ -99,6 +109,23 @@ class ToastView: RSTToastView
override func show(in view: UIView, duration: TimeInterval)
{
if self.opensErrorLog, #available(iOS 13, *),
case let configuration = UIImage.SymbolConfiguration(font: self.textLabel.font),
let icon = UIImage(systemName: "chevron.right.circle", withConfiguration: configuration)
{
let tintedIcon = icon.withTintColor(.white, renderingMode: .alwaysOriginal)
let moreIconImageView = UIImageView(image: tintedIcon)
moreIconImageView.translatesAutoresizingMaskIntoConstraints = false
self.addSubview(moreIconImageView)
NSLayoutConstraint.activate([
moreIconImageView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -self.layoutMargins.right),
moreIconImageView.centerYAnchor.constraint(equalTo: self.textLabel.centerYAnchor),
moreIconImageView.leadingAnchor.constraint(greaterThanOrEqualToSystemSpacingAfter: self.textLabel.trailingAnchor, multiplier: 1.0)
])
}
super.show(in: view, duration: duration)
let announcement = (self.textLabel.text ?? "") + ". " + (self.detailTextLabel.text ?? "")
@@ -115,3 +142,13 @@ class ToastView: RSTToastView
self.show(in: view, duration: self.preferredDuration)
}
}
private extension ToastView
{
@objc func showErrorLog()
{
guard self.opensErrorLog else { return }
NotificationCenter.default.post(name: ToastView.openErrorLogNotification, object: self)
}
}

10
AltStore/My Apps/MyAppsViewController.swift
View File

@@ -555,6 +555,8 @@ private extension MyAppsViewController
toastView.preferredDuration = 4.0
}
toastView.opensErrorLog = true
toastView.show(in: self)
}
@@ -690,6 +692,7 @@ private extension MyAppsViewController
case .failure(let error):
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
self.collectionView.reloadItems(at: [indexPath])
@@ -899,6 +902,7 @@ private extension MyAppsViewController
case .failure(let error):
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
completion(.failure(error))
@@ -1063,6 +1067,7 @@ private extension MyAppsViewController
installedApp.isActive = false
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
}
}
@@ -1136,6 +1141,7 @@ private extension MyAppsViewController
installedApp.isActive = true
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
}
}
@@ -1168,6 +1174,7 @@ private extension MyAppsViewController
case .failure(let error):
DispatchQueue.main.async {
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
}
}
@@ -1201,6 +1208,7 @@ private extension MyAppsViewController
DispatchQueue.main.async {
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
self.collectionView.reloadSections([Section.activeApps.rawValue, Section.inactiveApps.rawValue])
@@ -1236,6 +1244,7 @@ private extension MyAppsViewController
DispatchQueue.main.async {
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
}
}
@@ -1325,6 +1334,7 @@ private extension MyAppsViewController
case .success: break
case .failure(let error):
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
}
}

1
AltStore/News/NewsViewController.swift
View File

@@ -314,6 +314,7 @@ private extension NewsViewController
case .failure(OperationError.cancelled): break // Ignore
case .failure(let error):
let toastView = ToastView(error: error)
toastView.opensErrorLog = true
toastView.show(in: self)
case .success: print("Installed app:", storeApp.bundleIdentifier)

12
AltStore/Settings/SettingsViewController.swift
View File

@@ -82,6 +82,7 @@ class SettingsViewController: UITableViewController
super.init(coder: aDecoder)
NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.openPatreonSettings(_:)), name: AppDelegate.openPatreonSettingsDeepLinkNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(SettingsViewController.openErrorLog(_:)), name: ToastView.openErrorLogNotification, object: nil)
}
override func viewDidLoad()
@@ -340,6 +341,17 @@ private extension SettingsViewController
self.performSegue(withIdentifier: "showPatreon", sender: nil)
}
}
@objc func openErrorLog(_ notification: Notification)
{
guard self.presentedViewController == nil else { return }
self.navigationController?.popViewController(animated: false)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
self.performSegue(withIdentifier: "showErrorLog", sender: nil)
}
}
}
extension SettingsViewController

6
AltStore/TabBarController.swift
View File

@@ -33,6 +33,7 @@ class TabBarController: UITabBarController
NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.openPatreonSettings(_:)), name: AppDelegate.openPatreonSettingsDeepLinkNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.importApp(_:)), name: AppDelegate.importAppDeepLinkNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.presentSources(_:)), name: AppDelegate.addSourceDeepLinkNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(TabBarController.openErrorLog(_:)), name: ToastView.openErrorLogNotification, object: nil)
}
override func viewDidAppear(_ animated: Bool)
@@ -141,4 +142,9 @@ private extension TabBarController
{
self.selectedIndex = Tab.myApps.rawValue
}
@objc func openErrorLog(_ notification: Notification)
{
self.selectedIndex = Tab.settings.rawValue
}
}