From 207f6aac32aa7b614ab4db5f93cefdd592747797 Mon Sep 17 00:00:00 2001
From: Joe Mattiello <mail@joemattiello.com>
Date: Thu, 2 Mar 2023 01:09:10 -0500
Subject: [PATCH] Fix some Bundle refs

---
 SideStore.xcodeproj/project.pbxproj            |  4 +++-
 .../Resources/Storyboards/Settings.storyboard  |  4 ++--
 .../Resources/XIB/NewsCollectionViewCell.xib   |  8 ++++----
 .../Resources/XIB/SettingsHeaderFooterView.xib | 13 ++++++-------
 .../Resources/XIB/UpdateCollectionViewCell.xib | 18 +++++++++++-------
 .../App Detail/AppViewController.swift         |  2 +-
 .../Managing Apps/AppManager.swift             |  2 +-
 .../Operations/AuthenticationOperation.swift   |  2 +-
 .../Settings/PatreonViewController.swift       |  2 +-
 .../Settings/SettingsViewController.swift      |  2 +-
 10 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/SideStore.xcodeproj/project.pbxproj b/SideStore.xcodeproj/project.pbxproj
index 5ba1f675..009d9907 100644
--- a/SideStore.xcodeproj/project.pbxproj
+++ b/SideStore.xcodeproj/project.pbxproj
@@ -349,7 +349,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1400;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1420;
 				ORGANIZATIONNAME = SideStore;
 				TargetAttributes = {
 					BF989166250AABF3002ACF50 = {
@@ -557,6 +557,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -626,6 +627,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/SideStoreApp/Sources/SideStore/Resources/Storyboards/Settings.storyboard b/SideStoreApp/Sources/SideStore/Resources/Storyboards/Settings.storyboard
index ccf9515c..bf6dff03 100644
--- a/SideStoreApp/Sources/SideStore/Resources/Storyboards/Settings.storyboard
+++ b/SideStoreApp/Sources/SideStore/Resources/Storyboards/Settings.storyboard
@@ -21,7 +21,7 @@
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="separatorColor" white="1" alpha="0.25" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <label key="tableFooterView" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SideStore 1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bUR-rp-Nw2">
-                            <rect key="frame" x="0.0" y="1082" width="375" height="25"/>
+                            <rect key="frame" x="0.0" y="1089" width="375" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="1" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -592,7 +592,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251"  text="Reset Pairing File" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ysS-9s-dXm">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reset Pairing File" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ysS-9s-dXm">
                                                     <rect key="frame" x="30" y="15.5" width="140" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/SideStoreApp/Sources/SideStore/Resources/XIB/NewsCollectionViewCell.xib b/SideStoreApp/Sources/SideStore/Resources/XIB/NewsCollectionViewCell.xib
index 42ec35d6..20fffed1 100644
--- a/SideStoreApp/Sources/SideStore/Resources/XIB/NewsCollectionViewCell.xib
+++ b/SideStoreApp/Sources/SideStore/Resources/XIB/NewsCollectionViewCell.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="wRF-2R-NUG" customClass="NewsCollectionViewCell" customModule="AltStore" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="wRF-2R-NUG" customClass="NewsCollectionViewCell" customModule="SideStore" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="335" height="299"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
@@ -29,7 +29,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="303" height="117.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Delta" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="AkN-BE-I1a">
-                                                <rect key="frame" x="25" y="25" width="54.5" height="26.5"/>
+                                                <rect key="frame" x="25" y="25" width="54" height="26.5"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
diff --git a/SideStoreApp/Sources/SideStore/Resources/XIB/SettingsHeaderFooterView.xib b/SideStoreApp/Sources/SideStore/Resources/XIB/SettingsHeaderFooterView.xib
index fa93d7bd..948bfc10 100644
--- a/SideStoreApp/Sources/SideStore/Resources/XIB/SettingsHeaderFooterView.xib
+++ b/SideStoreApp/Sources/SideStore/Resources/XIB/SettingsHeaderFooterView.xib
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="fMJ-OF-djb" customClass="SettingsHeaderFooterView" customModule="AltStore" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="fMJ-OF-djb" customClass="SettingsHeaderFooterView" customModule="SideStore" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="197.5" height="62"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
@@ -27,7 +25,7 @@
                                     <color key="textColor" white="1" alpha="0.75" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="meg-d6-dbz">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="meg-d6-dbz">
                                     <rect key="frame" x="68.5" y="0.0" width="69" height="29"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
                                     <state key="normal" title="SIGN OUT">
@@ -59,6 +57,7 @@
                 <outlet property="secondaryLabel" destination="eet-Hi-RU4" id="eup-eh-q5E"/>
                 <outlet property="stackView" destination="lwu-4e-pWM" id="qu7-UX-6tI"/>
             </connections>
+            <point key="canvasLocation" x="48" y="0.0"/>
         </view>
     </objects>
 </document>
diff --git a/SideStoreApp/Sources/SideStore/Resources/XIB/UpdateCollectionViewCell.xib b/SideStoreApp/Sources/SideStore/Resources/XIB/UpdateCollectionViewCell.xib
index 73a2f158..f280ab59 100644
--- a/SideStoreApp/Sources/SideStore/Resources/XIB/UpdateCollectionViewCell.xib
+++ b/SideStoreApp/Sources/SideStore/Resources/XIB/UpdateCollectionViewCell.xib
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" 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="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="UpdateCell" id="Kqf-Pv-ca3" customClass="UpdateCollectionViewCell" customModule="AltStore" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="UpdateCollectionView" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="UpdateCell" id="Kqf-Pv-ca3" customClass="UpdateCollectionViewCell" customModule="SideStore" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="125"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
@@ -29,7 +30,7 @@
                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="uYl-PH-DuP">
                                             <rect key="frame" x="0.0" y="0.0" width="343" height="125"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nop-pL-Icx" customClass="AppBannerView" customModule="AltStore" customModuleProvider="target">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nop-pL-Icx" customClass="AppBannerView" customModule="SideStore" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="343" height="88"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="88" id="EPP-7O-1Ad"/>
@@ -65,9 +66,9 @@
                                                                 <blurEffect style="systemChromeMaterial"/>
                                                             </vibrancyEffect>
                                                         </visualEffectView>
-                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Version Notes" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNs-2O-k3V" customClass="CollapsingTextView" customModule="AltStore" customModuleProvider="target">
+                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Version Notes" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNs-2O-k3V" customClass="CollapsingTextView" customModule="SideStore" customModuleProvider="target">
                                                             <rect key="frame" x="90" y="0.0" width="238" height="22"/>
-                                                            <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <color key="textColor" systemColor="secondaryLabelColor"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                                         </textView>
@@ -115,7 +116,10 @@
     </objects>
     <resources>
         <namedColor name="BlurTint">
-            <color red="1" green="1" blue="1" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" alpha="0.30000001192092896" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/SideStoreApp/Sources/SideStoreAppKit/App Detail/AppViewController.swift b/SideStoreApp/Sources/SideStoreAppKit/App Detail/AppViewController.swift
index 91d14468..3dff12e5 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/App Detail/AppViewController.swift	
+++ b/SideStoreApp/Sources/SideStoreAppKit/App Detail/AppViewController.swift	
@@ -324,7 +324,7 @@ final class AppViewController: UIViewController {
 
 extension AppViewController {
     final class func makeAppViewController(app: StoreApp) -> AppViewController {
-        let storyboard = UIStoryboard(name: "Main", bundle: nil)
+		let storyboard = UIStoryboard(name: "Main", bundle: Bundle.init(for: AppViewController.self))
 
         let appViewController = storyboard.instantiateViewController(withIdentifier: "appViewController") as! AppViewController
         appViewController.app = app
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift b/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift
index 9ab04b1f..7bd44490 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift	
+++ b/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift	
@@ -962,7 +962,7 @@ private extension AppManager {
                 let patchApp = AnyApp(name: app.name, bundleIdentifier: app.bundleIdentifier, url: patchAppURL)
 
                 DispatchQueue.main.async {
-                    let storyboard = UIStoryboard(name: "PatchApp", bundle: nil)
+                    let storyboard = UIStoryboard(name: "PatchApp", bundle: Bundle.init(for: PatchViewController.self))
                     let navigationController = storyboard.instantiateInitialViewController() as! UINavigationController
 
                     let patchViewController = navigationController.topViewController as! PatchViewController
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Operations/AuthenticationOperation.swift b/SideStoreApp/Sources/SideStoreAppKit/Operations/AuthenticationOperation.swift
index 01373582..c8174912 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Operations/AuthenticationOperation.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Operations/AuthenticationOperation.swift
@@ -46,7 +46,7 @@ public final class AuthenticationOperation: ResultOperation<(ALTTeam, ALTCertifi
         return navigationController
     }()
 
-    private lazy var storyboard = UIStoryboard(name: "Authentication", bundle: nil)
+    private lazy var storyboard = UIStoryboard(name: "Authentication", bundle: Bundle.init(for: AuthenticationViewController.self))
 
     private var appleIDEmailAddress: String?
     private var appleIDPassword: String?
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Settings/PatreonViewController.swift b/SideStoreApp/Sources/SideStoreAppKit/Settings/PatreonViewController.swift
index c9cc7ad9..b1388c22 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Settings/PatreonViewController.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Settings/PatreonViewController.swift
@@ -33,7 +33,7 @@ final class PatreonViewController: UICollectionViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let aboutHeaderNib = UINib(nibName: "AboutPatreonHeaderView", bundle: nil)
+		let aboutHeaderNib = UINib(nibName: "AboutPatreonHeaderView", bundle: Bundle(for: PatronsHeaderView.self))
         prototypeAboutHeader = aboutHeaderNib.instantiate(withOwner: nil, options: nil)[0] as? AboutPatreonHeaderView
 
         collectionView.dataSource = dataSource
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Settings/SettingsViewController.swift b/SideStoreApp/Sources/SideStoreAppKit/Settings/SettingsViewController.swift
index abfd363e..a15b832e 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Settings/SettingsViewController.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Settings/SettingsViewController.swift
@@ -82,7 +82,7 @@ final class SettingsViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let nib = UINib(nibName: "SettingsHeaderFooterView", bundle: nil)
+		let nib = UINib(nibName: "SettingsHeaderFooterView", bundle: Bundle(for: SettingsHeaderFooterView.self))
         prototypeHeaderFooterView = nib.instantiate(withOwner: nil, options: nil)[0] as? SettingsHeaderFooterView
 
         tableView.register(nib, forHeaderFooterViewReuseIdentifier: "HeaderFooterView")