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

Support react native link on stable #2

Closed
wants to merge 3 commits into from
Closed

Support react native link on stable #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
058a942
check for HAVE_GOOGLE_MAPS in AIRGoogleMapOverlay
chrise86 Aug 23, 2018
871d970
fix air map link sources
chrise86 Aug 23, 2018
29fcc31
add GMaps conditionals to overlay manager
chrise86 Aug 24, 2018
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
4 changes: 4 additions & 0 deletions lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
// Created by Taro Matsuzawa on 5/3/17.
//

#ifdef HAVE_GOOGLE_MAPS

#import <Foundation/Foundation.h>
#import <GoogleMaps/GoogleMaps.h>
#import <React/RCTBridge.h>
Expand All @@ -21,3 +23,5 @@
@property (nonatomic, weak) RCTBridge *bridge;

@end

#endif
4 changes: 4 additions & 0 deletions lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// Created by Nick Italiano on 3/5/17.
//

#ifdef HAVE_GOOGLE_MAPS

#import "AIRGoogleMapOverlay.h"

#import <React/RCTEventDispatcher.h>
Expand Down Expand Up @@ -74,3 +76,5 @@ - (void)setBoundsRect:(NSArray *)boundsRect
}

@end

#endif
4 changes: 4 additions & 0 deletions lib/ios/AirGoogleMaps/AIRGoogleMapOverlayManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
// Created by Taro Matsuzawa on 3/5/17.
//

#ifdef HAVE_GOOGLE_MAPS

#import <Foundation/Foundation.h>
#import <React/RCTViewManager.h>

@interface AIRGoogleMapOverlayManager : RCTViewManager
@end

#endif
4 changes: 4 additions & 0 deletions lib/ios/AirGoogleMaps/AIRGoogleMapOverlayManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#ifdef HAVE_GOOGLE_MAPS

#import "AIRGoogleMapOverlayManager.h"
#import "AIRGoogleMapOverlay.h"

Expand All @@ -20,3 +22,5 @@ - (UIView *)view
RCT_REMAP_VIEW_PROPERTY(image, imageSrc, NSString)

@end

