debloat: remove patreon stuff carried over from altstore 2.0...not required by sidestore in-app since sidestore manages in web + remove old tests from altstore

AltStore/Analytics/AnalyticsManager.swift

@@ -1,82 +0,0 @@
-//
-//  AnalyticsManager.swift
-//  AltStore
-//
-//  Created by Riley Testut on 3/31/20.
-//  Copyright © 2020 Riley Testut. All rights reserved.
-//
-
-import Foundation
-
-import AltStoreCore
-
-#if DEBUG
-private let appCenterAppSecret = "73532d3e-e573-4693-99a4-9f85840bbb44"
-#elseif RELEASE
-private let appCenterAppSecret = "73532d3e-e573-4693-99a4-9f85840bbb44"
-#else
-private let appCenterAppSecret = "73532d3e-e573-4693-99a4-9f85840bbb44"
-#endif
-
-extension AnalyticsManager
-{
-    enum EventProperty: String
-    {
-        case name
-        case bundleIdentifier
-        case developerName
-        case version
-        case buildVersion
-        case size
-        case tintColor
-        case sourceIdentifier
-        case sourceURL
-        case patreonURL
-        case pledgeAmount
-        case pledgeCurrency
-    }
-    
-    enum Event
-    {
-        case installedApp(InstalledApp)
-        case updatedApp(InstalledApp)
-        case refreshedApp(InstalledApp)
-        
-        var name: String {
-            switch self
-            {
-            case .installedApp: return "installed_app"
-            case .updatedApp: return "updated_app"
-            case .refreshedApp: return "refreshed_app"
-            }
-        }
-        
-        var properties: [EventProperty: String] {
-            let properties: [EventProperty: String?]
-            
-            switch self
-            {
-            case .installedApp(let app), .updatedApp(let app), .refreshedApp(let app):
-                let appBundleURL = InstalledApp.fileURL(for: app)
-                let appBundleSize = FileManager.default.directorySize(at: appBundleURL)
-                
-                properties = [
-                    .name: app.name,
-                    .bundleIdentifier: app.bundleIdentifier,
-                    .developerName: app.storeApp?.developerName,
-                    .version: app.version,
-                    .buildVersion: app.buildVersion,
-                    .size: appBundleSize?.description,
-                    .tintColor: app.storeApp?.tintColor?.hexString,
-                    .sourceIdentifier: app.storeApp?.sourceIdentifier,
-                    .sourceURL: app.storeApp?.source?.sourceURL.absoluteString,
-                    .patreonURL: app.storeApp?.source?.patreonURL?.absoluteString,
-                    .pledgeAmount: app.storeApp?.pledgeAmount?.description,
-                    .pledgeCurrency: app.storeApp?.pledgeCurrency
-                ]
-            }
-            
-            return properties.compactMapValues { $0 }
-        }
-    }
-}

AltStore/AppDelegate.swift

@@ -147,8 +147,6 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         if UserDefaults.standard.enableEMPforWireguard {
             start_em_proxy(bind_addr: Consts.Proxy.serverURL)
         }
-
-        PatreonAPI.shared.refreshPatreonAccount()
     }
     
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any]) -> Bool

AltStore/LaunchViewController.swift

@@ -199,8 +199,6 @@ extension LaunchViewController {
         didFinishLaunching = true
         
         AppManager.shared.update()
-        AppManager.shared.updatePatronsIfNeeded()
-        PatreonAPI.shared.refreshPatreonAccount()
         AppManager.shared.updateAllSources { result in
             guard case .failure(let error) = result else { return }
             Logger.main.error("Failed to update sources on launch. \(error.localizedDescription, privacy: .public)")

AltStore/Managing Apps/AppManager.swift

@@ -22,7 +22,6 @@ import Roxas
 extension AppManager
 {
     static let didFetchSourceNotification = Notification.Name("io.sidestore.AppManager.didFetchSource")
-    static let didUpdatePatronsNotification = Notification.Name("io.sidestore.AppManager.didUpdatePatrons")
     static let didAddSourceNotification = Notification.Name("io.sidestore.AppManager.didAddSource")
     static let didRemoveSourceNotification = Notification.Name("io.sidestore.AppManager.didRemoveSource")
     static let willInstallAppFromNewSourceNotification = Notification.Name("io.sidestore.AppManager.willInstallAppFromNewSource")
@@ -590,34 +589,6 @@ extension AppManager
         return updateKnownSourcesOperation
     }
     
-    func updatePatronsIfNeeded()
-    {
-//        guard self.operationQueue.operations.allSatisfy({ !($0 is UpdatePatronsOperation) }) else {
-//            // There's already an UpdatePatronsOperation running.
-//            return
-//        }
-//        
-//        self.updatePatronsResult = nil
-//        
-//        let updatePatronsOperation = UpdatePatronsOperation()
-//        updatePatronsOperation.resultHandler = { (result) in
-//            do
-//            {
-//                try result.get()
-//                self.updatePatronsResult = .success(())
-//            }
-//            catch
-//            {
-//                print("Error updating Friend Zone Patrons:", error)
-//                self.updatePatronsResult = .failure(error)
-//            }
-//            
-//            NotificationCenter.default.post(name: AppManager.didUpdatePatronsNotification, object: self)
-//        }
-//        
-//        self.run([updatePatronsOperation], context: nil)
-    }
-    
     func updateAllSources(completion: @escaping (Result<Void, Error>) -> Void)
     {
         self.updateSourcesResult = nil
@@ -1285,20 +1256,6 @@ private extension AppManager
             }
         }
         
-        var verifyPledgeOperation: VerifyAppPledgeOperation?
-        if let storeApp = app.storeApp
-        {
-            verifyPledgeOperation = VerifyAppPledgeOperation(storeApp: storeApp, presentingViewController: context.presentingViewController)
-            verifyPledgeOperation?.resultHandler = { result in
-                switch result
-                {
-                case .failure(let error):
-                    context.error = error
-                case .success: break
-                }
-            }
-        }
-        
         /* Download */
         let downloadedAppURL = context.temporaryDirectory.appendingPathComponent("Cached.app")
         let downloadOperation = DownloadAppOperation(app: downloadingApp, destinationURL: downloadedAppURL, context: context)
@@ -1321,12 +1278,6 @@ private extension AppManager
         }
         progress.addChild(downloadOperation.progress, withPendingUnitCount: 25)
         
-        if let verifyPledgeOperation
-        {
-            downloadOperation.addDependency(verifyPledgeOperation)
-        }
-        
-        
         /* Verify App */
         let permissionsMode = UserDefaults.shared.permissionCheckingDisabled ? .none : permissionReviewMode
         let verifyOperation = VerifyAppOperation(permissionsMode: permissionsMode, context: context, customBundleId: app.bundleIdentifier)
