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.

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

Jump to bottom

[AVKit] Update to Xcode 9 beta 1 #2206

Merged
merged 2 commits into from
Jun 13, 2017
Merged

[AVKit] Update to Xcode 9 beta 1 #2206

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40152f
[AVKit] Update to Xcode 9 beta 1
dalexsoto Jun 7, 2017
c1ec6be
[AVKit] Fix whitespace
dalexsoto Jun 12, 2017
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
79 changes: 79 additions & 0 deletions src/avkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ interface AVPlayerViewController {
[Export ("contentOverlayView")]
UIView ContentOverlayView { get; }

[TV (11,0)]
[NoiOS]
[NullAllowed, Export ("unobscuredContentGuide")]
UILayoutGuide UnobscuredContentGuide { get; }

[NoTV]
[iOS (9,0)]
[Export ("allowsPictureInPicturePlayback")]
Expand All @@ -134,6 +139,16 @@ interface AVPlayerViewController {
[Export ("updatesNowPlayingInfoCenter")]
bool UpdatesNowPlayingInfoCenter { get; set; }

[iOS (11, 0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comment [iOS (11,0)] is prettier (note: you're sometimes not adding a space in this diff).

[NoTV]
[Export ("entersFullScreenWhenPlaybackBegins")]
bool EntersFullScreenWhenPlaybackBegins { get; set; }

[iOS (11, 0)]
[NoTV]
[Export ("exitsFullScreenWhenPlaybackEnds")]
bool ExitsFullScreenWhenPlaybackEnds { get; set; }

[Wrap ("WeakDelegate")]
[NullAllowed]
[Protocolize]
Expand Down Expand Up @@ -175,6 +190,20 @@ interface AVPlayerViewController {
[NoiOS, TV (10, 0), NoWatch, NoMac]
[Export ("skipBackwardEnabled")]
bool SkipBackwardEnabled { [Bind ("isSkipBackwardEnabled")] get; set; }

// From AVPlayerViewControllerControls category

[NoiOS, TV (11, 0), NoWatch, NoMac]
[Export ("playbackControlsIncludeTransportBar")]
bool PlaybackControlsIncludeTransportBar { get; set; }

[NoiOS, TV (11, 0), NoWatch, NoMac]
[Export ("playbackControlsIncludeInfoViews")]
bool PlaybackControlsIncludeInfoViews { get; set; }

[NoiOS, TV (11, 0), NoWatch, NoMac]
[Export ("customInfoViewController", ArgumentSemantic.Assign)]
UIViewController CustomInfoViewController { get; set; }
}

[Protocol, Model]
Expand Down Expand Up @@ -214,6 +243,21 @@ interface AVPlayerViewControllerDelegate
[Export ("playerViewController:didPresentInterstitialTimeRange:")]
void DidPresentInterstitialTimeRange (AVPlayerViewController playerViewController, AVInterstitialTimeRange interstitial);

[NoiOS][NoMac]
[TV (11,0)]
[Export ("playerViewControllerShouldDismiss:")]
bool ShouldDismiss ([NullAllowed] AVPlayerViewController playerViewController);

[NoiOS][NoMac]
[TV (11,0)]
[Export ("playerViewControllerWillBeginDismissalTransition:")]
void WillBeginDismissalTransition ([NullAllowed] AVPlayerViewController playerViewController);

[NoiOS][NoMac]
[TV (11,0)]
[Export ("playerViewControllerDidEndDismissalTransition:")]
void DidEndDismissalTransition ([NullAllowed] AVPlayerViewController playerViewController);

[NoiOS][NoMac]
[TV (9,0)]
[Export ("playerViewController:willPresentInterstitialTimeRange:")]
Expand Down Expand Up @@ -257,6 +301,21 @@ interface AVPlayerViewControllerDelegate
[NoiOS, TV (10,0), NoWatch, NoMac]
[Export ("playerViewController:didRejectContentProposal:")]
void DidRejectContentProposal (AVPlayerViewController playerViewController, AVContentProposal proposal);

[NoiOS, TV (11,0), NoWatch, NoMac]
[Export ("playerViewController:willTransitionToVisibilityOfTransportBar:withAnimationCoordinator:")]
void WillTransitionToVisibilityOfTransportBar ([NullAllowed] AVPlayerViewController playerViewController, bool visible, [NullAllowed] IAVPlayerViewControllerAnimationCoordinator coordinator);
}

interface IAVPlayerViewControllerAnimationCoordinator { }

[NoiOS, TV (11,0), NoWatch, NoMac]
[Protocol]
interface AVPlayerViewControllerAnimationCoordinator {

[Abstract]
[Export ("addCoordinatedAnimations:completion:")]
void AddCoordinatedAnimations (Action animations, Action<bool> completion);
}

#else
Expand Down Expand Up @@ -287,6 +346,10 @@ interface AVPlayerView {
[Export ("contentOverlayView")]
NSView ContentOverlayView { get; }

[Mac (10,13)]
[Export ("updatesNowPlayingInfoCenter")]
bool UpdatesNowPlayingInfoCenter { get; set; }

[Mac (10,9)]
[Export ("actionPopUpButtonMenu")]
NSMenu ActionPopUpButtonMenu { get; set; }
Expand Down Expand Up @@ -425,6 +488,22 @@ interface AVKitMetadataIdentifier {
NSString ExternalUserProfileIdentifier { get; }
[Field ("AVKitMetadataIdentifierPlaybackProgress")]
NSString PlaybackProgress { get; }

[TV (11,0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that under a tvOS only define ?

Copy link
Member Author

@dalexsoto dalexsoto Jun 11, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup

[Static]
[NoiOS, TV (10,1), NoWatch, NoMac]
interface AVKitMetadataIdentifier {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

[Field ("AVKitMetadataIdentifierExactStartDate")]
NSString ExactStartDate { get; }

[TV (11,0)]
[Field ("AVKitMetadataIdentifierApproximateStartDate")]
NSString ApproximateStartDate { get; }

[TV (11,0)]
[Field ("AVKitMetadataIdentifierExactEndDate")]
NSString ExactEndDate { get; }

[TV (11,0)]
[Field ("AVKitMetadataIdentifierApproximateEndDate")]
NSString ApproximateEndDate { get; }
}

#endif
Expand Down