Skip to content

visionOS compile fixes #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nighthawk merged 1 commit into from
Dec 15, 2025
Merged

visionOS compile fixes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions Sources/TGCardViewController/TGCardViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,22 +314,22 @@ open class TGCardViewController: UIViewController {
mapView.leadingAnchor.constraint(equalTo: mapViewWrapper.leadingAnchor).isActive = true
mapView.translatesAutoresizingMaskIntoConstraints = false
mapViewController.didMove(toParent: self)

#if compiler(>=6.2) // Xcode 26
if #available(iOS 26.0, *) {

if #available(iOS 26.0, visionOS 26.0, *) {
#if os(visionOS)
cardWrapperEffectView.effect = UIBlurEffect(style: .regular)
headerEffectView.effect = UIBlurEffect(style: .regular)
#else
cardWrapperEffectView.effect = UIGlassEffect(style: .regular)
headerEffectView.effect = UIGlassEffect(style: .regular)
#endif
cardWrapperEffectView.cornerConfiguration = .corners(radius: 12)

headerEffectView.effect = UIGlassEffect(style: .regular)
headerEffectView.cornerConfiguration = .corners(topLeftRadius: nil, topRightRadius: nil, bottomLeftRadius: 12, bottomRightRadius: 12)
} else {
cardWrapperEffectView.effect = nil
headerEffectView.effect = nil
}
#else
cardWrapperEffectView.effect = nil
headerEffectView.effect = nil
#endif

setupGestures()

Expand Down Expand Up @@ -925,25 +925,27 @@ extension TGCardViewController {
// already have such a shadow.

if let oldTop, animated, let cardView, cardTransitionShadow == nil {
if #unavailable(iOS 26.0) {
let shadow = TGCornerView(frame: cardWrapperContent.bounds)
shadow.frame.size.height += 50 // for bounciness
shadow.backgroundColor = .black
shadow.alpha = 0
cardWrapperContent.insertSubview(shadow, belowSubview: cardView)
cardTransitionShadow = shadow

} else if let oldView = oldTop.view, let container = cardWrapperShadow.superview, let snapshot = oldView.snapshotView(afterScreenUpdates: false) {

if #available(iOS 26.0, visionOS 26.0, *), let oldView = oldTop.view, let container = cardWrapperShadow.superview, let snapshot = oldView.snapshotView(afterScreenUpdates: false) {
var oldFrame = oldView.bounds
oldFrame.origin = oldView.convert(oldView.bounds.origin, to: container)
oldView.alpha = 0

#if os(visionOS)
let visualEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
#else
let visualEffectView = UIVisualEffectView(effect: UIGlassEffect(style: .regular))
#endif
visualEffectView.contentView.addSubview(snapshot)
visualEffectView.frame = oldFrame
container.insertSubview(visualEffectView, belowSubview: cardWrapperShadow)
cardTransitionShadow = visualEffectView
} else {
let shadow = TGCornerView(frame: cardWrapperContent.bounds)
shadow.frame.size.height += 50 // for bounciness
shadow.backgroundColor = .black
shadow.alpha = 0
cardWrapperContent.insertSubview(shadow, belowSubview: cardView)
cardTransitionShadow = shadow
}
}

Expand Down Expand Up @@ -1111,24 +1113,27 @@ extension TGCardViewController {
// We animate the view moving back down to the bottom
// we also temporarily insert a shadow view again, if there's a card below
if animated, cardTransitionShadow == nil, let topView {
if #unavailable(iOS 26.0) {
let shadow = TGCornerView(frame: cardWrapperContent.bounds)
shadow.backgroundColor = .black
shadow.alpha = 0.15
cardWrapperContent.insertSubview(shadow, belowSubview: topView)
cardTransitionShadow = shadow

} else if let container = cardWrapperShadow.superview, let snapshot = topView.snapshotView(afterScreenUpdates: false) {

if #available(iOS 26.0, visionOS 26.0, *), let container = cardWrapperShadow.superview, let snapshot = topView.snapshotView(afterScreenUpdates: false) {
topView.alpha = 0
var newFrame = topView.bounds
newFrame.origin = topView.convert(topView.bounds.origin, to: container)

#if os(visionOS)
let visualEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
#else
let visualEffectView = UIVisualEffectView(effect: UIGlassEffect(style: .regular))
#endif
visualEffectView.contentView.addSubview(snapshot)
visualEffectView.frame = newFrame
container.insertSubview(visualEffectView, aboveSubview: cardWrapperShadow)
cardTransitionShadow = visualEffectView

} else {
let shadow = TGCornerView(frame: cardWrapperContent.bounds)
shadow.backgroundColor = .black
shadow.alpha = 0.15
cardWrapperContent.insertSubview(shadow, belowSubview: topView)
cardTransitionShadow = shadow
}
}

Expand Down Expand Up @@ -1807,7 +1812,9 @@ extension TGCardViewController {
return assertionFailure()
}
if #available(iOS 26.0, *) {
#if compiler(>=6.2) // Xcode 26 proxy
#if os(visionOS)
visualView.effect = UIBlurEffect(style: .regular)
#else
visualView.effect = UIGlassEffect(style: .regular)
#endif
visualView.layer.borderWidth = 0
Expand Down
7 changes: 6 additions & 1 deletion Sources/TGCardViewController/cards/TGCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ open class TGCard: UIResponder, TGPreferrableView {
button.setTitle(nil, for: state)
}

var config = UIButton.Configuration.glass()
var config: UIButton.Configuration
#if os(visionOS)
config = .bordered()
#else
config = .glass()
#endif
config.title = nil
config.image = UIImage(systemName: "xmark")
config.imagePlacement = .all
Expand Down
Loading