@@ -1594,7 +1545,6 @@ private extension AppManager
         
         // Operations picked for request
         var operations = [
-            verifyPledgeOperation,
             downloadOperation,
             verifyOperation,
             removeAppExtensionsOperation,
@@ -2226,7 +2176,7 @@ private extension AppManager
             switch operation
             {
             case _ where requiresSerialQueue: fallthrough
-            case is InstallAppOperation, is RefreshAppOperation, is BackupAppOperation, is VerifyAppPledgeOperation:
+            case is InstallAppOperation, is RefreshAppOperation, is BackupAppOperation:
                 if let installAltStoreOperation = operation as? InstallAppOperation, installAltStoreOperation.context.bundleIdentifier == StoreApp.altstoreAppID
                 {
                     // Add dependencies on previous serial operations in `context` to ensure re-installing AltStore goes last.

AltStore/My Apps/MyAppsViewController.swift

@@ -544,11 +544,6 @@ private extension MyAppsViewController
         {
             print("[ALTLog] Failed to fetch updates:", error)
         }
-        
-        if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isAltStorePatron, PatreonAPI.shared.isAuthenticated
-        {
-            self.dataSource.predicate = nil
-        }
     }
 }
 

AltStore/Operations/DownloadAppOperation.swift

@@ -224,12 +224,6 @@ private extension DownloadAppOperation
                         fileURL = sourceURL
                         self.progress.completedUnitCount += 3
                     }
-                    else if let host = sourceURL.host, host.lowercased().hasSuffix("patreon.com") && sourceURL.path.lowercased() == "/file"
-                    {
-                        // Patreon app
-                        fileURL = try await downloadPatreonApp(from: sourceURL)
-                        self.printWithTid("downloadPatreonApp: completed at \(fileURL.path)")
-                    }
                     else
                     {
                         // Regular app
@@ -323,107 +317,6 @@ private extension DownloadAppOperation
                 self.printWithTid("download started: \(downloadURL)")
             }
         }
-        
-        func downloadPatreonApp(from patreonURL: URL) async throws -> URL
-        {
-            guard !UserDefaults.shared.skipPatreonDownloads else {
-                // Skip all hacks, take user straight to Patreon post.
-                return try await downloadFromPatreonPost()
-            }
-            
-            do
-            {
-                // User is pledged to this app, attempt to download.
-                
-                let fileURL = try await downloadFile(from: patreonURL)
-                return fileURL
-            }
-            catch URLError.noPermissionsToReadFile
-            {
-                guard let presentingViewController = self.context.presentingViewController else { throw OperationError.pledgeRequired(appName: self.appName) }
-                
-                // Attempt to sign-in again in case our Patreon session has expired.
-                try await withCheckedThrowingContinuation { continuation in
-                    PatreonAPI.shared.authenticate(presentingViewController: presentingViewController) { result in
-                        do
-                        {
-                            let account = try result.get()
-                            try account.managedObjectContext?.save()
-                            
-                            continuation.resume()
-                        }
-                        catch
-                        {
-                            continuation.resume(throwing: error)
-                        }
-                    }
-                }
-                
-                do
-                {
-                    // Success, so try to download once more now that we're definitely authenticated.
-                    
-                    let fileURL = try await downloadFile(from: patreonURL)
-                    return fileURL
-                }
-                catch URLError.noPermissionsToReadFile
-                {
-                    // We know authentication succeeded, so failure must mean user isn't patron/on the correct tier,
-                    // or that our hacky workaround for downloading Patreon attachments has failed.
-                    // Either way, taking them directly to the post serves as a decent fallback.
-                    
-                    return try await downloadFromPatreonPost()
-                }
-            }
-            
-            func downloadFromPatreonPost() async throws -> URL
-            {
-                guard let presentingViewController = self.context.presentingViewController else { throw OperationError.pledgeRequired(appName: self.appName) }
-                
-                let downloadURL: URL
-                
-                if let components = URLComponents(url: patreonURL, resolvingAgainstBaseURL: false),
-                   let postItem = components.queryItems?.first(where: { $0.name == "h" }),
-                   let postID = postItem.value,
-                   let patreonPostURL = URL(string: "https://www.patreon.com/posts/" + postID)
-                {
-                    downloadURL = patreonPostURL
-                }
-                else
-                {
-                    downloadURL = patreonURL
-                }
-                
-                return try await downloadFromPatreon(downloadURL, presentingViewController: presentingViewController)
-            }
-        }
-        
-        @MainActor
-        func downloadFromPatreon(_ patreonURL: URL, presentingViewController: UIViewController) async throws -> URL
-        {
-            let webViewController = WebViewController(url: patreonURL)
-            webViewController.delegate = self
-            webViewController.webView.navigationDelegate = self
-            
-            let navigationController = UINavigationController(rootViewController: webViewController)
-            presentingViewController.present(navigationController, animated: true)
-            
-            let downloadURL: URL
-            
-            do
-            {
-                defer {
-                    navigationController.dismiss(animated: true)
-                }
-                
-                downloadURL = try await withCheckedThrowingContinuation { continuation in
-                    self.downloadPatreonAppContinuation = continuation
-                }
-            }
-            
-            let fileURL = try await downloadFile(from: downloadURL)
-            return fileURL
-        }
     }
 }
 

AltStore/Operations/FetchSourceOperation.swift

@@ -177,7 +177,6 @@ final class FetchSourceOperation: ResultOperation<Source>
                     }
                     
                     try self.verify(source, response: response)
-                    try self.verifyPledges(for: source, in: childContext)
                     
                     try childContext.save()
                     
@@ -264,63 +263,6 @@ private extension FetchSourceOperation
         }
     }
     