#endif
18 changes: 12 additions & 6 deletions lib/ios/AirMaps.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
628F81201FD16DF80058313A /* AIRMapLocalTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 628F811F1FD16DF80058313A /* AIRMapLocalTile.m */; };
628F81231FD16EFA0058313A /* AIRMapLocalTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 628F81221FD16EFA0058313A /* AIRMapLocalTileManager.m */; };
62AEC4D41FD5A0AA003225E0 /* AIRMapLocalTileOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 62AEC4D31FD5A0AA003225E0 /* AIRMapLocalTileOverlay.m */; };
8BC85FB02107CFEC0006CEA5 /* AIRGoogleMapOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BC85FAF2107CFEC0006CEA5 /* AIRGoogleMapOverlay.m */; };
9B9498CA2017EFB800158761 /* AIRGoogleMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B9498A62017EFB400158761 /* AIRGoogleMapUrlTile.m */; };
9B9498CB2017EFB800158761 /* AIRGoogleMapURLTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B9498A72017EFB400158761 /* AIRGoogleMapURLTileManager.m */; };
9B9498CC2017EFB800158761 /* AIRGMSPolygon.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B9498A82017EFB400158761 /* AIRGMSPolygon.m */; };
Expand All @@ -51,6 +50,8 @@
9B9498DC2017EFB800158761 /* AIRGoogleMapPolygonManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B9498C92017EFB800158761 /* AIRGoogleMapPolygonManager.m */; };
DA6C26381C9E2AFE0035349F /* AIRMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */; };
DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6C263D1C9E324A0035349F /* AIRMapUrlTileManager.m */; };
DCF21593212F0D270099398D /* AIRGoogleMapOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF2158F212F0D270099398D /* AIRGoogleMapOverlay.m */; };
DCF21594212F0D270099398D /* AIRGoogleMapOverlayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF21591212F0D270099398D /* AIRGoogleMapOverlayManager.m */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -111,8 +112,6 @@
628F81221FD16EFA0058313A /* AIRMapLocalTileManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AIRMapLocalTileManager.m; sourceTree = "<group>"; };
62AEC4D31FD5A0AA003225E0 /* AIRMapLocalTileOverlay.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AIRMapLocalTileOverlay.m; path = AirMaps/AIRMapLocalTileOverlay.m; sourceTree = "<group>"; };
8BC85FAD2107C0BD0006CEA5 /* User.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = User.xcconfig; sourceTree = "<group>"; };
8BC85FAE2107CFD80006CEA5 /* AIRGoogleMapOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRGoogleMapOverlay.h; path = "../../../../../react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.h"; sourceTree = "<group>"; };
8BC85FAF2107CFEC0006CEA5 /* AIRGoogleMapOverlay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRGoogleMapOverlay.m; path = "../../../../../react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapOverlay.m"; sourceTree = "<group>"; };
9B9498A42017EFB400158761 /* AIRGoogleMapCallout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRGoogleMapCallout.h; path = AirGoogleMaps/AIRGoogleMapCallout.h; sourceTree = "<group>"; };
9B9498A52017EFB400158761 /* AIRGoogleMapPolygonManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRGoogleMapPolygonManager.h; path = AirGoogleMaps/AIRGoogleMapPolygonManager.h; sourceTree = "<group>"; };
9B9498A62017EFB400158761 /* AIRGoogleMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRGoogleMapUrlTile.m; path = AirGoogleMaps/AIRGoogleMapUrlTile.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -155,6 +154,10 @@
DA6C26371C9E2AFE0035349F /* AIRMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRMapUrlTile.m; sourceTree = "<group>"; };
DA6C263C1C9E324A0035349F /* AIRMapUrlTileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRMapUrlTileManager.h; sourceTree = "<group>"; };
DA6C263D1C9E324A0035349F /* AIRMapUrlTileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRMapUrlTileManager.m; sourceTree = "<group>"; };
DCF2158F212F0D270099398D /* AIRGoogleMapOverlay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRGoogleMapOverlay.m; path = AirGoogleMaps/AIRGoogleMapOverlay.m; sourceTree = "<group>"; };
DCF21590212F0D270099398D /* AIRGoogleMapOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRGoogleMapOverlay.h; path = AirGoogleMaps/AIRGoogleMapOverlay.h; sourceTree = "<group>"; };
DCF21591212F0D270099398D /* AIRGoogleMapOverlayManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRGoogleMapOverlayManager.m; path = AirGoogleMaps/AIRGoogleMapOverlayManager.m; sourceTree = "<group>"; };
DCF21592212F0D270099398D /* AIRGoogleMapOverlayManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRGoogleMapOverlayManager.h; path = AirGoogleMaps/AIRGoogleMapOverlayManager.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -243,6 +246,10 @@
9B9498A32017EF9D00158761 /* AirGoogleMaps */ = {
isa = PBXGroup;
children = (
DCF21590212F0D270099398D /* AIRGoogleMapOverlay.h */,
DCF2158F212F0D270099398D /* AIRGoogleMapOverlay.m */,
DCF21592212F0D270099398D /* AIRGoogleMapOverlayManager.h */,
DCF21591212F0D270099398D /* AIRGoogleMapOverlayManager.m */,
9B9498C12017EFB700158761 /* AIRGMSMarker.h */,
9B9498AE2017EFB500158761 /* AIRGMSMarker.m */,
9B9498BA2017EFB600158761 /* AIRGMSPolygon.h */,
Expand Down Expand Up @@ -271,8 +278,6 @@
9B9498C92017EFB800158761 /* AIRGoogleMapPolygonManager.m */,
9B9498B82017EFB600158761 /* AIRGoogleMapPolyline.h */,
9B9498BB2017EFB600158761 /* AIRGoogleMapPolyline.m */,
8BC85FAE2107CFD80006CEA5 /* AIRGoogleMapOverlay.h */,
8BC85FAF2107CFEC0006CEA5 /* AIRGoogleMapOverlay.m */,
9B9498B62017EFB500158761 /* AIRGoogleMapPolylineManager.h */,
9B9498B12017EFB500158761 /* AIRGoogleMapPolylineManager.m */,
9B9498C82017EFB800158761 /* AIRGoogleMapUrlTile.h */,
Expand Down Expand Up @@ -358,6 +363,7 @@
9B9498CE2017EFB800158761 /* AIRGMSMarker.m in Sources */,
9B9498D72017EFB800158761 /* AIRGoogleMapManager.m in Sources */,
19DABC7F1E7C9D3C00F41150 /* RCTConvert+AirMap.m in Sources */,
DCF21594212F0D270099398D /* AIRGoogleMapOverlayManager.m in Sources */,
1125B2E51C4AD3DA007D0023 /* AIRMapPolyline.m in Sources */,
9B9498D82017EFB800158761 /* DummyView.m in Sources */,
9B9498D52017EFB800158761 /* AIRGoogleMapPolyline.m in Sources */,
Expand All @@ -372,8 +378,8 @@
53D3163D202E734F00B55447 /* AIRMapOverlayRenderer.m in Sources */,
1125B2DA1C4AD3DA007D0023 /* AIRMap.m in Sources */,
1125B2DF1C4AD3DA007D0023 /* AIRMapCoordinate.m in Sources */,
DCF21593212F0D270099398D /* AIRGoogleMapOverlay.m in Sources */,
9B9498D62017EFB800158761 /* AIRGoogleMapCircleManager.m in Sources */,
8BC85FB02107CFEC0006CEA5 /* AIRGoogleMapOverlay.m in Sources */,
1125B2F21C4AD445007D0023 /* SMCalloutView.m in Sources */,
2163AA501FEAEDD100BBEC95 /* AIRMapPolylineRenderer.m in Sources */,
9B9498D02017EFB800158761 /* AIRGoogleMapPolylineManager.m in Sources */,
Expand Down