diff --git a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6193cb32..8afd403c 100644 --- a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -129,10 +129,10 @@ { "identity" : "swiftui-introspect", "kind" : "remoteSourceControl", - "location" : "https://github.com/siteline/SwiftUI-Introspect.git", + "location" : "https://github.com/Dimillian/swiftui-introspect", "state" : { - "revision" : "7dc5b287f8040e4ad5038739850b758e78f77808", - "version" : "1.1.4" + "branch" : "main", + "revision" : "e5d36b00e6e437b552aa76ed6d1eca71d6fd8f8b" } } ], diff --git a/IceCubesApp/App/Main/AppView.swift b/IceCubesApp/App/Main/AppView.swift index 4b090762..95b14d1b 100644 --- a/IceCubesApp/App/Main/AppView.swift +++ b/IceCubesApp/App/Main/AppView.swift @@ -122,7 +122,7 @@ struct AppView: View { .tag(tab) } } - .introspect(.tabView, on: .iOS(.v17)) { (tabview: UITabBarController) in + .introspect(.tabView, on: .iOS(.v18)) { (tabview: UITabBarController) in tabview.tabBar.isHidden = horizontalSizeClass == .regular tabview.customizableViewControllers = [] tabview.moreNavigationController.isNavigationBarHidden = true diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift index d5b4b6a4..b8849139 100644 --- a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift +++ b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift @@ -264,11 +264,13 @@ struct SettingsTabs: View { Text("settings.app.icon") } icon: { let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon") - if let image = UIImage(named: icon.appIconName) { - Image(uiImage: image) + if let image: UIImage = .init(named: icon.appIconName) { + Image(uiImage: .init(named: icon.appIconName)!) .resizable() .frame(width: 25, height: 25) .cornerRadius(4) + } else { + EmptyView() } } } diff --git a/Packages/Timeline/Package.swift b/Packages/Timeline/Package.swift index 811a2941..dbac639c 100644 --- a/Packages/Timeline/Package.swift +++ b/Packages/Timeline/Package.swift @@ -22,7 +22,7 @@ let package = Package( .package(name: "Env", path: "../Env"), .package(name: "StatusKit", path: "../StatusKit"), .package(name: "DesignSystem", path: "../DesignSystem"), - .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "1.0.0"), + .package(url: "https://github.com/Dimillian/swiftui-introspect", branch: "main"), .package(url: "https://github.com/Dimillian/Bodega", branch: "main"), ], targets: [ diff --git a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift index e6469249..8d86ebf8 100644 --- a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift +++ b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift @@ -68,7 +68,7 @@ public struct TimelineView: View { .scrollContentBackground(.hidden) .background(theme.primaryBackgroundColor) #endif - .introspect(.list, on: .iOS(.v17)) { (collectionView: UICollectionView) in + .introspect(.list, on: .iOS(.v18)) { (collectionView: UICollectionView) in DispatchQueue.main.async { self.collectionView = collectionView }