[carplay] Update for Xcode 11 beta 1 (#6442)

* [carplay] Update for Xcode 11 beta 1

* add maccore issue #, fix nits

* update w/ full issue link, update copyright
This commit is contained in:
Whitney Schmidt 2019-06-28 14:47:21 -04:00 коммит произвёл GitHub
Родитель e28a0810aa
Коммит 995333dfbc
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 32 добавлений и 13 удалений

Просмотреть файл

@ -4,7 +4,7 @@
// Authors: // Authors:
// Alex Soto <alexsoto@microsoft.com> // Alex Soto <alexsoto@microsoft.com>
// //
// Copyright 2018 Microsoft Corporation. All rights reserved. // Copyright 2018-2019 Microsoft Corporation. All rights reserved.
// //
#if XAMCORE_2_0 #if XAMCORE_2_0
@ -207,6 +207,10 @@ namespace CarPlay {
[NullAllowed, Export ("delegate", ArgumentSemantic.Weak)] [NullAllowed, Export ("delegate", ArgumentSemantic.Weak)]
NSObject WeakDelegate { get; set; } NSObject WeakDelegate { get; set; }
[iOS (13,0)]
[Export ("prefersDarkUserInterfaceStyle")]
bool PrefersDarkUserInterfaceStyle { get; set; }
[Export ("setRootTemplate:animated:")] [Export ("setRootTemplate:animated:")]
void SetRootTemplate (CPTemplate rootTemplate, bool animated); void SetRootTemplate (CPTemplate rootTemplate, bool animated);
@ -378,8 +382,14 @@ namespace CarPlay {
[BaseType (typeof (NSObject))] [BaseType (typeof (NSObject))]
interface CPManeuver : NSCopying, NSSecureCoding { interface CPManeuver : NSCopying, NSSecureCoding {
[Introduced (PlatformName.iOS, 12,0)]
[Deprecated (PlatformName.iOS, 13,0, message: "Use 'CPManeuver.SymbolImage' instead.")]
[NullAllowed, Export ("symbolSet", ArgumentSemantic.Strong)] [NullAllowed, Export ("symbolSet", ArgumentSemantic.Strong)]
CPImageSet SymbolSet { get; set; } CPImageSet SymbolSet { get; set; }
[iOS (13,0)]
[NullAllowed, Export ("symbolImage", ArgumentSemantic.Strong)]
UIImage SymbolImage { get; set; }
[Export ("instructionVariants", ArgumentSemantic.Copy)] [Export ("instructionVariants", ArgumentSemantic.Copy)]
string [] InstructionVariants { get; set; } string [] InstructionVariants { get; set; }
@ -558,8 +568,14 @@ namespace CarPlay {
[DisableDefaultCtor] [DisableDefaultCtor]
interface CPNavigationAlert : NSSecureCoding { interface CPNavigationAlert : NSSecureCoding {
[Deprecated (PlatformName.iOS, 13,0, message: "Use constructor that takes in 'UIImage' instead of 'CPImageSet'.")]
[Export ("initWithTitleVariants:subtitleVariants:imageSet:primaryAction:secondaryAction:duration:")] [Export ("initWithTitleVariants:subtitleVariants:imageSet:primaryAction:secondaryAction:duration:")]
IntPtr Constructor (string [] titleVariants, string [] subtitleVariants, [NullAllowed] CPImageSet imageSet, CPAlertAction primaryAction, [NullAllowed] CPAlertAction secondaryAction, double duration); IntPtr Constructor (string[] titleVariants, [NullAllowed] string[] subtitleVariants, [NullAllowed] CPImageSet imageSet, CPAlertAction primaryAction, [NullAllowed] CPAlertAction secondaryAction, double duration);
[iOS (13,0)]
[Export ("initWithTitleVariants:subtitleVariants:image:primaryAction:secondaryAction:duration:")]
IntPtr Constructor (string[] titleVariants, [NullAllowed] string[] subtitleVariants, [NullAllowed] UIImage image, CPAlertAction primaryAction, [NullAllowed] CPAlertAction secondaryAction, double duration);
[Export ("updateTitleVariants:subtitleVariants:")] [Export ("updateTitleVariants:subtitleVariants:")]
void UpdateTitleVariants (string [] newTitleVariants, string [] newSubtitleVariants); void UpdateTitleVariants (string [] newTitleVariants, string [] newSubtitleVariants);
@ -573,6 +589,10 @@ namespace CarPlay {
[NullAllowed, Export ("imageSet", ArgumentSemantic.Copy)] [NullAllowed, Export ("imageSet", ArgumentSemantic.Copy)]
CPImageSet ImageSet { get; } CPImageSet ImageSet { get; }
[iOS (13,0)]
[NullAllowed, Export ("image", ArgumentSemantic.Copy)]
UIImage Image { get; }
[Export ("primaryAction", ArgumentSemantic.Strong)] [Export ("primaryAction", ArgumentSemantic.Strong)]
CPAlertAction PrimaryAction { get; } CPAlertAction PrimaryAction { get; }
@ -785,6 +805,12 @@ namespace CarPlay {
[Export ("mapButtonSafeAreaLayoutGuide")] [Export ("mapButtonSafeAreaLayoutGuide")]
UILayoutGuide MapButtonSafeAreaLayoutGuide { get; } UILayoutGuide MapButtonSafeAreaLayoutGuide { get; }
#if false
// Apple is trying to use CPTemplateApplicationScene but it is not exposed. https://github.com/xamarin/maccore/issues/1822
[NullAllowed, Export ("templateApplicationScene", ArgumentSemantic.Weak)]
CPTemplateApplicationScene TemplateApplicationScene { get; set; }
#endif
} }
[NoWatch, NoTV, NoMac, iOS (12,0)] [NoWatch, NoTV, NoMac, iOS (12,0)]

Просмотреть файл

@ -1,2 +1,6 @@
!incorrect-protocol-member! CPBarButtonProviding::backButton is REQUIRED and should be abstract !incorrect-protocol-member! CPBarButtonProviding::backButton is REQUIRED and should be abstract
!incorrect-protocol-member! CPBarButtonProviding::setBackButton: is REQUIRED and should be abstract !incorrect-protocol-member! CPBarButtonProviding::setBackButton: is REQUIRED and should be abstract
# https://github.com/xamarin/maccore/issues/1822
!missing-selector! CPWindow::setTemplateApplicationScene: not bound
!missing-selector! CPWindow::templateApplicationScene not bound

Просмотреть файл

@ -1,11 +0,0 @@
!deprecated-attribute-missing! CPManeuver::setSymbolSet: missing a [Deprecated] attribute
!deprecated-attribute-missing! CPManeuver::symbolSet missing a [Deprecated] attribute
!deprecated-attribute-missing! CPNavigationAlert::initWithTitleVariants:subtitleVariants:imageSet:primaryAction:secondaryAction:duration: missing a [Deprecated] attribute
!missing-selector! CPInterfaceController::prefersDarkUserInterfaceStyle not bound
!missing-selector! CPInterfaceController::setPrefersDarkUserInterfaceStyle: not bound
!missing-selector! CPManeuver::setSymbolImage: not bound
!missing-selector! CPManeuver::symbolImage not bound
!missing-selector! CPNavigationAlert::image not bound
!missing-selector! CPNavigationAlert::initWithTitleVariants:subtitleVariants:image:primaryAction:secondaryAction:duration: not bound
!missing-selector! CPWindow::setTemplateApplicationScene: not bound
!missing-selector! CPWindow::templateApplicationScene not bound