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

[UIKit] Add support for Xcode 14 up to beta 5. #15694

Merged
merged 16 commits into from
Aug 27, 2022
Merged

[UIKit] Add support for Xcode 14 up to beta 5. #15694

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6209233
[UIKit] Add support for Xcode 14 up to beta 5.
mandel-macaque Aug 10, 2022
49e3519
Merge branch 'xcode14' into uikit-xcode14
mandel-macaque Aug 16, 2022
52a49c5
Bump for xcode 14 beta5.
mandel-macaque Aug 16, 2022
071ae73
Implement the missing selectors and changes for beta 5
mandel-macaque Aug 18, 2022
a858fbe
Apply suggestions from code review
mandel-macaque Aug 18, 2022
60ab4c1
Address the last changes needed from the reviews.
mandel-macaque Aug 18, 2022
b63b613
Wrong xcode version.
mandel-macaque Aug 18, 2022
41da5dd
Apply suggestions from code review
mandel-macaque Aug 18, 2022
749aadc
Address reviews.
mandel-macaque Aug 18, 2022
3a03b1f
Merge branch 'uikit-xcode14' of github.com:mandel-macaque/xamarin-mac…
mandel-macaque Aug 18, 2022
aaad221
Update src/uikit.cs
mandel-macaque Aug 19, 2022
ccb4c58
Merge branch 'xcode14' into uikit-xcode14
dalexsoto Aug 23, 2022
127531d
Merge branch 'xcode14' into uikit-xcode14
dalexsoto Aug 25, 2022
0a2c963
Fix tests
dalexsoto Aug 26, 2022
f38c30e
Fix incomplete bindings on UITableViewSource
dalexsoto Aug 26, 2022
f7494ac
Add missing tvos attributes
dalexsoto Aug 26, 2022
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
7 changes: 0 additions & 7 deletions src/AppKit/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,13 +1637,6 @@ public enum NSTextTableLayoutAlgorithm : ulong {
Automatic, Fixed
}

[NoMacCatalyst]
[Flags]
[Native]
public enum NSTextListOptions : ulong {
PrependEnclosingMarker = 1
}

[NoMacCatalyst]
[Flags]
public enum NSFontSymbolicTraits : int { // uint32_t NSFontSymbolicTraits
Expand Down
36 changes: 35 additions & 1 deletion src/UIKit/UIEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,10 @@ public enum UIDataDetectorType : ulong {
FlightNumber = 1 << 5,
[iOS (10,0)]
LookupSuggestion = 1 << 6,
[NoWatch, NoTV, iOS (16,0), MacCatalyst (16,0)]
Money = 1 << 7,
[NoWatch, NoTV, iOS (16,0), MacCatalyst (16,0)]
PhysicalValue = 1uL << 8,

None = 0,
All = UInt64.MaxValue
Expand Down Expand Up @@ -894,6 +898,9 @@ public enum UIModalPresentationStyle : long {
OverCurrentContext,
[NoTV]
Popover,
[Deprecated (PlatformName.iOS, 16, 0)]
[Deprecated (PlatformName.TvOS, 16, 0)]
[Deprecated (PlatformName.MacCatalyst, 16, 0)]
BlurOverFullScreen,
}

Expand Down Expand Up @@ -1375,7 +1382,13 @@ public enum UIKeyModifierFlags : long {
[Native]
[NoWatch]
public enum UIScrollViewKeyboardDismissMode : long {
None, OnDrag, Interactive
None,
OnDrag,
Interactive,
[TV (16,0), iOS (16,0), MacCatalyst (16,0)]
OnDragWithAccessory,
rolfbjarne marked this conversation as resolved.
Show resolved Hide resolved
tj-devel709 marked this conversation as resolved.
Show resolved Hide resolved
[TV (16,0), iOS (16,0), MacCatalyst (16,0)]
InteractiveWithAccessory,
}

// NSInteger -> UIWebView.h
Expand Down Expand Up @@ -1686,6 +1699,14 @@ public enum UIFontWeight {
Black,
}

[Watch (9,0), TV (16,0), iOS (16, 0), MacCatalyst (16,0)]
public enum UIFontWidth {
Condensed,
Standard,
Expanded,
Compressed,
}

[NoWatch]
[iOS (9,0)]
[Native]
Expand Down Expand Up @@ -2270,6 +2291,8 @@ public enum UISceneErrorCode : long
{
MultipleScenesNotSupported,
RequestDenied,
GeometryRequestUnsupported = 100,
GeometryRequestDenied,
}

[Watch (6,0), TV (13,0), iOS (13,0)]
Expand Down Expand Up @@ -2322,6 +2345,8 @@ public enum UIMenuElementAttributes : ulong {
Disabled = 1uL << 0,
Destructive = 1uL << 1,
Hidden = 1uL << 2,
[TV (16,0), iOS (16,0), MacCatalyst (16,0)]
KeepsMenuPresented = 1uL << 3,
}

[Flags]
Expand Down Expand Up @@ -2354,6 +2379,10 @@ public enum UIWindowSceneSessionRole {
[Field ("CPTemplateApplicationSceneSessionRoleApplication", "CarPlay")]
#endif
CarTemplateApplication,

[TV (16,0), iOS (16, 0), MacCatalyst (16,0)]
[Field ("UIWindowSceneSessionRoleExternalDisplayNonInteractive")]
ExternalDisplayNonInteractive,
}

[iOS (13,0), TV (13,0), NoWatch]
Expand Down Expand Up @@ -2455,6 +2484,11 @@ public enum UIMenuIdentifier {
[MacCatalyst (14,0)]
[Field ("UIMenuOpenRecent")]
OpenRecent,

[TV (16,0), iOS (16, 0), MacCatalyst (16,0)]
[Field ("UIMenuDocument")]
Document,

}

[iOS (13,0), TV (13,0), Watch (6,0)]
Expand Down
36 changes: 36 additions & 0 deletions src/UIKit/UIFont.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,30 @@ static nfloat GetFontWeight (UIFontWeight weight)
}
}

#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Watch (9,0), iOS (16,0), TV (16,0), MacCatalyst (16,0)]
#endif
static double GetFontWidth (UIFontWidth width)
{
switch (width) {
case UIFontWidth.Condensed:
return UIFontWidthConstants.Condensed;
case UIFontWidth.Standard:
return UIFontWidthConstants.Standard;
case UIFontWidth.Expanded:
return UIFontWidthConstants.Expanded;
case UIFontWidth.Compressed:
return UIFontWidthConstants.Compressed;
default:
throw new ArgumentException (width.ToString ());
}
}


#if NET
[SupportedOSPlatform ("ios8.2")]
[SupportedOSPlatform ("maccatalyst")]
Expand Down Expand Up @@ -318,6 +342,18 @@ public static UIFont SystemFontOfSize (nfloat size)
return ptr == IntPtr.Zero ? null : new UIFont (ptr);
}

