Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HomeKit] Updates for Xcode13 Beta 1-2 #12092

Merged
merged 13 commits into from
Aug 3, 2021
Merged

[HomeKit] Updates for Xcode13 Beta 1-2 #12092

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
909eda8
initial changes
Jul 9, 2021
3245e8b
adding delegate
Jul 9, 2021
44d4790
using Handler
Jul 9, 2021
f3cc71d
removing error availablity and trying to allow maccatalyst
Jul 12, 2021
e8f1e81
merge main
Jul 19, 2021
2484cec
adding MacCatalyst support
Jul 20, 2021
d554000
Merge branch 'main' into Xcode13-HomeKit-Beta2
tj-devel709 Jul 20, 2021
3cc71ec
adding ignore file for all MacCatalyst selectors
Jul 26, 2021
a6cf406
Merge remote-tracking branch 'TJ/Xcode13-HomeKit-Beta2' into Xcode13-…
Jul 26, 2021
bac5674
Merge remote-tracking branch 'xamarin/main' into Xcode13-HomeKit-Beta2
Jul 29, 2021
03c4161
attempting to add homekit in maccatalyst workaround
Jul 29, 2021
4933df6
updated MacCatalyst ignore
Jul 29, 2021
5eb4404
Merge branch 'main' into Xcode13-HomeKit-Beta2
mandel-macaque Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/HomeKit/HMEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ public enum HMError : long {
TimedOutWaitingForAccessory = 100,
AccessoryCommunicationFailure = 101,
FailedToJoinNetwork = 102,
// iOS 15
AccessoryIsSuspended = 103,
}


Expand Down
73 changes: 73 additions & 0 deletions src/homekit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,5 +1874,78 @@ interface HMAccessControl {

}

delegate void HMErrorHandler ([NullAllowed] NSError error);

[iOS (15,0), Watch (8,0), TV (15,0), MacCatalyst (15,0)]
[BaseType (typeof (NSObject))]
interface HMAccessorySetupManager
{
[Async]
[Export ("addAndSetUpAccessoriesForTopology:completionHandler:")]
void AddAndSetUpAccessories (HMChipServiceTopology topology, HMErrorHandler completion);
}

[iOS (15,0), Watch (8,0), TV (15,0), MacCatalyst (15,0)]
[BaseType (typeof (NSObject), Name = "HMCHIPServiceHome")]
[DisableDefaultCtor]
interface HMChipServiceHome : NSCopying, NSSecureCoding
{
[Export ("uuid", ArgumentSemantic.Strong)]
NSUuid Uuid { get; }

[Export ("name", ArgumentSemantic.Strong)]
string Name { get; }

[Export ("initWithUUID:name:")]
[DesignatedInitializer]
IntPtr Constructor (NSUuid uuid, string name);
}

delegate void FetchRoomHandler (NSArray<HMChipServiceRoom> rooms, NSError error);

[iOS (15,0), Watch (8,0), TV (15,0), MacCatalyst (15,0)]
[BaseType (typeof (NSObject), Name = "HMCHIPServiceRequestHandler")]
interface HMChipServiceRequestHandler : NSExtensionRequestHandling
{
[Async]
[Export ("fetchRoomsInHome:completion:")]
void FetchRooms (HMChipServiceHome home, FetchRoomHandler completion);

[Async]
[Export ("pairAccessoryInHome:onboardingPayload:completion:")]
void PairAccessory (HMChipServiceHome home, string onboardingPayload, Action<NSError> completion);

[Async]
[Export ("configureAccessoryWithName:room:completion:")]
void ConfigureAccessory (string accessoryName, HMChipServiceRoom accessoryRoom, Action<NSError> completion);
}

[iOS (15,0), Watch (8,0), TV (15,0), MacCatalyst (15,0)]
[BaseType (typeof (NSObject), Name = "HMCHIPServiceRoom")]
[DisableDefaultCtor]
interface HMChipServiceRoom : NSCopying, NSSecureCoding
{
[Export ("uuid", ArgumentSemantic.Strong)]
NSUuid Uuid { get; }

[Export ("name", ArgumentSemantic.Strong)]
string Name { get; }

[Export ("initWithUUID:name:")]
[DesignatedInitializer]
IntPtr Constructor (NSUuid uuid, string name);
}

[iOS (15,0), Watch (8,0), TV (15,0), MacCatalyst (15,0)]
[BaseType (typeof (NSObject), Name = "HMCHIPServiceTopology")]
[DisableDefaultCtor]
interface HMChipServiceTopology : NSCopying, NSSecureCoding
{
[Export ("initWithHomes:")]
IntPtr Constructor (HMChipServiceHome[] homes);

[Export ("homes", ArgumentSemantic.Copy)]
HMChipServiceHome[] Homes { get; }
}

}
18 changes: 0 additions & 18 deletions tests/xtro-sharpie/iOS-HomeKit.todo
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions tests/xtro-sharpie/tvOS-HomeKit.todo
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions tests/xtro-sharpie/watchOS-HomeKit.todo
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools/common/Frameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@ public static Frameworks GetMacCatalystFrameworks ()
case "HealthKitUI":
case "iAd":
case "IdentityLookupUI":
case "HomeKit":
rolfbjarne marked this conversation as resolved.
Show resolved Hide resolved
case "Messages":
case "MessageUI":
case "VisionKit":
Expand Down