Merge pull request react-native-maps#370 from lelandrichardson/lmr--rn-029-compat

lelandrichardson · web-flow · commit 6455a623888c · 2016-07-09T14:24:45.000-07:00
RN 0.29 Compat and various changes
diff --git a/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -26,11 +26,10 @@
 
 public class AirMapManager extends ViewGroupManager<AirMapView> {
 
-    public static final String REACT_CLASS = "AIRMap";
-
-    public static final int ANIMATE_TO_REGION = 1;
-    public static final int ANIMATE_TO_COORDINATE = 2;
-    public static final int FIT_TO_ELEMENTS = 3;
+    private static final String REACT_CLASS = "AIRMap";
+    private static final int ANIMATE_TO_REGION = 1;
+    private static final int ANIMATE_TO_COORDINATE = 2;
+    private static final int FIT_TO_ELEMENTS = 3;
 
     private final Map<String, Integer> MAP_TYPES = MapBuilder.of(
             "standard", GoogleMap.MAP_TYPE_NORMAL,
@@ -41,23 +40,10 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
 
     private ReactContext reactContext;
 
-    private Context appContext;
-    private AirMapMarkerManager markerManager;
-    private AirMapPolylineManager polylineManager;
-    private AirMapPolygonManager polygonManager;
-    private AirMapCircleManager circleManager;
-
-    public AirMapManager(
-            Context context,
-            AirMapMarkerManager markerManager,
-            AirMapPolylineManager polylineManager,
-            AirMapPolygonManager polygonManager,
-            AirMapCircleManager circleManager) {
+    private final Context appContext;
+
+    public AirMapManager(Context context) {
         this.appContext = context;
-        this.markerManager = markerManager;
-        this.polylineManager = polylineManager;
-        this.polygonManager = polygonManager;
-        this.circleManager = circleManager;
     }
 
     @Override
@@ -71,13 +57,12 @@ protected AirMapView createViewInstance(ThemedReactContext context) {
 
         try {
             MapsInitializer.initialize(this.appContext);
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             e.printStackTrace();
             emitMapError("Map initialize error", "map_init_error");
         }
-        AirMapView view = new AirMapView(context, this.appContext, this);
 
-        return view;
+        return new AirMapView(context, this.appContext, this);
     }
 
     @Override
@@ -224,7 +209,7 @@ public void receiveCommand(AirMapView view, int commandId, @Nullable ReadableArr
     @Override
     @Nullable
     public Map getExportedCustomDirectEventTypeConstants() {
-        Map map = MapBuilder.of(
+        Map<String, Map<String, String>> map = MapBuilder.of(
                 "onMapReady", MapBuilder.of("registrationName", "onMapReady"),
                 "onPress", MapBuilder.of("registrationName", "onPress"),
                 "onLongPress", MapBuilder.of("registrationName", "onLongPress"),
@@ -286,7 +271,7 @@ public void updateExtraData(AirMapView view, Object extraData) {
         view.updateExtraData(extraData);
     }
 
-    public void pushEvent(View view, String name, WritableMap data) {
+    void pushEvent(View view, String name, WritableMap data) {
         reactContext.getJSModule(RCTEventEmitter.class)
                 .receiveEvent(view.getId(), name, data);
     }
diff --git a/android/lib/src/main/java/com/airbnb/android/react/maps/MapsPackage.java b/android/lib/src/main/java/com/airbnb/android/react/maps/MapsPackage.java
@@ -33,12 +33,7 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
         AirMapPolylineManager polylineManager = new AirMapPolylineManager(reactContext);
         AirMapPolygonManager polygonManager = new AirMapPolygonManager(reactContext);
         AirMapCircleManager circleManager = new AirMapCircleManager(reactContext);
-        AirMapManager mapManager = new AirMapManager(
-                reactContext.getBaseContext(),
-                annotationManager,
-                polylineManager,
-                polygonManager,
-                circleManager);
+        AirMapManager mapManager = new AirMapManager(reactContext.getBaseContext());
 
         return Arrays.<ViewManager>asList(
                 calloutManager,
diff --git a/example/android/AirMapsExplorer.iml b/example/android/AirMapsExplorer.iml
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -100,6 +100,6 @@ android {
 
 dependencies {
     compile "com.android.support:appcompat-v7:23.4.0"
-    compile "com.facebook.react:react-native:0.27.2"  // From node_modules
+    compile "com.facebook.react:react-native:0.29.0"  // From node_modules
     compile project(':react-native-maps')
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <application
       android:allowBackup="true"
       android:label="@string/app_name"
+      android:name=".ExampleApplication"
       android:icon="@mipmap/ic_launcher"
       android:theme="@style/AppTheme">
       <activity
diff --git a/example/android/app/src/main/java/com/airbnb/android/react/maps/example/ExampleApplication.java b/example/android/app/src/main/java/com/airbnb/android/react/maps/example/ExampleApplication.java
@@ -0,0 +1,31 @@
+package com.airbnb.android.react.maps.example;
+
+import android.app.Application;
+
+import com.airbnb.android.react.maps.MapsPackage;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ExampleApplication extends Application implements ReactApplication {
+  private final ReactNativeHost reactNativeHost = new ReactNativeHost(this) {
+    @Override protected boolean getUseDeveloperSupport() {
+      return BuildConfig.DEBUG;
+    }
+
+    @Override protected List<ReactPackage> getPackages() {
+      return Arrays.asList(
+          new MainReactPackage(),
+          new MapsPackage());
+    }
+  };
+
+  @Override
+  public ReactNativeHost getReactNativeHost() {
+    return reactNativeHost;
+  }
+}
diff --git a/example/android/app/src/main/java/com/airbnb/android/react/maps/example/MainActivity.java b/example/android/app/src/main/java/com/airbnb/android/react/maps/example/MainActivity.java
@@ -1,12 +1,7 @@
 package com.airbnb.android.react.maps.example;
 
-import com.airbnb.android.react.maps.MapsPackage;
 import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
 
-import java.util.Arrays;
-import java.util.List;
 
 public class MainActivity extends ReactActivity {
 
@@ -19,23 +14,4 @@ protected String getMainComponentName() {
         return "AirMapsExplorer";
     }
 
-    /**
-     * Returns whether dev mode should be enabled.
-     * This enables e.g. the dev menu.
-     */
-    @Override
-    protected boolean getUseDeveloperSupport() {
-        return BuildConfig.DEBUG;
-    }
-
-    /**
-     * A list of packages used by the app. If the app uses additional views
-     * or modules besides the default ones, add more packages here.
-     */
-    @Override
-    protected List<ReactPackage> getPackages() {
-        return Arrays.asList(
-            new MainReactPackage(),
-            new MapsPackage(this));
-    }
 }
diff --git a/example/package.json b/example/package.json
@@ -3,11 +3,14 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "start": "react-native start"
+    "start": "react-native start",
+    "watch": "node ./scripts/watch-and-copy-src.js",
+    "packager": "sh ./node_modules/react-native/packager/packager.sh --root ./node_modules/react-native-maps",
+    "dev": "concurrently 'npm run watch' 'npm run packager'"
   },
   "dependencies": {
-    "react": "15.1.0",
-    "react-native": "0.27.2",
+    "react": "15.2.0",
+    "react-native": "0.29.0",
     "react-native-maps": "../"
   }
 }
diff --git a/example/scripts/watch-and-copy-src.js b/example/scripts/watch-and-copy-src.js
@@ -0,0 +1,28 @@
+const fs = require('fs-extra');
+const watch = require('node-watch');
+const rimraf = require('rimraf');
+
+const packageName = 'react-native-maps/components';
+const packagePath = '../components';
+
+console.log(`Cleaning node_modules/${packageName}`);
+rimraf(`node_modules/${packageName}`, () => {
+  console.log(`Copying ${packageName}`);
+  fs.copy(packagePath, `node_modules/${packageName}`, (err) => {
+    if (err) return console.error(err);
+
+    // Remove conflicting node_modules from `airbnb-dls`.
+    //['react-native', 'react'].forEach(moduleName =>
+    //  rimraf(`node_modules/${packageName}/node_modules/${moduleName}`, () => {}));
+  });
+
+  console.log(`Watching ${packageName}`);
+  watch(packagePath, (filename) => {
+    const localPath = filename.split(packagePath).pop();
+    const destination = `node_modules/${packageName}${localPath}`;
+    console.log(`Copying ${filename} to ${destination}`);
+    fs.copy(filename, destination, (err) => {
+      if (err) return console.error(err);
+    });
+  });
+});
diff --git a/package.json b/package.json
@@ -20,9 +20,12 @@
     "google-maps",
     "mapkit"
   ],
-  "dependencies": {},
+  "dependencies": {
+    "react": "*",
+    "react-native": "*"
+  },
   "devDependencies": {
-    "react": "15.1.0",
-    "react-native": "0.27.2"
+    "react": "15.2.0",
+    "react-native": "0.29.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,6 @@ android {`
`100`	`100`
`101`	`101`	`dependencies {`
`102`	`102`	`compile "com.android.support:appcompat-v7:23.4.0"`
`103`		`- compile "com.facebook.react:react-native:0.27.2" // From node_modules`
	`103`	`+ compile "com.facebook.react:react-native:0.29.0" // From node_modules`
`104`	`104`	`compile project(':react-native-maps')`
`105`	`105`	`}`