From 3b03f5ba1858a87d2bcde768022c8bf169d8415c Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Thu, 10 Aug 2017 11:39:30 +0200
Subject: [PATCH] correctly export view constants on android

---
 RNAdMobBanner.js                                          | 3 +--
 RNPublisherBanner.js                                      | 3 +--
 .../com/sbugert/rnadmob/RNAdMobBannerViewManager.java     | 6 +++---
 .../src/main/java/com/sbugert/rnadmob/RNAdMobPackage.java | 8 ++++----
 .../com/sbugert/rnadmob/RNPublisherBannerViewManager.java | 6 +++---
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/RNAdMobBanner.js b/RNAdMobBanner.js
index bfc97d7ce..6a6004f47 100644
--- 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
index 59148edc9..d5c1f9f47 100644
--- 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
index 299001c5e..a16a8ffac 100644
--- 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
index ea521d567..2145ced63 100644
--- 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
index 9d5ce43b8..e0f4f7258 100644
--- 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);