mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-12-04 14:26:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into iOS-18

Browse source
This commit is contained in:
Thomas Ricouard 2024-06-12 20:39:07 +02:00
commit 3182762824
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -129,10 +129,10 @@
{ {
"identity" : "swiftui-introspect", "identity" : "swiftui-introspect",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/SwiftUI-Introspect.git", "location" : "https://github.com/Dimillian/swiftui-introspect",
"state" : { "state" : {
"revision" : "7dc5b287f8040e4ad5038739850b758e78f77808", "branch" : "main",
"version" : "1.1.4" "revision" : "e5d36b00e6e437b552aa76ed6d1eca71d6fd8f8b"
} }
} }
], ],

2
IceCubesApp/App/Main/AppView.swift
View file

@ -122,7 +122,7 @@ struct AppView: View {
.tag(tab) .tag(tab)
} }
} }
.introspect(.tabView, on: .iOS(.v17)) { (tabview: UITabBarController) in .introspect(.tabView, on: .iOS(.v18)) { (tabview: UITabBarController) in
tabview.tabBar.isHidden = horizontalSizeClass == .regular tabview.tabBar.isHidden = horizontalSizeClass == .regular
tabview.customizableViewControllers = [] tabview.customizableViewControllers = []
tabview.moreNavigationController.isNavigationBarHidden = true tabview.moreNavigationController.isNavigationBarHidden = true

6
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -264,11 +264,13 @@ struct SettingsTabs: View {
Text("settings.app.icon") Text("settings.app.icon")
} icon: { } icon: {
let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon") let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon")
if let image = UIImage(named: icon.appIconName) { if let image: UIImage = .init(named: icon.appIconName) {
Image(uiImage: image) Image(uiImage: .init(named: icon.appIconName)!)
.resizable() .resizable()
.frame(width: 25, height: 25) .frame(width: 25, height: 25)
.cornerRadius(4) .cornerRadius(4)
} else {
EmptyView()
} }
} }
} }

2
Packages/Timeline/Package.swift
View file

@ -22,7 +22,7 @@ let package = Package(
.package(name: "Env", path: "../Env"), .package(name: "Env", path: "../Env"),
.package(name: "StatusKit", path: "../StatusKit"), .package(name: "StatusKit", path: "../StatusKit"),
.package(name: "DesignSystem", path: "../DesignSystem"), .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"), .package(url: "https://github.com/Dimillian/Bodega", branch: "main"),
], ],
targets: [ targets: [

2
Packages/Timeline/Sources/Timeline/View/TimelineView.swift
View file

@ -68,7 +68,7 @@ public struct TimelineView: View {
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(theme.primaryBackgroundColor) .background(theme.primaryBackgroundColor)
#endif #endif
.introspect(.list, on: .iOS(.v17)) { (collectionView: UICollectionView) in .introspect(.list, on: .iOS(.v18)) { (collectionView: UICollectionView) in
DispatchQueue.main.async { DispatchQueue.main.async {
self.collectionView = collectionView self.collectionView = collectionView
} }