Skip to content
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.

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

[Photos] Add support for Xcode 15 beta 8 #18941

Merged
Merged
Show file tree
Hide file tree
Changes from 3 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
3 changes: 3 additions & 0 deletions src/Photos/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ public enum PHAssetResourceType : long {
[iOS (13, 0), TV (13, 0)]
[MacCatalyst (13, 1)]
AdjustmentBaseVideo = 12,
[iOS (17, 0), TV (10, 0)]
haritha-mohan marked this conversation as resolved.
Show resolved Hide resolved
haritha-mohan marked this conversation as resolved.
Show resolved Hide resolved
[MacCatalyst (17, 1), Mac (14, 0)]
haritha-mohan marked this conversation as resolved.
Show resolved Hide resolved
haritha-mohan marked this conversation as resolved.
Show resolved Hide resolved
PhotoProxy = 19,
}

[MacCatalyst (13, 1)]
Expand Down
18 changes: 18 additions & 0 deletions src/photos.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using CoreMedia;
using ImageIO;
using System;
using UniformTypeIdentifiers;
#if !MONOMAC
using UIKit;
using NSImage = Foundation.NSObject; // help [NoiOS] and [NoTV]
Expand Down Expand Up @@ -795,6 +796,19 @@ interface PHContentEditingOutput : NSCoding, NSSecureCoding {

[Export ("renderedContentURL", ArgumentSemantic.Copy)]
NSUrl RenderedContentUrl { get; }

[TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[NullAllowed, Export ("defaultRenderedContentType", ArgumentSemantic.Copy)]
UTType DefaultRenderedContentType { get; }

[TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[Export ("supportedRenderedContentTypes", ArgumentSemantic.Copy)]
UTType [] SupportedRenderedContentTypes { get; }

[TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[Export ("renderedContentURLForType:error:")]
[return: NullAllowed]
NSUrl GetRenderedContentUrl (UTType type, [NullAllowed] out NSError error);
}

[MacCatalyst (13, 1)]
Expand Down Expand Up @@ -912,6 +926,10 @@ interface PHImageRequestOptions : NSCopying {
[Export ("progressHandler", ArgumentSemantic.Copy)]
[NullAllowed]
PHAssetImageProgressHandler ProgressHandler { get; set; }

[TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[Export ("allowSecondaryDegradedImage")]
bool AllowSecondaryDegradedImage { get; set; }
}

delegate void PHAssetVideoProgressHandler (double progress, NSError error, out bool stop, NSDictionary info);
Expand Down
6 changes: 0 additions & 6 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-Photos.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/api-annotations-dotnet/macOS-Photos.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/api-annotations-dotnet/tvOS-Photos.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/iOS-Photos.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/macOS-Photos.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/tvOS-Photos.todo

This file was deleted.

Loading