diff --git a/src/UIKit/UIEnums.cs b/src/UIKit/UIEnums.cs index cbbcbcc999..0732e41e12 100644 --- a/src/UIKit/UIEnums.cs +++ b/src/UIKit/UIEnums.cs @@ -2960,7 +2960,7 @@ namespace UIKit { WhenNotEditing, } - [NoWatch, TV (14,0), iOS (14,0)] + [NoWatch, NoTV, iOS (14,0)] [Native] public enum UICellAccessoryOutlineDisclosureStyle : long { Automatic, @@ -3125,4 +3125,22 @@ namespace UIKit { Supplementary, } + [Introduced (PlatformName.MacCatalyst, 14, 0)] + [NoWatch, NoTV, NoiOS] + [Native] + public enum UITitlebarSeparatorStyle : long { + Automatic, + None, + Line, + Shadow, + } + + [NoWatch, NoTV, iOS (14,0)] + [Native] + public enum UINavigationItemBackButtonDisplayMode : long { + Default = 0, + Generic = 1, + Minimal = 2, + } + } diff --git a/src/uikit.cs b/src/uikit.cs index c6829fda99..267567fd3c 100644 --- a/src/uikit.cs +++ b/src/uikit.cs @@ -1792,6 +1792,11 @@ namespace UIKit { [Export ("sender")] NSObject Sender { get; } + [TV (14,0), iOS (14,0)] + [Static] + [Export ("actionWithHandler:")] + UIAction Create (UIActionHandler handler); + [Static] [Export ("actionWithTitle:image:identifier:handler:")] UIAction Create (string title, [NullAllowed] UIImage image, [NullAllowed] string identifier, UIActionHandler handler); @@ -5228,7 +5233,7 @@ namespace UIKit { // UIColor (UIAccessibility) Category - [Watch (7,0), TV (14,0), Mac (10,16), iOS (14,0)] + [Watch (7,0), TV (14,0), iOS (14,0)] [Export ("accessibilityName")] string AccessibilityName { get; } } @@ -7908,6 +7913,11 @@ namespace UIKit { [Export ("children")] UIMenuElement [] Children { get; } + [TV (14,0), iOS (14,0)] + [Static] + [Export ("menuWithChildren:")] + UIMenu Create (UIMenuElement[] children); + [Static] [Export ("menuWithTitle:children:")] UIMenu Create (string title, UIMenuElement [] children); @@ -8291,6 +8301,10 @@ namespace UIKit { [NoWatch, NoTV, iOS (14,0)] [Export ("showsMenuAsPrimaryAction")] bool ShowsMenuAsPrimaryAction { get; set; } + + [NoWatch, NoTV, iOS (14,0)] + [Export ("menuAttachmentPointForConfiguration:")] + CGPoint GetMenuAttachmentPoint (UIContextMenuConfiguration configuration); } [iOS (7,0)] @@ -9511,6 +9525,10 @@ namespace UIKit { [Export ("setHidesBackButton:animated:")] void SetHidesBackButton (bool hides, bool animated); + [NoTV, iOS (14,0)] + [Export ("backButtonDisplayMode", ArgumentSemantic.Assign)] + UINavigationItemBackButtonDisplayMode BackButtonDisplayMode { get; set; } + [Export ("leftBarButtonItem", ArgumentSemantic.Retain)][NullAllowed] UIBarButtonItem LeftBarButtonItem { get; @@ -11882,7 +11900,11 @@ namespace UIKit { [iOS (7,0)] [Field ("NSWritingDirectionAttributeName")] NSString WritingDirection { get; } - + + [TV (14,0), Watch (7,0), iOS (14,0)] + [Field ("NSTrackingAttributeName")] + NSString Tracking { get; } + // // These are internal, if we choose to expose these, we should // put them on a better named class @@ -21877,10 +21899,12 @@ namespace UIKit { [Export ("listGroupedHeaderFooterConfiguration")] UIBackgroundConfiguration ListGroupedHeaderFooterConfiguration { get; } + [NoTV] [Static] [Export ("listSidebarHeaderConfiguration")] UIBackgroundConfiguration ListSidebarHeaderConfiguration { get; } + [NoTV] [Static] [Export ("listSidebarCellConfiguration")] UIBackgroundConfiguration ListSidebarCellConfiguration { get; } @@ -21990,7 +22014,7 @@ namespace UIKit { UIColor SelectedTintColor { get; set; } } - [NoWatch, TV (14,0), iOS (14,0)] + [NoWatch, NoTV, iOS (14,0)] [BaseType (typeof (UICellAccessory))] interface UICellAccessoryOutlineDisclosure { @@ -22465,14 +22489,17 @@ namespace UIKit { [Export ("groupedFooterConfiguration")] UIListContentConfiguration GroupedFooterConfiguration { get; } + [NoTV] [Static] [Export ("sidebarCellConfiguration")] UIListContentConfiguration SidebarCellConfiguration { get; } + [NoTV] [Static] [Export ("sidebarSubtitleCellConfiguration")] UIListContentConfiguration SidebarSubtitleCellConfiguration { get; } + [NoTV] [Static] [Export ("sidebarHeaderConfiguration")] UIListContentConfiguration SidebarHeaderConfiguration { get; } diff --git a/tests/xtro-sharpie/iOS-UIKit.todo b/tests/xtro-sharpie/iOS-UIKit.todo index 5e8da8a5e4..4b7894a077 100644 --- a/tests/xtro-sharpie/iOS-UIKit.todo +++ b/tests/xtro-sharpie/iOS-UIKit.todo @@ -1,7 +1,3 @@ -!missing-enum! UINavigationItemBackButtonDisplayMode not bound -!missing-field! NSTrackingAttributeName not bound -!missing-selector! +UIAction::actionWithHandler: not bound -!missing-selector! +UIMenu::menuWithChildren: not bound !missing-selector! NSDiffableDataSourceSectionTransaction::difference not bound !missing-selector! NSDiffableDataSourceTransaction::difference not bound !missing-selector! UICollectionViewDiffableDataSourceReorderingHandlers::canReorderItemHandler not bound @@ -20,6 +16,3 @@ !missing-selector! UICollectionViewDiffableDataSourceSectionSnapshotHandlers::snapshotForExpandingParentItemHandler not bound !missing-selector! UICollectionViewDiffableDataSourceSectionSnapshotHandlers::willCollapseItemHandler not bound !missing-selector! UICollectionViewDiffableDataSourceSectionSnapshotHandlers::willExpandItemHandler not bound -!missing-selector! UIControl::menuAttachmentPointForConfiguration: not bound -!missing-selector! UINavigationItem::backButtonDisplayMode not bound -!missing-selector! UINavigationItem::setBackButtonDisplayMode: not bound diff --git a/tests/xtro-sharpie/tvOS-UIKit.todo b/tests/xtro-sharpie/tvOS-UIKit.todo index e554afdc11..1d3d6b6230 100644 --- a/tests/xtro-sharpie/tvOS-UIKit.todo +++ b/tests/xtro-sharpie/tvOS-UIKit.todo @@ -1,8 +1,5 @@ !missing-enum! UINavigationItemBackButtonDisplayMode not bound -!missing-field! NSTrackingAttributeName not bound !missing-protocol-member! UIApplicationDelegate::application:handlerForIntent: not found -!missing-selector! +UIAction::actionWithHandler: not bound -!missing-selector! +UIMenu::menuWithChildren: not bound !missing-selector! NSDiffableDataSourceSectionTransaction::difference not bound !missing-selector! NSDiffableDataSourceTransaction::difference not bound !missing-selector! UICollectionViewDiffableDataSourceReorderingHandlers::canReorderItemHandler not bound @@ -21,5 +18,3 @@ !missing-selector! UICollectionViewDiffableDataSourceSectionSnapshotHandlers::snapshotForExpandingParentItemHandler not bound !missing-selector! UICollectionViewDiffableDataSourceSectionSnapshotHandlers::willCollapseItemHandler not bound !missing-selector! UICollectionViewDiffableDataSourceSectionSnapshotHandlers::willExpandItemHandler not bound -!unknown-native-enum! UICellAccessoryOutlineDisclosureStyle bound -!unknown-type! UICellAccessoryOutlineDisclosure bound diff --git a/tests/xtro-sharpie/watchOS-UIKit.todo b/tests/xtro-sharpie/watchOS-UIKit.todo index ba8cce6137..e69de29bb2 100644 --- a/tests/xtro-sharpie/watchOS-UIKit.todo +++ b/tests/xtro-sharpie/watchOS-UIKit.todo @@ -1 +0,0 @@ -!missing-field! NSTrackingAttributeName not bound