Make UIKit implementation agnostic of iOS/visionOS.

furby-tm · furby-tm · commit c63d3ef793d3 · 2025-03-01T01:34:12.000-07:00
Signed-off-by: furby™ &lt;devs@wabi.foundation&gt;
diff --git a/Sources/UIKitBackend/UIKitBackend+Passive.swift b/Sources/UIKitBackend/UIKitBackend+Passive.swift
@@ -15,7 +15,7 @@ extension UIKitBackend {
                 case .leading:
                     .natural
                 case .trailing:
-                    UIScreen.main.traitCollection.layoutDirection == .rightToLeft ? .left : .right
+                    UITraitCollection.current.layoutDirection == .rightToLeft ? .left : .right
             }
         paragraphStyle.lineBreakMode = .byWordWrapping
 
diff --git a/Sources/UIKitBackend/UIKitBackend.swift b/Sources/UIKitBackend/UIKitBackend.swift
@@ -71,7 +71,7 @@ public final class UIKitBackend: AppBackend {
             design: .default
         )
 
-        switch UIScreen.main.traitCollection.userInterfaceStyle {
+        switch UITraitCollection.current.userInterfaceStyle {
             case .light:
                 environment.colorScheme = .light
             case .dark:

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ extension UIKitBackend {`
`15`	`15`	`case .leading:`
`16`	`16`	`.natural`
`17`	`17`	`case .trailing:`
`18`		`- UIScreen.main.traitCollection.layoutDirection == .rightToLeft ? .left : .right`
	`18`	`+ UITraitCollection.current.layoutDirection == .rightToLeft ? .left : .right`
`19`	`19`	`}`
`20`	`20`	`paragraphStyle.lineBreakMode = .byWordWrapping`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public final class UIKitBackend: AppBackend {`
`71`	`71`	`design: .default`
`72`	`72`	`)`
`73`	`73`
`74`		`- switch UIScreen.main.traitCollection.userInterfaceStyle {`
	`74`	`+ switch UITraitCollection.current.userInterfaceStyle {`
`75`	`75`	`case .light:`
`76`	`76`	`environment.colorScheme = .light`
`77`	`77`	`case .dark:`