[Photos] Update for Xcode10-beta2. (#4371)
This commit is contained in:
Родитель
709e855c15
Коммит
1b946b7cf6
|
@ -337,4 +337,18 @@ namespace Photos
|
|||
Unknown,
|
||||
Aborted,
|
||||
}
|
||||
|
||||
[Mac (10,14, onlyOn64 : true)]
|
||||
[NoiOS][NoTV]
|
||||
public enum FigExifCustomRenderedValue : short {
|
||||
NotCustom = 0,
|
||||
Custom = 1,
|
||||
HdrImage = 2,
|
||||
HdrPlusEV0_HdrImage = 3,
|
||||
HdrPlusEV0_EV0Image = 4,
|
||||
PanoramaImage = 6,
|
||||
SdofImage = 7,
|
||||
SdofPlusOriginal_SdofImage = 8,
|
||||
SdofPlusOriginal_OriginalImage = 9,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using Foundation;
|
||||
using ObjCRuntime;
|
||||
|
||||
namespace PhotosUI {
|
||||
|
@ -32,4 +33,22 @@ namespace PhotosUI {
|
|||
LiveOff = 1 << 1,
|
||||
}
|
||||
#endif
|
||||
[NoiOS][NoTV][NoWatch]
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
public enum PHProjectCategory {
|
||||
[Field ("PHProjectCategoryBook")]
|
||||
Book,
|
||||
[Field ("PHProjectCategoryCalendar")]
|
||||
Calendar,
|
||||
[Field ("PHProjectCategoryCard")]
|
||||
Card,
|
||||
[Field ("PHProjectCategoryPrints")]
|
||||
Prints,
|
||||
[Field ("PHProjectCategorySlideshow")]
|
||||
Slideshow,
|
||||
[Field ("PHProjectCategoryWallDecor")]
|
||||
WallDecor,
|
||||
[Field ("PHProjectCategoryOther")]
|
||||
Other,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1198,7 +1198,7 @@ PHOTOS_SOURCES = \
|
|||
|
||||
# PhotosUI
|
||||
|
||||
PHOTOSUI_CORE_SOURCES = \
|
||||
PHOTOSUI_API_SOURCES = \
|
||||
PhotosUI/PHEnums.cs \
|
||||
|
||||
# PrintCode
|
||||
|
|
|
@ -1251,6 +1251,10 @@ namespace Photos
|
|||
|
||||
[Export ("projectExtensionData")]
|
||||
NSData ProjectExtensionData { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("hasProjectPreview")]
|
||||
bool HasProjectPreview { get; }
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -1267,8 +1271,13 @@ namespace Photos
|
|||
[Export ("projectExtensionData", ArgumentSemantic.Copy)]
|
||||
NSData ProjectExtensionData { get; set; }
|
||||
|
||||
[Deprecated (PlatformName.MacOSX, 10, 14)]
|
||||
[Export ("setKeyAsset:")]
|
||||
void SetKeyAsset ([NullAllowed] PHAsset keyAsset);
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("setProjectPreviewImage:")]
|
||||
void SetProjectPreviewImage (NSImage previewImage);
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
|
148
src/photosui.cs
148
src/photosui.cs
|
@ -1,4 +1,5 @@
|
|||
using CoreGraphics;
|
||||
using CoreLocation;
|
||||
using ObjCRuntime;
|
||||
using Foundation;
|
||||
#if !MONOMAC
|
||||
|
@ -9,10 +10,12 @@ using PHLivePhotoViewContentMode = Foundation.NSObject;
|
|||
#else
|
||||
using AppKit;
|
||||
using UIImage = AppKit.NSImage;
|
||||
using UIColor = AppKit.NSColor;
|
||||
// ease compilation for [NoMac] decorated members
|
||||
using UIGestureRecognizer = Foundation.NSObject;
|
||||
using PHLivePhotoBadgeOptions = Foundation.NSObject;
|
||||
#endif
|
||||
using MapKit;
|
||||
using Photos;
|
||||
using System;
|
||||
|
||||
|
@ -145,6 +148,14 @@ namespace PhotosUI {
|
|||
|
||||
[Export ("project")]
|
||||
PHProject Project { get; }
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("showEditorForAsset:")]
|
||||
void ShowEditor (PHAsset asset);
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("updatedProjectInfoFromProjectInfo:completion:")]
|
||||
NSProgress UpdatedProjectInfo ([NullAllowed] PHProjectInfo existingProjectInfo, Action<PHProjectInfo> completionHandler);
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -184,6 +195,7 @@ namespace PhotosUI {
|
|||
[Protocol]
|
||||
interface PHProjectExtensionController {
|
||||
|
||||
[Deprecated (PlatformName.MacOSX, 10, 14)]
|
||||
[Export ("supportedProjectTypes", ArgumentSemantic.Copy)]
|
||||
PHProjectTypeDescription [] GetSupportedProjectTypes ();
|
||||
|
||||
|
@ -198,6 +210,14 @@ namespace PhotosUI {
|
|||
[Abstract]
|
||||
[Export ("finishProjectWithCompletionHandler:")]
|
||||
void FinishProject (Action completion);
|
||||
|
||||
[Protected]
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("typeDescriptionDataSourceForCategory:invalidator:")]
|
||||
IPHProjectTypeDescriptionDataSource GetTypeDescriptionDataSource (NSString category, IPHProjectTypeDescriptionInvalidator invalidator);
|
||||
|
||||
[Wrap ("GetTypeDescriptionDataSource (category.GetConstant(), invalidator)")]
|
||||
IPHProjectTypeDescriptionDataSource GetTypeDescriptionDataSource (PHProjectCategory category, IPHProjectTypeDescriptionInvalidator invalidator);
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -227,6 +247,29 @@ namespace PhotosUI {
|
|||
|
||||
[Export ("initWithProjectType:title:description:image:")]
|
||||
IntPtr Constructor (NSString projectType, string localizedTitle, [NullAllowed] string localizedDescription, [NullAllowed] UIImage image);
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("initWithProjectType:title:attributedDescription:image:subtypeDescriptions:")]
|
||||
[DesignatedInitializer]
|
||||
IntPtr Constructor (NSString projectType, string localizedTitle, [NullAllowed] NSAttributedString localizedAttributedDescription, [NullAllowed] UIImage image, PHProjectTypeDescription[] subtypeDescriptions);
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("initWithProjectType:title:attributedDescription:image:canProvideSubtypes:")]
|
||||
[DesignatedInitializer]
|
||||
IntPtr Constructor (NSString projectType, string localizedTitle, [NullAllowed] NSAttributedString localizedAttributedDescription, [NullAllowed] UIImage image, bool canProvideSubtypes);
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[Export ("initWithProjectType:title:description:image:canProvideSubtypes:")]
|
||||
[DesignatedInitializer]
|
||||
IntPtr Constructor (NSString projectType, string localizedTitle, [NullAllowed] string localizedDescription, [NullAllowed] UIImage image, bool canProvideSubtypes);
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("canProvideSubtypes")]
|
||||
bool CanProvideSubtypes { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[NullAllowed, Export ("localizedAttributedDescription", ArgumentSemantic.Copy)]
|
||||
NSAttributedString LocalizedAttributedDescription { get; }
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -243,6 +286,10 @@ namespace PhotosUI {
|
|||
|
||||
[Export ("identifier")]
|
||||
string Identifier { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("quality")]
|
||||
double Quality { get; }
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -275,6 +322,14 @@ namespace PhotosUI {
|
|||
|
||||
[Export ("regionsOfInterest")]
|
||||
PHProjectRegionOfInterest[] RegionsOfInterest { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("horizontallyFlipped")]
|
||||
bool HorizontallyFlipped { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("verticallyFlipped")]
|
||||
bool VerticallyFlipped { get; }
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -291,6 +346,22 @@ namespace PhotosUI {
|
|||
|
||||
[Export ("sections")]
|
||||
PHProjectSection[] Sections { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("brandingEnabled")]
|
||||
bool BrandingEnabled { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[Export ("pageNumbersEnabled")]
|
||||
bool PageNumbersEnabled { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[NullAllowed, Export ("productIdentifier")]
|
||||
string ProductIdentifier { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[NullAllowed, Export ("themeIdentifier")]
|
||||
string ThemeIdentifier { get; }
|
||||
}
|
||||
|
||||
[Mac (10,13, onlyOn64 : true)]
|
||||
|
@ -326,5 +397,82 @@ namespace PhotosUI {
|
|||
|
||||
[Export ("cloudAssetIdentifiers")]
|
||||
PHCloudIdentifier[] CloudAssetIdentifiers { get; }
|
||||
|
||||
[Mac (10, 14, onlyOn64: true)]
|
||||
[NullAllowed, Export ("backgroundColor")]
|
||||
UIColor BackgroundColor { get; }
|
||||
}
|
||||
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[NoiOS][NoTV]
|
||||
[DisableDefaultCtor]
|
||||
[BaseType (typeof(PHProjectElement))]
|
||||
interface PHProjectMapElement : NSSecureCoding
|
||||
{
|
||||
[Export ("mapType")]
|
||||
MKMapType MapType { get; }
|
||||
|
||||
[Export ("centerCoordinate")]
|
||||
CLLocationCoordinate2D CenterCoordinate { get; }
|
||||
|
||||
[Export ("heading")]
|
||||
double Heading { get; }
|
||||
|
||||
[Export ("pitch")]
|
||||
nfloat Pitch { get; }
|
||||
|
||||
[Export ("altitude")]
|
||||
double Altitude { get; }
|
||||
|
||||
[Export ("annotations", ArgumentSemantic.Copy)]
|
||||
IMKAnnotation[] Annotations { get; }
|
||||
}
|
||||
|
||||
interface IPHProjectTypeDescriptionDataSource {}
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[NoiOS][NoTV]
|
||||
[Protocol, Model]
|
||||
[BaseType (typeof(NSObject))]
|
||||
interface PHProjectTypeDescriptionDataSource
|
||||
{
|
||||
[Abstract]
|
||||
[Export ("subtypesForProjectType:")]
|
||||
PHProjectTypeDescription[] GetSubtypes (NSString projectType);
|
||||
|
||||
[Abstract]
|
||||
[Export ("typeDescriptionForProjectType:")]
|
||||
[return: NullAllowed]
|
||||
PHProjectTypeDescription GetTypeDescription (NSString projectType);
|
||||
|
||||
[Abstract]
|
||||
[Export ("footerTextForSubtypesOfProjectType:")]
|
||||
[return: NullAllowed]
|
||||
NSAttributedString GetFooterTextForSubtypes (NSString projectType);
|
||||
|
||||
[Export ("extensionWillDiscardDataSource")]
|
||||
void WillDiscardDataSource ();
|
||||
}
|
||||
|
||||
interface IPHProjectTypeDescriptionInvalidator {}
|
||||
[Mac (10,14, onlyOn64: true)]
|
||||
[NoiOS][NoTV]
|
||||
[Protocol]
|
||||
interface PHProjectTypeDescriptionInvalidator
|
||||
{
|
||||
[Abstract]
|
||||
[Export ("invalidateTypeDescriptionForProjectType:")]
|
||||
void InvalidateTypeDescription (NSString projectType);
|
||||
|
||||
[Abstract]
|
||||
[Export ("invalidateFooterTextForSubtypesOfProjectType:")]
|
||||
void InvalidateFooterTextForSubtypes (NSString projectType);
|
||||
}
|
||||
|
||||
[iOS (8,0)]
|
||||
[NoMac][NoTV]
|
||||
[DisableDefaultCtor]
|
||||
[BaseType (typeof (NSExtensionContext))]
|
||||
interface PHEditingExtensionContext
|
||||
{
|
||||
}
|
||||
}
|
|
@ -101,6 +101,7 @@ namespace Introspection {
|
|||
case "VSAccountMetadata":
|
||||
case "VSAccountMetadataRequest":
|
||||
case "VSAccountProviderResponse":
|
||||
case "PHEditingExtensionContext":
|
||||
case "HKCumulativeQuantitySeriesSample":
|
||||
return true;
|
||||
}
|
||||
|
@ -151,6 +152,7 @@ namespace Introspection {
|
|||
case "VSAccountMetadata":
|
||||
case "VSAccountMetadataRequest":
|
||||
case "VSAccountProviderResponse":
|
||||
case "PHEditingExtensionContext":
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
|
@ -198,6 +200,7 @@ namespace Introspection {
|
|||
case "VSAccountMetadata":
|
||||
case "VSAccountMetadataRequest":
|
||||
case "VSAccountProviderResponse":
|
||||
case "PHEditingExtensionContext":
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
!missing-type! PHEditingExtensionContext not bound
|
|
@ -1,2 +0,0 @@
|
|||
!missing-selector! PHProject::hasProjectPreview not bound
|
||||
!missing-selector! PHProjectChangeRequest::setProjectPreviewImage: not bound
|
|
@ -1,32 +0,0 @@
|
|||
!missing-field! PHProjectCategoryBook not bound
|
||||
!missing-field! PHProjectCategoryCalendar not bound
|
||||
!missing-field! PHProjectCategoryCard not bound
|
||||
!missing-field! PHProjectCategoryOther not bound
|
||||
!missing-field! PHProjectCategoryPrints not bound
|
||||
!missing-field! PHProjectCategorySlideshow not bound
|
||||
!missing-field! PHProjectCategoryWallDecor not bound
|
||||
!missing-protocol! PHProjectTypeDescriptionDataSource not bound
|
||||
!missing-protocol! PHProjectTypeDescriptionInvalidator not bound
|
||||
!missing-protocol-member! PHProjectExtensionController::typeDescriptionDataSourceForCategory:invalidator: not found
|
||||
!missing-selector! PHProjectAssetElement::horizontallyFlipped not bound
|
||||
!missing-selector! PHProjectAssetElement::verticallyFlipped not bound
|
||||
!missing-selector! PHProjectExtensionContext::showEditorForAsset: not bound
|
||||
!missing-selector! PHProjectExtensionContext::updatedProjectInfoFromProjectInfo:completion: not bound
|
||||
!missing-selector! PHProjectInfo::brandingEnabled not bound
|
||||
!missing-selector! PHProjectInfo::pageNumbersEnabled not bound
|
||||
!missing-selector! PHProjectInfo::productIdentifier not bound
|
||||
!missing-selector! PHProjectInfo::themeIdentifier not bound
|
||||
!missing-selector! PHProjectMapElement::altitude not bound
|
||||
!missing-selector! PHProjectMapElement::annotations not bound
|
||||
!missing-selector! PHProjectMapElement::centerCoordinate not bound
|
||||
!missing-selector! PHProjectMapElement::heading not bound
|
||||
!missing-selector! PHProjectMapElement::mapType not bound
|
||||
!missing-selector! PHProjectMapElement::pitch not bound
|
||||
!missing-selector! PHProjectRegionOfInterest::quality not bound
|
||||
!missing-selector! PHProjectSectionContent::backgroundColor not bound
|
||||
!missing-selector! PHProjectTypeDescription::canProvideSubtypes not bound
|
||||
!missing-selector! PHProjectTypeDescription::initWithProjectType:title:attributedDescription:image:canProvideSubtypes: not bound
|
||||
!missing-selector! PHProjectTypeDescription::initWithProjectType:title:attributedDescription:image:subtypeDescriptions: not bound
|
||||
!missing-selector! PHProjectTypeDescription::initWithProjectType:title:description:image:canProvideSubtypes: not bound
|
||||
!missing-selector! PHProjectTypeDescription::localizedAttributedDescription not bound
|
||||
!missing-type! PHProjectMapElement not bound
|
Загрузка…
Ссылка в новой задаче