This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[ios] Modify return type so callout bridges with protocol in Swift #8541
Merged
boundsj
merged 1 commit into
release-ios-v3.5.0-android-v5.0.0
from
boundsj-return-callout-as-protocol
Mar 29, 2017
Merged
[ios] Modify return type so callout bridges with protocol in Swift #8541
boundsj
merged 1 commit into
release-ios-v3.5.0-android-v5.0.0
from
boundsj-return-callout-as-protocol
Mar 29, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eebf86e
to
2985953
Compare
1ec5
approved these changes
Mar 28, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
@@ -456,7 +456,7 @@ NS_ASSUME_NONNULL_BEGIN | |||
@return A view conforming to the `MGLCalloutView` protocol, or `nil` to use the | |||
default callout view. | |||
*/ | |||
- (nullable UIView <MGLCalloutView> *)mapView:(MGLMapView *)mapView calloutViewForAnnotation:(id <MGLAnnotation>)annotation; | |||
- (nullable id <MGLCalloutView>)mapView:(MGLMapView *)mapView calloutViewForAnnotation:(id <MGLAnnotation>)annotation; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is worth a mention in the iOS changelog.
`- (nullable UIView <MGLCalloutView> *)mapView:(MGLMapView *)mapView calloutViewForAnnotation:(id <MGLAnnotation>)annotation;` bridges with a `UIView?` return type in Swift. This changes replaces the `UIView` type in the method signature so that, when bridged to Swift, the returned object is defined as `MGLCalloutView?`.
2985953
to
f374ea2
Compare
1ec5
reviewed
Mar 30, 2017
@@ -2,6 +2,12 @@ | |||
|
|||
Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. | |||
|
|||
## 3.5.1 | |||
|
|||
### Other changes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: normally we don’t break out patch releases by topic, since they’re so small. This will be pretty easy to address right before release when we copy-edit release notes anyhow.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
annotations
Annotations on iOS and macOS or markers on Android
iOS
Mapbox Maps SDK for iOS
Swift
Specific to the Swift/Objective-C bridge on iOS or macOS
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8420
- (nullable UIView <MGLCalloutView> *)mapView:(MGLMapView *)mapView calloutViewForAnnotation:(id <MGLAnnotation>)annotation;
bridges with aUIView?
return type in Swift. This changes replaces theUIView
type in the method signature so that, when bridged to Swift, the returned object is defined asMGLCalloutView?
.