-    func verifyPledges(for source: Source, in context: NSManagedObjectContext) throws
-    {
-        guard let patreonURL = source.patreonURL, let patreonAccount = DatabaseManager.shared.patreonAccount(in: context) else { return }
-        
-        let normalizedPatreonURL = try patreonURL.normalized()
-        
-        guard let pledge = patreonAccount.pledges.first(where: { pledge in
-            do
-            {
-                let normalizedCampaignURL = try pledge.campaignURL.normalized()
-                return normalizedCampaignURL == normalizedPatreonURL
-            }
-            catch
-            {
-                Logger.main.error("Failed to normalize Patreon URL \(pledge.campaignURL, privacy: .public). \(error.localizedDescription, privacy: .public)")
-                return false
-            }
-        }) else { return }
-        
-        // User is pledged to this source's Patreon, so check which apps they're pledged to.
-        
-        // We only assign `isPledged = true` because false is already the default,
-        // and only one check needs to be true for isPledged to be true.
-        
-        for app in source.apps where app.isPledgeRequired
-        {
-            if let requiredAppPledge = app.pledgeAmount
-            {
-                if pledge.amount >= requiredAppPledge
-                {
-                    app.isPledged = true
-                    continue
-                }
-            }
-            
-            if let tierIDs = app._tierIDs
-            {
-                let tier = pledge.tiers.first { tierIDs.contains($0.identifier) }
-                if tier != nil
-                {
-                    app.isPledged = true
-                    continue
-                }
-            }
-                                
-            if let rewardID = app._rewardID
-            {
-                let reward = pledge.rewards.first { $0.identifier == rewardID }
-                if reward != nil
-                {
-                    app.isPledged = true
-                    continue
-                }
-            }
-        }
-    }
-    
     func verifySourceNotBlocked(_ source: Source, response: URLResponse?) throws
     {
         guard let blockedSources = UserDefaults.shared.blockedSources else { return }

AltStore/Operations/VerifyAppPledgeOperation.swift

@@ -1,281 +0,0 @@
-//
-//  VerifyAppPledgeOperation.swift
-//  AltStore
-//
-//  Created by Riley Testut on 12/6/23.
-//  Copyright © 2023 Riley Testut. All rights reserved.
-//
-
-import Combine
-
-import AltStoreCore
-
-class VerifyAppPledgeOperation: ResultOperation<Void>
-{
-    @AsyncManaged
-    private(set) var storeApp: StoreApp
-    
-    private let presentingViewController: UIViewController?
-    private var openPatreonPageContinuation: CheckedContinuation<Void, Never>?
-    
-    private var cancellable: AnyCancellable?
-    
-    init(storeApp: StoreApp, presentingViewController: UIViewController?)
-    {
-        self.storeApp = storeApp
-        self.presentingViewController = presentingViewController
-    }
-    
-    override func main()
-    {
-        super.main()
-        
-        // _Don't_ rethrow earlier errors, or else user will only be taken to Patreon post if connected to same Wi-Fi as AltServer.
-        // if let error = self.context.error
-        // {
-        //     self.finish(.failure(error))
-        //     return
-        // }
-        
-        Task<Void, Never>.detached(priority: .medium) {
-            do
-            {
-                guard await self.$storeApp.isPledgeRequired else { return self.finish(.success(())) }
-                
-                if let presentingViewController = self.presentingViewController
-                {
-                    // Ask user to connect Patreon account if they are signed-in to Patreon inside WebViewController, but haven't yet signed in through AltStore settings.
-                    // This is most likely because the user joined a Patreon campaign directly through WebViewController before connecting Patreon account in settings.
-                    try await self.connectPatreonAccountIfNeeded(presentingViewController: presentingViewController)
-                }
-                
-                do
-                {
-                    try await self.verifyPledge()
-                }
-                catch let error as OperationError where error.code == .pledgeRequired || error.code == .pledgeInactive
-                {
-                    guard 
-                        let presentingViewController = self.presentingViewController,
-                        let source = await self.$storeApp.source,
-                        let patreonURL = await self.$storeApp.perform({ _ in source.patreonURL })
-                    else { throw error }
-                    
-                    let components = URLComponents(url: patreonURL, resolvingAgainstBaseURL: false)
-                    let lastPathComponent = components?.path.components(separatedBy: "/").last
-                    
-                    let username = lastPathComponent ?? patreonURL.lastPathComponent
-                    
-                    let checkoutURL: URL
-                    if await self.$storeApp.prefersCustomPledge, let customPledgeURL = URL(string: "https://www.patreon.com/checkout/" + username + "?rid=0&custom=1")
-                    {
-                        checkoutURL = customPledgeURL
-                        
-                        let action = await UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default)
-                        try await presentingViewController.presentConfirmationAlert(title: NSLocalizedString("Custom Pledge", comment: ""),
-                                                                                message: NSLocalizedString("This app supports custom pledges. Pledge any amount on Patreon to receive access.", comment: ""),
-                                                                                primaryAction: action)
-                    }
-                    else if !username.isEmpty, let url = URL(string: "https://www.patreon.com/join/" + username)
-                    {
-                        // Prefer /join URL over campaign homepage.
-                        // URL format from https://support.patreon.com/hc/en-us/articles/360044376211-Managing-members-with-custom-pledges
-                        checkoutURL = url
-                    }
-                    else
-                    {
-                        checkoutURL = patreonURL
-                    }
-                    
-                    // Direct user to Patreon page if they're not already pledged.
-                    await self.openPatreonPage(checkoutURL, presentingViewController: presentingViewController)
-                                        
-                    let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
-                    if let patreonAccount = await context.performAsync({ DatabaseManager.shared.patreonAccount(in: context) })
-                    {
-                        // Patreon account is connected, so we'll update it via API to see if pledges changed.
-                        // If so, we'll re-fetch the source to update pledge statuses.
-                        try await self.updatePledges(for: source, account: patreonAccount)
-                    }
-                    else
-                    {
-                        // Patreon account is not connected, so prompt user to connect it.
-                        try await self.connectPatreonAccountIfNeeded(presentingViewController: presentingViewController)
-                    }
-                    
-                    do
-                    {
-                        try await self.verifyPledge()
-                    }
-                    catch
-                    {
-                        // Ignore error, but cancel remainder of operation.
-                        throw CancellationError()
-                    }
-                }
-                
-                self.finish(.success(()))
-            }
-            catch
-            {
-                self.finish(.failure(error))
-            }
-        }
-    }
-}
-
-private extension VerifyAppPledgeOperation
-{
-    func verifyPledge() async throws
-    {
-        let (appName, isPledged) = await self.$storeApp.perform { ($0.name, $0.isPledged) }
-        
-        if !PatreonAPI.shared.isAuthenticated || !isPledged
-        {
-            let isInstalled = await self.$storeApp.installedApp != nil
-            if isInstalled
-            {
-                // Assume if there is an InstalledApp, the user had previously pledged to this app.
-                throw OperationError.pledgeInactive(appName: appName)
-            }
-            else
-            {
-                throw OperationError.pledgeRequired(appName: appName)
-            }
-        }
-    }
-    
-    func connectPatreonAccountIfNeeded(presentingViewController: UIViewController) async throws
-    {
-        guard !PatreonAPI.shared.isAuthenticated, let authCookie = PatreonAPI.shared.authCookies.first(where: { $0.name.lowercased() == "session_id" }) else { return }
-        
-        Logger.sideload.debug("Patreon Auth cookie: \(authCookie.name)=\(authCookie.value)")
-        
-        let message = NSLocalizedString("You're signed into Patreon but haven't connected your account with SideStore.\n\nPlease connect your account to download Patreon-exclusive apps.", comment: "")
-        let action = await UIAlertAction(title: NSLocalizedString("Connect Patreon Account", comment: ""), style: .default)
-        
-        do
-        {
-            _ = try await presentingViewController.presentConfirmationAlert(title: NSLocalizedString("Patreon Account Detected", comment: ""),
-                                                                            message: message, actions: [action])
-        }
-        catch
-        {
-            // Ignore and continue
-            return
-        }
-        
-        try await withCheckedThrowingContinuation { continuation in
-            PatreonAPI.shared.authenticate(presentingViewController: presentingViewController) { result in
-                do
-                {
-                    let account = try result.get()
-                    try account.managedObjectContext?.save()
-                    
-                    continuation.resume()
-                }
-                catch
-                {
-                    continuation.resume(throwing: error)
-                }
-            }
-        }
-                
-        if let source = await self.$storeApp.source
-        {
-            // Fetch source to update pledge status now that account is connected.
-            try await self.update(source)
-        }
-    }
-    
-    func updatePledges(@AsyncManaged for source: Source, @AsyncManaged account: PatreonAccount) async throws
-    {
-        guard PatreonAPI.shared.isAuthenticated else { return }
-        
-        let previousPledgeIDs = Set(await $account.perform { $0.pledges.map(\.identifier) })
-        
-        let updatedPledgeIDs = try await withCheckedThrowingContinuation { continuation in
-            PatreonAPI.shared.fetchAccount { (result: Result<PatreonAccount, Swift.Error>) in
-                do
-                {
-                    let account = try result.get()
-                    let pledgeIDs = Set(account.pledges.map(\.identifier))
-                    
-                    try account.managedObjectContext?.save()
-                    
-                    continuation.resume(returning: pledgeIDs)
-                }
-                catch
-                {
-                    Logger.sideload.error("Failed to update Patreon account. \(error.localizedDescription, privacy: .public)")
-                    continuation.resume(throwing: error)
-                }
-            }
-        }
-                
-        if updatedPledgeIDs != previousPledgeIDs
-        {
-            // Active pledges changed, so fetch source to update pledge status.
-            try await self.update(source)
-        }
-    }
-    
-    func update(@AsyncManaged _ source: Source) async throws
-    {
-        let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
-        _ = try await AppManager.shared.fetchSource(sourceURL: $source.sourceURL, managedObjectContext: context)
-        
-        try await context.performAsync {
-            try context.save()
-        }
-    }
-    
-    @MainActor
-    func openPatreonPage(_ patreonURL: URL, presentingViewController: UIViewController) async
-    {
-        let webViewController = WebViewController(url: patreonURL)
-        webViewController.delegate = self
-
-        let navigationController = UINavigationController(rootViewController: webViewController)
-        presentingViewController.present(navigationController, animated: true)
-        
-        // Automatically dismiss if user completes checkout flow.
-        self.cancellable = webViewController.webView.publisher(for: \.url, options: [.new])
-            .compactMap { $0 }
-            .compactMap { URLComponents(url: $0, resolvingAgainstBaseURL: false) }
-            .compactMap { components in
-                let lastPathComponent = components.path.components(separatedBy: "/").last
-                return lastPathComponent?.lowercased()
-            }
-            .filter { $0 == "membership" }
-            .receive(on: RunLoop.main)
-            .sink { [weak self] url in
-                guard let continuation = self?.openPatreonPageContinuation else { return }
-                self?.openPatreonPageContinuation = nil
-                
-                continuation.resume()
-            }
-
-        await withCheckedContinuation { continuation in
-            self.openPatreonPageContinuation = continuation
-        }
-        
-        // Cache auth cookies just in case user signed in.
-        await PatreonAPI.shared.saveAuthCookies()
-
-        navigationController.dismiss(animated: true)
-        
-        self.cancellable = nil
-    }
-}
-
-extension VerifyAppPledgeOperation: WebViewControllerDelegate
-{
-    func webViewControllerDidFinish(_ webViewController: WebViewController)
-    {
-        guard let continuation = self.openPatreonPageContinuation else { return }
-        self.openPatreonPageContinuation = nil
-
-        continuation.resume()
-    }
-}

