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

[HealthKitUI] Add support for Xcode 15 #19017

Merged
merged 5 commits into from Sep 18, 2023
Merged

[HealthKitUI] Add support for Xcode 15 #19017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bef14ce
[HealthKitUI] Add support for Xcode 15
haritha-mohan Sep 13, 2023
ed3b20c
Auto-format source code
Sep 13, 2023
b7a0d4f
inline to property instead
haritha-mohan Sep 14, 2023
7ec50a5
Merge branch 'net8.0-xcode15' into net8.0-xcode15-healthkitui
haritha-mohan Sep 14, 2023
d054712
Auto-format source code
Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/healthkit.cs
View file
Open in desktop
Expand Up @@ -17,6 +17,13 @@
using System.ComponentModel;
using CoreLocation;
using UniformTypeIdentifiers;
#if MONOMAC
using AppKit;
using UIViewController = AppKit.NSViewController;
#else
using UIKit;
using NSViewController = Foundation.NSObject;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't really necessary in the context of this PR but thought it would be good to include to maintain consistency b/w platforms if there is a UI/NSViewController use case in the future..

#endif

#if !NET
using NativeHandle = System.IntPtr;
Expand Down Expand Up @@ -796,6 +803,10 @@ interface HKHealthStore {
[iOS (17, 0), Mac (14, 0), Watch (10, 0), NoTV, MacCatalyst (17, 0)]
[Export ("workoutSessionMirroringStartHandler", ArgumentSemantic.Copy)]
Action<HKWorkoutSession> WorkoutSessionMirroringStartHandler { get; set; }

[NoTV, NoWatch, NoMac, iOS (17, 0), MacCatalyst (17, 0)]
[NullAllowed, Export ("authorizationViewControllerPresenter")]
UIViewController AuthorizationViewControllerPresenter { get; set; }
}

delegate void HKStoreSampleAddedCallback (bool success, NSError error);
Expand Down
2 changes: 0 additions & 2 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKitUI.todo
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tests/xtro-sharpie/iOS-HealthKitUI.todo
View file
Open in desktop

This file was deleted.