From ef35a9ba2f3d5187106ee48d8078981a14644634 Mon Sep 17 00:00:00 2001
From: Dylan <dylancompanjen@gmail.com>
Date: Mon, 20 May 2024 19:16:19 +0200
Subject: [PATCH] rename

---
 RNGoogleMobileAdsExample/App.tsx              | 10 +++--
 .../xcshareddata/IDEWorkspaceChecks.plist     |  8 ++++
 ...iveGoogleMobileAdsBannerAdViewManager.java |  6 +--
 docs/displaying-ads.mdx                       |  4 +-
 .../RNGoogleMobileAdsBannerComponent.h        |  2 +-
 .../RNGoogleMobileAdsBannerComponent.m        |  9 +----
 .../RNGoogleMobileAdsBannerView.mm            | 40 +++++++------------
 .../RNGoogleMobileAdsBannerViewManager.mm     |  4 +-
 src/ads/BannerAd.tsx                          |  4 +-
 src/ads/GAMBannerAd.tsx                       |  4 +-
 ...oogleMobileAdsBannerViewNativeComponent.ts |  4 +-
 11 files changed, 45 insertions(+), 50 deletions(-)
 create mode 100644 RNGoogleMobileAdsExample/ios/RNGoogleMobileAdsExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/RNGoogleMobileAdsExample/App.tsx b/RNGoogleMobileAdsExample/App.tsx
index b3505b6d..de6ab97d 100644
--- a/RNGoogleMobileAdsExample/App.tsx
+++ b/RNGoogleMobileAdsExample/App.tsx
@@ -204,9 +204,6 @@ class BannerTest implements Test {
   }
 
   render(onMount: (component: any) => void): React.ReactNode {
-    const reload = () => {
-      this.bannerRef.current?.reload();
-    };
     return (
       <View ref={onMount}>
         <BannerAd
@@ -225,7 +222,12 @@ class BannerTest implements Test {
             );
           }}
         />
-        <Button title="reload" onPress={reload} />
+        <Button
+          title="reload"
+          onPress={() => {
+            this.bannerRef.current?.load();
+          }}
+        />
       </View>
     );
   }
diff --git a/RNGoogleMobileAdsExample/ios/RNGoogleMobileAdsExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RNGoogleMobileAdsExample/ios/RNGoogleMobileAdsExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /dev/null
+++ b/RNGoogleMobileAdsExample/ios/RNGoogleMobileAdsExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java b/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java
index f7a8a868..612f58f2 100644
--- a/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java
+++ b/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java
@@ -62,7 +62,7 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
   private final String EVENT_SIZE_CHANGE = "onSizeChange";
   private final String EVENT_APP_EVENT = "onAppEvent";
   private final int COMMAND_ID_RECORD_MANUAL_IMPRESSION = 1;
-  private final int COMMAND_ID_RELOAD = 2;
+  private final int COMMAND_ID_LOAD = 2;
 
   @Nonnull
   @Override
@@ -88,7 +88,7 @@ public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
   public Map<String, Integer> getCommandsMap() {
     return MapBuilder.of(
       "recordManualImpression", COMMAND_ID_RECORD_MANUAL_IMPRESSION,
-      "reload", COMMAND_ID_RELOAD);
+      "load", COMMAND_ID_LOAD);
   }
 
   @Override