AltStore/SceneDelegate.swift

@@ -43,8 +43,6 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate
         if UserDefaults.standard.enableEMPforWireguard {
             start_em_proxy(bind_addr: Consts.Proxy.serverURL)
         }
-
-        PatreonAPI.shared.refreshPatreonAccount()
     }
 
     func sceneDidEnterBackground(_ scene: UIScene)

AltStore/Settings/AboutPatreonHeaderView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,7 +23,7 @@
                                 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="f7H-EV-7Sx">
                                     <rect key="frame" x="0.0" y="0.0" width="343" height="55"/>
                                     <subviews>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SideStore" translatesAutoresizingMaskIntoConstraints="NO" id="pn6-Ic-MJm">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SideStore" translatesAutoresizingMaskIntoConstraints="NO" id="pn6-Ic-MJm" userLabel="Icon View">
                                             <rect key="frame" x="0.0" y="0.0" width="55" height="55"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="55" id="7LH-UB-M1b"/>
@@ -31,36 +31,19 @@
                                             </constraints>
                                         </imageView>
                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="si2-MA-3RH">
-                                            <rect key="frame" x="65" y="0.0" width="213" height="55"/>
+                                            <rect key="frame" x="65" y="0.0" width="278" height="55"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="hkS-oz-wiT">
-                                                    <rect key="frame" x="0.0" y="0.0" width="100.5" height="55"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="278" height="55"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideTeam" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="DTd-Yu-HXr">
-                                                            <rect key="frame" x="0.0" y="0.0" width="100.5" height="21.5"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideTeam" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="DTd-Yu-HXr" userLabel="Team name">
+                                                            <rect key="frame" x="0.0" y="0.0" width="278" height="21.5"/>
                                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nPA-DN-RTG" userLabel=" ">
-                                                            <rect key="frame" x="0.0" y="23.5" width="100.5" height="31.5"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <color key="textColor" white="1" alpha="0.65000000000000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                </stackView>
-                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="TFB-qo-cbh">
-                                                    <rect key="frame" x="127" y="0.0" width="86" height="55"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Zpb-k3-y7l">
-                                                            <rect key="frame" x="0.0" y="0.0" width="86" height="50"/>
-                                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VOu-b8-uEL">
-                                                            <rect key="frame" x="0.0" y="52" width="86" height="3"/>
+                                                            <rect key="frame" x="0.0" y="23.5" width="278" height="31.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="1" alpha="0.65000000000000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
@@ -69,14 +52,6 @@
                                                 </stackView>
                                             </subviews>
                                         </stackView>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Shane" translatesAutoresizingMaskIntoConstraints="NO" id="F6g-4g-Gr2">
-                                            <rect key="frame" x="288" y="0.0" width="55" height="55"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="55" id="CaK-rR-Zjy"/>
-                                                <constraint firstAttribute="width" secondItem="F6g-4g-Gr2" secondAttribute="height" id="cCw-He-Yyc"/>
-                                                <constraint firstAttribute="width" secondItem="F6g-4g-Gr2" secondAttribute="height" id="geK-Xu-ybL"/>
-                                            </constraints>
-                                        </imageView>
                                     </subviews>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="55" id="Uiy-9X-WSO"/>
@@ -149,7 +124,6 @@ Following us on social media allows us to give quick updates and spread the word
                 <outlet property="instagramButton" destination="VdY-7Q-amF" id="5kj-9x-k4F"/>
                 <outlet property="rileyImageView" destination="pn6-Ic-MJm" id="60i-Q0-ojz"/>
                 <outlet property="rileyLabel" destination="DTd-Yu-HXr" id="O0y-JB-gWp"/>
