Skip to content

UIKit watchOS xcode13.0 beta2

Alex Soto edited this page Sep 13, 2021 · 2 revisions

#UIKit.framework https://github.com/xamarin/xamarin-macios/pull/12706

diff -ruN /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/NSParagraphStyle.h /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/NSParagraphStyle.h
--- /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/NSParagraphStyle.h	2021-06-02 12:44:57.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/NSParagraphStyle.h	2021-06-17 03:46:38.000000000 -0400
@@ -12,10 +12,6 @@
 #import <UIKit/UIKitDefines.h>
 #import <UIKit/NSText.h>
 
-#ifndef FALL_2021_NEW_API_TRANSITION
-#define FALL_2021_NEW_API_TRANSITION 1
-#endif
-
 #if TARGET_OS_IPHONE
 NS_ASSUME_NONNULL_BEGIN
 
diff -ruN /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImage.h /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImage.h
--- /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImage.h	2021-06-02 05:35:51.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImage.h	2021-06-17 03:46:23.000000000 -0400
@@ -304,39 +304,27 @@
 
 @end
 
+
 @interface UIImage (ImageVariant)
 
-/// Get a system symbol with a certain variant shape.
-+ (nullable UIImage *)systemImageNamed:(NSString *)name shape:(UIImageVariantShape)shape API_AVAILABLE(ios(15.0));
-/// Get a system symbol with a certain variant shape and fill.
-+ (nullable UIImage *)systemImageNamed:(NSString *)name shape:(UIImageVariantShape)shape fill:(UIImageVariantFill)fill API_AVAILABLE(ios(15.0));
-/// Get a system symbol with a certain variant shape and fill with a specific configuration.
-+ (nullable UIImage *)systemImageNamed:(NSString *)name shape:(UIImageVariantShape)shape fill:(UIImageVariantFill)fill withConfiguration:(nullable UIImageConfiguration *)configuration API_AVAILABLE(ios(15.0));
-
-/// Get a custom image with a certain variant shape.
-+ (nullable UIImage *)imageNamed:(NSString *)name shape:(UIImageVariantShape)shape API_AVAILABLE(ios(15.0));
-/// Get a custom image with a certain variant shape and fill.
-+ (nullable UIImage *)imageNamed:(NSString *)name shape:(UIImageVariantShape)shape fill:(UIImageVariantFill)fill API_AVAILABLE(ios(15.0));
-/// Get a custom image with a certain variant shape and fill with a specific configuration.
-+ (nullable UIImage *)imageNamed:(NSString *)name shape:(UIImageVariantShape)shape fill:(UIImageVariantFill)fill withConfiguration:(nullable UIImageConfiguration *)configuration API_AVAILABLE(ios(15.0));
-
-/// Get an image with a variant shape.
-- (UIImage *)imageWithShape:(UIImageVariantShape)shape API_AVAILABLE(ios(15.0));
-
-/// Get an image with a variant fill.
-/// You can use this to both add or remove a fill variant of an image.
-- (UIImage *)imageWithFill:(UIImageVariantFill)fill API_AVAILABLE(ios(15.0));
-
-/// Get an image with a variant shape and fill. This is equivalent to
-/// getting a variant with a shape first, then requesting a variant with a fill, but
-/// without loading the intermediate image.
-- (UIImage *)imageWithShape:(UIImageVariantShape)shape fill:(UIImageVariantFill)fill API_AVAILABLE(ios(15.0));
+/// Get a system symbol with a certain variant.
++ (nullable UIImage *)systemImageNamed:(NSString *)name variant:(UIImageVariant)variant API_AVAILABLE(ios(15.0));
+/// Get a system symbol with a certain variant with a specific configuration.
++ (nullable UIImage *)systemImageNamed:(NSString *)name variant:(UIImageVariant)variant withConfiguration:(nullable UIImageConfiguration *)configuration API_AVAILABLE(ios(15.0));
+
+/// Get a custom image with a certain variant.
++ (nullable UIImage *)imageNamed:(NSString *)name variant:(UIImageVariant)variant API_AVAILABLE(ios(15.0));
+/// Get a custom image with a certain variant with a specific configuration.
++ (nullable UIImage *)imageNamed:(NSString *)name variant:(UIImageVariant)variant withConfiguration:(nullable UIImageConfiguration *)configuration API_AVAILABLE(ios(15.0));
+
+/// Get an image with a variant.
+- (nullable UIImage *)imageByApplyingVariant:(UIImageVariant)variant API_AVAILABLE(ios(15.0));
 
 /// Get an image with a variant the same as another (variant) image.