#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Watch (9,0), iOS (16,0), TV (16,0), MacCatalyst (16,0)]
#endif
public static UIFont SystemFontOfSize (nfloat fontSize, UIFontWeight weight, UIFontWidth width) {
var ptr = _SystemFontOfSize (fontSize, GetFontWeight (weight), GetFontWidth (width));
return ptr == IntPtr.Zero ? null : new UIFont (ptr);
}

#if NET
[SupportedOSPlatform ("ios8.2")]
[SupportedOSPlatform ("maccatalyst")]
Expand Down
109 changes: 0 additions & 109 deletions src/appkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18961,115 +18961,6 @@ partial interface NSTextInputContext {
string LocalizedNameForInputSource (string inputSourceIdentifier);
}

[NoMacCatalyst]
[BaseType (typeof (NSObject))]
interface NSTextList : NSCoding, NSCopying, NSSecureCoding {
[Export ("initWithMarkerFormat:options:")]
#if NET
NativeHandle Constructor ([BindAs (typeof (NSTextListMarkerFormats))] NSString format, NSTextListOptions mask);
#else
NativeHandle Constructor (string format, NSTextListOptions mask);
#endif

#if !NET
[Wrap ("this (format.GetConstant(), mask)")]
NativeHandle Constructor (NSTextListMarkerFormats format, NSTextListOptions mask);
#endif

#if NET
[BindAs (typeof (NSTextListMarkerFormats))]
#endif
[Export ("markerFormat")]
#if NET
NSString MarkerFormat { get; }
#else
string MarkerFormat { get; }
#endif

[Export ("listOptions")]
NSTextListOptions ListOptions { get; }

[Export ("markerForItemNumber:")]
string GetMarker (nint itemNum);

//Detected properties
[Export ("startingItemNumber")]
nint StartingItemNumber { get; set; }

}

[NoMacCatalyst]
enum NSTextListMarkerFormats
{
[Mac (10, 13)]
[Field ("NSTextListMarkerBox")]
Box,

[Mac (10, 13)]
[Field ("NSTextListMarkerCheck")]
Check,

[Mac (10, 13)]
[Field ("NSTextListMarkerCircle")]
Circle,

[Mac (10, 13)]
[Field ("NSTextListMarkerDiamond")]
Diamond,

[Mac (10, 13)]
[Field ("NSTextListMarkerDisc")]
Disc,

[Mac (10, 13)]
[Field ("NSTextListMarkerHyphen")]
Hyphen,

[Mac (10, 13)]
[Field ("NSTextListMarkerSquare")]
Square,

[Mac (10, 13)]
[Field ("NSTextListMarkerLowercaseHexadecimal")]
LowercaseHexadecimal,

[Mac (10, 13)]
[Field ("NSTextListMarkerUppercaseHexadecimal")]
UppercaseHexadecimal,

[Mac (10, 13)]
[Field ("NSTextListMarkerOctal")]
Octal,

[Mac (10, 13)]
[Field ("NSTextListMarkerLowercaseAlpha")]
LowercaseAlpha,

[Mac (10, 13)]
[Field ("NSTextListMarkerUppercaseAlpha")]
UppercaseAlpha,

[Mac (10, 13)]
[Field ("NSTextListMarkerLowercaseLatin")]
LowercaseLatin,

[Mac (10, 13)]
[Field ("NSTextListMarkerUppercaseLatin")]
UppercaseLatin,

[Mac (10, 13)]
[Field ("NSTextListMarkerLowercaseRoman")]
LowercaseRoman,

[Mac (10, 13)]
[Field ("NSTextListMarkerUppercaseRoman")]
UppercaseRoman,

[Mac (10, 13)]
[Field ("NSTextListMarkerDecimal")]
Decimal,
}

[NoMacCatalyst]
[BaseType (typeof (NSTextBlock))]
[DisableDefaultCtor]
Expand Down
2 changes: 1 addition & 1 deletion src/generator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,7 +1802,7 @@ public TrampolineInfo MakeTrampoline (Type t)
}

var rt = mi.ReturnType;
var rts = IsNativeEnum (rt) ? "var" : rt.ToString ();
var rts = IsNativeEnum (rt) ? "var" : RenderType (rt);
var trampoline_name = MakeTrampolineName (t);
var ti = new TrampolineInfo (userDelegate: FormatType (null, t),
delegateName: "D" + trampoline_name,
Expand Down
Loading