Merge pull request #23 from StefanDorresteijn/develop

Author: christophermark

android/build.gradle

@@ -1,3 +1,7 @@
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 buildscript {
     repositories {
         jcenter()
@@ -11,12 +15,12 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion safeExtGet('compileSdkVersion', 23)
+    buildToolsVersion safeExtGet('buildToolsVersion', "23.0.1")
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('minSdkVersion', targetSdkVersion)
         versionCode 1
         versionName "1.0"
     }
@@ -30,5 +34,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.15.+'
+    implementation 'com.facebook.react:react-native:0.15.+'
 }

android/src/main/java/com/robinpowered/react/battery/DeviceBatteryModule.java

@@ -5,6 +5,7 @@
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.os.BatteryManager;
+import android.util.Log;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -13,9 +14,13 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 import com.facebook.react.bridge.LifecycleEventListener;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.annotation.Nullable;
 
 // @link http://developer.android.com/training/monitoring-device-state/battery-monitoring.html
@@ -58,15 +63,27 @@ private WritableNativeMap getJSMap (Intent intent) {
   }
 
   public void notifyBatteryStateChanged(Intent intent) {
+    batteryStatus = intent;
     // only emit an event if the Catalyst instance is avialable
     if (getReactApplicationContext().hasActiveCatalystInstance()) {
       WritableNativeMap params = getJSMap(intent);
-      getReactApplicationContext()
-              .getJSModule(RCTNativeAppEventEmitter.class)
-              .emit(EVENT_NAME, params);
+      try {
+        getReactApplicationContext()
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                .emit(EVENT_NAME, params);
+      } catch (Exception e) {
+        Log.e(getName(), "notifyBatteryStateChanged called before bundle loaded");
+      }
     }
   }
 
+  @Override
+  public Map<String, Object> getConstants() {
+    final Map<String, Object> constants = new HashMap<>();
+    constants.put("BATTERY_CHANGE_EVENT", EVENT_NAME);
+    return constants;
+  }
+
   @ReactMethod
   public void getBatteryLevel(Promise promise) {
     if (batteryStatus != null) {

ios/DeviceBattery/DeviceBattery.m

@@ -33,11 +33,20 @@ - (void)dealloc
     return @[BATTERY_CHANGE_EVENT];
 }
 
+- (NSDictionary *)constantsToExport
+{
+    return @{@"BATTERY_CHANGE_EVENT": BATTERY_CHANGE_EVENT};
+}
+
 // UIDevice (UIKit) may only be accessed on main thread
 +(BOOL)requiresMainQueueSetup
 {
     return YES;
 }
+-(dispatch_queue_t)methodQueue
+{
+    return dispatch_get_main_queue();
+}
 
 RCT_REMAP_METHOD(isCharging,
                  isChargingResolver:(RCTPromiseResolveBlock)resolve