-- (UIImage *)imageWithVariantsFromImage:(UIImage *)image API_AVAILABLE(ios(15.0));
+- (nullable UIImage *)imageByApplyingVariantFromImage:(UIImage *)image API_AVAILABLE(ios(15.0));
 
 /// Remove all variants from a (variant) image.
-- (UIImage *)imageWithoutVariants API_AVAILABLE(ios(15.0));
+- (nullable UIImage *)imageByRemovingVariant API_AVAILABLE(ios(15.0));
 
 @end
 
diff -ruN /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImageVariants.h /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImageVariants.h
--- /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImageVariants.h	2021-06-02 07:36:14.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImageVariants.h	2021-06-17 04:16:01.000000000 -0400
@@ -8,20 +8,17 @@
 
 #import <Foundation/Foundation.h>
 
-typedef NS_ENUM(NSInteger, UIImageVariantShape) {
-    UIImageVariantShapeUnspecified = -1,    // shape value is not specified
-    UIImageVariantShapeNone = 0,            // don't use any shape. This is different from unspecified.
-    UIImageVariantShapeCircle,              // prefer a circle shape
-    UIImageVariantShapeSquare,              // prefer a square shape
-    UIImageVariantShapeRectangle            // prefer a rectangle shape
-} API_AVAILABLE(ios(15.0));
-
-typedef NS_ENUM(NSInteger, UIImageVariantFill) {
-    UIImageVariantFillUnspecified = -1,     // fill value is not specified
-    UIImageVariantFillOutline = 0,          // prefer an unfilled, outlined shape
-    UIImageVariantFillFilled                // prefer a filled shape
-} API_AVAILABLE(ios(15.0));
+typedef NS_OPTIONS(NSUInteger, UIImageVariant) {
+    UIImageVariantNone = 0,              // don't use any shape. This is different than unspecified.
 
+    UIImageVariantCircle = 1 << 1,       // prefer a circle shape
+    UIImageVariantSquare = 1 << 2,       // prefer a square shape
+    UIImageVariantRectangle = 1 << 3,    // prefer a rectangle shape
+
+    UIImageVariantSlash = 1 << 16,       // prefer a slash accessory
+
+    UIImageVariantFill = 1 << 30,        // prefer a filled shape
+} API_AVAILABLE(ios(15.0)) NS_REFINED_FOR_SWIFT;
 
 #else
 #import <UIKitCore/UIImageVariants.h>
diff -ruN /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.apinotes /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.apinotes
--- /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.apinotes	2021-06-01 22:11:47.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.apinotes	2021-06-17 01:29:22.000000000 -0400
@@ -7,6 +7,67 @@
 ---
 Name: UIKit
 Classes:
