-
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
RN0.29 compatability #363
RN0.29 compatability #363
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
apply plugin: 'com.android.library' | ||
apply from: 'gradle-maven-push.gradle' | ||
|
||
android { | ||
compileSdkVersion 23 | ||
|
@@ -16,7 +15,7 @@ android { | |
} | ||
|
||
dependencies { | ||
compile 'com.facebook.react:react-native:0.27.2' | ||
compile 'com.facebook.react:react-native:+' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
compile "com.google.android.gms:play-services-base:8.4.0" | ||
compile 'com.google.android.gms:play-services-maps:8.4.0' | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
package com.airbnb.android.react.maps; | ||
|
||
import android.view.View; | ||
import android.app.Activity; | ||
import android.content.Context; | ||
|
||
import com.facebook.react.bridge.Arguments; | ||
import com.facebook.react.bridge.ReactContext; | ||
|
@@ -41,19 +41,19 @@ public class AirMapManager extends ViewGroupManager<AirMapView> { | |
|
||
private ReactContext reactContext; | ||
|
||
private Activity reactActivity; | ||
private Context appContext; | ||
private AirMapMarkerManager markerManager; | ||
private AirMapPolylineManager polylineManager; | ||
private AirMapPolygonManager polygonManager; | ||
private AirMapCircleManager circleManager; | ||
|
||
public AirMapManager( | ||
Activity activity, | ||
Context context, | ||
AirMapMarkerManager markerManager, | ||
AirMapPolylineManager polylineManager, | ||
AirMapPolygonManager polygonManager, | ||
AirMapCircleManager circleManager) { | ||
this.reactActivity = activity; | ||
this.appContext = context; | ||
this.markerManager = markerManager; | ||
this.polylineManager = polylineManager; | ||
this.polygonManager = polygonManager; | ||
|
@@ -70,12 +70,12 @@ protected AirMapView createViewInstance(ThemedReactContext context) { | |
reactContext = context; | ||
|
||
try { | ||
MapsInitializer.initialize(reactActivity); | ||
MapsInitializer.initialize(this.appContext); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. omit |
||
} catch (Exception e) { | ||
e.printStackTrace(); | ||
emitMapError("Map initialize error", "map_init_error"); | ||
} | ||
AirMapView view = new AirMapView(context, reactActivity, this); | ||
AirMapView view = new AirMapView(context, this.appContext, this); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same |
||
|
||
return view; | ||
} | ||
|
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 change seems unrelated