diff --git a/AltStore.xcconfig b/AltStore.xcconfig index 63f7cd6f..f8172a13 100644 --- a/AltStore.xcconfig +++ b/AltStore.xcconfig @@ -1,3 +1,3 @@ #include "Build.xcconfig" -PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).SideStore +PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).AltStore diff --git a/AltStore/Info.plist b/AltStore/Info.plist index 85306265..485b460b 100644 --- a/AltStore/Info.plist +++ b/AltStore/Info.plist @@ -93,6 +93,8 @@ _altserver._tcp + NSLocalNetworkUsageDescription + SideStore uses the local network to find and communicate with your device. NSUserActivityTypes RefreshAllIntent diff --git a/AltStore/Settings/AboutPatreonHeaderView.xib b/AltStore/Settings/AboutPatreonHeaderView.xib index 833351fe..ae57d9b7 100644 --- a/AltStore/Settings/AboutPatreonHeaderView.xib +++ b/AltStore/Settings/AboutPatreonHeaderView.xib @@ -1,9 +1,9 @@ - + - + @@ -18,12 +18,12 @@ - + - + @@ -31,19 +31,19 @@ - + - + - - + - - - - - - - - - - + - Hey y'all! - -If you'd like to support my work, you can donate here. In return, you'll gain access to beta versions of all of my apps and be among the first to try the latest features. - -Thanks for all your support ๐Ÿ’œ -Riley + 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 @@ -98,7 +89,7 @@ Riley - + - @@ -134,10 +114,8 @@ Riley - - @@ -146,10 +124,9 @@ Riley - - + - + diff --git a/AltStore/Settings/PatreonViewController.swift b/AltStore/Settings/PatreonViewController.swift index 10d0e5d2..b0765fd8 100644 --- a/AltStore/Settings/PatreonViewController.swift +++ b/AltStore/Settings/PatreonViewController.swift @@ -44,9 +44,9 @@ class PatreonViewController: UICollectionViewController 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") + //self.collectionView.register(PatronsFooterView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "PatronsFooter") - NotificationCenter.default.addObserver(self, selector: #selector(PatreonViewController.didUpdatePatrons(_:)), name: AppManager.didUpdatePatronsNotification, object: nil) + //NotificationCenter.default.addObserver(self, selector: #selector(PatreonViewController.didUpdatePatrons(_:)), name: AppManager.didUpdatePatronsNotification, object: nil) self.update() } @@ -55,7 +55,7 @@ class PatreonViewController: UICollectionViewController { super.viewWillAppear(animated) - self.fetchPatrons() + //self.fetchPatrons() self.update() } @@ -69,7 +69,8 @@ class PatreonViewController: UICollectionViewController var itemWidth = (self.collectionView.bounds.width - (layout.sectionInset.left + layout.sectionInset.right + layout.minimumInteritemSpacing)) / 2 itemWidth.round(.down) - layout.itemSize = CGSize(width: itemWidth, height: layout.itemSize.height) + // TODO: if the intention here is to hide the cells, we should just modify the data source. @JoeMatt + layout.itemSize = CGSize(width: 0, height: 0) } } @@ -110,18 +111,16 @@ private extension PatreonViewController headerView.layoutMargins = self.view.layoutMargins headerView.supportButton.addTarget(self, action: #selector(PatreonViewController.openPatreonURL(_:)), for: .primaryActionTriggered) - headerView.accountButton.removeTarget(self, action: nil, for: .primaryActionTriggered) let defaultSupportButtonTitle = NSLocalizedString("Become a patron", comment: "") let isPatronSupportButtonTitle = NSLocalizedString("View Patreon", comment: "") let defaultText = NSLocalizedString(""" - Hey y'all, + Hello, thank you for using SideStore! - You can support future development of our apps by donating to us on Patreon. In return, you'll receive access to the beta versions of our apps and be among the first to try the latest features. + If you would subscribe to the patreon that would support us and make sure we can continue developing SideStore for you. - Thanks for all your support ๐Ÿ’œ - Riley & Shane + -SideTeam """, comment: "") let isPatronText = NSLocalizedString(""" @@ -130,7 +129,7 @@ private extension PatreonViewController Youโ€™re the best. Your account was linked successfully, so you now have access to the beta versions of all of our apps. You can find them all in the Browse tab. Thanks for all of your support. Enjoy! - Riley & Shane + - SideTeam """, comment: "") if let account = DatabaseManager.shared.patreonAccount(), PatreonAPI.shared.isAuthenticated @@ -160,15 +159,7 @@ private extension PatreonViewController headerView.textView.text = defaultText } } - else - { - headerView.accountButton.addTarget(self, action: #selector(PatreonViewController.authenticate(_:)), for: .primaryActionTriggered) - - headerView.supportButton.setTitle(defaultSupportButtonTitle, for: .normal) - headerView.accountButton.setTitle(NSLocalizedString("Link Patreon account", comment: ""), for: .normal) - - headerView.textView.text = defaultText - } + } } @@ -182,7 +173,8 @@ private extension PatreonViewController @objc func openPatreonURL(_ sender: UIButton) { - let patreonURL = URL(string: "https://altstore.io/patreon")! + // TODO: Is this the final URL? @JoeMatt + let patreonURL = URL(string: "https://www.patreon.com/JitStreamer")! let safariViewController = SFSafariViewController(url: patreonURL) safariViewController.preferredControlTintColor = self.view.tintColor @@ -276,7 +268,7 @@ extension PatreonViewController 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) + //footerView.button.addTarget(self, action: #selector(PatreonViewController.fetchPatrons), for: .primaryActionTriggered) if self.patronsDataSource.itemCount > 0 { @@ -316,7 +308,7 @@ extension PatreonViewController: UICollectionViewDelegateFlowLayout return size case .patrons: - return CGSize(width: 320, height: 20) + return CGSize(width: 0, height: 0) } } @@ -326,7 +318,7 @@ extension PatreonViewController: UICollectionViewDelegateFlowLayout switch section { case .about: return .zero - case .patrons: return CGSize(width: 320, height: 20) + case .patrons: return CGSize(width: 0, height: 0) } } }