[android] replace android.support NonNull & Nullable annotation insta…

…nces with java annotations + linting/formatter changes
invertase · Oct 12, 2018 · 0820e6a · 0820e6a
1 parent 94852c8
commit 0820e6a
Show file tree

Hide file tree

Showing 25 changed files with 215 additions and 152 deletions.
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.invertase.firebase">
+  package="io.invertase.firebase">
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMob.java b/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMob.java
@@ -21,7 +21,7 @@ public class RNFirebaseAdMob extends ReactContextBaseJavaModule {
   private HashMap<String, RNFirebaseAdmobInterstitial> interstitials = new HashMap<>();
   private HashMap<String, RNFirebaseAdMobRewardedVideo> rewardedVideos = new HashMap<>();
 
-  public RNFirebaseAdMob(ReactApplicationContext reactContext) {
+  RNFirebaseAdMob(ReactApplicationContext reactContext) {
     super(reactContext);
     Log.d(TAG, "New instance");
   }

diff --git a/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobBanner.java b/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobBanner.java
@@ -1,7 +1,5 @@
 package io.invertase.firebase.admob;
 
-import android.support.annotation.Nullable;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
@@ -19,10 +17,11 @@
 
 import java.util.Map;
 
-public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> {
+import javax.annotation.Nullable;
 
-  public static final String REACT_CLASS = "RNFirebaseAdMobBanner";
-  public static final String BANNER_EVENT = "onBannerEvent";
+public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> {
+  private static final String REACT_CLASS = "RNFirebaseAdMobBanner";
+  private static final String BANNER_EVENT = "onBannerEvent";
   private ThemedReactContext context;
   private ReactViewGroup viewGroup;
   private RCTEventEmitter emitter;
@@ -56,7 +55,7 @@ public ReactViewGroup createViewInstance(ThemedReactContext themedReactContext)
     return viewGroup;
   }
 
-  AdView getAdView() {
+  private AdView getAdView() {
     return (AdView) viewGroup.getChildAt(0);
   }
 
@@ -142,7 +141,7 @@ public void setSize(ReactViewGroup view, String value) {
   /**
    * Loads a new ad into a viewGroup
    */
-  void requestAd() {
+  private void requestAd() {
     // If the props have not yet been set
     if (size == null || unitId == null || request == null) {
       return;
@@ -165,7 +164,7 @@ void requestAd() {
   /**
    * Listen to Ad events
    */
-  void setAdListener() {
+  private void setAdListener() {
     final AdView adView = getAdView();
 
     adView.setAdListener(new AdListener() {
@@ -225,7 +224,7 @@ public void onAdLeftApplication() {
    * @param type
    * @param payload
    */
-  void sendEvent(String type, final @Nullable WritableMap payload) {
+  private void sendEvent(String type, final @Nullable WritableMap payload) {
     WritableMap event = Arguments.createMap();
     event.putString("type", type);
 

diff --git a/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobNativeExpress.java b/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobNativeExpress.java
@@ -1,7 +1,5 @@
 package io.invertase.firebase.admob;
 
-import android.support.annotation.Nullable;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
@@ -21,10 +19,12 @@
 
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGroup> {
 
-  public static final String REACT_CLASS = "RNFirebaseAdMobNativeExpress";
-  public static final String BANNER_EVENT = "onBannerEvent";
+  private static final String REACT_CLASS = "RNFirebaseAdMobNativeExpress";
+  private static final String BANNER_EVENT = "onBannerEvent";
   private ThemedReactContext context;
   private ReactViewGroup viewGroup;
   private RCTEventEmitter emitter;
@@ -59,7 +59,7 @@ public ReactViewGroup createViewInstance(ThemedReactContext themedReactContext)
     return viewGroup;
   }
 
-  NativeExpressAdView getAdView() {
+  private NativeExpressAdView getAdView() {
     return (NativeExpressAdView) viewGroup.getChildAt(0);
   }
 
@@ -157,7 +157,7 @@ public void setSize(ReactViewGroup view, String value) {
   /**
    * Loads a new ad into a viewGroup
    */
-  void requestAd() {
+  private void requestAd() {
     if (size == null || unitId == null || request == null || videoOptions == null) {
       return;
     }
@@ -179,7 +179,7 @@ void requestAd() {
   /**
    * Listen to Ad events
    */
-  void setAdListener() {
+  private void setAdListener() {
     final NativeExpressAdView adView = getAdView();
 
     adView.setAdListener(new AdListener() {
@@ -263,15 +263,14 @@ public void onAdLeftApplication() {
    * @param type
    * @param payload
    */
-  void sendEvent(String type, final @Nullable WritableMap payload) {
+  private void sendEvent(String type, final @Nullable WritableMap payload) {
     WritableMap event = Arguments.createMap();
     event.putString("type", type);
 
     if (payload != null) {
       event.putMap("payload", payload);
     }
 
-    int id = viewGroup.getId();
     emitter.receiveEvent(viewGroup.getId(), BANNER_EVENT, event);
   }
 

diff --git a/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobRewardedVideo.java b/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobRewardedVideo.java
@@ -2,7 +2,6 @@
 
 
 import android.app.Activity;
-import android.support.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
@@ -12,11 +11,12 @@
 import com.google.android.gms.ads.reward.RewardedVideoAd;
 import com.google.android.gms.ads.reward.RewardedVideoAdListener;
 
+import javax.annotation.Nullable;
+
 import io.invertase.firebase.Utils;
 
 public class RNFirebaseAdMobRewardedVideo implements RewardedVideoAdListener {
 
-  private RewardedVideoAd mAd;
   private String adUnit;
   private RNFirebaseAdMob adMob;
   private RewardedVideoAd rewardedVideo;
@@ -126,7 +126,7 @@ public void onRewardedVideoStarted() {
    * @param type
    * @param payload
    */
-  void sendEvent(String type, final @Nullable WritableMap payload) {
+  private void sendEvent(String type, final @Nullable WritableMap payload) {
     WritableMap map = Arguments.createMap();
     map.putString("type", type);
     map.putString("adUnit", adUnit);

diff --git a/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdmobInterstitial.java b/android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdmobInterstitial.java
@@ -2,21 +2,21 @@
 
 
 import android.app.Activity;
-import android.support.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.google.android.gms.ads.AdListener;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.InterstitialAd;
 
+import javax.annotation.Nullable;
+
 import io.invertase.firebase.Utils;
 
 class RNFirebaseAdmobInterstitial {
 
   private InterstitialAd interstitialAd;
   private RNFirebaseAdMob adMob;
-  private AdListener adListener;
   private String adUnit;
 
   RNFirebaseAdmobInterstitial(final String adUnitString, final RNFirebaseAdMob adMobInstance) {
@@ -25,7 +25,7 @@ class RNFirebaseAdmobInterstitial {
     interstitialAd = new InterstitialAd(adMob.getContext());
     interstitialAd.setAdUnitId(adUnit);
 
-    adListener = new AdListener() {
+    AdListener adListener = new AdListener() {
       @Override
       public void onAdLoaded() {
         sendEvent("onAdLoaded", null);
@@ -96,7 +96,7 @@ public void run() {
    * @param type
    * @param payload
    */
-  void sendEvent(String type, final @Nullable WritableMap payload) {
+  private void sendEvent(String type, final @Nullable WritableMap payload) {
     WritableMap map = Arguments.createMap();
     map.putString("type", type);
     map.putString("adUnit", adUnit);

diff --git a/android/src/main/java/io/invertase/firebase/analytics/RNFirebaseAnalytics.java b/android/src/main/java/io/invertase/firebase/analytics/RNFirebaseAnalytics.java
@@ -1,7 +1,6 @@
 package io.invertase.firebase.analytics;
 
 import android.app.Activity;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -11,12 +10,14 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
+import javax.annotation.Nullable;
+
 
 public class RNFirebaseAnalytics extends ReactContextBaseJavaModule {
 
   private static final String TAG = "RNFirebaseAnalytics";
 
-  public RNFirebaseAnalytics(ReactApplicationContext reactContext) {
+  RNFirebaseAnalytics(ReactApplicationContext reactContext) {
     super(reactContext);
     Log.d(TAG, "New instance");
   }