[Accessibility] Add new Framework from Xcode 12 beta 1. (#9086)

Co-authored-by: Rolf Bjarne Kvinge <[email protected]>
xamarin · Jul 15, 2020 · 2b35db0 · 2b35db0 · xamarin-release-manager · Jul 16, 2020
1 parent 0bf816a
commit 2b35db0
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 50 deletions.
diff --git a/src/Constants.iOS.cs.in b/src/Constants.iOS.cs.in
@@ -145,6 +145,7 @@ namespace ObjCRuntime {
 		// iOS 13.4
 		public const string AutomaticAssessmentConfigurationLibrary = "/System/Library/Frameworks/AutomaticAssessmentConfiguration.framework/AutomaticAssessmentConfiguration";
 		// iOS 14.0
+		public const string AccessibilityLibrary = "/System/Library/Frameworks/Accessibility.framework/Accessibility";
 		public const string AppClipLibrary = "/System/Library/Frameworks/AppClip.framework/AppClip";
 		public const string UniformTypeIdentifiersLibrary = "/System/Library/Frameworks/UniformTypeIdentifiers.framework/UniformTypeIdentifiers";
 	}

diff --git a/src/Constants.mac.cs.in b/src/Constants.mac.cs.in
@@ -172,9 +172,10 @@ namespace ObjCRuntime {
 		public const string AutomaticAssessmentConfigurationLibrary = "/System/Library/Frameworks/AutomaticAssessmentConfiguration.framework/AutomaticAssessmentConfiguration";
 
 		// macOS 10.16
-		public const string UniformTypeIdentifiersLibrary = "/System/Library/Frameworks/UniformTypeIdentifiers.framework/UniformTypeIdentifiers";
-		public const string UserNotificationsUILibrary = "/System/Library/Frameworks/UserNotificationsUI.framework/UserNotificationsUI";
+		public const string AccessibilityLibrary = "/System/Library/Frameworks/Accessibility.framework/Accessibility";
 		public const string ClassKitLibrary = "/System/Library/Frameworks/ClassKit.framework/ClassKit";
 		public const string ReplayKitLibrary = "/System/Library/Frameworks/ReplayKit.framework/ReplayKit";
+		public const string UniformTypeIdentifiersLibrary = "/System/Library/Frameworks/UniformTypeIdentifiers.framework/UniformTypeIdentifiers";
+		public const string UserNotificationsUILibrary = "/System/Library/Frameworks/UserNotificationsUI.framework/UserNotificationsUI";
 	}
 }
diff --git a/src/Constants.tvos.cs.in b/src/Constants.tvos.cs.in
@@ -93,6 +93,7 @@ namespace ObjCRuntime {
 		public const string BackgroundTasksLibrary = "/System/Library/Frameworks/BackgroundTasks.framework/BackgroundTasks";
 
 		// tvOS 14.0
+		public const string AccessibilityLibrary = "/System/Library/Frameworks/Accessibility.framework/Accessibility";
 		public const string LinkPresentationLibrary = "/System/Library/Frameworks/LinkPresentation.framework/LinkPresentation";
 		public const string UniformTypeIdentifiersLibrary = "/System/Library/Frameworks/UniformTypeIdentifiers.framework/UniformTypeIdentifiers";
 	}

diff --git a/src/Constants.watch.cs.in b/src/Constants.watch.cs.in
@@ -70,6 +70,7 @@ namespace ObjCRuntime {
 		public const string StoreKitLibrary = "/System/Library/Frameworks/StoreKit.framework/StoreKit";
 
 		// watchOS 7
+		public const string AccessibilityLibrary = "/System/Library/Frameworks/Accessibility.framework/Accessibility";
 		public const string UniformTypeIdentifiersLibrary = "/System/Library/Frameworks/UniformTypeIdentifiers.framework/UniformTypeIdentifiers";
 	}
 }
diff --git a/src/CoreGraphics/CGColor.cs b/src/CoreGraphics/CGColor.cs
@@ -330,6 +330,15 @@ static public CGColor CreateCmyk (nfloat cyan, nfloat magenta, nfloat yellow, nf
 			var h = CGColorCreateGenericCMYK (cyan, magenta, yellow, black, alpha);
 			return h == IntPtr.Zero ? null : new CGColor (h, owns: true);
 		}
+
+		[iOS (14,0)][TV (14,0)][Watch (7,0)][Mac (10,16)]
+		[DllImport (Constants.AccessibilityLibrary)]
+		static extern /* NSString */ IntPtr AXNameFromColor (/* CGColorRef */ IntPtr color);
+
+		[iOS (14,0)][TV (14,0)][Watch (7,0)][Mac (10,16)]
+		public string AXName => NSString.FromHandle (AXNameFromColor (handle));
+
+
 #endif // !COREBUILD
 	}
 }