+- Name: NSTextContentStorage
+  Methods:
+  - Selector: "locationFromLocation:withOffset:"
+    MethodKind: Instance
+    SwiftName: location(_:offsetBy:)
+- Name: NSTextLayoutManager
+  Methods:
+  - Selector: "ensureLayoutForBounds:"
+    MethodKind: Instance
+    SwiftName: ensureLayout(for:)
+  - Selector: "replaceTextContentManager:"
+    MethodKind: Instance
+    SwiftName: replace(_:)
+  - Selector: "textLayoutFragmentForPosition:"
+    MethodKind: Instance
+    SwiftName: textLayoutFragment(for:)
+- Name: NSTextRange
+  Methods:
+  - Selector: "containsLocation:"
+    MethodKind: Instance
+    SwiftName: contains(_:)
+  - Selector: "containsRange:"
+    MethodKind: Instance
+    SwiftName: contains(_:)
+  - Selector: "initWithLocation:"
+    MethodKind: Instance
+    SwiftName: init(location:)
+  - Selector: "intersectsWithTextRange:"
+    MethodKind: Instance
+    SwiftName: intersects(_:)
+  - Selector: "textRangeByFormingUnionWithTextRange:"
+    MethodKind: Instance
+    SwiftName: union(_:)
+  - Selector: "textRangeByIntersectingWithTextRange:"
+    MethodKind: Instance
+    SwiftName: intersection(_:)
+- Name: NSTextSelection
+  Methods:
+  - Selector: "initWithLocation:affinity:"
+    MethodKind: Instance
+    SwiftName: init(_:affinity:)
+  - Selector: "initWithRange:affinity:granularity:"
+    MethodKind: Instance
+    SwiftName: init(_:affinity:granularity:)
+  - Selector: "initWithRanges:affinity:granularity:"
+    MethodKind: Instance
+    SwiftName: init(_:affinity:granularity:)
+  - Selector: "textSelectionWithTextRanges:"
+    MethodKind: Instance
+    SwiftName: textSelection(_:)
+- Name: NSTextSelectionNavigation
+  Methods:
+  - Selector: "textSelectionForSelectionGranularity:enclosingPoint:inContainerAtLocation:"
+    MethodKind: Instance
+    SwiftName: textSelection(for:enclosing:inContainerAt:)
+  - Selector: "textSelectionForSelectionGranularity:enclosingTextSelection:"
+    MethodKind: Instance
+    SwiftName: textSelection(for:enclosing:)
+  - Selector: "textSelectionsInteractingAtPoint:inContainerAtLocation:anchors:modifiers:selecting:bounds:"
+    MethodKind: Instance
+    SwiftName: textSelections(interactingAt:inContainerAt:anchors:modifiers:selecting:bounds:)
 - Name: UICollectionViewCompositionalLayout
   Methods:
   - Selector: "layoutWithListConfiguration:"
@@ -773,21 +834,27 @@
   - Selector: 'systemImageNamed:compatibleWithTraitCollection:'
     MethodKind: Class
     SwiftName: 'init(systemName:compatibleWith:)'
-  - Selector: 'systemImageNamed:shape:'
+  - Selector: 'systemImageNamed:variant:'
     MethodKind: Class
-    SwiftName: 'init(systemName:shape:)'
-  - Selector: 'systemImageNamed:shape:fill:'
+    SwiftName: 'init(__systemName:variant:)'
+  - Selector: 'systemImageNamed:variant:withConfiguration:'
     MethodKind: Class
-    SwiftName: 'init(systemName:shape:fill:)'
-  - Selector: 'systemImageNamed:shape:fill:withConfiguration:'
+    SwiftName: 'init(__systemName:variant:configuration:)'
+  - Selector: 'imageNamed:variant:'
     MethodKind: Class
-    SwiftName: 'init(systemName:shape:fill:configuration:)'
-  - Selector: 'imageWithoutVariants'
+    SwiftName: 'init(__named:variant:)'
+  - Selector: 'imageNamed:variant:withConfiguration:'
+    MethodKind: Class
+    SwiftName: 'init(__named:variant:configuration:)'
+  - Selector: 'imageByApplyingVariant:'
+    MethodKind: Instance
+    SwiftName: '__applyingVariant(_:)'
+  - Selector: 'imageByApplyingVariantFromImage:'
     MethodKind: Instance
-    SwiftName: 'withoutVariants()'
-  - Selector: 'imageWithVariantsFromImage:'
+    SwiftName: 'applyingVariant(from:)'
+  - Selector: 'imageByRemovingVariant'
     MethodKind: Instance
-    SwiftName: 'withVariants(from:)'
+    SwiftName: 'removingVariant()'
 - Name: UIImageConfiguration
   SwiftName: UIImage.Configuration
 - Name: UIImageSymbolConfiguration