-                <outlet property="shaneLabel" destination="Zpb-k3-y7l" id="aQN-6B-s5T"/>
                 <outlet property="supportButton" destination="yEi-L6-kQ8" id="Dzo-vd-SnD"/>
                 <outlet property="textView" destination="FeG-e5-LJl" id="K0M-lF-I6u"/>
                 <outlet property="twitterButton" destination="hov-Ce-LaM" id="gib-Lt-qtY"/>
@@ -158,8 +132,7 @@ Following us on social media allows us to give quick updates and spread the word
         </collectionReusableView>
     </objects>
     <resources>
-        <image name="Shane" width="128" height="128"/>
-        <image name="SideStore" width="1024" height="1024"/>
+        <image name="SideStore" width="512" height="512"/>
         <namedColor name="SettingsHighlighted">
             <color red="0.38823529411764707" green="0.011764705882352941" blue="0.58823529411764708" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

AltStore/Settings/OperationsLoggingContolView.swift

@@ -42,63 +42,56 @@ struct OperationsLoggingControlView: View {
                                 }
                             ))
                             
-                            CustomToggle("2. VerifyAppPledge", isOn: Binding(
-                                get: { self.viewModel.getFromDatabase(for: VerifyAppPledgeOperation.self) },
-                                set: { value in
-                                    self.viewModel.updateDatabase(for: VerifyAppPledgeOperation.self, value: value)
-                                }
-                            ))
-                            
-                            CustomToggle("3. DownloadApp", isOn: Binding(
+                            CustomToggle("2. DownloadApp", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: DownloadAppOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: DownloadAppOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("4. VerifyApp", isOn: Binding(
+                            CustomToggle("3. VerifyApp", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: VerifyAppOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: VerifyAppOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("5. RemoveAppExtensions", isOn: Binding(
+                            CustomToggle("4. RemoveAppExtensions", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: RemoveAppExtensionsOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: RemoveAppExtensionsOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("6. FetchAnisetteData", isOn: Binding(
+                            CustomToggle("5. FetchAnisetteData", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: FetchAnisetteDataOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: FetchAnisetteDataOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("7. FetchProvisioningProfiles(I)", isOn: Binding(
+                            CustomToggle("6. FetchProvisioningProfiles(I)", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: FetchProvisioningProfilesInstallOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: FetchProvisioningProfilesInstallOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("8. ResignApp", isOn: Binding(
+                            CustomToggle("7. ResignApp", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: ResignAppOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: ResignAppOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("9. SendApp", isOn: Binding(
+                            CustomToggle("8. SendApp", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: SendAppOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: SendAppOperation.self, value: value)
                                 }
                             ))
                             
-                            CustomToggle("10. InstallApp", isOn: Binding(
+                            CustomToggle("9. InstallApp", isOn: Binding(
                                 get: { self.viewModel.getFromDatabase(for: InstallAppOperation.self) },
                                 set: { value in
                                     self.viewModel.updateDatabase(for: InstallAppOperation.self, value: value)
@@ -203,16 +196,6 @@ struct OperationsLoggingControlView: View {
                             ))
                         }
                         
-                        CustomSection(header: Text("Patrons Operations"))
-                        {
-                            CustomToggle("1. UpdatePatrons", isOn: Binding(
-                                get: { self.viewModel.getFromDatabase(for: UpdatePatronsOperation.self) },
-                                set: { value in
-                                    self.viewModel.updateDatabase(for: UpdatePatronsOperation.self, value: value)
-                                }
-                            ))
-                        }
-                        
                         CustomSection(header: Text("Cache Operations"))
                         {
                             CustomToggle("1. ClearAppCache", isOn: Binding(

AltStore/Settings/PatreonComponents.swift

@@ -13,60 +13,18 @@ final class PatronCollectionViewCell: UICollectionViewCell
     @IBOutlet var textLabel: UILabel!
 }
 
-final class PatronsHeaderView: UICollectionReusableView
-{
-    let textLabel = UILabel()
-    
-    override init(frame: CGRect)
-    {
-        super.init(frame: frame)
-        
-        self.textLabel.font = UIFont.boldSystemFont(ofSize: 17)
-        self.textLabel.textColor = .white
-        self.addSubview(self.textLabel, pinningEdgesWith: UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20))
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-}
-
-final class PatronsFooterView: UICollectionReusableView
-{
-    let button = UIButton(type: .system)
-    
-    override init(frame: CGRect)
-    {
-        super.init(frame: frame)
-        
-        self.button.translatesAutoresizingMaskIntoConstraints = false
-        self.button.activityIndicatorView.style = .medium
-        self.button.activityIndicatorView.color = .white
-        self.button.titleLabel?.textColor = .white
-        self.addSubview(self.button)
-        
-        NSLayoutConstraint.activate([self.button.centerXAnchor.constraint(equalTo: self.centerXAnchor),
-                                     self.button.centerYAnchor.constraint(equalTo: self.centerYAnchor)])
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-}
 
 final class AboutPatreonHeaderView: UICollectionReusableView
 {
     @IBOutlet var supportButton: UIButton!
     @IBOutlet var twitterButton: UIButton!
     @IBOutlet var instagramButton: UIButton!
-    @IBOutlet var accountButton: UIButton!
     @IBOutlet var textView: UITextView!
     
     @IBOutlet private var rileyLabel: UILabel!
     @IBOutlet private var shaneLabel: UILabel!
     
     @IBOutlet private var rileyImageView: UIImageView!
-    @IBOutlet private var shaneImageView: UIImageView!
     
     override func awakeFromNib()
     {
@@ -76,13 +34,13 @@ final class AboutPatreonHeaderView: UICollectionReusableView
         self.textView.layer.cornerRadius = 20
         self.textView.textContainer.lineFragmentPadding = 0
         
-        for imageView in [self.rileyImageView, self.shaneImageView].compactMap({$0})
+        for imageView in [self.rileyImageView].compactMap({$0})
         {
             imageView.clipsToBounds = true
             imageView.layer.cornerRadius = imageView.bounds.midY
         }
         
-        for button in [self.supportButton, self.accountButton, self.twitterButton, self.instagramButton].compactMap({$0})
+        for button in [self.supportButton, self.twitterButton, self.instagramButton].compactMap({$0})
         {
             button.clipsToBounds = true
             button.layer.cornerRadius = 16

AltStore/Settings/PatreonViewController.swift

@@ -13,26 +13,10 @@ import AuthenticationServices
 import AltStoreCore
 import Roxas
 
-extension PatreonViewController
-{
-    private enum Section: Int, CaseIterable
-    {
-        case about
-        case patrons
-    }
-}
-
 final class PatreonViewController: UICollectionViewController
 {
-//    private lazy var dataSource = self.makeDataSource()
-    private lazy var patronsDataSource = self.makePatronsDataSource()
-    
     private var prototypeAboutHeader: AboutPatreonHeaderView!
     
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return .lightContent
-    }
-    
     override func viewDidLoad()
     {
         super.viewDidLoad()
@@ -40,24 +24,14 @@ final class PatreonViewController: UICollectionViewController
         let aboutHeaderNib = UINib(nibName: "AboutPatreonHeaderView", bundle: nil)
         self.prototypeAboutHeader = aboutHeaderNib.instantiate(withOwner: nil, options: nil)[0] as? AboutPatreonHeaderView
         
-//        self.collectionView.dataSource = self.dataSource
-        
         self.collectionView.register(aboutHeaderNib, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "AboutHeader")
-        self.collectionView.register(PatronsHeaderView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "PatronsHeader")
-        self.collectionView.register(PatronsFooterView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "PatronsFooter")
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(PatreonViewController.didUpdatePatrons(_:)), name: AppManager.didUpdatePatronsNotification, object: nil)
-        
-        self.update()
+        self.collectionView.reloadData()
     }
     
     override func viewWillAppear(_ animated: Bool)
     {
         super.viewWillAppear(animated)
-        
-        //self.fetchPatrons()
-        
-        self.update()
+        self.collectionView.reloadData()
     }
     
     override func viewDidLayoutSubviews()
@@ -76,103 +50,17 @@ final class PatreonViewController: UICollectionViewController
 
 private extension PatreonViewController
 {
-    func makeDataSource() -> RSTCompositeCollectionViewDataSource<ManagedPatron>
-    {
-        let aboutDataSource = RSTDynamicCollectionViewDataSource<ManagedPatron>()
-        aboutDataSource.numberOfSectionsHandler = { 1 }
-        aboutDataSource.numberOfItemsHandler = { _ in 0 }
-        
-        let dataSource = RSTCompositeCollectionViewDataSource<ManagedPatron>(dataSources: [aboutDataSource, self.patronsDataSource])
-        dataSource.proxy = self
-        return dataSource
-    }
-    
-    func makePatronsDataSource() -> RSTFetchedResultsCollectionViewDataSource<ManagedPatron>
-    {
-        let fetchRequest: NSFetchRequest<ManagedPatron> = ManagedPatron.fetchRequest()
-        fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(ManagedPatron.name), ascending: true, selector: #selector(NSString.caseInsensitiveCompare(_:)))]
-        
-        let patronsDataSource = RSTFetchedResultsCollectionViewDataSource<ManagedPatron>(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext)
-        patronsDataSource.cellConfigurationHandler = { (cell, patron, indexPath) in
-            let cell = cell as! PatronCollectionViewCell
-            cell.textLabel.text = patron.name
-        }
-        
-        return patronsDataSource
-    }
-    
-    func update()
-    {
-        self.collectionView.reloadData()
-    }
-    
     func prepare(_ headerView: AboutPatreonHeaderView)
     {
         headerView.layoutMargins = self.view.layoutMargins
-        
         headerView.supportButton.addTarget(self, action: #selector(PatreonViewController.openPatreonURL(_:)), for: .primaryActionTriggered)
         headerView.twitterButton.addTarget(self, action: #selector(PatreonViewController.openTwitterURL(_:)), for: .primaryActionTriggered)
         headerView.instagramButton.addTarget(self, action: #selector(PatreonViewController.openInstagramURL(_:)), for: .primaryActionTriggered)
-
-        let defaultSupportButtonTitle = NSLocalizedString("Become a patron", comment: "")
-        let isPatronSupportButtonTitle = NSLocalizedString("View Patreon", comment: "")
-        
-        let defaultText = NSLocalizedString("""
-        Hello, thank you for using SideStore!
-        
-        If you would subscribe to the patreon that would support us and make sure we can continue developing SideStore for you.
-        
-        -SideTeam
-        """, comment: "")
-        
-        let isPatronText = NSLocalizedString("""
-        Hey ,
-        
-        You’re the best. Your account was linked successfully, so you now have access to any beta versions of our apps. You can find them all in the Browse tab.
-        
-        Thanks for all of your support. Enjoy!
-        - SideTeam
-        """, comment: "")
-        
-        if let account = DatabaseManager.shared.patreonAccount(), PatreonAPI.shared.isAuthenticated
-        {
-            headerView.accountButton.addTarget(self, action: #selector(PatreonViewController.signOut(_:)), for: .primaryActionTriggered)
-            headerView.accountButton.setTitle(String(format: NSLocalizedString("Unlink %@", comment: ""), account.name), for: .normal)
-            
-            if account.isAltStorePatron
-            {
-                headerView.supportButton.setTitle(isPatronSupportButtonTitle, for: .normal)
-                
-                let font = UIFont.systemFont(ofSize: 16)
-                
-                let attributedText = NSMutableAttributedString(string: isPatronText, attributes: [.font: font,
-                                                                                                  .foregroundColor: UIColor.white])
-                
-                let boldedName = NSAttributedString(string: account.firstName ?? account.name,
-                                                    attributes: [.font: UIFont.boldSystemFont(ofSize: font.pointSize),
-                                                                 .foregroundColor: UIColor.white])
-                attributedText.insert(boldedName, at: 4)
-                
-                headerView.textView.attributedText = attributedText
-            }
-            else
-            {
-                headerView.supportButton.setTitle(defaultSupportButtonTitle, for: .normal)
-                headerView.textView.text = defaultText
-            }
-        }
-        
     }
 }
 
 private extension PatreonViewController
 {
-    @objc func fetchPatrons()
-    {
-        AppManager.shared.updatePatronsIfNeeded()
-        self.update()
-    }
-    
     @objc func openPatreonURL(_ sender: UIButton)
     {
         let patreonURL = URL(string: "https://www.patreon.com/SideStoreIO")!
@@ -199,148 +87,15 @@ private extension PatreonViewController
         safariViewController.preferredControlTintColor = self.view.tintColor
         self.present(safariViewController, animated: true, completion: nil)
     }
-    
-    @IBAction func authenticate(_ sender: UIBarButtonItem)
-    {
-        PatreonAPI.shared.authenticate(presentingViewController: self) { (result) in
-            do
-            {
-                let account = try result.get()
-                try account.managedObjectContext?.save()
-                
-                // Update sources to show any Patreon-only apps.
-                AppManager.shared.fetchSources { result in
-                    do
-                    {
-                        let (_, context) = try result.get()
-                        try context.save()
-                    }
-                    catch
-                    {
-                        Logger.main.error("Failed to update sources after authenticating Patreon account. \(error.localizedDescription, privacy: .public)")
-                    }
-                    
-                    DispatchQueue.main.async {
-                        self.update()
-                    }
-                }
-            }
-            catch is CancellationError
-            {
-                // Clear in-app browser cache in case they are signed into wrong account.
-                Task<Void, Never>.detached {
-                    await PatreonAPI.shared.deleteAuthCookies()
-                }
-            }
-            catch
-            {
-                DispatchQueue.main.async {
-                    let toastView = ToastView(error: error)
-                    toastView.show(in: self)
-                }
-            }
-        }
-    }
-    
-    @IBAction func signOut(_ sender: UIBarButtonItem)
-    {
-        func signOut()
-        {
-            PatreonAPI.shared.signOut { (result) in
-                do
-                {
-                    try result.get()
-                    
-                    DispatchQueue.main.async {
-                        self.update()
-                    }
-                }
-                catch
-                {
-                    DispatchQueue.main.async {
-                        let toastView = ToastView(error: error)
-                        toastView.show(in: self)
-                    }
-                }
-            }
-        }
-        
-        
-        #if MARKETPLACE
-        let message = NSLocalizedString("You will no longer be able to install or update any apps that require pledges.", comment: "")
-        #else
-        let message = NSLocalizedString("You will no longer be able to install or refresh any apps that require pledges.", comment: "")
-        #endif
-        
-        let alertController = UIAlertController(title: NSLocalizedString("Are you sure you want to unlink your Patreon account?", comment: ""), message: message, preferredStyle: .actionSheet)
-        alertController.addAction(UIAlertAction(title: NSLocalizedString("Unlink Patreon Account", comment: ""), style: .destructive) { _ in signOut() })
-        alertController.addAction(.cancel)
-        self.present(alertController, animated: true, completion: nil)
-    }
-    
-    @objc func didUpdatePatrons(_ notification: Notification)
-    {
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-            // Wait short delay before reloading or else footer won't properly update if it's already visible 🤷‍♂️
-            self.collectionView.reloadData()
-        }
-    }
 }
 
 extension PatreonViewController
 {
     override func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView
     {
-        let section = Section.allCases[indexPath.section]
-        switch section
-        {
-        case .about:
-            let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "AboutHeader", for: indexPath) as! AboutPatreonHeaderView
-            self.prepare(headerView)
-            return headerView
-            
-        case .patrons:
-            if kind == UICollectionView.elementKindSectionHeader
-            {
-                let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "PatronsHeader", for: indexPath) as! PatronsHeaderView
-                headerView.textLabel.text = NSLocalizedString("Special thanks to...", comment: "")
-                return headerView
-            }
-            else
-            {
-                let footerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "PatronsFooter", for: indexPath) as! PatronsFooterView
-                footerView.button.isIndicatingActivity = false
-                footerView.button.isHidden = false
-                //footerView.button.addTarget(self, action: #selector(PatreonViewController.fetchPatrons), for: .primaryActionTriggered)
-                
-                switch AppManager.shared.updatePatronsResult
-                {
-                case .none: footerView.button.isIndicatingActivity = true
-                case .success?: footerView.button.isHidden = true
-                case .failure?:
-                    // In simulator debug builds only enable debug mode flag
-                    #if DEBUG && targetEnvironment(simulator)
-                    let debug = true
-                    #else
-                    let debug = false
-                    #endif
-                    
-                    if self.patronsDataSource.itemCount == 0 || debug
-                    {
-                        // Only show error message if there aren't any cached Patrons (or if this is a debug build).
-                        
-                        footerView.button.isHidden = false
-                        footerView.button.setTitle(NSLocalizedString("Error Loading Patrons", comment: ""), for: .normal)
-                    }
-                    else
-                    {
-                        footerView.button.isHidden = true
-                    }
-                }
-                
-                return footerView
-            }
-        }
+        let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "AboutHeader", for: indexPath) as! AboutPatreonHeaderView
+        self.prepare(headerView)
+        return headerView
     }
 }
 
@@ -348,31 +103,11 @@ extension PatreonViewController: UICollectionViewDelegateFlowLayout
 {
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize
     {
-        let section = Section.allCases[section]
-        switch section
-        {
-        case .about:
-            let widthConstraint = self.prototypeAboutHeader.widthAnchor.constraint(equalToConstant: collectionView.bounds.width)
-            NSLayoutConstraint.activate([widthConstraint])
-            defer { NSLayoutConstraint.deactivate([widthConstraint]) }
-            
-            self.prepare(self.prototypeAboutHeader)
-            
-            let size = self.prototypeAboutHeader.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
-            return size
-            
-        case .patrons:
-            return CGSize(width: 0, height: 0)
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize
-    {
-        let section = Section.allCases[section]
-        switch section
-        {
-        case .about: return .zero
-        case .patrons: return CGSize(width: 320, height: 44)
-        }
+        let widthConstraint = self.prototypeAboutHeader.widthAnchor.constraint(equalToConstant: collectionView.bounds.width)
+        NSLayoutConstraint.activate([widthConstraint])
+        defer { NSLayoutConstraint.deactivate([widthConstraint]) }
+        
+        self.prepare(self.prototypeAboutHeader)
+        return self.prototypeAboutHeader.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
     }
 }

AltStore/Settings/Settings.storyboard

@@ -22,7 +22,7 @@
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="separatorColor" white="1" alpha="0.25" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <stackView key="tableFooterView" opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" alignment="center" spacing="15" id="48g-cT-stR">
-                            <rect key="frame" x="0.0" y="2431.3333301544189" width="402" height="125"/>
+                            <rect key="frame" x="0.0" y="2442.6666641235352" width="402" height="125"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="900" text="Follow SideStore for updates" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XFa-MY-7cV">
@@ -500,13 +500,13 @@
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="View Error Log" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vH6-7i-tCE">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="View Error Log" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vH6-7i-tCE">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="119" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AeT-qF-bwB">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AeT-qF-bwB">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -537,7 +537,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clear Cache…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4e-Mz-DlL">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Clear Cache…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4e-Mz-DlL">
                                                     <rect key="frame" x="29.999999999999993" y="15.333333333333334" width="114.33333333333331" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -569,22 +569,22 @@
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Developers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hRA-OK-Vjw">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Developers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hRA-OK-Vjw">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="86" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="lx9-35-OSk">
-                                                    <rect key="frame" x="217" y="15.333333333333334" width="155" height="20.333333333333329"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="lx9-35-OSk">
+                                                    <rect key="frame" x="217" y="15.333333333333336" width="155" height="20.333333333333329"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideStore Team" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAA-iZ-VGb">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="SideStore Team" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAA-iZ-VGb">
                                                             <rect key="frame" x="0.0" y="0.0" width="125.33333333333333" height="20.333333333333332"/>
                                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Mmj-3V-fTb">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mmj-3V-fTb">
                                                             <rect key="frame" x="139.33333333333331" y="-1" width="15.666666666666657" height="22.333333333333332"/>
                                                             <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                         </imageView>
@@ -614,23 +614,23 @@
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UI Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oqY-wY-1Vf">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="UI Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oqY-wY-1Vf">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="89" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="gUq-6Q-t5X">
-                                                    <rect key="frame" x="227.33333333333337" y="15.333333333333334" width="144.66666666666663" height="20.333333333333329"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="gUq-6Q-t5X">
+                                                    <rect key="frame" x="227.33333333333337" y="15.333333333333336" width="144.66666666666663" height="20.333333333333329"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fabian (thdev)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylE-VL-7Fq">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Fabian (thdev)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ylE-VL-7Fq">
                                                             <rect key="frame" x="0.0" y="0.0" width="115" height="20.333333333333332"/>
                                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="e3L-vR-Jae">
-                                                            <rect key="frame" x="128.99999999999997" y="-1" width="15.666666666666657" height="22.333333333333332"/>
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e3L-vR-Jae">
+                                                            <rect key="frame" x="129" y="-1" width="15.666666666666657" height="22.333333333333332"/>
                                                             <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                         </imageView>
                                                     </subviews>
@@ -659,23 +659,23 @@
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Asset Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGU-Fp-XgM">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Asset Designer" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGU-Fp-XgM">
                                                     <rect key="frame" x="29.999999999999993" y="15.333333333333334" width="115.33333333333331" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="R8B-DW-7mY">
-                                                    <rect key="frame" x="235.33333333333337" y="15.333333333333334" width="136.66666666666663" height="20.333333333333329"/>
+                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="R8B-DW-7mY">
+                                                    <rect key="frame" x="235.33333333333337" y="15.333333333333336" width="136.66666666666663" height="20.333333333333329"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Chris (LitRitt)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hId-3P-41T">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Chris (LitRitt)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hId-3P-41T">
                                                             <rect key="frame" x="0.0" y="0.0" width="107" height="20.333333333333332"/>
                                                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="baq-cE-fMY">
-                                                            <rect key="frame" x="120.99999999999999" y="-1" width="15.666666666666671" height="22.333333333333332"/>
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="baq-cE-fMY">
+                                                            <rect key="frame" x="120.99999999999997" y="-1" width="15.666666666666657" height="22.333333333333332"/>
                                                             <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                         </imageView>
                                                     </subviews>
@@ -704,13 +704,13 @@
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Licenses" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D6b-cd-pVK">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Licenses" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D6b-cd-pVK">
                                                     <rect key="frame" x="30" y="15.333333333333334" width="67.333333333333329" height="20.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="s79-GQ-khr">
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s79-GQ-khr">
                                                     <rect key="frame" x="356.33333333333331" y="14.333333333333334" width="15.666666666666686" height="22.333333333333329"/>
                                                     <imageReference key="image" image="chevron.right" catalog="system" symbolScale="large"/>
                                                 </imageView>
@@ -1062,7 +1062,7 @@
                             <tableViewSection id="ZhW-yK-wdJ">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="qjD-UK-myl" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1714.6666641235352" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1701.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qjD-UK-myl" id="bcu-KT-Xee">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1090,7 +1090,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="dNh-fp-vBs" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1765.6666641235352" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1752.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dNh-fp-vBs" id="Meb-tV-6br">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1118,7 +1118,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="Y6h-Bo-yec" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1816.6666641235352" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1803.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Y6h-Bo-yec" id="4Jf-I6-v7z">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1146,7 +1146,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="dLk-d6-X4T" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1867.6666641235352" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1854.6666622161865" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dLk-d6-X4T" id="Okl-3m-rde">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1178,7 +1178,7 @@
                             <tableViewSection headerTitle="" id="lLQ-K0-XSb">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="daQ-mk-yqC" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="1954.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1941.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="daQ-mk-yqC" id="ZkW-ZR-twy">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1213,7 +1213,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="hRP-jU-2hd" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2005.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="1992.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hRP-jU-2hd" id="JhE-O4-pRg">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1248,7 +1248,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="JoN-Aj-XtZ" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2056.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2043.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JoN-Aj-XtZ" id="v8Q-VQ-Q1h">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1283,7 +1283,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="QOO-bO-4M5" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2107.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2094.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QOO-bO-4M5" id="VTT-z5-C89">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1311,7 +1311,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="ToB-H7-2lR" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2158.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2145.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ToB-H7-2lR" id="Acf-xV-Isn">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1339,7 +1339,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="xtI-eU-LFb" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2209.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2196.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="xtI-eU-LFb" id="bc9-41-6mE">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1373,7 +1373,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="pvu-IV-Poa" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2260.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2247.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pvu-IV-Poa" id="zck-an-8cK">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1408,7 +1408,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="9By-QW-Jw9" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2311.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2298.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9By-QW-Jw9" id="Dzq-gE-zyT">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1443,7 +1443,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="51" id="LzP-Qb-bmC" customClass="InsetGroupTableViewCell" customModule="SideStore" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="2362.3333301544189" width="402" height="51"/>
+                                        <rect key="frame" x="0.0" y="2349.3333282470703" width="402" height="51"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LzP-Qb-bmC" id="3rE-h0-8kb">
                                             <rect key="frame" x="0.0" y="0.0" width="402" height="51"/>
@@ -1768,33 +1768,7 @@ Settings by i cons from the Noun Project</string>
                             <size key="footerReferenceSize" width="0.0" height="0.0"/>
                             <inset key="sectionInset" minX="20" minY="8" maxX="20" maxY="0.0"/>
                         </collectionViewFlowLayout>
-                        <cells>
-                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="Cell" id="T6v-Rq-ntX" customClass="PatronCollectionViewCell" customModule="SideStore" customModuleProvider="target">
-                                <rect key="frame" x="20" y="8" width="157" height="20"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
-                                    <rect key="frame" x="0.0" y="0.0" width="157" height="20"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Caroline Moore" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="ahr-fF-k3e">
-                                            <rect key="frame" x="0.0" y="0.0" width="157" height="20"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" white="1" alpha="0.75" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </view>
-                                <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="ahr-fF-k3e" secondAttribute="trailing" id="9aF-2y-sZf"/>
-                                    <constraint firstItem="ahr-fF-k3e" firstAttribute="top" secondItem="T6v-Rq-ntX" secondAttribute="top" id="M89-x2-VnS"/>
-                                    <constraint firstItem="ahr-fF-k3e" firstAttribute="leading" secondItem="T6v-Rq-ntX" secondAttribute="leading" id="THC-sX-gVq"/>
-                                    <constraint firstAttribute="bottom" secondItem="ahr-fF-k3e" secondAttribute="bottom" id="loA-GD-3td"/>
-                                </constraints>
-                                <connections>
-                                    <outlet property="textLabel" destination="ahr-fF-k3e" id="xql-Ch-bfh"/>
-                                </connections>
-                            </collectionViewCell>
-                        </cells>
+                        <cells/>
                         <connections>
                             <outlet property="dataSource" destination="dp8-8j-vt9" id="ONG-kb-M7N"/>
                             <outlet property="delegate" destination="dp8-8j-vt9" id="790-Kr-6l7"/>