diff --git a/src/accessibility.cs b/src/accessibility.cs
@@ -0,0 +1,53 @@
+using System;
+using Foundation;
+using ObjCRuntime;
+
+namespace Accessibility {
+
+	[Watch (7, 0), TV (14, 0), Mac (10, 16), iOS (14, 0)]
+	[Native]
+	public enum AXCustomContentImportance : ulong
+	{
+		Default,
+		High,
+	}
+
+	[Watch (7, 0), TV (14, 0), Mac (10, 16), iOS (14, 0)]
+	[BaseType (typeof (NSObject))]
+	[DisableDefaultCtor]
+	interface AXCustomContent : NSCopying, NSSecureCoding
+	{
+		[Static]
+		[Export ("customContentWithLabel:value:")]
+		AXCustomContent Create (string label, string value);
+
+		[Static]
+		[Export ("customContentWithAttributedLabel:attributedValue:")]
+		AXCustomContent Create (NSAttributedString label, NSAttributedString value);
+
+		[Export ("label")]
+		string Label { get; }
+
+		[Export ("attributedLabel", ArgumentSemantic.Copy)]
+		NSAttributedString AttributedLabel { get; }
+
+		[Export ("value")]
+		string Value { get; }
+
+		[Export ("attributedValue", ArgumentSemantic.Copy)]
+		NSAttributedString AttributedValue { get; }
+
+		[Export ("importance", ArgumentSemantic.Assign)]
+		AXCustomContentImportance Importance { get; set; }
+	}
+
+	[Watch (7, 0), TV (14, 0), Mac (10, 16), iOS (14, 0)]
+	[Protocol]
+	interface AXCustomContentProvider
+	{
+		[Abstract]
+		[NullAllowed, Export ("accessibilityCustomContent", ArgumentSemantic.Copy)]
+		AXCustomContent[] AccessibilityCustomContent { get; set; }
+	}
+
+}
diff --git a/src/frameworks.sources b/src/frameworks.sources
@@ -1779,6 +1779,7 @@ SHARED_SOURCES = \
 #
 
 COMMON_FRAMEWORKS =         \
+	Accessibility           \
 	Accelerate              \
 	AuthenticationServices	\
 	AVFoundation            \

diff --git a/tests/monotouch-test/CoreGraphics/ColorTest.cs b/tests/monotouch-test/CoreGraphics/ColorTest.cs
@@ -98,6 +98,15 @@ public void Cmyk ()
 			}
 		}
 
+		[Test]
+		public void GetAXName ()
+		{
+			TestRuntime.AssertXcodeVersion (12, 0);
+			using (var c = new CGColor (CGConstantColor.Black)) {
+				Assert.IsNotNull (c.AXName, "AXName");
+			}
+		}
+
 	}
 }
 
diff --git a/tests/xtro-sharpie/iOS-Accessibility.todo b/tests/xtro-sharpie/iOS-Accessibility.todo
diff --git a/tests/xtro-sharpie/macOS-Accessibility.todo b/tests/xtro-sharpie/macOS-Accessibility.todo
diff --git a/tests/xtro-sharpie/tvOS-Accessibility.todo b/tests/xtro-sharpie/tvOS-Accessibility.todo
diff --git a/tests/xtro-sharpie/watchOS-Accessibility.todo b/tests/xtro-sharpie/watchOS-Accessibility.todo
diff --git a/tools/common/Frameworks.cs b/tools/common/Frameworks.cs
@@ -199,6 +199,7 @@ public static Frameworks MacFrameworks {
 					{ "CallKit", "CallKit", 10,16 },
 					{ "ClassKit", "ClassKit", 10,16 },
 					{ "ReplayKit", "ReplayKit", 10,16 },
+					{ "Accessibility", "Accessibility", 10,16 },
 				};
 			}
 			return mac_frameworks;
@@ -337,6 +338,7 @@ public static Frameworks GetiOSFrameworks (Application app)
 
 				{ "AppClip", "AppClip", 14,0 },
 				{ "UniformTypeIdentifiers", "UniformTypeIdentifiers", 14,0 },
+				{ "Accessibility", "Accessibility", 14,0 },
 
 				// the above MUST be kept in sync with simlauncher
 				// see tools/mtouch/Makefile
@@ -404,6 +406,7 @@ public static Frameworks GetwatchOSFrameworks (Application app)
 				{ "StoreKit", "StoreKit", 6,2 },
 
 				{ "UniformTypeIdentifiers", "UniformTypeIdentifiers", 7,0 },
+				{ "Accessibility", "Accessibility", 7,0 },
 			};
 		}
 		return watch_frameworks;
@@ -485,6 +488,7 @@ public static Frameworks TVOSFrameworks {
 
 					{ "LinkPresentation", "LinkPresentation", 14,0 },
 					{ "UniformTypeIdentifiers", "UniformTypeIdentifiers", 14,0 },
+					{ "Accessibility", "Accessibility", 14,0 },
 				};
 			}
 			return tvos_frameworks;

diff --git a/tools/mtouch/Makefile b/tools/mtouch/Makefile
@@ -162,6 +162,7 @@ SIMLAUNCHER_FRAMEWORKS =  \
 	-weak_framework AutomaticAssessmentConfiguration	\
 						\
 	-weak_framework AppClip	\
+	-weak_framework Accessibility	\
 
 # keep the above list of weak_framework
 # 1. grouped by iOS versions;