correctly export view constants on android

sbugert · Aug 10, 2017 · 3b03f5b · 3b03f5b
1 parent ecf2ecb
commit 3b03f5b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/RNAdMobBanner.js b/RNAdMobBanner.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import {
-  NativeModules,
   requireNativeComponent,
   UIManager,
   findNodeHandle,
@@ -62,7 +61,7 @@ class AdMobBanner extends Component {
 
 Object.defineProperty(AdMobBanner, 'simulatorId', {
   get() {
-    return NativeModules.RNGADBannerViewManager.simulatorId;
+    return UIManager.RNGADBannerView.Constants.simulatorId;
   },
 });
 

diff --git a/RNPublisherBanner.js b/RNPublisherBanner.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import {
-  NativeModules,
   requireNativeComponent,
   UIManager,
   findNodeHandle,
@@ -71,7 +70,7 @@ class PublisherBanner extends Component {
 
 Object.defineProperty(PublisherBanner, 'simulatorId', {
   get() {
-    return NativeModules.RNDFPBannerViewManager.simulatorId;
+    return UIManager.RNDFPBannerView.Constants.simulatorId;
   },
 });
 

diff --git a/android/src/main/java/com/sbugert/rnadmob/RNAdMobBannerViewManager.java b/android/src/main/java/com/sbugert/rnadmob/RNAdMobBannerViewManager.java
@@ -246,15 +246,15 @@ private AdSize getAdSizeFromString(String adSize) {
     }
   }
 
-  @javax.annotation.Nullable
+  @Nullable
   @Override
-  public Map<String, Object> getConstants() {
+  public Map<String, Object> getExportedViewConstants() {
     final Map<String, Object> constants = new HashMap<>();
     constants.put("simulatorId", AdRequest.DEVICE_ID_EMULATOR);
     return constants;
   }
 
-  @javax.annotation.Nullable
+  @Nullable
   @Override
   public Map<String, Integer> getCommandsMap() {
     return MapBuilder.of("loadBanner", COMMAND_LOAD_BANNER);

diff --git a/android/src/main/java/com/sbugert/rnadmob/RNAdMobPackage.java b/android/src/main/java/com/sbugert/rnadmob/RNAdMobPackage.java
@@ -28,9 +28,9 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        List<ViewManager> managers = new ArrayList<>();
-        managers.add(new RNAdMobBannerViewManager());
-        managers.add(new RNPublisherBannerViewManager());
-        return managers;
+      return Arrays.<ViewManager>asList(
+          new RNAdMobBannerViewManager(),
+          new RNPublisherBannerViewManager()
+      );
     }
 }
diff --git a/android/src/main/java/com/sbugert/rnadmob/RNPublisherBannerViewManager.java b/android/src/main/java/com/sbugert/rnadmob/RNPublisherBannerViewManager.java
@@ -288,15 +288,15 @@ private AdSize getAdSizeFromString(String adSize) {
     }
   }
 
-  @javax.annotation.Nullable
+  @Nullable
   @Override
-  public Map<String, Object> getConstants() {
+  public Map<String, Object> getExportedViewConstants() {
     final Map<String, Object> constants = new HashMap<>();
     constants.put("simulatorId", PublisherAdRequest.DEVICE_ID_EMULATOR);
     return constants;
   }
 
-  @javax.annotation.Nullable
+  @Nullable
   @Override
   public Map<String, Integer> getCommandsMap() {
     return MapBuilder.of("loadBanner", COMMAND_LOAD_BANNER);