Skip to content

Commit 2ae1716

Browse files
committed
Fixes example JS code for RN 30 compatibility
Also bump to RN to 30-rc
1 parent 512f734 commit 2ae1716

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed

android/lib/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
}
1717

1818
dependencies {
19-
compile 'com.facebook.react:react-native:0.29.0'
20-
compile "com.google.android.gms:play-services-base:8.4.0"
21-
compile 'com.google.android.gms:play-services-maps:8.4.0'
19+
compile 'com.facebook.react:react-native:0.30.0-rc.0'
20+
compile "com.google.android.gms:play-services-base:9.2.0"
21+
compile 'com.google.android.gms:play-services-maps:9.2.0'
2222
}

android/lib/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class AirMapMarker extends AirMapFeature {
6767

6868
private boolean hasCustomMarkerView = false;
6969

70-
private final DraweeHolder mLogoHolder;
70+
private final DraweeHolder<?> logoHolder;
7171
private DataSource<CloseableReference<CloseableImage>> dataSource;
7272
private final ControllerListener<ImageInfo> mLogoControllerListener =
7373
new BaseControllerListener<ImageInfo>() {
@@ -104,8 +104,8 @@ public void onFinalImageSet(
104104
public AirMapMarker(Context context) {
105105
super(context);
106106
this.context = context;
107-
mLogoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
108-
mLogoHolder.onAttach();
107+
logoHolder = DraweeHolder.create(createDraweeHierarchy(), context);
108+
logoHolder.onAttach();
109109
}
110110

111111
private GenericDraweeHierarchy createDraweeHierarchy() {
@@ -203,9 +203,9 @@ public void setImage(String uri) {
203203
DraweeController controller = Fresco.newDraweeControllerBuilder()
204204
.setImageRequest(imageRequest)
205205
.setControllerListener(mLogoControllerListener)
206-
.setOldController(mLogoHolder.getController())
206+
.setOldController(logoHolder.getController())
207207
.build();
208-
mLogoHolder.setController(controller);
208+
logoHolder.setController(controller);
209209
} else {
210210
iconBitmapDescriptor = getBitmapDescriptorByName(uri);
211211
update();

example/examples/AnimatedPriceMarker.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
var React = require('react');
22
var ReactNative = require('react-native');
33
var {
4-
StyleSheet,
54
PropTypes,
5+
} = React;
6+
7+
var {
8+
StyleSheet,
69
View,
710
Text,
811
Animated,
912
} = ReactNative;
10-
var PropTypes = require('ReactPropTypes');
1113

1214
const PriceMarker = ({ amount, selected, style }) => {
1315

example/examples/PanController.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
var React = require('react');
22
var ReactNative = require('react-native');
3+
var {
4+
PropTypes,
5+
} = React;
36
var {
47
View,
58
Animated,
6-
PropTypes,
79
PanResponder,
810
} = ReactNative;
9-
var PropTypes = require('ReactPropTypes');
1011

1112
var ModePropType = PropTypes.oneOf(["decay", "snap", "spring-origin"]);
1213
var OvershootPropType = PropTypes.oneOf(["spring", "clamp"]);

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"react": "15.2.0",
13-
"react-native": "0.29.0",
13+
"react-native": "^0.30.0-rc",
1414
"react-native-maps": "../"
1515
}
1616
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"mapkit"
2222
],
2323
"dependencies": {
24-
"react": "*",
25-
"react-native": "*"
24+
"react": "15.2.0",
25+
"react-native": "^0.30.0-rc"
2626
},
2727
"devDependencies": {
2828
"react": "15.2.0",
29-
"react-native": "0.29.0"
29+
"react-native": "^0.30.0-rc"
3030
}
3131
}

0 commit comments

Comments
 (0)