Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions Example/Example/Assets.xcassets/Contents.json

This file was deleted.

16 changes: 16 additions & 0 deletions Example/OpenSwiftUIUITests/View/Image/NamedImageUITests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// NamedImageUITests.swift
// OpenSwiftUIUITests

import SnapshotTesting
import Testing
@testable import TestingHost

@MainActor
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct NamedImageUITests {
@Test
func decorativeLogo() {
openSwiftUIAssertSnapshot(of: NamedImageDecorativeExample())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ struct LabelsHiddenModifierUITests {
}
}
#if os(iOS) || os(visionOS)
openSwiftUIAssertSnapshot(of: ContentView())
withKnownIssue(isIntermittent: true) {
openSwiftUIAssertSnapshot(of: ContentView())
}
#else
withKnownIssue("checkBox style is not supported yet") {
openSwiftUIAssertSnapshot(of: ContentView())
Expand Down
2 changes: 1 addition & 1 deletion Example/Shared/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ import SwiftUI

struct ContentView: View {
var body: some View {
FlowerView()
NamedImageDecorativeExample()
}
}
5 changes: 1 addition & 4 deletions Example/Shared/View/Image/AsyncImageExample.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
//
// AsyncImageExample.swift
// Example
//
// Created by Kyle on 1/18/26.
//
// Shared

#if OPENSWIFTUI
import OpenSwiftUI
Expand Down
17 changes: 17 additions & 0 deletions Example/Shared/View/Image/NamedImageExample.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// NamedImageExample.swift
// Shared

#if OPENSWIFTUI
import OpenSwiftUI
#else
import SwiftUI
#endif

struct NamedImageDecorativeExample: View {
var body: some View {
Image(decorative: "logo")
.resizable()
.frame(width: 100, height: 100)
}
}
2 changes: 1 addition & 1 deletion Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,32 @@ extension Image {
}
}

#if OPENSWIFTUI_LINK_COREUI
// MARK: - Image.TemplateRenderingMode + CUIRenderMode

package import CoreUI

extension Image.TemplateRenderingMode {
package init?(_ renderMode: CUIRenderMode) {
switch renderMode {
case .original:
self = .original
case .template:
self = .template
case .default:
return nil
}
}

package var cuiRenderMode: CUIRenderMode {
switch self {
case .template: .template
case .original: .original
}
}
}
#endif

// MARK: - UserInterfaceSizeClass

/// A set of values that indicate the visual size available to the view.
Expand Down Expand Up @@ -108,11 +134,47 @@ public enum UserInterfaceSizeClass: Sendable {
case regular
}

#if OPENSWIFTUI_LINK_COREUI
// MARK: - UserInterfaceSizeClass + CUIUserInterfaceSizeClass

package import CoreUI

extension UserInterfaceSizeClass {
package init?(_ sizeClass: CUIUserInterfaceSizeClass) {
switch sizeClass {
case .any: return nil
case .compact: self = .compact
case .regular: self = .regular
}
}

package var cUISizeClass: CUIUserInterfaceSizeClass {
switch self {
case .compact: .compact
case .regular: .regular
}
}
}
#endif

extension UserInterfaceSizeClass? {
package var rawValue: Int8 {
#if OPENSWIFTUI_LINK_COREUI
Int8((self?.cUISizeClass ?? .any).rawValue)
#else
switch self {
case .none: 0
case .compact: 1
case .regular: 2
}
#endif
}
}

// MARK: - DisplayGamut

#if canImport(Darwin) && OPENSWIFTUI_LINK_COREUI
import CoreUI_Private
import CoreUI
#endif

@_spi(Private)
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUICore/Util/RenderBoxShims.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
// RenderBoxShims.swift
// OpenSwiftUICore

package protocol RBDisplayListContents {} // RenderBox.RBDisplayListContents
public protocol RBDisplayListContents {} // RenderBox.RBDisplayListContents

class RBDisplayListInterpolator {}
Loading
Loading