@@ -834,6 +901,19 @@
     PropertyKind: Instance
     SwiftPrivate: true
 Protocols:
+- Name: NSTextElementProvider
+  Methods:
+  - Selector: "locationFromLocation:withOffset:"
+    MethodKind: Instance
+    SwiftName: location(_:offsetBy:)
+- Name: NSTextSelectionDataSource
+  Methods:
+  - Selector: "locationFromLocation:withOffset:"
+    MethodKind: Instance
+    SwiftName: location(_:offsetBy:)
+  - Selector: "textRangeForSelectionGranularity:enclosingLocation:"
+    MethodKind: Instance
+    SwiftName: textRange(for:enclosing:)
 - Name: UIConfigurationState
   SwiftPrivate: true
 - Name: UIContentConfiguration
@@ -1070,6 +1150,30 @@
     SwiftName: 'contextMenuInteraction(_:previewForDismissingMenuWithConfiguration:)'
     MethodKind: Instance
 Tags:
+- Name: NSTextContentManagerEnumerationOptions
+  SwiftName: NSTextContentManager.EnumerationOptions
+- Name: NSTextLayoutFragmentEnumerationOptions
+  SwiftName: NSTextLayoutFragment.EnumerationOptions
+- Name: NSTextLayoutFragmentState
+  SwiftName: NSTextLayoutFragment.State
+- Name: NSTextLayoutManagerSegmentOptions
+  SwiftName: NSTextLayoutManager.SegmentOptions
+- Name: NSTextLayoutManagerSegmentType
+  SwiftName: NSTextLayoutManager.SegmentType
+- Name: NSTextSelectionAffinity
+  SwiftName: NSTextSelection.Affinity
+- Name: NSTextSelectionGranularity
+  SwiftName: NSTextSelection.Granularity
+- Name: NSTextSelectionNavigationDestination
+  SwiftName: NSTextSelectionNavigation.Destination
+- Name: NSTextSelectionNavigationDirection
+  SwiftName: NSTextSelectionNavigation.Direction
+- Name: NSTextSelectionNavigationLayoutOrientation
+  SwiftName: NSTextSelectionNavigation.LayoutOrientation
+- Name: NSTextSelectionNavigationModifier
+  SwiftName: NSTextSelectionNavigation.Modifier
+- Name: NSTextSelectionNavigationWritingDirection
+  SwiftName: NSTextSelectionNavigation.WritingDirection
 - Name: UICollectionLayoutListAppearance
   SwiftPrivate: true
 - Name: UICollectionLayoutListHeaderMode
@@ -1373,10 +1477,6 @@
   SwiftName: UIImage.SymbolScale
 - Name: UIImageSymbolWeight
   SwiftName: UIImage.SymbolWeight
-- Name: UIImageVariantShape
-  SwiftName: UIImage.VariantShape
-- Name: UIImageVariantFill
-  SwiftName: UIImage.VariantFill
 - Name: UIPrinterCutterBehavior
   SwiftName: UIPrinter.CutterBehavior
 - Name: UIPrinterJobTypes
@@ -2179,6 +2279,8 @@
   SwiftName: tracking
 - Name: UIGuidedAccessErrorDomain
   SwiftName: UIAccessibility.guidedAccessErrorDomain
+- Name: NSTextContentStorageUnsupportedAttributeAddedNotification
+  SwiftName: unsupportedAttributeAddedNotification
 Functions:
 - Name: UICellAccessoryPositionBeforeAccessoryOfClass
   SwiftPrivate: true
diff -ruN /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.h /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.h
--- /Applications/Xcode_13.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.h	2021-06-01 22:12:24.000000000 -0400
+++ /Applications/Xcode_13.0.0-beta2.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIKit.h	2021-06-16 02:26:46.000000000 -0400
@@ -8,6 +8,10 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKitCore.h>
 
+#if __has_include(<UIKit/UIFoundation.h>)
+#import <UIKit/UIFoundation.h>
+#endif
+
 #if __has_include(<UIKit/DocumentManager.h>)
 #import <UIKit/DocumentManager.h>
 #endif
Clone this wiki locally