From 4a626c2ac567e09b4fa4a578b401fdc15cbe68ed Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 15 Nov 2022 17:41:59 +0100 Subject: [PATCH] [autoformat] Add the IOSurface, ImageCaptureCore, ImageIO, ImageKit, Intents, JavaScriptCore, LocalAuthentication, MLCompute, MapKit, MediaAccessibility, MediaLibrary, MediaPlayer and MediaToolbox frameworks. (#16755) --- src/IOSurface/IODefs.cs | 2 +- src/IOSurface/IOSurface.cs | 8 +- src/IOSurface/IOSurfacePropertyKey.cs | 2 +- src/ImageCaptureCore/Defs.cs | 20 +- src/ImageIO/CGImageAnimation.cs | 192 +++++++++--------- src/ImageIO/CGImageDestination.cs | 44 ++-- src/ImageIO/CGImageMetadata.cs | 6 +- src/ImageIO/CGImageMetadataTag.cs | 8 +- src/ImageIO/CGImageSource.cs | 65 +++--- src/ImageIO/CGImageSource.iOS.cs | 10 +- src/ImageIO/CGMutableImageMetadata.cs | 2 +- src/ImageIO/Enums.cs | 12 +- src/ImageKit/Enums.cs | 42 ++-- src/Intents/INBillTypeResolutionResult.cs | 4 +- .../INCallRecordTypeResolutionResult.cs | 4 +- .../INCarSignalOptionsResolutionResult.cs | 4 +- src/Intents/INIntentResolutionResult.cs | 17 +- ...MessageAttributeOptionsResolutionResult.cs | 4 +- .../INMessageAttributeResolutionResult.cs | 4 +- .../INPaymentStatusResolutionResult.cs | 4 +- src/Intents/INPerson.cs | 26 ++- src/Intents/INSpeakableString.cs | 2 +- .../INWorkoutGoalUnitTypeResolutionResult.cs | 4 +- .../INWorkoutLocationTypeResolutionResult.cs | 4 +- src/JavaScriptCore/Enums.cs | 3 +- src/JavaScriptCore/Extensions.cs | 10 +- src/LocalAuthentication/LAEnums.cs | 77 +++---- src/MLCompute/MLHelpers.cs | 80 ++++---- src/MapKit/MKEnums.cs | 107 +++++----- src/MapKit/MKFeatureDisplayPriority.cs | 6 +- src/MapKit/MKGeodesicPolyline.cs | 4 +- src/MapKit/MKLocalSearch.cs | 4 +- src/MapKit/MKMapItem.cs | 27 ++- src/MapKit/MKMultiPoint.cs | 4 +- src/MapKit/MKOverlayView.cs | 4 +- src/MapKit/MKPointOfInterestFilter.cs | 6 +- src/MapKit/MKPolygon.cs | 14 +- src/MapKit/MKPolyline.cs | 10 +- src/MapKit/MapKit.cs | 119 ++++++----- src/MediaAccessibility/MAEnums.cs | 15 +- src/MediaAccessibility/MAImageCaptioning.cs | 6 +- src/MediaAccessibility/MediaAccessibility.cs | 52 ++--- src/MediaLibrary/Enums.cs | 6 +- src/MediaPlayer/MPMediaItem.cs | 22 +- src/MediaPlayer/MPMediaItemArtwork.cs | 2 +- src/MediaPlayer/MPMediaQuery.cs | 5 +- src/MediaPlayer/MPNowPlayingInfoCenter.cs | 40 ++-- src/MediaPlayer/MPSkipIntervalCommand.cs | 4 +- src/MediaPlayer/MPVolumeSettings.cs | 12 +- src/MediaPlayer/MediaPlayer.cs | 137 ++++++------- src/MediaToolbox/MTFormatNames.cs | 16 +- tools/autoformat.sh | 13 ++ 52 files changed, 654 insertions(+), 641 deletions(-) diff --git a/src/IOSurface/IODefs.cs b/src/IOSurface/IODefs.cs index 23ae9eb153..5ee24ba77c 100644 --- a/src/IOSurface/IODefs.cs +++ b/src/IOSurface/IODefs.cs @@ -36,5 +36,5 @@ namespace IOSurface { CopybackInnerCache = 5 << 8, }; - + } diff --git a/src/IOSurface/IOSurface.cs b/src/IOSurface/IOSurface.cs index 288933cdbf..3f8e14d5ce 100644 --- a/src/IOSurface/IOSurface.cs +++ b/src/IOSurface/IOSurface.cs @@ -38,7 +38,7 @@ namespace IOSurface { public int Lock (IOSurfaceLockOptions options, ref int seed) { unsafe { - fixed (int *p = &seed){ + fixed (int* p = &seed) { return _Lock (options, (IntPtr) p); } } @@ -50,13 +50,13 @@ namespace IOSurface { { return _Lock (options, IntPtr.Zero); } - + // kern_return_t // See bug #59201 [iOS (10,0)] public int Unlock (IOSurfaceLockOptions options, ref int seed) { unsafe { - fixed (int *p = &seed){ + fixed (int* p = &seed) { return _Unlock (options, (IntPtr) p); } } @@ -74,7 +74,7 @@ namespace IOSurface { public int SetPurgeable (IOSurfacePurgeabilityState newState, ref IOSurfacePurgeabilityState oldState) { unsafe { - fixed (IOSurfacePurgeabilityState *p = &oldState){ + fixed (IOSurfacePurgeabilityState* p = &oldState) { return _SetPurgeable (newState, (IntPtr) p); } } diff --git a/src/IOSurface/IOSurfacePropertyKey.cs b/src/IOSurface/IOSurfacePropertyKey.cs index 69be4b0133..1703c2d0d9 100644 --- a/src/IOSurface/IOSurfacePropertyKey.cs +++ b/src/IOSurface/IOSurfacePropertyKey.cs @@ -40,7 +40,7 @@ namespace IOSurface { #elif TVOS || IOS return SystemVersion.CheckiOS (12, 0); #else - #error Unknown platform +#error Unknown platform #endif } diff --git a/src/ImageCaptureCore/Defs.cs b/src/ImageCaptureCore/Defs.cs index bf0928fb75..5fbf692a43 100644 --- a/src/ImageCaptureCore/Defs.cs +++ b/src/ImageCaptureCore/Defs.cs @@ -275,15 +275,15 @@ namespace ImageCaptureCore { } enum ICTransportType { - [Field ("ICTransportTypeUSB")] - Usb, - [Field ("ICTransportTypeFireWire")] - FireWire, - [Field ("ICTransportTypeBluetooth")] - Bluetooth, - [Field ("ICTransportTypeTCPIP")] - TcpIp, - [Field ("ICTransportTypeMassStorage")] - MassStorage, + [Field ("ICTransportTypeUSB")] + Usb, + [Field ("ICTransportTypeFireWire")] + FireWire, + [Field ("ICTransportTypeBluetooth")] + Bluetooth, + [Field ("ICTransportTypeTCPIP")] + TcpIp, + [Field ("ICTransportTypeMassStorage")] + MassStorage, } } diff --git a/src/ImageIO/CGImageAnimation.cs b/src/ImageIO/CGImageAnimation.cs index cad9a4fac1..a8d5db2580 100644 --- a/src/ImageIO/CGImageAnimation.cs +++ b/src/ImageIO/CGImageAnimation.cs @@ -16,8 +16,7 @@ using CoreGraphics; using Foundation; using ObjCRuntime; -namespace ImageIO -{ +namespace ImageIO { #if NET [SupportedOSPlatform ("ios")] @@ -25,10 +24,9 @@ namespace ImageIO [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #endif - public static class CGImageAnimation - { + public static class CGImageAnimation { - public delegate void CGImageSourceAnimationHandler (nint index, CGImage image, out bool stop); + public delegate void CGImageSourceAnimationHandler (nint index, CGImage image, out bool stop); #if NET [SupportedOSPlatform ("macos10.15")] @@ -36,13 +34,13 @@ namespace ImageIO [SupportedOSPlatform ("tvos13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] - [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] + [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] #endif - [DllImport (Constants.ImageIOLibrary)] - static extern /* OSStatus */ CGImageAnimationStatus CGAnimateImageAtURLWithBlock ( /* CFURLRef */ IntPtr url, /* CFDictionaryRef _iio_Nullable */ IntPtr options, /* CGImageSourceAnimationHandler */ ref BlockLiteral block); + [DllImport (Constants.ImageIOLibrary)] + static extern /* OSStatus */ CGImageAnimationStatus CGAnimateImageAtURLWithBlock ( /* CFURLRef */ IntPtr url, /* CFDictionaryRef _iio_Nullable */ IntPtr options, /* CGImageSourceAnimationHandler */ ref BlockLiteral block); #if NET [SupportedOSPlatform ("macos10.15")] @@ -50,13 +48,13 @@ namespace ImageIO [SupportedOSPlatform ("tvos13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] - [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] + [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] #endif - [DllImport (Constants.ImageIOLibrary)] - static extern /* OSStatus */ CGImageAnimationStatus CGAnimateImageDataWithBlock ( /* CFDataRef _Nonnull */ IntPtr data, /* CFDictionaryRef _Nullable */ IntPtr options, /* CGImageSourceAnimationHandler _Nonnull */ ref BlockLiteral block); + [DllImport (Constants.ImageIOLibrary)] + static extern /* OSStatus */ CGImageAnimationStatus CGAnimateImageDataWithBlock ( /* CFDataRef _Nonnull */ IntPtr data, /* CFDictionaryRef _Nullable */ IntPtr options, /* CGImageSourceAnimationHandler _Nonnull */ ref BlockLiteral block); #if NET [SupportedOSPlatform ("macos10.15")] @@ -64,32 +62,32 @@ namespace ImageIO [SupportedOSPlatform ("tvos13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] - [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] + [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] #endif - [BindingImpl (BindingImplOptions.Optimizable)] - public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOptions options, [BlockProxy (typeof (NIDCGImageSourceAnimationBlock))] CGImageSourceAnimationHandler handler) - { + [BindingImpl (BindingImplOptions.Optimizable)] + public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOptions options, [BlockProxy (typeof (NIDCGImageSourceAnimationBlock))] CGImageSourceAnimationHandler handler) + { #if IOS && ARCH_32 throw new PlatformNotSupportedException ("This API is not supported on this version of iOS"); #else - if (url is null) - ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (url)); - if (handler is null) - ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (handler)); + if (url is null) + ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (url)); + if (handler is null) + ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (handler)); - var block = new BlockLiteral (); - block.SetupBlockUnsafe (SDCGImageSourceAnimationBlock.Handler, handler); + var block = new BlockLiteral (); + block.SetupBlockUnsafe (SDCGImageSourceAnimationBlock.Handler, handler); - try { - return CGAnimateImageAtURLWithBlock (url.Handle, options.GetHandle (), ref block); - } finally { - block.CleanupBlock (); - } + try { + return CGAnimateImageAtURLWithBlock (url.Handle, options.GetHandle (), ref block); + } finally { + block.CleanupBlock (); + } #endif - } + } #if NET [SupportedOSPlatform ("macos10.15")] @@ -97,81 +95,79 @@ namespace ImageIO [SupportedOSPlatform ("tvos13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] - [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] - [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.MacOSX, 10, 15, PlatformArchitecture.All)] + [Introduced (PlatformName.iOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.TvOS, 13, 0, PlatformArchitecture.All)] + [Introduced (PlatformName.WatchOS, 6, 0, PlatformArchitecture.All)] #endif - [BindingImpl (BindingImplOptions.Optimizable)] - public static CGImageAnimationStatus AnimateImage (NSData data, CGImageAnimationOptions options, [BlockProxy (typeof (NIDCGImageSourceAnimationBlock))] CGImageSourceAnimationHandler handler) - { + [BindingImpl (BindingImplOptions.Optimizable)] + public static CGImageAnimationStatus AnimateImage (NSData data, CGImageAnimationOptions options, [BlockProxy (typeof (NIDCGImageSourceAnimationBlock))] CGImageSourceAnimationHandler handler) + { #if IOS && ARCH_32 throw new PlatformNotSupportedException ("This API is not supported on this version of iOS"); #else - if (data is null) - ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (data)); - if (handler is null) - ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (handler)); + if (data is null) + ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (data)); + if (handler is null) + ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (handler)); - var block = new BlockLiteral (); - block.SetupBlockUnsafe (SDCGImageSourceAnimationBlock.Handler, handler); + var block = new BlockLiteral (); + block.SetupBlockUnsafe (SDCGImageSourceAnimationBlock.Handler, handler); - try { - return CGAnimateImageDataWithBlock (data.Handle, options.GetHandle (), ref block); - } finally { - block.CleanupBlock (); - } + try { + return CGAnimateImageDataWithBlock (data.Handle, options.GetHandle (), ref block); + } finally { + block.CleanupBlock (); + } #endif - } + } - // - // This class bridges native block invocations that call into C# - // - static internal class SDCGImageSourceAnimationBlock - { - static internal readonly DCGImageSourceAnimationBlock Handler = Invoke; + // + // This class bridges native block invocations that call into C# + // + static internal class SDCGImageSourceAnimationBlock { + static internal readonly DCGImageSourceAnimationBlock Handler = Invoke; - [MonoPInvokeCallback (typeof (DCGImageSourceAnimationBlock))] - static void Invoke (IntPtr block, nint index, IntPtr image, [MarshalAs (UnmanagedType.I1)] out bool stop) - { - var del = BlockLiteral.GetTarget (block); - if (del is not null) - del (index, new CoreGraphics.CGImage (image, false), out stop); - else - stop = false; - } - } /* class SDCGImageSourceAnimationBlock */ + [MonoPInvokeCallback (typeof (DCGImageSourceAnimationBlock))] + static void Invoke (IntPtr block, nint index, IntPtr image, [MarshalAs (UnmanagedType.I1)] out bool stop) + { + var del = BlockLiteral.GetTarget (block); + if (del is not null) + del (index, new CoreGraphics.CGImage (image, false), out stop); + else + stop = false; + } + } /* class SDCGImageSourceAnimationBlock */ - internal sealed class NIDCGImageSourceAnimationBlock : TrampolineBlockBase - { - DCGImageSourceAnimationBlock invoker; + internal sealed class NIDCGImageSourceAnimationBlock : TrampolineBlockBase { + DCGImageSourceAnimationBlock invoker; - [BindingImpl (BindingImplOptions.Optimizable)] - public unsafe NIDCGImageSourceAnimationBlock (BlockLiteral * block) : base (block) - { - invoker = block->GetDelegateForBlock (); - } + [BindingImpl (BindingImplOptions.Optimizable)] + public unsafe NIDCGImageSourceAnimationBlock (BlockLiteral* block) : base (block) + { + invoker = block->GetDelegateForBlock (); + } - [Preserve (Conditional = true)] - [BindingImpl (BindingImplOptions.Optimizable)] - public unsafe static CGImageSourceAnimationHandler? Create (IntPtr block) - { - if (block == IntPtr.Zero) - return null; - var del = (CGImageSourceAnimationHandler) GetExistingManagedDelegate (block); - return del ?? new NIDCGImageSourceAnimationBlock ( (BlockLiteral *) block).Invoke; - } + [Preserve (Conditional = true)] + [BindingImpl (BindingImplOptions.Optimizable)] + public unsafe static CGImageSourceAnimationHandler? Create (IntPtr block) + { + if (block == IntPtr.Zero) + return null; + var del = (CGImageSourceAnimationHandler) GetExistingManagedDelegate (block); + return del ?? new NIDCGImageSourceAnimationBlock ((BlockLiteral*) block).Invoke; + } - [BindingImpl (BindingImplOptions.Optimizable)] - void Invoke (nint index, CGImage image, out bool stop) - { - invoker (BlockPointer, index, image.GetHandle (), out stop); - } - } /* class NIDCGImageSourceAnimationBlock */ + [BindingImpl (BindingImplOptions.Optimizable)] + void Invoke (nint index, CGImage image, out bool stop) + { + invoker (BlockPointer, index, image.GetHandle (), out stop); + } + } /* class NIDCGImageSourceAnimationBlock */ - [UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl)] - [UserDelegateType (typeof (CGImageSourceAnimationHandler))] - internal delegate void DCGImageSourceAnimationBlock (IntPtr block, nint index, IntPtr imageHandle, [MarshalAs (UnmanagedType.I1)] out bool stop); - } + [UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl)] + [UserDelegateType (typeof (CGImageSourceAnimationHandler))] + internal delegate void DCGImageSourceAnimationBlock (IntPtr block, nint index, IntPtr imageHandle, [MarshalAs (UnmanagedType.I1)] out bool stop); + } } diff --git a/src/ImageIO/CGImageDestination.cs b/src/ImageIO/CGImageDestination.cs index 409a5757f5..e37c441c6f 100644 --- a/src/ImageIO/CGImageDestination.cs +++ b/src/ImageIO/CGImageDestination.cs @@ -41,8 +41,7 @@ using NativeHandle = System.IntPtr; namespace ImageIO { - public partial class CGImageDestinationOptions - { + public partial class CGImageDestinationOptions { CGColor? destinationBackgroundColor; public CGColor? DestinationBackgroundColor { get { return destinationBackgroundColor; } @@ -58,15 +57,14 @@ namespace ImageIO { } } - public partial class CGCopyImageSourceOptions - { + public partial class CGCopyImageSourceOptions { #if NET [SupportedOSPlatform ("ios7.0")] [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public CGImageMetadata? Metadata { get; set; } @@ -76,7 +74,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public bool MergeMetadata { get; set; } @@ -86,7 +84,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public bool ShouldExcludeXMP { get; set; } @@ -107,7 +105,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public DateTime? DateTime { get; set; } @@ -117,7 +115,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public int? Orientation { get; set; } @@ -147,7 +145,7 @@ namespace ImageIO { using (var n = new NSNumber (Orientation.Value)) dict.LowlevelSetObject (n.Handle, kOrientation); } - + return dict; } } @@ -178,15 +176,15 @@ namespace ImageIO { } #endif - [Preserve (Conditional=true)] + [Preserve (Conditional = true)] internal CGImageDestination (NativeHandle handle, bool owns) : base (handle, owns) { } - [DllImport (Constants.ImageIOLibrary, EntryPoint="CGImageDestinationGetTypeID")] + [DllImport (Constants.ImageIOLibrary, EntryPoint = "CGImageDestinationGetTypeID")] public extern static /* CFTypeID */ nint GetTypeID (); - + [DllImport (Constants.ImageIOLibrary)] extern static /* CFArrayRef __nonnull */ IntPtr CGImageDestinationCopyTypeIdentifiers (); @@ -221,7 +219,7 @@ namespace ImageIO { [DllImport (Constants.ImageIOLibrary)] extern static /* CGImageDestinationRef __nullable */ IntPtr CGImageDestinationCreateWithData ( - /* CFMutableDataRef __nonnull */ IntPtr data, /* CFStringRef __nonnull */ IntPtr stringType, + /* CFMutableDataRef __nonnull */ IntPtr data, /* CFStringRef __nonnull */ IntPtr stringType, /* size_t */ nint count, /* CFDictionaryRef __nullable */ IntPtr options); public static CGImageDestination? Create (NSMutableData data, string typeIdentifier, int imageCount, CGImageDestinationOptions? options = null) @@ -289,13 +287,13 @@ namespace ImageIO { { if (image is null) ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (image)); - + CGImageDestinationAddImage (Handle, image.Handle, properties.GetHandle ()); } [DllImport (Constants.ImageIOLibrary)] extern static void CGImageDestinationAddImageFromSource (/* CGImageDestinationRef __nonnull */ IntPtr idst, - /* CGImageSourceRef __nonnull */ IntPtr sourceHandle, /* size_t */ nint index, + /* CGImageSourceRef __nonnull */ IntPtr sourceHandle, /* size_t */ nint index, /* CFDictionaryRef __nullable */ IntPtr properties); public void AddImage (CGImageSource source, int index, CGImageDestinationOptions? options = null) @@ -311,7 +309,7 @@ namespace ImageIO { { if (source is null) ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (source)); - + CGImageDestinationAddImageFromSource (Handle, source.Handle, index, properties.GetHandle ()); } @@ -332,7 +330,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif [DllImport (Constants.ImageIOLibrary)] extern static void CGImageDestinationAddImageAndMetadata (/* CGImageDestinationRef __nonnull */ IntPtr idst, @@ -345,7 +343,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif [EditorBrowsable (EditorBrowsableState.Advanced)] public void AddImageAndMetadata (CGImage image, CGImageMetadata meta, NSDictionary? options) @@ -361,7 +359,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public void AddImageAndMetadata (CGImage image, CGImageMetadata meta, CGImageDestinationOptions? options) { @@ -375,7 +373,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif [DllImport (Constants.ImageIOLibrary)] [return: MarshalAs (UnmanagedType.I1)] @@ -389,7 +387,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif [EditorBrowsable (EditorBrowsableState.Advanced)] public bool CopyImageSource (CGImageSource image, NSDictionary? options, out NSError? error) @@ -407,7 +405,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public bool CopyImageSource (CGImageSource image, CGCopyImageSourceOptions? options, out NSError? error) { diff --git a/src/ImageIO/CGImageMetadata.cs b/src/ImageIO/CGImageMetadata.cs index ae51df9cd2..ecba0b6706 100644 --- a/src/ImageIO/CGImageMetadata.cs +++ b/src/ImageIO/CGImageMetadata.cs @@ -28,7 +28,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public partial class CGImageMetadataEnumerateOptions { @@ -55,7 +55,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public partial class CGImageMetadata : NativeObject { #if !NET @@ -80,7 +80,7 @@ namespace ImageIO { { } - [DllImport (Constants.ImageIOLibrary, EntryPoint="CGImageMetadataGetTypeID")] + [DllImport (Constants.ImageIOLibrary, EntryPoint = "CGImageMetadataGetTypeID")] public extern static /* CFTypeID */ nint GetTypeID (); diff --git a/src/ImageIO/CGImageMetadataTag.cs b/src/ImageIO/CGImageMetadataTag.cs index ccd3f372f8..a34e9d961f 100644 --- a/src/ImageIO/CGImageMetadataTag.cs +++ b/src/ImageIO/CGImageMetadataTag.cs @@ -29,7 +29,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public class CGImageMetadataTag : NativeObject { @@ -46,7 +46,7 @@ namespace ImageIO { } #endif - [Preserve (Conditional=true)] + [Preserve (Conditional = true)] internal CGImageMetadataTag (NativeHandle handle, bool owns) : base (handle, owns) { @@ -83,7 +83,7 @@ namespace ImageIO { InitializeHandle (CGImageMetadataTagCreate (xmlns.Handle, prefix.GetHandle (), name.Handle, type, value)); } - [DllImport (Constants.ImageIOLibrary, EntryPoint="CGImageMetadataTagGetTypeID")] + [DllImport (Constants.ImageIOLibrary, EntryPoint = "CGImageMetadataTagGetTypeID")] public extern static nint GetTypeID (); @@ -141,7 +141,7 @@ namespace ImageIO { extern static /* CFArrayRef __nullable */ IntPtr CGImageMetadataTagCopyQualifiers ( /* CGImageMetadataTagRef __nonnull */ IntPtr tag); - public CGImageMetadataTag?[]? GetQualifiers () + public CGImageMetadataTag? []? GetQualifiers () { IntPtr result = CGImageMetadataTagCopyQualifiers (Handle); return CFArray.ArrayFromHandle (result, true); diff --git a/src/ImageIO/CGImageSource.cs b/src/ImageIO/CGImageSource.cs index 2eb77f1c4a..ffda362879 100644 --- a/src/ImageIO/CGImageSource.cs +++ b/src/ImageIO/CGImageSource.cs @@ -46,21 +46,21 @@ namespace ImageIO { #if !COREBUILD // untyped enum -> CGImageSource.h public enum CGImageSourceStatus { - Complete = 0, - Incomplete = -1, + Complete = 0, + Incomplete = -1, ReadingHeader = -2, - UnknownType = -3, - InvalidData = -4, + UnknownType = -3, + InvalidData = -4, UnexpectedEOF = -5, } - + public partial class CGImageOptions { public CGImageOptions () { ShouldCache = true; } - + public string? BestGuessTypeIdentifier { get; set; } public bool ShouldCache { get; set; } @@ -71,17 +71,17 @@ namespace ImageIO { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] - [Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] #endif public bool ShouldCacheImmediately { get; set; } public bool ShouldAllowFloat { get; set; } - + internal virtual NSMutableDictionary ToDictionary () { var dict = new NSMutableDictionary (); - + if (BestGuessTypeIdentifier is not null) dict.LowlevelSetObject (BestGuessTypeIdentifier, kTypeIdentifierHint); if (!ShouldCache) @@ -108,8 +108,8 @@ namespace ImageIO { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] - [Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] #endif public int? SubsampleFactor { get; set; } @@ -128,16 +128,15 @@ namespace ImageIO { dict.LowlevelSetObject (thandle, kCreateThumbnailWithTransform); if (SubsampleFactor.HasValue) dict.LowlevelSetObject (new NSNumber (SubsampleFactor.Value), kCGImageSourceSubsampleFactor); - + return dict; } } #endif - public partial class CGImageSource : NativeObject - { + public partial class CGImageSource : NativeObject { #if !COREBUILD - [DllImport (Constants.ImageIOLibrary, EntryPoint="CGImageSourceGetTypeID")] + [DllImport (Constants.ImageIOLibrary, EntryPoint = "CGImageSourceGetTypeID")] public extern static nint GetTypeID (); [DllImport (Constants.ImageIOLibrary)] @@ -150,7 +149,7 @@ namespace ImageIO { } } #endif - [Preserve (Conditional=true)] + [Preserve (Conditional = true)] internal CGImageSource (NativeHandle handle, bool owns) : base (handle, owns) { @@ -165,7 +164,7 @@ namespace ImageIO { { return FromUrl (url, null); } - + public static CGImageSource? FromUrl (NSUrl url, CGImageOptions? options) { if (url is null) @@ -185,7 +184,7 @@ namespace ImageIO { { return FromDataProvider (provider, null); } - + public static CGImageSource? FromDataProvider (CGDataProvider provider, CGImageOptions? options) { if (provider is null) @@ -205,7 +204,7 @@ namespace ImageIO { { return FromData (data, null); } - + public static CGImageSource? FromData (NSData data, CGImageOptions? options) { if (data is null) @@ -220,7 +219,7 @@ namespace ImageIO { [DllImport (Constants.ImageIOLibrary)] extern static /* CFStringRef __nullable */ IntPtr CGImageSourceGetType ( /* CGImageSourceRef __nonnull */ IntPtr handle); - + public string? TypeIdentifier { get { return CFString.FromHandle (CGImageSourceGetType (Handle)); @@ -229,7 +228,7 @@ namespace ImageIO { [DllImport (Constants.ImageIOLibrary)] extern static /* size_t */ nint CGImageSourceGetCount (/* CGImageSourceRef __nonnull */ IntPtr handle); - + public nint ImageCount { get { return CGImageSourceGetCount (Handle); @@ -330,7 +329,7 @@ namespace ImageIO { [DllImport (Constants.ImageIOLibrary)] extern static void CGImageSourceUpdateData (/* CGImageSourceRef __nonnull */ IntPtr isrc, /* CFDataRef __nonnull */ IntPtr data, [MarshalAs (UnmanagedType.I1)] bool final); - + public void UpdateData (NSData data, bool final) { if (data is null) @@ -353,7 +352,7 @@ namespace ImageIO { // note: CGImageSourceStatus is always an int (4 bytes) so it's ok to use in the pinvoke declaration [DllImport (Constants.ImageIOLibrary)] extern static CGImageSourceStatus CGImageSourceGetStatus (/* CGImageSourceRef __nonnull */ IntPtr isrc); - + public CGImageSourceStatus GetStatus () { return CGImageSourceGetStatus (Handle); @@ -362,7 +361,7 @@ namespace ImageIO { // note: CGImageSourceStatus is always an int (4 bytes) so it's ok to use in the pinvoke declaration [DllImport (Constants.ImageIOLibrary)] extern static CGImageSourceStatus CGImageSourceGetStatusAtIndex ( - /* CGImageSourceRef __nonnull */ IntPtr handle, /* size_t */ nint idx); + /* CGImageSourceRef __nonnull */ IntPtr handle, /* size_t */ nint idx); public CGImageSourceStatus GetStatus (int index) { @@ -410,10 +409,10 @@ namespace ImageIO { [SupportedOSPlatform ("tvos12.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Mac (10,14)] - [iOS (12,0)] - [TV (12,0)] - [Watch (5,0)] + [Mac (10, 14)] + [iOS (12, 0)] + [TV (12, 0)] + [Watch (5, 0)] #endif [DllImport (Constants.ImageIOLibrary)] extern static nuint CGImageSourceGetPrimaryImageIndex (IntPtr /* CGImageSource */ src); @@ -424,10 +423,10 @@ namespace ImageIO { [SupportedOSPlatform ("tvos12.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Mac (10,14)] - [iOS (12,0)] - [TV (12,0)] - [Watch (5,0)] + [Mac (10, 14)] + [iOS (12, 0)] + [TV (12, 0)] + [Watch (5, 0)] #endif public nuint GetPrimaryImageIndex () { diff --git a/src/ImageIO/CGImageSource.iOS.cs b/src/ImageIO/CGImageSource.iOS.cs index 90883a85ff..59043e5d02 100644 --- a/src/ImageIO/CGImageSource.iOS.cs +++ b/src/ImageIO/CGImageSource.iOS.cs @@ -17,7 +17,7 @@ using ObjCRuntime; using Foundation; namespace ImageIO { - + public partial class CGImageSource { // CGImageSource.h @@ -32,7 +32,7 @@ namespace ImageIO { [SupportedOSPlatform ("tvos")] [UnsupportedOSPlatform ("macos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif [EditorBrowsable (EditorBrowsableState.Advanced)] public CGImageMetadata? CopyMetadata (nint index, NSDictionary? options) @@ -47,7 +47,7 @@ namespace ImageIO { [SupportedOSPlatform ("tvos")] [UnsupportedOSPlatform ("macos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public CGImageMetadata? CopyMetadata (nint index, CGImageOptions? options) { @@ -62,7 +62,7 @@ namespace ImageIO { [SupportedOSPlatform ("tvos")] [UnsupportedOSPlatform ("macos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif [DllImport (Constants.ImageIOLibrary)] extern static void CGImageSourceRemoveCacheAtIndex (/* CGImageSourceRef __nonnull */ IntPtr isrc, @@ -74,7 +74,7 @@ namespace ImageIO { [SupportedOSPlatform ("tvos")] [UnsupportedOSPlatform ("macos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public void RemoveCache (nint index) { diff --git a/src/ImageIO/CGMutableImageMetadata.cs b/src/ImageIO/CGMutableImageMetadata.cs index 26e3234e4e..dae1e96d8d 100644 --- a/src/ImageIO/CGMutableImageMetadata.cs +++ b/src/ImageIO/CGMutableImageMetadata.cs @@ -24,7 +24,7 @@ namespace ImageIO { [SupportedOSPlatform ("macos")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public class CGMutableImageMetadata : CGImageMetadata { diff --git a/src/ImageIO/Enums.cs b/src/ImageIO/Enums.cs index 310c48e9e6..80acb2b704 100644 --- a/src/ImageIO/Enums.cs +++ b/src/ImageIO/Enums.cs @@ -15,7 +15,7 @@ namespace ImageIO { // untyped enum -> CGImageMetadata.h // note: not used in any API - [iOS (7,0)] + [iOS (7, 0)] [ErrorDomain ("kCFErrorDomainCGImageMetadata")] public enum CGImageMetadataErrors { Unknown = 0, @@ -26,7 +26,7 @@ namespace ImageIO { } // untyped enum -> CGImageMetadata.h - [iOS (7,0)] + [iOS (7, 0)] public enum CGImageMetadataType { Invalid = -1, Default = 0, @@ -51,7 +51,8 @@ namespace ImageIO { // untyped enum / #defines // used with kCGImagePropertyPNGCompressionFilter - [iOS (9,0)][Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] [Flags] public enum CGImagePropertyPngFilters { No = 0, @@ -63,8 +64,7 @@ namespace ImageIO { } [Mac (10, 15), iOS (13, 0), TV (13, 0), Watch (6, 0)] - public enum CGImageAnimationStatus - { + public enum CGImageAnimationStatus { Ok = 0, ParameterError = -22140, CorruptInputImage = -22141, @@ -74,7 +74,7 @@ namespace ImageIO { } // Yes, no [Native] here - [Mac (11,0), iOS (14,1), TV (14,2), Watch (7,1)] + [Mac (11, 0), iOS (14, 1), TV (14, 2), Watch (7, 1)] public enum CGImagePropertyTgaCompression : uint { None = 0, Rle, diff --git a/src/ImageKit/Enums.cs b/src/ImageKit/Enums.cs index 7f0d565697..e55c50adc7 100644 --- a/src/ImageKit/Enums.cs +++ b/src/ImageKit/Enums.cs @@ -39,68 +39,68 @@ namespace ImageKit { public enum IKCameraDeviceViewDisplayMode : long { None = -1, Table = 0, - Icon = 1 + Icon = 1 }; - + [Native] public enum IKCameraDeviceViewTransferMode : long { - File = 0, + File = 0, Memory = 1 }; - + [Native] public enum IKDeviceBrowserViewDisplayMode : long { - Table = 0, + Table = 0, Outline = 1, - Icon = 2 + Icon = 2 }; // Untyped enum in ObjC public enum IKImageBrowserCellState : int { NoImage = 0, Invalid = 1, - Ready = 2 - }; - + Ready = 2 + }; + [Flags] [Native] public enum IKCellsStyle : ulong { - None = 0, - Shadowed = 1 << 0, - Outlined = 1 << 1, - Titled = 1 << 2, + None = 0, + Shadowed = 1 << 0, + Outlined = 1 << 1, + Titled = 1 << 2, Subtitled = 1 << 3 }; //used as a value for the IKImageBrowserGroupStyleKey in the NSDictionary that defines a group in IKImageBrowserView [Native] public enum IKGroupStyle : long { - Bezel = 0, + Bezel = 0, Disclosure = 1 }; // Untyped enum in ObjC public enum IKImageBrowserDropOperation : int { - On = 0, + On = 0, Before = 1 }; - + [Native] public enum IKScannerDeviceViewTransferMode : long { - File = 0, + File = 0, Memory = 1 }; - + [Native] public enum IKScannerDeviceViewDisplayMode : long { - None = -1, - Simple = 0, + None = -1, + Simple = 0, Advanced = 1 }; [Flags] public enum IKFilterBrowserPanelStyleMask : uint { - Normal = 0, + Normal = 0, Textured = 1 << 8 // Other NSWindow Style Mask bit settings do not apply to this panel } diff --git a/src/Intents/INBillTypeResolutionResult.cs b/src/Intents/INBillTypeResolutionResult.cs index 8411dfe262..8183364415 100644 --- a/src/Intents/INBillTypeResolutionResult.cs +++ b/src/Intents/INBillTypeResolutionResult.cs @@ -22,7 +22,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return SuccessWithResolvedBillType (resolvedValue); + return SuccessWithResolvedBillType (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -34,7 +34,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return ConfirmationRequiredWithBillTypeToConfirm (valueToConfirm); + return ConfirmationRequiredWithBillTypeToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INCallRecordTypeResolutionResult.cs b/src/Intents/INCallRecordTypeResolutionResult.cs index 2bccaa2c1e..eddbd72c4e 100644 --- a/src/Intents/INCallRecordTypeResolutionResult.cs +++ b/src/Intents/INCallRecordTypeResolutionResult.cs @@ -24,7 +24,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - return SuccessWithResolvedCallRecordType (resolvedValue); + return SuccessWithResolvedCallRecordType (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -38,7 +38,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - return ConfirmationRequiredWithCallRecordTypeToConfirm (valueToConfirm); + return ConfirmationRequiredWithCallRecordTypeToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INCarSignalOptionsResolutionResult.cs b/src/Intents/INCarSignalOptionsResolutionResult.cs index 370619b8ee..a8073ea747 100644 --- a/src/Intents/INCarSignalOptionsResolutionResult.cs +++ b/src/Intents/INCarSignalOptionsResolutionResult.cs @@ -22,7 +22,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return SuccessWithResolvedCarSignalOptions (resolvedValue); + return SuccessWithResolvedCarSignalOptions (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -34,7 +34,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return ConfirmationRequiredWithCarSignalOptionsToConfirm (valueToConfirm); + return ConfirmationRequiredWithCarSignalOptionsToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INIntentResolutionResult.cs b/src/Intents/INIntentResolutionResult.cs index fcfd5f300f..a20820a650 100644 --- a/src/Intents/INIntentResolutionResult.cs +++ b/src/Intents/INIntentResolutionResult.cs @@ -26,12 +26,11 @@ namespace Intents { [iOS (10, 0)] [Mac (10, 12, 0, PlatformArchitecture.Arch64)] [Watch (3, 2)] - [TV (14,0)] + [TV (14, 0)] #endif [Register ("INIntentResolutionResult", SkipRegistration = true)] public sealed partial class INIntentResolutionResult : INIntentResolutionResult - where ObjectType : class, INativeObject - { + where ObjectType : class, INativeObject { internal INIntentResolutionResult (NativeHandle handle) : base (handle) { } @@ -63,9 +62,9 @@ namespace Intents { [SupportedOSPlatform ("tvos14.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Watch (6,0)] - [iOS (13,0)] - [Mac (11,0)] + [Watch (6, 0)] + [iOS (13, 0)] + [Mac (11, 0)] #endif public static INIntentResolutionResult GetUnsupported (nint reason) => throw new NotImplementedException ("All subclasses of INIntentResolutionResult must re-implement this method"); @@ -75,9 +74,9 @@ namespace Intents { [SupportedOSPlatform ("tvos14.0")] [SupportedOSPlatform ("maccatalyst")] #else - [Watch (6,0)] - [iOS (13,0)] - [Mac (11,0)] + [Watch (6, 0)] + [iOS (13, 0)] + [Mac (11, 0)] #endif public static INIntentResolutionResult GetConfirmationRequired (NSObject itemToConfirm, nint reason) => throw new NotImplementedException ("All subclasses of INIntentResolutionResult must re-implement this method"); diff --git a/src/Intents/INMessageAttributeOptionsResolutionResult.cs b/src/Intents/INMessageAttributeOptionsResolutionResult.cs index 4d2a6094b1..5ec88e8cac 100644 --- a/src/Intents/INMessageAttributeOptionsResolutionResult.cs +++ b/src/Intents/INMessageAttributeOptionsResolutionResult.cs @@ -25,7 +25,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - return SuccessWithResolvedMessageAttributeOptions (resolvedValue); + return SuccessWithResolvedMessageAttributeOptions (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -39,7 +39,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - return ConfirmationRequiredWithMessageAttributeOptionsToConfirm (valueToConfirm); + return ConfirmationRequiredWithMessageAttributeOptionsToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INMessageAttributeResolutionResult.cs b/src/Intents/INMessageAttributeResolutionResult.cs index 44a6e87693..3954bf285b 100644 --- a/src/Intents/INMessageAttributeResolutionResult.cs +++ b/src/Intents/INMessageAttributeResolutionResult.cs @@ -25,7 +25,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - return SuccessWithResolvedMessageAttribute (resolvedValue); + return SuccessWithResolvedMessageAttribute (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -39,7 +39,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - return ConfirmationRequiredWithMessageAttributeToConfirm (valueToConfirm); + return ConfirmationRequiredWithMessageAttributeToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INPaymentStatusResolutionResult.cs b/src/Intents/INPaymentStatusResolutionResult.cs index e4837050e7..f9ec101b46 100644 --- a/src/Intents/INPaymentStatusResolutionResult.cs +++ b/src/Intents/INPaymentStatusResolutionResult.cs @@ -22,7 +22,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return SuccessWithResolvedPaymentStatus (resolvedValue); + return SuccessWithResolvedPaymentStatus (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -34,7 +34,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return ConfirmationRequiredWithPaymentStatusToConfirm (valueToConfirm); + return ConfirmationRequiredWithPaymentStatusToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INPerson.cs b/src/Intents/INPerson.cs index cf06486f96..fc08efd1a4 100644 --- a/src/Intents/INPerson.cs +++ b/src/Intents/INPerson.cs @@ -5,12 +5,10 @@ using ObjCRuntime; #nullable enable -namespace Intents -{ +namespace Intents { #if !TVOS - public partial class INPerson - { + public partial class INPerson { #if NET [SupportedOSPlatform ("ios15.0")] @@ -18,12 +16,12 @@ namespace Intents [SupportedOSPlatform ("maccatalyst")] [UnsupportedOSPlatform ("tvos")] #else - [Introduced (PlatformName.iOS, 15,0)] - [Introduced (PlatformName.MacOSX, 12,0)] - [Introduced (PlatformName.WatchOS, 8,0)] + [Introduced (PlatformName.iOS, 15, 0)] + [Introduced (PlatformName.MacOSX, 12, 0)] + [Introduced (PlatformName.WatchOS, 8, 0)] #endif public enum INPersonType { - Me = 0, + Me = 0, ContactSuggestion = 1, } @@ -33,9 +31,9 @@ namespace Intents [SupportedOSPlatform ("maccatalyst")] [UnsupportedOSPlatform ("tvos")] #else - [Introduced (PlatformName.iOS, 15,0)] - [Introduced (PlatformName.MacOSX, 12,0)] - [Introduced (PlatformName.WatchOS, 8,0)] + [Introduced (PlatformName.iOS, 15, 0)] + [Introduced (PlatformName.MacOSX, 12, 0)] + [Introduced (PlatformName.WatchOS, 8, 0)] #endif public INPerson (INPersonHandle personHandle, NSPersonNameComponents? nameComponents, string? displayName, INImage? image, string? contactIdentifier, string? customIdentifier, bool isMe, INPersonSuggestionType suggestionType) : this (personHandle, nameComponents, displayName, image, contactIdentifier, customIdentifier, isMe, suggestionType, INPersonType.Me) @@ -48,9 +46,9 @@ namespace Intents [SupportedOSPlatform ("maccatalyst")] [UnsupportedOSPlatform ("tvos")] #else - [Introduced (PlatformName.iOS, 15,0)] - [Introduced (PlatformName.MacOSX, 12,0)] - [Introduced (PlatformName.WatchOS, 8,0)] + [Introduced (PlatformName.iOS, 15, 0)] + [Introduced (PlatformName.MacOSX, 12, 0)] + [Introduced (PlatformName.WatchOS, 8, 0)] #endif public INPerson (INPersonHandle personHandle, NSPersonNameComponents? nameComponents, string? displayName, INImage? image, string? contactIdentifier, string? customIdentifier, bool isMe, INPersonSuggestionType suggestionType, INPersonType personType) : base (NSObjectFlag.Empty) { diff --git a/src/Intents/INSpeakableString.cs b/src/Intents/INSpeakableString.cs index 2a7c622582..a7561e782b 100644 --- a/src/Intents/INSpeakableString.cs +++ b/src/Intents/INSpeakableString.cs @@ -23,7 +23,7 @@ namespace Intents { #elif MONOMAC if (SystemVersion.CheckmacOS (10, 13)) #endif - InitializeHandle (InitWithVocabularyIdentifier (identifier, spokenPhrase, pronunciationHint)); + InitializeHandle (InitWithVocabularyIdentifier (identifier, spokenPhrase, pronunciationHint)); #if !TVOS else InitializeHandle (InitWithIdentifier (identifier, spokenPhrase, pronunciationHint)); diff --git a/src/Intents/INWorkoutGoalUnitTypeResolutionResult.cs b/src/Intents/INWorkoutGoalUnitTypeResolutionResult.cs index 014dde5940..abc83a3e1b 100644 --- a/src/Intents/INWorkoutGoalUnitTypeResolutionResult.cs +++ b/src/Intents/INWorkoutGoalUnitTypeResolutionResult.cs @@ -22,7 +22,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return SuccessWithResolvedWorkoutGoalUnitType (resolvedValue); + return SuccessWithResolvedWorkoutGoalUnitType (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -34,7 +34,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return ConfirmationRequiredWithWorkoutGoalUnitTypeToConfirm (valueToConfirm); + return ConfirmationRequiredWithWorkoutGoalUnitTypeToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/Intents/INWorkoutLocationTypeResolutionResult.cs b/src/Intents/INWorkoutLocationTypeResolutionResult.cs index 474d726e7f..96b5a91293 100644 --- a/src/Intents/INWorkoutLocationTypeResolutionResult.cs +++ b/src/Intents/INWorkoutLocationTypeResolutionResult.cs @@ -22,7 +22,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return SuccessWithResolvedWorkoutLocationType (resolvedValue); + return SuccessWithResolvedWorkoutLocationType (resolvedValue); else return SuccessWithResolvedValue (resolvedValue); } @@ -34,7 +34,7 @@ namespace Intents { #elif WATCH if (SystemVersion.CheckwatchOS (4, 0)) #endif - return ConfirmationRequiredWithWorkoutLocationTypeToConfirm (valueToConfirm); + return ConfirmationRequiredWithWorkoutLocationTypeToConfirm (valueToConfirm); else return ConfirmationRequiredWithValueToConfirm (valueToConfirm); } diff --git a/src/JavaScriptCore/Enums.cs b/src/JavaScriptCore/Enums.cs index 78cf3c26eb..4c9ae64465 100644 --- a/src/JavaScriptCore/Enums.cs +++ b/src/JavaScriptCore/Enums.cs @@ -19,7 +19,8 @@ namespace JavaScriptCore { Number, String, Object, - [iOS (13,0)][Mac (10,15)] + [iOS (13, 0)] + [Mac (10, 15)] Symbol, } diff --git a/src/JavaScriptCore/Extensions.cs b/src/JavaScriptCore/Extensions.cs index 072e49a08e..22dbd8713f 100644 --- a/src/JavaScriptCore/Extensions.cs +++ b/src/JavaScriptCore/Extensions.cs @@ -14,8 +14,8 @@ using Foundation; namespace JavaScriptCore { public partial class JSContext { - - public JSValue this[NSObject key] { + + public JSValue this [NSObject key] { get { return _GetObject (key); } set { _SetObject (value, key); } } @@ -31,16 +31,16 @@ namespace JavaScriptCore { static public JSValue From (string value, JSContext context) { using (var str = new NSString (value)) { - return From ((NSObject)str, context); + return From ((NSObject) str, context); } } - public JSValue this[nuint index] { + public JSValue this [nuint index] { get { return _ObjectAtIndexedSubscript (index); } set { _SetObject (value, index); } } - public JSValue this[NSObject key] { + public JSValue this [NSObject key] { get { return _ObjectForKeyedSubscript (key); } set { _SetObject (value, key); } } diff --git a/src/LocalAuthentication/LAEnums.cs b/src/LocalAuthentication/LAEnums.cs index 5c611b59ab..a9eb3cb320 100644 --- a/src/LocalAuthentication/LAEnums.cs +++ b/src/LocalAuthentication/LAEnums.cs @@ -4,26 +4,32 @@ using Foundation; namespace LocalAuthentication { - [iOS (8,0)] + [iOS (8, 0)] [Mac (10, 10)] [NoTV] [Native] public enum LAPolicy : long { - [Mac (10,12,2), NoWatch] + [Mac (10, 12, 2), NoWatch] DeviceOwnerAuthenticationWithBiometrics = 1, DeviceOwnerAuthentication = 2, - [NoiOS][Mac (10,15)][NoWatch] + [NoiOS] + [Mac (10, 15)] + [NoWatch] DeviceOwnerAuthenticationWithWatch = 3, - [NoiOS][Mac (10,15)][NoWatch] + [NoiOS] + [Mac (10, 15)] + [NoWatch] DeviceOwnerAuthenticationWithBiometricsOrWatch = 4, [Obsolete ("Use DeviceOwnerAuthenticationWithBiometricsOrWatch enum value instead.")] - [NoiOS][Mac (10,15)][NoWatch] + [NoiOS] + [Mac (10, 15)] + [NoWatch] OwnerAuthenticationWithBiometricsOrWatch = DeviceOwnerAuthenticationWithBiometricsOrWatch, - [NoMac, NoiOS, NoMacCatalyst, Watch (9,0)] + [NoMac, NoiOS, NoMacCatalyst, Watch (9, 0)] DeviceOwnerAuthenticationWithWristDetection = 5, } - [iOS (8,0)] + [iOS (8, 0)] [Mac (10, 10)] [NoTV] [Native ("LAError")] @@ -33,58 +39,58 @@ namespace LocalAuthentication { /// Authentication was not successful, because user failed to provide valid credentials. AuthenticationFailed = -1, /// Authentication was canceled by user (e.g. tapped Cancel button). - UserCancel = -2, + UserCancel = -2, /// Authentication was canceled, because the user tapped the fallback button (Enter Password). - UserFallback = -3, + UserFallback = -3, /// Authentication was canceled by system (e.g. another application went to foreground). - SystemCancel = -4, + SystemCancel = -4, /// Authentication could not start, because passcode is not set on the device. - PasscodeNotSet = -5, + PasscodeNotSet = -5, #if !NET /// Authentication could not start, because Touch ID is not available on the device. - [Deprecated (PlatformName.iOS, 11,0, message: "Use 'BiometryNotAvailable' instead.")] - [Deprecated (PlatformName.MacOSX, 10,13, message: "Use 'BiometryNotAvailable' instead.")] - TouchIDNotAvailable = BiometryNotAvailable, + [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'BiometryNotAvailable' instead.")] + [Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'BiometryNotAvailable' instead.")] + TouchIDNotAvailable = BiometryNotAvailable, /// Authentication could not start, because Touch ID has no enrolled fingers. - [Deprecated (PlatformName.iOS, 11,0, message: "Use 'BiometryNotEnrolled' instead.")] - [Deprecated (PlatformName.MacOSX, 10,13, message: "Use 'BiometryNotEnrolled' instead.")] - TouchIDNotEnrolled = BiometryNotEnrolled, + [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'BiometryNotEnrolled' instead.")] + [Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'BiometryNotEnrolled' instead.")] + TouchIDNotEnrolled = BiometryNotEnrolled, - [Deprecated (PlatformName.iOS, 11,0, message: "Use 'BiometryLockout' instead.")] - [Deprecated (PlatformName.MacOSX, 10,13, message: "Use 'BiometryLockout' instead.")] - TouchIDLockout = BiometryLockout, + [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'BiometryLockout' instead.")] + [Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'BiometryLockout' instead.")] + TouchIDLockout = BiometryLockout, #endif - AppCancel = -9, - InvalidContext = -10, + AppCancel = -9, + InvalidContext = -10, [NoiOS, NoWatch, NoMacCatalyst] - WatchNotAvailable = -11, + WatchNotAvailable = -11, [NoiOS, NoWatch, NoMacCatalyst] - BiometryNotPaired = -12, + BiometryNotPaired = -12, [NoiOS, NoWatch, NoMacCatalyst] BiometryDisconnected = -13, [NoiOS, NoWatch, NoMacCatalyst] - InvalidDimension = -14, + InvalidDimension = -14, [NoWatch] BiometryNotAvailable = -6, [NoWatch] BiometryNotEnrolled = -7, [NoWatch] BiometryLockout = -8, - NotInteractive = -1004, + NotInteractive = -1004, } - [iOS (9,0), Mac (10,11), Watch (3,0), NoTV] + [iOS (9, 0), Mac (10, 11), Watch (3, 0), NoTV] [Native] public enum LACredentialType : long { ApplicationPassword = 0, - [iOS (13,4), Mac (10,15,4), NoWatch, NoTV] + [iOS (13, 4), Mac (10, 15, 4), NoWatch, NoTV] SmartCardPin = -3, } - [iOS (9,0)] - [Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] [NoTV] [Native] public enum LAAccessControlOperation : long { @@ -92,16 +98,17 @@ namespace LocalAuthentication { UseItem, CreateKey, UseKeySign, - [iOS (10,0)][Mac (10,12)] + [iOS (10, 0)] + [Mac (10, 12)] UseKeyDecrypt, - [iOS (10,0)][Mac (10,12)] + [iOS (10, 0)] + [Mac (10, 12)] UseKeyKeyExchange, } - [Mac (13,0), iOS (16,0), MacCatalyst (16,0), NoWatch, NoTV] + [Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0), NoWatch, NoTV] [Native] - public enum LARightState : long - { + public enum LARightState : long { Unknown = 0, Authorizing = 1, Authorized = 2, diff --git a/src/MLCompute/MLHelpers.cs b/src/MLCompute/MLHelpers.cs index dc89e50262..c09d61c7ed 100644 --- a/src/MLCompute/MLHelpers.cs +++ b/src/MLCompute/MLHelpers.cs @@ -15,9 +15,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCActivationTypeExtensions { @@ -37,9 +37,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCArithmeticOperationExtensions { @@ -59,9 +59,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCPaddingPolicyExtensions { @@ -81,9 +81,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCLossTypeExtensions { @@ -103,9 +103,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCReductionTypeExtensions { @@ -125,9 +125,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCPaddingTypeExtensions { @@ -147,9 +147,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCConvolutionTypeExtensions { @@ -169,9 +169,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCPoolingTypeExtensions { @@ -191,9 +191,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCSoftmaxOperationExtensions { @@ -213,9 +213,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCSampleModeExtensions { @@ -235,9 +235,9 @@ namespace MLCompute { [SupportedOSPlatform ("macos11.0")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (14,0)] - [TV (14,0)] - [Mac (11,0)] + [iOS (14, 0)] + [TV (14, 0)] + [Mac (11, 0)] [NoWatch] #endif public static class MLCLstmResultModeExtensions { @@ -257,9 +257,9 @@ namespace MLCompute { [SupportedOSPlatform ("ios14.5")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (14,5)] - [Mac (11,3)] - [iOS (14,5)] + [TV (14, 5)] + [Mac (11, 3)] + [iOS (14, 5)] [NoWatch] #endif public static class MLCComparisonOperationExtensions { @@ -280,10 +280,10 @@ namespace MLCompute { [SupportedOSPlatform ("maccatalyst15.0")] #else [NoWatch] - [TV (15,0)] - [Mac (12,0)] - [iOS (15,0)] - [MacCatalyst (15,0)] + [TV (15, 0)] + [Mac (12, 0)] + [iOS (15, 0)] + [MacCatalyst (15, 0)] #endif public static class MLCGradientClippingTypeExtensions { diff --git a/src/MapKit/MKEnums.cs b/src/MapKit/MKEnums.cs index 81e6afd750..1df61fb0b7 100644 --- a/src/MapKit/MKEnums.cs +++ b/src/MapKit/MKEnums.cs @@ -22,17 +22,17 @@ namespace MapKit { // NSUInteger -> MKDirectionsTypes.h [NoWatch] [Native] - [TV (9,2)] - [iOS (7,0)] + [TV (9, 2)] + [iOS (7, 0)] public enum MKDirectionsTransportType : ulong { Automobile = 1 << 0, - Walking = 1 << 1, - Transit = 1 << 2, - Any = 0x0FFFFFFF, + Walking = 1 << 1, + Transit = 1 << 2, + Any = 0x0FFFFFFF, } // NSUInteger -> MKTypes.h - [TV (9,2)] + [TV (9, 2)] [NoWatch] [Native] public enum MKMapType : ulong { @@ -41,14 +41,16 @@ namespace MapKit { Hybrid, SatelliteFlyover, HybridFlyover, - [iOS (11,0)][TV (11,0)][Mac (10,13)] + [iOS (11, 0)] + [TV (11, 0)] + [Mac (10, 13)] MutedStandard, } // NSUInteger -> MKDistanceFormatter.h [Native] - [TV (9,2)] - [iOS (7,0)] + [TV (9, 2)] + [iOS (7, 0)] public enum MKDistanceFormatterUnits : ulong { Default, Metric, @@ -58,8 +60,8 @@ namespace MapKit { // NSUInteger -> MKDistanceFormatter.h [Native] - [TV (9,2)] - [iOS (7,0)] + [TV (9, 2)] + [iOS (7, 0)] public enum MKDistanceFormatterUnitStyle : ulong { Default = 0, Abbreviated, @@ -67,17 +69,17 @@ namespace MapKit { } // NSInteger -> MKMapView.h - [TV (9,2)] + [TV (9, 2)] [NoWatch] [Native] - [iOS (7,0)] + [iOS (7, 0)] public enum MKOverlayLevel : long { AboveRoads = 0, AboveLabels, } // NSUInteger -> MKTypes.h - [TV (9,2)] + [TV (9, 2)] [NoWatch] [Native] [ErrorDomain ("MKErrorDomain")] @@ -97,23 +99,23 @@ namespace MapKit { public enum MKAnnotationViewDragState : ulong { None, Starting, Dragging, Canceling, Ending } - + // NSUInteger -> MKTypes.h [NoTV] [NoWatch] [Native] - [Deprecated (PlatformName.iOS, 9, 0, message : "Use 'MKPinAnnotationView.PinTintColor' instead.")] + [Deprecated (PlatformName.iOS, 9, 0, message: "Use 'MKPinAnnotationView.PinTintColor' instead.")] public enum MKPinAnnotationColor : ulong { Red, Green, Purple } // NSUInteger -> MKTypes.h - [TV (9,2)] + [TV (9, 2)] [NoWatch] [Native] public enum MKUserTrackingMode : ulong { None, - Follow, + Follow, #if !XAMCORE_5_0 && !(IOS || MACCATALYST) [Obsolete ("This is only available on iOS and MacCatalyst.")] FollowWithHeading, @@ -122,7 +124,9 @@ namespace MapKit { #endif } - [TV (9,2)][NoWatch][iOS (9,3)] + [TV (9, 2)] + [NoWatch] + [iOS (9, 3)] [Native] [Deprecated (PlatformName.iOS, 13, 0, message: "Use 'MKLocalSearchCompleterResultType' instead.")] [Deprecated (PlatformName.MacOSX, 10, 15, message: "Use 'MKLocalSearchCompleterResultType' instead.")] @@ -132,23 +136,34 @@ namespace MapKit { Only } - [TV (11,0)][NoWatch][iOS (11,0)][Mac (10,13)] + [TV (11, 0)] + [NoWatch] + [iOS (11, 0)] + [Mac (10, 13)] [Native] public enum MKAnnotationViewCollisionMode : long { Rectangle, Circle, - [TV (14,0)][iOS (14,0)][Mac (11,0)] + [TV (14, 0)] + [iOS (14, 0)] + [Mac (11, 0)] None, } - [TV (11,0)][NoWatch][iOS (11,0)][NoMac] + [TV (11, 0)] + [NoWatch] + [iOS (11, 0)] + [NoMac] [Native] public enum MKScaleViewAlignment : long { Leading, Trailing, } - [TV (11,0)][NoWatch][iOS (11,0)][Mac (10,13)] + [TV (11, 0)] + [NoWatch] + [iOS (11, 0)] + [Mac (10, 13)] [Native] public enum MKFeatureVisibility : long { Adaptive, @@ -157,72 +172,64 @@ namespace MapKit { } [Flags] - [TV (13,0), NoWatch, Mac (10,15), iOS (13,0)] + [TV (13, 0), NoWatch, Mac (10, 15), iOS (13, 0)] [Native] - public enum MKLocalSearchCompleterResultType : ulong - { + public enum MKLocalSearchCompleterResultType : ulong { Address = 1 << 0, PointOfInterest = 1 << 1, Query = 1 << 2, } [Flags] - [TV (13,0), NoWatch, Mac (10,15), iOS (13,0)] + [TV (13, 0), NoWatch, Mac (10, 15), iOS (13, 0)] [Native] - public enum MKLocalSearchResultType : ulong - { + public enum MKLocalSearchResultType : ulong { Address = 1 << 0, PointOfInterest = 1 << 1, } - [Mac (13,0), iOS (16,0), MacCatalyst (16,0), NoWatch, TV (16,0)] + [Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0), NoWatch, TV (16, 0)] [Native] - public enum MKDirectionsRoutePreference : long - { + public enum MKDirectionsRoutePreference : long { Any = 0, Avoid, } [Flags] - [NoMac, iOS (16,0), MacCatalyst (16,0), NoWatch, NoTV] + [NoMac, iOS (16, 0), MacCatalyst (16, 0), NoWatch, NoTV] [Native] - public enum MKMapFeatureOptions : long - { - PointsOfInterest = 1 << (int)MKMapFeatureType.PointOfInterest, - Territories = 1 << (int)MKMapFeatureType.Territory, - PhysicalFeatures = 1 << (int)MKMapFeatureType.PhysicalFeature, + public enum MKMapFeatureOptions : long { + PointsOfInterest = 1 << (int) MKMapFeatureType.PointOfInterest, + Territories = 1 << (int) MKMapFeatureType.Territory, + PhysicalFeatures = 1 << (int) MKMapFeatureType.PhysicalFeature, } - [Mac (13,0), iOS (16,0), MacCatalyst (16,0), NoWatch, NoTV] + [Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0), NoWatch, NoTV] [Native] - public enum MKLookAroundBadgePosition : long - { + public enum MKLookAroundBadgePosition : long { TopLeading = 0, TopTrailing, BottomTrailing, } - [Mac (13,0), iOS (16,0), MacCatalyst (16,0), NoWatch, TV (16,0)] + [Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0), NoWatch, TV (16, 0)] [Native] - public enum MKMapElevationStyle : long - { + public enum MKMapElevationStyle : long { Flat = 0, Realistic, } - [NoMac, iOS (16,0), MacCatalyst (16,0), NoWatch, NoTV] + [NoMac, iOS (16, 0), MacCatalyst (16, 0), NoWatch, NoTV] [Native] - public enum MKMapFeatureType : long - { + public enum MKMapFeatureType : long { PointOfInterest = 0, Territory, PhysicalFeature, } - [Mac (13,0), iOS (16,0), MacCatalyst (16,0), NoWatch, TV (16,0)] + [Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0), NoWatch, TV (16, 0)] [Native] - public enum MKStandardMapEmphasisStyle : long - { + public enum MKStandardMapEmphasisStyle : long { Default = 0, Muted, } diff --git a/src/MapKit/MKFeatureDisplayPriority.cs b/src/MapKit/MKFeatureDisplayPriority.cs index 0644cb4691..87278012e3 100644 --- a/src/MapKit/MKFeatureDisplayPriority.cs +++ b/src/MapKit/MKFeatureDisplayPriority.cs @@ -13,10 +13,10 @@ namespace MapKit { [SupportedOSPlatform ("macos10.13")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (11,0)] + [TV (11, 0)] [NoWatch] - [iOS (11,0)] - [Mac (10,13)] + [iOS (11, 0)] + [Mac (10, 13)] #endif #if WATCH && !NET [Obsolete ("This API is not available on this platform.")] diff --git a/src/MapKit/MKGeodesicPolyline.cs b/src/MapKit/MKGeodesicPolyline.cs index 638c34ac49..e3ca2cb38a 100644 --- a/src/MapKit/MKGeodesicPolyline.cs +++ b/src/MapKit/MKGeodesicPolyline.cs @@ -44,7 +44,7 @@ namespace MapKit { if (points.Length == 0) return PolylineWithPoints (IntPtr.Zero, 0); - fixed (MKMapPoint *first = &points [0]){ + fixed (MKMapPoint* first = &points [0]) { return PolylineWithPoints ((IntPtr) first, points.Length); } } @@ -56,7 +56,7 @@ namespace MapKit { if (coords.Length == 0) return PolylineWithCoordinates (IntPtr.Zero, 0); - fixed (CLLocationCoordinate2D *first = &coords [0]){ + fixed (CLLocationCoordinate2D* first = &coords [0]) { return PolylineWithCoordinates ((IntPtr) first, coords.Length); } } diff --git a/src/MapKit/MKLocalSearch.cs b/src/MapKit/MKLocalSearch.cs index c2f3d49218..d85b1efefc 100644 --- a/src/MapKit/MKLocalSearch.cs +++ b/src/MapKit/MKLocalSearch.cs @@ -45,13 +45,13 @@ namespace MapKit { tcs.SetCanceled (); } else { var tcr = token.Register (() => { this.Cancel (); tcs.TrySetCanceled (); }); - Start((response, error) => { + Start ((response, error) => { tcr.Dispose (); if (token.IsCancellationRequested) { tcs.TrySetCanceled (); } else { if (error is not null) - tcs.SetException (new NSErrorException(error)); + tcs.SetException (new NSErrorException (error)); else tcs.SetResult (response); } diff --git a/src/MapKit/MKMapItem.cs b/src/MapKit/MKMapItem.cs index ee1973c843..3fcf0f87cb 100644 --- a/src/MapKit/MKMapItem.cs +++ b/src/MapKit/MKMapItem.cs @@ -26,10 +26,10 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [UnsupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] [NoTV] - [Watch (3,0)] - [Mac (10,12)] + [Watch (3, 0)] + [Mac (10, 12)] #endif Default } @@ -39,8 +39,7 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("macos")] #endif - public class MKLaunchOptions - { + public class MKLaunchOptions { public MKDirectionsMode? DirectionsMode { get; set; } #if !WATCH // MapType: __WATCHOS_PROHIBITED public MKMapType? MapType { get; set; } @@ -58,7 +57,7 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("macos")] #else - [iOS (7,0)] + [iOS (7, 0)] #endif public MKMapCamera? Camera { get; set; } #endif @@ -78,14 +77,14 @@ namespace MapKit { #endif if (n == 0) return null; - + var keys = new NSObject [n]; var values = new NSObject [n]; int i = 0; - if (DirectionsMode.HasValue){ + if (DirectionsMode.HasValue) { keys [i] = MKMapItem.MKLaunchOptionsDirectionsModeKey; NSString v = MKMapItem.MKLaunchOptionsDirectionsModeDriving; - switch (DirectionsMode.Value){ + switch (DirectionsMode.Value) { case MKDirectionsMode.Driving: v = MKMapItem.MKLaunchOptionsDirectionsModeDriving; break; @@ -105,21 +104,21 @@ namespace MapKit { } #if !WATCH // MapType: __WATCHOS_PROHIBITED - if (MapType.HasValue){ + if (MapType.HasValue) { keys [i] = MKMapItem.MKLaunchOptionsMapTypeKey; values [i++] = new NSNumber ((int) MapType.Value); } #endif - if (MapCenter.HasValue){ + if (MapCenter.HasValue) { keys [i] = MKMapItem.MKLaunchOptionsMapCenterKey; values [i++] = NSValue.FromMKCoordinate (MapCenter.Value); } - if (MapSpan.HasValue){ + if (MapSpan.HasValue) { keys [i] = MKMapItem.MKLaunchOptionsMapSpanKey; values [i++] = NSValue.FromMKCoordinateSpan (MapSpan.Value); } #if !WATCH // ShowsTraffic: __WATCHOS_PROHIBITED - if (ShowTraffic.HasValue){ + if (ShowTraffic.HasValue) { keys [i] = MKMapItem.MKLaunchOptionsShowsTrafficKey; values [i++] = new NSNumber (ShowTraffic.Value); } @@ -145,6 +144,6 @@ namespace MapKit { return _OpenMaps (mapItems, launchOptions?.ToDictionary ()); } } - + } #endif diff --git a/src/MapKit/MKMultiPoint.cs b/src/MapKit/MKMultiPoint.cs index 271511a86c..900b46d1bc 100644 --- a/src/MapKit/MKMultiPoint.cs +++ b/src/MapKit/MKMultiPoint.cs @@ -12,7 +12,7 @@ namespace MapKit { public partial class MKMultiPoint { public unsafe MKMapPoint [] Points { get { - var source = (MKMapPoint *) _Points; + var source = (MKMapPoint*) _Points; nint n = PointCount; var result = new MKMapPoint [n]; for (int i = 0; i < n; i++) @@ -26,7 +26,7 @@ namespace MapKit { { var range = new NSRange (first, count); var target = new CLLocationCoordinate2D [count]; - fixed (CLLocationCoordinate2D *firstE = &target [0]){ + fixed (CLLocationCoordinate2D* firstE = &target [0]) { GetCoords ((IntPtr) firstE, range); } return target; diff --git a/src/MapKit/MKOverlayView.cs b/src/MapKit/MKOverlayView.cs index 4f1ede2c0c..b52dcb58ee 100644 --- a/src/MapKit/MKOverlayView.cs +++ b/src/MapKit/MKOverlayView.cs @@ -23,8 +23,8 @@ namespace MapKit { [UnsupportedOSPlatform ("ios7.0")] [ObsoletedOSPlatform ("ios7.0", "Use 'MKOverlayRenderer' instead.")] #else - [TV (9,2)] - [Mac (10,9)] + [TV (9, 2)] + [Mac (10, 9)] #endif [DllImport (Constants.MapKitLibrary)] public static extern nfloat MKRoadWidthAtZoomScale (/* MKZoomScale */ nfloat zoomScale); diff --git a/src/MapKit/MKPointOfInterestFilter.cs b/src/MapKit/MKPointOfInterestFilter.cs index 4d4d7dba8f..d40e91d10d 100644 --- a/src/MapKit/MKPointOfInterestFilter.cs +++ b/src/MapKit/MKPointOfInterestFilter.cs @@ -7,17 +7,17 @@ using ObjCRuntime; namespace MapKit { - public enum MKPointOfInterestFilterType { + public enum MKPointOfInterestFilterType { Including, Excluding, } public partial class MKPointOfInterestFilter { - public MKPointOfInterestFilter (MKPointOfInterestCategory[] categories) : this (categories, MKPointOfInterestFilterType.Including) + public MKPointOfInterestFilter (MKPointOfInterestCategory [] categories) : this (categories, MKPointOfInterestFilterType.Including) { } - public MKPointOfInterestFilter (MKPointOfInterestCategory[] categories, MKPointOfInterestFilterType type) + public MKPointOfInterestFilter (MKPointOfInterestCategory [] categories, MKPointOfInterestFilterType type) { // two different `init*` would share the same C# signature switch (type) { diff --git a/src/MapKit/MKPolygon.cs b/src/MapKit/MKPolygon.cs index 223fffe8ef..a89c16ca12 100644 --- a/src/MapKit/MKPolygon.cs +++ b/src/MapKit/MKPolygon.cs @@ -17,8 +17,8 @@ namespace MapKit { ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (points)); if (points.Length == 0) return _FromPoints (IntPtr.Zero, 0); - - fixed (MKMapPoint *first = &points [0]){ + + fixed (MKMapPoint* first = &points [0]) { return _FromPoints ((IntPtr) first, points.Length); } } @@ -29,8 +29,8 @@ namespace MapKit { ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (points)); if (points.Length == 0) return _FromPoints (IntPtr.Zero, 0); - - fixed (MKMapPoint *first = &points [0]){ + + fixed (MKMapPoint* first = &points [0]) { return _FromPoints ((IntPtr) first, points.Length, interiorPolygons); } } @@ -42,7 +42,7 @@ namespace MapKit { if (coords.Length == 0) return _FromCoordinates (IntPtr.Zero, 0); - fixed (CLLocationCoordinate2D *first = &coords [0]){ + fixed (CLLocationCoordinate2D* first = &coords [0]) { return _FromCoordinates ((IntPtr) first, coords.Length); } } @@ -53,8 +53,8 @@ namespace MapKit { ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (coords)); if (coords.Length == 0) return _FromCoordinates (IntPtr.Zero, 0); - - fixed (CLLocationCoordinate2D *first = &coords [0]){ + + fixed (CLLocationCoordinate2D* first = &coords [0]) { return _FromCoordinates ((IntPtr) first, coords.Length, interiorPolygons); } } diff --git a/src/MapKit/MKPolyline.cs b/src/MapKit/MKPolyline.cs index da559373d8..8fc4e4a115 100644 --- a/src/MapKit/MKPolyline.cs +++ b/src/MapKit/MKPolyline.cs @@ -10,15 +10,15 @@ using ObjCRuntime; namespace MapKit { public partial class MKPolyline { - + public static unsafe MKPolyline FromPoints (MKMapPoint [] points) { if (points is null) ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (points)); if (points.Length == 0) return _FromPoints (IntPtr.Zero, 0); - - fixed (MKMapPoint *first = &points [0]){ + + fixed (MKMapPoint* first = &points [0]) { return _FromPoints ((IntPtr) first, points.Length); } } @@ -29,8 +29,8 @@ namespace MapKit { ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (coords)); if (coords.Length == 0) return _FromCoordinates (IntPtr.Zero, 0); - - fixed (CLLocationCoordinate2D *first = &coords [0]){ + + fixed (CLLocationCoordinate2D* first = &coords [0]) { return _FromCoordinates ((IntPtr) first, coords.Length); } } diff --git a/src/MapKit/MapKit.cs b/src/MapKit/MapKit.cs index 53f4962da8..6f0bb9f082 100644 --- a/src/MapKit/MapKit.cs +++ b/src/MapKit/MapKit.cs @@ -28,8 +28,7 @@ namespace MapKit { [SupportedOSPlatform ("tvos")] #endif [StructLayout (LayoutKind.Sequential)] - public struct MKTileOverlayPath - { + public struct MKTileOverlayPath { public /* NSInteger */ nint X; public /* NSInteger */ nint Y; public /* NSInteger */ nint Z; @@ -49,7 +48,7 @@ namespace MapKit { public struct MKCoordinateSpan { public /* CLLocationDegrees */ double LatitudeDelta; public /* CLLocationDegrees */ double LongitudeDelta; - + // MKCoordinateSpanMake public MKCoordinateSpan (double latitudeDelta, double longitudeDelta) { @@ -70,7 +69,7 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [Mac (10,9)] + [Mac (10, 9)] #endif [StructLayout (LayoutKind.Sequential)] public struct MKCoordinateRegion { @@ -85,10 +84,10 @@ namespace MapKit { } // note: CLLocationDistance is double - see CLLocation.h - [DllImport (Constants.MapKitLibrary, EntryPoint="MKCoordinateRegionMakeWithDistance")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKCoordinateRegionMakeWithDistance")] extern static public MKCoordinateRegion FromDistance (CLLocationCoordinate2D center, /* CLLocationDistance */ double latitudinalMeters, /* CLLocationDistance */ double longitudinalMeters); - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKCoordinateRegionForMapRect")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKCoordinateRegionForMapRect")] extern static public MKCoordinateRegion FromMapRect (MKMapRect rect); public override string ToString () @@ -104,25 +103,25 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [Mac (10,9)] + [Mac (10, 9)] #endif [StructLayout (LayoutKind.Sequential)] public struct MKMapPoint { public double X, Y; - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapPointForCoordinate")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapPointForCoordinate")] public extern static MKMapPoint FromCoordinate (CLLocationCoordinate2D coordinate); - [DllImport (Constants.MapKitLibrary, EntryPoint="MKCoordinateForMapPoint")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKCoordinateForMapPoint")] public extern static CLLocationCoordinate2D ToCoordinate (MKMapPoint mapPoint); - + // MKMapPointMake public MKMapPoint (double x, double y) { X = x; Y = y; } - + // MKMapPointEqualToPoint public static bool operator == (MKMapPoint a, MKMapPoint b) { @@ -136,7 +135,7 @@ namespace MapKit { public override bool Equals (object? other) { - if (other is MKMapPoint){ + if (other is MKMapPoint) { var omap = (MKMapPoint) other; return omap.X == X && omap.Y == Y; @@ -148,7 +147,7 @@ namespace MapKit { { return (int) (X + Y); } - + // MKStringFromMapPoint does not really exists, it's inlined in MKGeometry.h public override string ToString () { @@ -166,7 +165,7 @@ namespace MapKit { [StructLayout (LayoutKind.Sequential)] public struct MKMapSize { public double Width, Height; - + // MKMapSizeMake public MKMapSize (double width, double height) { @@ -180,10 +179,10 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("macos")] #else - [TV (9,2)] + [TV (9, 2)] #endif - public static MKMapSize World { get { return new MKMapSize (0x10000000, 0x10000000); }} - + public static MKMapSize World { get { return new MKMapSize (0x10000000, 0x10000000); } } + // MKMapSizeEqualToSize public static bool operator == (MKMapSize a, MKMapSize b) { @@ -209,7 +208,7 @@ namespace MapKit { { return (int) (Width + Height); } - + // MKStringFromMapSize does not really exists, it's inlined in MKGeometry.h public override string ToString () { @@ -224,7 +223,7 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [Mac (10,9)] + [Mac (10, 9)] #endif [StructLayout (LayoutKind.Sequential)] public struct MKMapRect { @@ -234,7 +233,7 @@ namespace MapKit { [SupportedOSPlatform ("ios")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (9,2)] + [TV (9, 2)] #endif public static readonly MKMapRect Null = new MKMapRect (double.PositiveInfinity, double.PositiveInfinity, 0, 0); @@ -255,14 +254,14 @@ namespace MapKit { Size.Width = width; Size.Height = height; } - + // MKMapRectGetMinX public double MinX { get { return Origin.X; } } - + // MKMapRectGetMinY public double MinY { get { @@ -276,49 +275,49 @@ namespace MapKit { return Origin.X + Size.Width; } } - + // MKMapRectGetMaxY public double MaxY { get { return Origin.Y + Size.Height; } } - + // MKMapRectGetMidX public double MidX { get { return Origin.X + Size.Width / 2.0; } } - + // MKMapRectGetMidY public double MidY { get { return Origin.Y + Size.Height / 2.0; } } - + // MKMapRectGetWidth public double Width { get { return Size.Width; } } - + // MKMapRectGetHeight public double Height { get { return Size.Height; } } - + // MKMapRectIsNull public bool IsNull { get { return Double.IsInfinity (Origin.X) || Double.IsInfinity (Origin.Y); } } - + // MKMapRectIsEmpty public bool IsEmpty { get { @@ -332,14 +331,14 @@ namespace MapKit { [SupportedOSPlatform ("ios")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (9,2)] + [TV (9, 2)] #endif public MKMapRect World { get { return new MKMapRect (0, 0, 0x10000000, 0x10000000); } } - + // MKMapRectEqualToRect public static bool operator == (MKMapRect a, MKMapRect b) { @@ -365,58 +364,58 @@ namespace MapKit { { return Origin.GetHashCode () ^ Size.GetHashCode (); } - + // MKStringFromMapRect does not really exists, it's inlined in MKGeometry.h public override string ToString () { return string.Format ("{{{0}, {1}}}", Origin, Size); } - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectContainsPoint")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectContainsPoint")] [return: MarshalAs (UnmanagedType.I1)] - static extern bool MKMapRectContainsPoint (MKMapRect rect, MKMapPoint point); - + static extern bool MKMapRectContainsPoint (MKMapRect rect, MKMapPoint point); + public bool Contains (MKMapPoint point) { return MKMapRectContainsPoint (this, point); } - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectContainsRect")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectContainsRect")] [return: MarshalAs (UnmanagedType.I1)] static extern bool MKMapRectContainsRect (MKMapRect rect1, MKMapRect rect2); - + public bool Contains (MKMapRect rect) { return MKMapRectContainsRect (this, rect); } - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectUnion")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectUnion")] static public extern MKMapRect Union (MKMapRect rect1, MKMapRect rect2); - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectIntersection")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectIntersection")] static public extern MKMapRect Intersection (MKMapRect rect1, MKMapRect rect2); - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectIntersectsRect")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectIntersectsRect")] [return: MarshalAs (UnmanagedType.I1)] static public extern bool Intersects (MKMapRect rect1, MKMapRect rect2); - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectInset")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectInset")] static extern MKMapRect MKMapRectInset (MKMapRect rect, double dx, double dy); - + public MKMapRect Inset (double dx, double dy) { return MKMapRectInset (this, dx, dy); } - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectOffset")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectOffset")] static extern MKMapRect MKMapRectOffset (MKMapRect rect, double dx, double dy); - + public MKMapRect Offset (double dx, double dy) { return MKMapRectOffset (this, dx, dy); } - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectDivide")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectDivide")] static extern void MKMapRectDivide (MKMapRect rect, out MKMapRect slice, out MKMapRect remainder, double amount, CGRectEdge edge); public MKMapRect Divide (double amount, CGRectEdge edge, out MKMapRect remainder) @@ -425,18 +424,18 @@ namespace MapKit { MKMapRectDivide (this, out slice, out remainder, amount, edge); return slice; } - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectSpans180thMeridian")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectSpans180thMeridian")] [return: MarshalAs (UnmanagedType.I1)] static extern bool MKMapRectSpans180thMeridian (MKMapRect rect); - + public bool Spans180thMeridian { get { return MKMapRectSpans180thMeridian (this); } } - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapRectRemainder")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapRectRemainder")] static extern MKMapRect MKMapRectRemainder (MKMapRect rect); - + public MKMapRect Remainder () { return MKMapRectRemainder (this); @@ -450,17 +449,17 @@ namespace MapKit { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [Mac (10,9)] + [Mac (10, 9)] #endif public static class MKGeometry { - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMapPointsPerMeterAtLatitude")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMapPointsPerMeterAtLatitude")] static extern public double MapPointsPerMeterAtLatitude (/* CLLocationDegrees */ double latitude); - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMetersPerMapPointAtLatitude")] + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMetersPerMapPointAtLatitude")] static extern public /* CLLocationDistance */ double MetersPerMapPointAtLatitude (/* CLLocationDegrees */ double latitude); - - [DllImport (Constants.MapKitLibrary, EntryPoint="MKMetersBetweenMapPoints")] + + [DllImport (Constants.MapKitLibrary, EntryPoint = "MKMetersBetweenMapPoints")] static extern public /* CLLocationDistance */ double MetersBetweenMapPoints (MKMapPoint a, MKMapPoint b); } diff --git a/src/MediaAccessibility/MAEnums.cs b/src/MediaAccessibility/MAEnums.cs index ed2796c088..fa9f659870 100644 --- a/src/MediaAccessibility/MAEnums.cs +++ b/src/MediaAccessibility/MAEnums.cs @@ -18,14 +18,16 @@ using Foundation; namespace MediaAccessibility { [Native] - [iOS (7,0)][Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] public enum MACaptionAppearanceDomain : long { Default = 0, User = 1, } [Native] - [iOS (7,0)][Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] public enum MACaptionAppearanceDisplayType : long { ForcedOnly = 0, Automatic = 1, @@ -33,14 +35,16 @@ namespace MediaAccessibility { } [Native] - [iOS (7,0)][Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] public enum MACaptionAppearanceBehavior : long { UseValue = 0, UseContentIfAvailable = 1, } [Native] - [iOS (7,0)][Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] public enum MACaptionAppearanceFontStyle : long { Default = 0, MonospacedWithSerif = 1, @@ -53,7 +57,8 @@ namespace MediaAccessibility { } [Native] - [iOS (7,0)][Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] public enum MACaptionAppearanceTextEdgeStyle : long { Undefined = 0, None = 1, diff --git a/src/MediaAccessibility/MAImageCaptioning.cs b/src/MediaAccessibility/MAImageCaptioning.cs index 1947edda8a..9d502e099f 100644 --- a/src/MediaAccessibility/MAImageCaptioning.cs +++ b/src/MediaAccessibility/MAImageCaptioning.cs @@ -17,9 +17,9 @@ namespace MediaAccessibility { [SupportedOSPlatform ("ios13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (13,0)] - [Mac (10,15)] - [iOS (13,0)] + [TV (13, 0)] + [Mac (10, 15)] + [iOS (13, 0)] #endif public static partial class MAImageCaptioning { diff --git a/src/MediaAccessibility/MediaAccessibility.cs b/src/MediaAccessibility/MediaAccessibility.cs index 0057c2c9a0..8058b65f01 100644 --- a/src/MediaAccessibility/MediaAccessibility.cs +++ b/src/MediaAccessibility/MediaAccessibility.cs @@ -25,8 +25,8 @@ namespace MediaAccessibility { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (7,0)] - [Mac (10,9)] + [iOS (7, 0)] + [Mac (10, 9)] #endif public static partial class MACaptionAppearance { @@ -54,7 +54,7 @@ namespace MediaAccessibility { [DllImport (Constants.MediaAccessibilityLibrary)] [return: MarshalAs (UnmanagedType.I1)] - static extern bool MACaptionAppearanceAddSelectedLanguage (nint domain, + static extern bool MACaptionAppearanceAddSelectedLanguage (nint domain, /* CFStringRef __nonnull */ IntPtr language); public static bool AddSelectedLanguage (MACaptionAppearanceDomain domain, string language) @@ -73,7 +73,7 @@ namespace MediaAccessibility { using (var langs = new CFArray (MACaptionAppearanceCopySelectedLanguages ((int) domain), owns: true)) { var languages = new string? [langs.Count]; for (int i = 0; i < langs.Count; i++) { - languages[i] = CFString.FromHandle (langs.GetValue (i)); + languages [i] = CFString.FromHandle (langs.GetValue (i)); } return languages; } @@ -81,12 +81,12 @@ namespace MediaAccessibility { [DllImport (Constants.MediaAccessibilityLibrary)] static extern nint MACaptionAppearanceGetDisplayType (nint domain); - + public static MACaptionAppearanceDisplayType GetDisplayType (MACaptionAppearanceDomain domain) { return (MACaptionAppearanceDisplayType) (int) MACaptionAppearanceGetDisplayType ((int) domain); } - + [DllImport (Constants.MediaAccessibilityLibrary)] static extern void MACaptionAppearanceSetDisplayType (nint domain, nint displayType); @@ -103,16 +103,16 @@ namespace MediaAccessibility { using (var chars = new CFArray (MACaptionAppearanceCopyPreferredCaptioningMediaCharacteristics ((int) domain), owns: true)) { NSString [] characteristics = new NSString [chars.Count]; for (int i = 0; i < chars.Count; i++) { - characteristics[i] = new NSString (chars.GetValue (i)); + characteristics [i] = new NSString (chars.GetValue (i)); } return characteristics; } } [DllImport (Constants.MediaAccessibilityLibrary)] - static extern /* CGColorRef __nonnull */ IntPtr MACaptionAppearanceCopyForegroundColor (nint domain, + static extern /* CGColorRef __nonnull */ IntPtr MACaptionAppearanceCopyForegroundColor (nint domain, /* MACaptionAppearanceBehavior * __nullable */ ref nint behavior); - + public static CGColor GetForegroundColor (MACaptionAppearanceDomain domain, ref MACaptionAppearanceBehavior behavior) { nint b = (int) behavior; @@ -122,7 +122,7 @@ namespace MediaAccessibility { } [DllImport (Constants.MediaAccessibilityLibrary)] - static extern /* CGColorRef __nonnull */ IntPtr MACaptionAppearanceCopyBackgroundColor (nint domain, + static extern /* CGColorRef __nonnull */ IntPtr MACaptionAppearanceCopyBackgroundColor (nint domain, /* MACaptionAppearanceBehavior * __nullable */ ref nint behavior); public static CGColor GetBackgroundColor (MACaptionAppearanceDomain domain, ref MACaptionAppearanceBehavior behavior) @@ -134,7 +134,7 @@ namespace MediaAccessibility { } [DllImport (Constants.MediaAccessibilityLibrary)] - static extern /* CGColorRef __nonnull */ IntPtr MACaptionAppearanceCopyWindowColor (nint domain, + static extern /* CGColorRef __nonnull */ IntPtr MACaptionAppearanceCopyWindowColor (nint domain, /* MACaptionAppearanceBehavior * __nullable */ ref nint behavior); public static CGColor GetWindowColor (MACaptionAppearanceDomain domain, ref MACaptionAppearanceBehavior behavior) @@ -193,7 +193,7 @@ namespace MediaAccessibility { } [DllImport (Constants.MediaAccessibilityLibrary)] - static extern /* CTFontDescriptorRef __nonnull */ IntPtr MACaptionAppearanceCopyFontDescriptorForStyle (nint domain, + static extern /* CTFontDescriptorRef __nonnull */ IntPtr MACaptionAppearanceCopyFontDescriptorForStyle (nint domain, /* MACaptionAppearanceBehavior * __nullable */ ref nint behavior, nint fontStyle); public static CTFontDescriptor GetFontDescriptor (MACaptionAppearanceDomain domain, ref MACaptionAppearanceBehavior behavior, MACaptionAppearanceFontStyle fontStyle) @@ -234,9 +234,9 @@ namespace MediaAccessibility { [SupportedOSPlatform ("ios13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (13,0)] - [Mac (10,15)] - [iOS (13,0)] + [TV (13, 0)] + [Mac (10, 15)] + [iOS (13, 0)] #endif [DllImport (Constants.MediaAccessibilityLibrary)] static extern void MACaptionAppearanceDidDisplayCaptions (IntPtr /* CFArratRef */ strings); @@ -247,11 +247,11 @@ namespace MediaAccessibility { [SupportedOSPlatform ("ios13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (13,0)] - [Mac (10,15)] - [iOS (13,0)] + [TV (13, 0)] + [Mac (10, 15)] + [iOS (13, 0)] #endif - public static void DidDisplayCaptions (string[] strings) + public static void DidDisplayCaptions (string [] strings) { if ((strings is null) || (strings.Length == 0)) MACaptionAppearanceDidDisplayCaptions (IntPtr.Zero); @@ -267,11 +267,11 @@ namespace MediaAccessibility { [SupportedOSPlatform ("ios13.0")] [SupportedOSPlatform ("maccatalyst")] #else - [TV (13,0)] - [Mac (10,15)] - [iOS (13,0)] + [TV (13, 0)] + [Mac (10, 15)] + [iOS (13, 0)] #endif - public static void DidDisplayCaptions (NSAttributedString[] strings) + public static void DidDisplayCaptions (NSAttributedString [] strings) { // CFAttributedString is “toll-free bridged” with its Foundation counterpart, NSAttributedString. // https://developer.apple.com/documentation/corefoundation/cfattributedstring?language=objc @@ -297,15 +297,15 @@ namespace MediaAccessibility { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (8,0)] - [Mac (10,10)] + [iOS (8, 0)] + [Mac (10, 10)] #endif [DllImport (Constants.MediaAccessibilityLibrary)] static extern unsafe IntPtr /* CFArrayRef __nonnull */ MAAudibleMediaCopyPreferredCharacteristics (); // according to webkit source code (the only use I could find) this is an array of CFString // https://github.com/WebKit/webkit/blob/master/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp - static public string?[]? GetPreferredCharacteristics () + static public string? []? GetPreferredCharacteristics () { var handle = MAAudibleMediaCopyPreferredCharacteristics (); if (handle == IntPtr.Zero) diff --git a/src/MediaLibrary/Enums.cs b/src/MediaLibrary/Enums.cs index e47f655af0..4046807efb 100644 --- a/src/MediaLibrary/Enums.cs +++ b/src/MediaLibrary/Enums.cs @@ -25,16 +25,14 @@ using ObjCRuntime; namespace MediaLibrary { [Native] - public enum MLMediaSourceType : ulong - { + public enum MLMediaSourceType : ulong { Audio = 1 << 0, Image = 1 << 1, Movie = 1 << 2 } [Native] - public enum MLMediaType : ulong - { + public enum MLMediaType : ulong { Audio = 1 << 0, Image = 1 << 1, Movie = 1 << 2 diff --git a/src/MediaPlayer/MPMediaItem.cs b/src/MediaPlayer/MPMediaItem.cs index e00711c2a9..54ecfa8d54 100644 --- a/src/MediaPlayer/MPMediaItem.cs +++ b/src/MediaPlayer/MPMediaItem.cs @@ -13,7 +13,7 @@ using System; using System.Collections; -using Foundation; +using Foundation; using ObjCRuntime; using CoreGraphics; @@ -72,7 +72,7 @@ namespace MediaPlayer { return UInt64ForProperty (AlbumPersistentIDProperty); } } - + public ulong ArtistPersistentID { get { return UInt64ForProperty (ArtistPersistentIDProperty); @@ -264,14 +264,14 @@ namespace MediaPlayer { return Int32ForProperty (IsCloudItemProperty) != 0; } } - + #if NET [SupportedOSPlatform ("ios9.2")] [SupportedOSPlatform ("macos10.12.2")] [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,2)] + [iOS (9, 2)] #endif public bool HasProtectedAsset { get { @@ -285,7 +285,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public bool IsExplicitItem { get { @@ -299,7 +299,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public NSDate? DateAdded { get { @@ -313,7 +313,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,3)] + [iOS (10, 3)] #endif public NSString? PlaybackStoreID { get { @@ -327,10 +327,10 @@ namespace MediaPlayer { [SupportedOSPlatform ("ios14.5")] [SupportedOSPlatform ("maccatalyst")] #else - [Watch (7,4)] - [TV (14,5)] - [Mac (11,3)] - [iOS (14,5)] + [Watch (7, 4)] + [TV (14, 5)] + [Mac (11, 3)] + [iOS (14, 5)] #endif public bool IsPreorder { get { diff --git a/src/MediaPlayer/MPMediaItemArtwork.cs b/src/MediaPlayer/MPMediaItemArtwork.cs index ef1c052958..18f3c040f8 100644 --- a/src/MediaPlayer/MPMediaItemArtwork.cs +++ b/src/MediaPlayer/MPMediaItemArtwork.cs @@ -11,7 +11,7 @@ using System; using System.Collections; -using Foundation; +using Foundation; using ObjCRuntime; using CoreGraphics; diff --git a/src/MediaPlayer/MPMediaQuery.cs b/src/MediaPlayer/MPMediaQuery.cs index 72c944dd7a..2053f71fed 100644 --- a/src/MediaPlayer/MPMediaQuery.cs +++ b/src/MediaPlayer/MPMediaQuery.cs @@ -12,15 +12,14 @@ #if !TVOS && !MONOMAC && !WATCH using System; -using Foundation; +using Foundation; using ObjCRuntime; #nullable enable namespace MediaPlayer { - public partial class MPMediaQuery - { + public partial class MPMediaQuery { public MPMediaItem GetItem (nuint index) { using (var array = new NSArray (Messaging.IntPtr_objc_msgSend (Handle, Selector.GetHandle ("items")))) diff --git a/src/MediaPlayer/MPNowPlayingInfoCenter.cs b/src/MediaPlayer/MPNowPlayingInfoCenter.cs index f046d3c7ce..d5317c507c 100644 --- a/src/MediaPlayer/MPNowPlayingInfoCenter.cs +++ b/src/MediaPlayer/MPNowPlayingInfoCenter.cs @@ -22,13 +22,13 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [Mac (10,12,2)] + [Mac (10, 12, 2)] #endif public class MPNowPlayingInfo { public MPNowPlayingInfo () { } - + public double? ElapsedPlaybackTime; public double? PlaybackRate; public int? PlaybackQueueIndex; @@ -37,7 +37,7 @@ namespace MediaPlayer { public int? ChapterCount; public int? AlbumTrackCount; public int? AlbumTrackNumber; - public int? DiscCount; + public int? DiscCount; public int? DiscNumber; public ulong? PersistentID; public double? PlaybackDuration; @@ -47,7 +47,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (8,0)] + [iOS (8, 0)] #endif public double? DefaultPlaybackRate; @@ -57,25 +57,25 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] + [iOS (9, 0)] #endif - public MPNowPlayingInfoLanguageOptionGroup[]? AvailableLanguageOptions { get; set; } + public MPNowPlayingInfoLanguageOptionGroup []? AvailableLanguageOptions { get; set; } #if NET [SupportedOSPlatform ("ios9.0")] [SupportedOSPlatform ("macos10.12.2")] [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] + [iOS (9, 0)] #endif - public MPNowPlayingInfoLanguageOption[]? CurrentLanguageOptions { get; set; } + public MPNowPlayingInfoLanguageOption []? CurrentLanguageOptions { get; set; } #if NET [SupportedOSPlatform ("ios10.0")] [SupportedOSPlatform ("macos10.12.2")] [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public string? CollectionIdentifier { get; set; } #if NET @@ -84,7 +84,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public string? ExternalContentIdentifier { get; set; } #if NET @@ -93,7 +93,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public string? ExternalUserProfileIdentifier { get; set; } #if NET @@ -102,7 +102,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public float? PlaybackProgress { get; set; } #if NET @@ -111,7 +111,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public MPNowPlayingInfoMediaType? MediaType { get; set; } #if NET @@ -120,7 +120,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,0)] + [iOS (10, 0)] #endif public bool? IsLiveStream { get; set; } #if NET @@ -129,7 +129,7 @@ namespace MediaPlayer { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (10,3)] + [iOS (10, 3)] #endif public NSUrl? AssetUrl { get; set; } #if NET @@ -138,9 +138,9 @@ namespace MediaPlayer { [SupportedOSPlatform ("macos10.13.1")] [SupportedOSPlatform ("maccatalyst")] #else - [iOS (11,1)] - [TV (11,1)] - [Mac (10,13,1)] + [iOS (11, 1)] + [TV (11, 1)] + [Mac (10, 13, 1)] #endif public NSDate? CurrentPlaybackDate { get; set; } @@ -183,7 +183,7 @@ namespace MediaPlayer { if (PlaybackProgress.HasValue) Add (dict, MPNowPlayingInfoCenter.PropertyPlaybackProgress, new NSNumber (PlaybackProgress.Value)); if (MediaType.HasValue) - Add (dict, MPNowPlayingInfoCenter.PropertyMediaType, new NSNumber ((int)MediaType.Value)); + Add (dict, MPNowPlayingInfoCenter.PropertyMediaType, new NSNumber ((int) MediaType.Value)); if (IsLiveStream.HasValue) Add (dict, MPNowPlayingInfoCenter.PropertyIsLiveStream, new NSNumber (IsLiveStream.Value)); if (AssetUrl is not null) @@ -238,7 +238,7 @@ namespace MediaPlayer { { if (source is null) return; - + NSObject? result; if (TryGetValue (source, MPNowPlayingInfoCenter.PropertyElapsedPlaybackTime, out result)) diff --git a/src/MediaPlayer/MPSkipIntervalCommand.cs b/src/MediaPlayer/MPSkipIntervalCommand.cs index 112e9cecff..cf6eda6dfa 100644 --- a/src/MediaPlayer/MPSkipIntervalCommand.cs +++ b/src/MediaPlayer/MPSkipIntervalCommand.cs @@ -15,13 +15,13 @@ using ObjCRuntime; namespace MediaPlayer { public partial class MPSkipIntervalCommand { - public double[]? PreferredIntervals { + public double []? PreferredIntervals { get { NSArray a = _PreferredIntervals; if ((a is null) || (a.Count == 0)) return null; - return NSArray.ArrayFromHandle (a.Handle, input => { + return NSArray.ArrayFromHandle (a.Handle, input => { return new NSNumber (input).DoubleValue; }); } diff --git a/src/MediaPlayer/MPVolumeSettings.cs b/src/MediaPlayer/MPVolumeSettings.cs index 2649783cb6..bee736603b 100644 --- a/src/MediaPlayer/MPVolumeSettings.cs +++ b/src/MediaPlayer/MPVolumeSettings.cs @@ -25,9 +25,9 @@ namespace MediaPlayer { [UnsupportedOSPlatform ("ios11.3")] [ObsoletedOSPlatform ("ios11.3", "Use 'MPVolumeView' to present volume controls.")] #else - [Deprecated (PlatformName.iOS, 11,3, message: "Use 'MPVolumeView' to present volume controls.")] + [Deprecated (PlatformName.iOS, 11, 3, message: "Use 'MPVolumeView' to present volume controls.")] #endif - [DllImport (Constants.MediaPlayerLibrary, EntryPoint="MPVolumeSettingsAlertShow")] + [DllImport (Constants.MediaPlayerLibrary, EntryPoint = "MPVolumeSettingsAlertShow")] public extern static void AlertShow (); #if NET @@ -36,9 +36,9 @@ namespace MediaPlayer { [UnsupportedOSPlatform ("ios11.3")] [ObsoletedOSPlatform ("ios11.3", "Use 'MPVolumeView' to present volume controls.")] #else - [Deprecated (PlatformName.iOS, 11,3, message: "Use 'MPVolumeView' to present volume controls.")] + [Deprecated (PlatformName.iOS, 11, 3, message: "Use 'MPVolumeView' to present volume controls.")] #endif - [DllImport (Constants.MediaPlayerLibrary, EntryPoint="MPVolumeSettingsAlertHide")] + [DllImport (Constants.MediaPlayerLibrary, EntryPoint = "MPVolumeSettingsAlertHide")] public extern static void AlertHide (); // note: sizeof (BOOL) is 1 like C, i.e. it's not a Win32 BOOL (4 bytes) @@ -48,9 +48,9 @@ namespace MediaPlayer { [UnsupportedOSPlatform ("ios11.3")] [ObsoletedOSPlatform ("ios11.3", "Use 'MPVolumeView' to present volume controls.")] #else - [Deprecated (PlatformName.iOS, 11,3, message: "Use 'MPVolumeView' to present volume controls.")] + [Deprecated (PlatformName.iOS, 11, 3, message: "Use 'MPVolumeView' to present volume controls.")] #endif - [DllImport (Constants.MediaPlayerLibrary, EntryPoint="MPVolumeSettingsAlertIsVisible")] + [DllImport (Constants.MediaPlayerLibrary, EntryPoint = "MPVolumeSettingsAlertIsVisible")] [return: MarshalAs (UnmanagedType.I1)] public extern static /* BOOL */ bool AlertIsVisible (); } diff --git a/src/MediaPlayer/MediaPlayer.cs b/src/MediaPlayer/MediaPlayer.cs index 9bb1a70a36..f6d33c2486 100644 --- a/src/MediaPlayer/MediaPlayer.cs +++ b/src/MediaPlayer/MediaPlayer.cs @@ -37,10 +37,10 @@ namespace MediaPlayer { [Deprecated (PlatformName.iOS, 9, 0)] [Native] public enum MPMovieLoadState : long { - Unknown = 0, - Playable = 1 << 0, - PlaythroughOK = 1 << 1, - Stalled = 1 << 2, + Unknown = 0, + Playable = 1 << 0, + PlaythroughOK = 1 << 1, + Stalled = 1 << 2, } // NSInteger -> MPMoviePlayerController.h @@ -108,32 +108,32 @@ namespace MediaPlayer { } // NSUInteger -> MPMediaItem.h - [Watch (7,0)] + [Watch (7, 0)] [Native] [Flags] public enum MPMediaType : ulong { - Music = 1 << 0, - Podcast = 1 << 1, - AudioBook = 1 << 2, + Music = 1 << 0, + Podcast = 1 << 1, + AudioBook = 1 << 2, AudioITunesU = 1 << 3, - AnyAudio = 0x00ff, - - [Mac (10,12,2)] + AnyAudio = 0x00ff, + + [Mac (10, 12, 2)] Movie = 1 << 8, - [Mac (10,12,2)] + [Mac (10, 12, 2)] TVShow = 1 << 9, - [Mac (10,12,2)] + [Mac (10, 12, 2)] VideoPodcast = 1 << 10, - [Mac (10,12,2)] + [Mac (10, 12, 2)] MusicVideo = 1 << 11, - [Mac (10,12,2)] + [Mac (10, 12, 2)] VideoITunesU = 1 << 12, - [iOS (7,0)] - [Mac (10,12,2)] + [iOS (7, 0)] + [Mac (10, 12, 2)] HomeVideo = 1 << 13, - [Mac (10,12,2)] + [Mac (10, 12, 2)] TypeAnyVideo = 0xff00, - Any = 0xFFFFFFFFFFFFFFFF + Any = 0xFFFFFFFFFFFFFFFF } // NSInteger -> MPMediaPlaylist.h @@ -143,12 +143,12 @@ namespace MediaPlayer { [Native] [Flags] public enum MPMediaPlaylistAttribute : long { - None = 0, + None = 0, OnTheGo = (1 << 0), // if set, the playlist was created on a device rather than synced from iTunes - Smart = (1 << 1), - Genius = (1 << 2) + Smart = (1 << 1), + Genius = (1 << 2) }; - + // NSInteger -> MPMediaQuery.h [NoMac] [NoTV] @@ -187,19 +187,19 @@ namespace MediaPlayer { AspectFill, Fill } - + // untyped enum -> MPMoviePlayerController.h [NoMac] public enum MPMovieControlMode { - Default, + Default, VolumeOnly, - Hidden + Hidden } // NSInteger -> /MPMusicPlayerController.h [NoMac] [NoWatch] - [TV (14,0)] + [TV (14, 0)] [Native] public enum MPMusicPlaybackState : long { Stopped, @@ -209,11 +209,11 @@ namespace MediaPlayer { SeekingForward, SeekingBackward } - + // NSInteger -> /MPMusicPlayerController.h [NoMac] [NoWatch] - [TV (14,0)] + [TV (14, 0)] [Native] public enum MPMusicRepeatMode : long { Default, @@ -221,11 +221,11 @@ namespace MediaPlayer { One, All } - + // NSInteger -> /MPMusicPlayerController.h [NoMac] [NoWatch] - [TV (14,0)] + [TV (14, 0)] [Native] public enum MPMusicShuffleMode : long { Default, @@ -236,76 +236,73 @@ namespace MediaPlayer { public delegate void MPMediaItemEnumerator (string property, NSObject value, ref bool stop); - [Mac (10,12,2)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [Watch (5, 0)] [Native] - public enum MPShuffleType : long - { + public enum MPShuffleType : long { Off, Items, Collections } - [Mac (10,12,2)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [Watch (5, 0)] [Native] - public enum MPRepeatType : long - { + public enum MPRepeatType : long { Off, One, All } - [Mac (10,12,2)] - [iOS (10,0)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [iOS (10, 0)] + [Watch (5, 0)] [Native] - public enum MPChangeLanguageOptionSetting : long - { + public enum MPChangeLanguageOptionSetting : long { None, NowPlayingItemOnly, Permanent } // NSInteger -> MPRemoteCommand.h - [Mac (10,12,2)] - [iOS (7,1)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [iOS (7, 1)] + [Watch (5, 0)] [Native] public enum MPRemoteCommandHandlerStatus : long { Success = 0, NoSuchContent = 100, - [iOS (9,1)] + [iOS (9, 1)] NoActionableNowPlayingItem = 110, - [iOS (11,0)] - [TV (11,0)] - [Mac (10,13)] + [iOS (11, 0)] + [TV (11, 0)] + [Mac (10, 13)] DeviceNotFound = 120, CommandFailed = 200 } // NSUInteger -> MPRemoteCommandEvent.h - [Mac (10,12,2)] - [iOS (7,1)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [iOS (7, 1)] + [Watch (5, 0)] [Native] public enum MPSeekCommandEventType : ulong { BeginSeeking, EndSeeking } - [Mac (10,12,2)] - [iOS (9,0)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [iOS (9, 0)] + [Watch (5, 0)] [Native] public enum MPNowPlayingInfoLanguageOptionType : ulong { Audible, Legible } - [Mac (10,14,2)] - [Watch (7,0)] - [iOS (9,3)] + [Mac (10, 14, 2)] + [Watch (7, 0)] + [iOS (9, 3)] [Native] [ErrorDomain ("MPErrorDomain")] public enum MPErrorCode : long { @@ -322,7 +319,7 @@ namespace MediaPlayer { [NoMac] [NoTV] [NoWatch] - [iOS (9,3)] + [iOS (9, 3)] [Native] public enum MPMediaLibraryAuthorizationStatus : long { NotDetermined = 0, @@ -331,25 +328,23 @@ namespace MediaPlayer { Authorized } - [Mac (10,12,2)] - [iOS (10,0)] - [TV (10,0)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [iOS (10, 0)] + [TV (10, 0)] + [Watch (5, 0)] [Native] - public enum MPNowPlayingInfoMediaType : ulong - { + public enum MPNowPlayingInfoMediaType : ulong { None = 0, Audio, Video } - [Mac (10,12,2)] - [Watch (5,0)] + [Mac (10, 12, 2)] + [Watch (5, 0)] [iOS (11, 0)] [TV (11, 0)] [Native] - public enum MPNowPlayingPlaybackState : ulong - { + public enum MPNowPlayingPlaybackState : ulong { Unknown = 0, Playing, Paused, diff --git a/src/MediaToolbox/MTFormatNames.cs b/src/MediaToolbox/MTFormatNames.cs index d8a487d2c3..466abfd405 100644 --- a/src/MediaToolbox/MTFormatNames.cs +++ b/src/MediaToolbox/MTFormatNames.cs @@ -24,8 +24,8 @@ namespace MediaToolbox { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] - [Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] #endif [DllImport (Constants.MediaToolboxLibrary)] static extern /* CFStringRef CM_NULLABLE */ IntPtr MTCopyLocalizedNameForMediaType ( @@ -37,8 +37,8 @@ namespace MediaToolbox { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] - [Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] #endif static public string? GetLocalizedName (this CMMediaType mediaType) { @@ -51,8 +51,8 @@ namespace MediaToolbox { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] - [Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] #endif [DllImport (Constants.MediaToolboxLibrary)] static extern /* CFStringRef CM_NULLABLE */ IntPtr MTCopyLocalizedNameForMediaSubType ( @@ -64,8 +64,8 @@ namespace MediaToolbox { [SupportedOSPlatform ("maccatalyst")] [SupportedOSPlatform ("tvos")] #else - [iOS (9,0)] - [Mac (10,11)] + [iOS (9, 0)] + [Mac (10, 11)] #endif static public string? GetLocalizedName (this CMMediaType mediaType, uint mediaSubType) { diff --git a/tools/autoformat.sh b/tools/autoformat.sh index a9c5a7ac38..239e45ec00 100755 --- a/tools/autoformat.sh +++ b/tools/autoformat.sh @@ -94,6 +94,19 @@ dotnet format whitespace --folder "$SRC_DIR/src/GameKit" dotnet format whitespace --folder "$SRC_DIR/src/GameplayKit" dotnet format whitespace --folder "$SRC_DIR/src/HealthKit" dotnet format whitespace --folder "$SRC_DIR/src/HomeKit" +dotnet format whitespace --folder "$SRC_DIR/src/IOSurface" +dotnet format whitespace --folder "$SRC_DIR/src/ImageCaptureCore" +dotnet format whitespace --folder "$SRC_DIR/src/ImageIO" +dotnet format whitespace --folder "$SRC_DIR/src/ImageKit" +dotnet format whitespace --folder "$SRC_DIR/src/Intents" +dotnet format whitespace --folder "$SRC_DIR/src/JavaScriptCore" +dotnet format whitespace --folder "$SRC_DIR/src/LocalAuthentication" +dotnet format whitespace --folder "$SRC_DIR/src/MLCompute" +dotnet format whitespace --folder "$SRC_DIR/src/MapKit" +dotnet format whitespace --folder "$SRC_DIR/src/MediaAccessibility" +dotnet format whitespace --folder "$SRC_DIR/src/MediaLibrary" +dotnet format whitespace --folder "$SRC_DIR/src/MediaPlayer" +dotnet format whitespace --folder "$SRC_DIR/src/MediaToolbox" # dotnet format "$SRC_DIR/[...]" # add more projects here...