@@ -102,7 +102,7 @@ public void receiveCommand(
       if (adView instanceof AdManagerAdView) {
         ((AdManagerAdView) adView).recordManualImpression();
       }
-    } else if (commandIdInt == COMMAND_ID_RELOAD) {
+    } else if (commandIdInt == COMMAND_ID_LOAD) {
       BaseAdView adView = getAdView(reactViewGroup);
       AdRequest request = reactViewGroup.getRequest();
       adView.loadAd(request);
diff --git a/docs/displaying-ads.mdx b/docs/displaying-ads.mdx
index 46fa48f6..189060fb 100644
--- a/docs/displaying-ads.mdx
+++ b/docs/displaying-ads.mdx
@@ -406,7 +406,7 @@ import { BannerAd, BannerAdSize, TestIds } from 'react-native-google-mobile-ads'
 const adUnitId = __DEV__ ? TestIds.ADAPTIVE_BANNER : 'ca-app-pub-xxxxxxxxxxxxx/yyyyyyyyyyyyyy';
 
 function App() {
-  const bannerRef = useRef<BannerAd>(null);
+  const bannerRef = useRef < BannerAd > null;
   const appState = useRef(AppState.currentState);
 
   // WKWebView can terminate if app is in a "suspended state", resulting in an empty banner when app returns to foreground.
@@ -415,7 +415,7 @@ function App() {
   useEffect(() => {
     const subscription = AppState.addEventListener('change', nextAppState => {
       if (appState.current.match(/background/) && nextAppState === 'active') {
-        bannerRef.current?.reload();
+        bannerRef.current?.load();
       }
       appState.current = nextAppState;
     });
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h
index 3fe60270..f341abcc 100644
--- a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h
+++ b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h
@@ -36,8 +36,8 @@
 @property(nonatomic, copy) RCTBubblingEventBlock onNativeEvent;
 
 - (void)requestAd;
+- (void)load;
 - (void)recordManualImpression;
-- (void)reload;
 
 @end
 
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m
index f0972300..8d679d21 100644
--- a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m
+++ b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m
@@ -129,15 +129,10 @@ - (void)requestAd {
       }];
     }
   };
-  [_banner loadRequest:[RNGoogleMobileAdsCommon buildAdRequest:_request]];
-  [self sendEvent:@"onSizeChange"
-          payload:@{
-            @"width" : @(_banner.bounds.size.width),
-            @"height" : @(_banner.bounds.size.height),
-          }];
+  [self loadAd];
 }
 
-- (void)reload {
+- (void)loadAd {
   [_banner loadRequest:[RNGoogleMobileAdsCommon buildAdRequest:_request]];
   [self sendEvent:@"onSizeChange"
           payload:@{
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm
index 1118db20..13ad4b48 100644
--- a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm
+++ b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm
@@ -146,23 +146,27 @@ - (void)requestAd {
     [self addSubview:_banner];
     _banner.adUnitID = _unitId;
     [self setRequested:YES];
-    [_banner loadRequest:[RNGoogleMobileAdsCommon buildAdRequest:_request]];
-    if (_eventEmitter != nullptr) {
-      std::dynamic_pointer_cast<const facebook::react::RNGoogleMobileAdsBannerViewEventEmitter>(
-          _eventEmitter)
-          ->onNativeEvent(facebook::react::RNGoogleMobileAdsBannerViewEventEmitter::OnNativeEvent{
-              .type = "onSizeChange",
-              .width = _banner.bounds.size.width,
-              .height = _banner.bounds.size.height});
-    }
+    [self load];
+  }
+}
+
+- (void)load {
+  [_banner loadRequest:[RNGoogleMobileAdsCommon buildAdRequest:_request]];
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const facebook::react::RNGoogleMobileAdsBannerViewEventEmitter>(
+        _eventEmitter)
+        ->onNativeEvent(facebook::react::RNGoogleMobileAdsBannerViewEventEmitter::OnNativeEvent{
+            .type = "onSizeChange",
+            .width = _banner.bounds.size.width,
+            .height = _banner.bounds.size.height});
   }
 }
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
   if ([commandName isEqual:@"recordManualImpression"]) {
     [self recordManualImpression];
-  } else if ([commandName isEqual:@"reload"]) {
-    [self reload];
+  } else if ([commandName isEqual:@"load"]) {
+    [self load];
   }
 }
 
@@ -172,20 +176,6 @@ - (void)recordManualImpression {
   }
 }
 
-- (void)reload {
-  if ([_banner class] == [GAMBannerView class]) {
-    [_banner loadRequest:[RNGoogleMobileAdsCommon buildAdRequest:_request]];
-    if (_eventEmitter != nullptr) {
-      std::dynamic_pointer_cast<const facebook::react::RNGoogleMobileAdsBannerViewEventEmitter>(
-          _eventEmitter)
-          ->onNativeEvent(facebook::react::RNGoogleMobileAdsBannerViewEventEmitter::OnNativeEvent{
-              .type = "onSizeChange",
-              .width = _banner.bounds.size.width,
-              .height = _banner.bounds.size.height});
-    }
-  }
-}
-
 #pragma mark - Events
 
 - (void)bannerViewDidReceiveAd:(GADBannerView *)bannerView {
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerViewManager.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerViewManager.mm
index 6e43db32..1e7b0102 100644
--- a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerViewManager.mm
+++ b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerViewManager.mm
@@ -55,7 +55,7 @@ @implementation RNGoogleMobileAdsBannerViewManager
 #endif
 }
 
-RCT_EXPORT_METHOD(reload : (nonnull NSNumber *)reactTag) {
+RCT_EXPORT_METHOD(load : (nonnull NSNumber *)reactTag) {
 #if !TARGET_OS_MACCATALYST
   [self.bridge.uiManager
       addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
@@ -64,7 +64,7 @@ @implementation RNGoogleMobileAdsBannerViewManager
           RCTLogError(@"Cannot find NativeView with tag #%@", reactTag);
           return;
         }
-        [banner reload];
+        [banner load];
       }];
 #endif
 }
diff --git a/src/ads/BannerAd.tsx b/src/ads/BannerAd.tsx
index 9d7e1bf8..3e515ecf 100644
--- a/src/ads/BannerAd.tsx
+++ b/src/ads/BannerAd.tsx
@@ -23,9 +23,9 @@ import GoogleMobileAdsBannerView, { Commands } from './GoogleMobileAdsBannerView
 export class BannerAd extends React.Component<BannerAdProps> {
   private ref = createRef<React.ElementRef<typeof GoogleMobileAdsBannerView>>();
 
-  reload() {
+  load() {
     if (this.ref.current) {
-      Commands.reload(this.ref.current);
+      Commands.load(this.ref.current);
     }
   }
 
diff --git a/src/ads/GAMBannerAd.tsx b/src/ads/GAMBannerAd.tsx
index ecac7298..e8f7df1d 100644
--- a/src/ads/GAMBannerAd.tsx
+++ b/src/ads/GAMBannerAd.tsx
@@ -29,9 +29,9 @@ export class GAMBannerAd extends React.Component<GAMBannerAdProps> {
     }
   }
 
-  reload() {
+  load() {
     if (this.ref.current) {
-      Commands.reload(this.ref.current);
+      Commands.load(this.ref.current);
     }
   }
 
diff --git a/src/ads/GoogleMobileAdsBannerViewNativeComponent.ts b/src/ads/GoogleMobileAdsBannerViewNativeComponent.ts
index c5c4bb44..1a044f87 100644
--- a/src/ads/GoogleMobileAdsBannerViewNativeComponent.ts
+++ b/src/ads/GoogleMobileAdsBannerViewNativeComponent.ts
@@ -29,11 +29,11 @@ export type ComponentType = HostComponent<NativeProps>;
 
 interface NativeCommands {
   recordManualImpression: (viewRef: React.ElementRef<ComponentType>) => void;
-  reload: (viewRef: React.ElementRef<ComponentType>) => void;
+  load: (viewRef: React.ElementRef<ComponentType>) => void;
 }
 
 export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['recordManualImpression', 'reload'],
+  supportedCommands: ['recordManualImpression', 'load'],
 });
 
 export default codegenNativeComponent<NativeProps>(