Skip to content

Commit 3b03f5b

Browse files
committed
correctly export view constants on android
1 parent ecf2ecb commit 3b03f5b

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

RNAdMobBanner.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { Component } from 'react';
22
import {
3-
NativeModules,
43
requireNativeComponent,
54
UIManager,
65
findNodeHandle,
@@ -62,7 +61,7 @@ class AdMobBanner extends Component {
6261

6362
Object.defineProperty(AdMobBanner, 'simulatorId', {
6463
get() {
65-
return NativeModules.RNGADBannerViewManager.simulatorId;
64+
return UIManager.RNGADBannerView.Constants.simulatorId;
6665
},
6766
});
6867

RNPublisherBanner.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { Component } from 'react';
22
import {
3-
NativeModules,
43
requireNativeComponent,
54
UIManager,
65
findNodeHandle,
@@ -71,7 +70,7 @@ class PublisherBanner extends Component {
7170

7271
Object.defineProperty(PublisherBanner, 'simulatorId', {
7372
get() {
74-
return NativeModules.RNDFPBannerViewManager.simulatorId;
73+
return UIManager.RNDFPBannerView.Constants.simulatorId;
7574
},
7675
});
7776

android/src/main/java/com/sbugert/rnadmob/RNAdMobBannerViewManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,15 @@ private AdSize getAdSizeFromString(String adSize) {
246246
}
247247
}
248248

249-
@javax.annotation.Nullable
249+
@Nullable
250250
@Override
251-
public Map<String, Object> getConstants() {
251+
public Map<String, Object> getExportedViewConstants() {
252252
final Map<String, Object> constants = new HashMap<>();
253253
constants.put("simulatorId", AdRequest.DEVICE_ID_EMULATOR);
254254
return constants;
255255
}
256256

257-
@javax.annotation.Nullable
257+
@Nullable
258258
@Override
259259
public Map<String, Integer> getCommandsMap() {
260260
return MapBuilder.of("loadBanner", COMMAND_LOAD_BANNER);

android/src/main/java/com/sbugert/rnadmob/RNAdMobPackage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
2828

2929
@Override
3030
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
31-
List<ViewManager> managers = new ArrayList<>();
32-
managers.add(new RNAdMobBannerViewManager());
33-
managers.add(new RNPublisherBannerViewManager());
34-
return managers;
31+
return Arrays.<ViewManager>asList(
32+
new RNAdMobBannerViewManager(),
33+
new RNPublisherBannerViewManager()
34+
);
3535
}
3636
}

android/src/main/java/com/sbugert/rnadmob/RNPublisherBannerViewManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,15 +288,15 @@ private AdSize getAdSizeFromString(String adSize) {
288288
}
289289
}
290290

291-
@javax.annotation.Nullable
291+
@Nullable
292292
@Override
293-
public Map<String, Object> getConstants() {
293+
public Map<String, Object> getExportedViewConstants() {
294294
final Map<String, Object> constants = new HashMap<>();
295295
constants.put("simulatorId", PublisherAdRequest.DEVICE_ID_EMULATOR);
296296
return constants;
297297
}
298298

299-
@javax.annotation.Nullable
299+
@Nullable
300300
@Override
301301
public Map<String, Integer> getCommandsMap() {
302302
return MapBuilder.of("loadBanner", COMMAND_LOAD_BANNER);

0 commit comments

Comments
 (0)