Skip to content

Commit 0820e6a

Browse files
SalakarSalakar
committed
[android] replace android.support NonNull & Nullable annotation instances with java annotations + linting/formatter changes
1 parent 94852c8 commit 0820e6a

25 files changed

+215
-152
lines changed

‎android/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="io.invertase.firebase">
2+
package="io.invertase.firebase">
33

44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.WAKE_LOCK" />

‎android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMob.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class RNFirebaseAdMob extends ReactContextBaseJavaModule {
2121
private HashMap<String, RNFirebaseAdmobInterstitial> interstitials = new HashMap<>();
2222
private HashMap<String, RNFirebaseAdMobRewardedVideo> rewardedVideos = new HashMap<>();
2323

24-
public RNFirebaseAdMob(ReactApplicationContext reactContext) {
24+
RNFirebaseAdMob(ReactApplicationContext reactContext) {
2525
super(reactContext);
2626
Log.d(TAG, "New instance");
2727
}

‎android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobBanner.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.invertase.firebase.admob;
22

3-
import android.support.annotation.Nullable;
4-
53
import com.facebook.react.bridge.Arguments;
64
import com.facebook.react.bridge.ReadableMap;
75
import com.facebook.react.bridge.WritableMap;
@@ -19,10 +17,11 @@
1917

2018
import java.util.Map;
2119

22-
public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> {
20+
import javax.annotation.Nullable;
2321

24-
public static final String REACT_CLASS = "RNFirebaseAdMobBanner";
25-
public static final String BANNER_EVENT = "onBannerEvent";
22+
public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> {
23+
private static final String REACT_CLASS = "RNFirebaseAdMobBanner";
24+
private static final String BANNER_EVENT = "onBannerEvent";
2625
private ThemedReactContext context;
2726
private ReactViewGroup viewGroup;
2827
private RCTEventEmitter emitter;
@@ -56,7 +55,7 @@ public ReactViewGroup createViewInstance(ThemedReactContext themedReactContext)
5655
return viewGroup;
5756
}
5857

59-
AdView getAdView() {
58+
private AdView getAdView() {
6059
return (AdView) viewGroup.getChildAt(0);
6160
}
6261

@@ -142,7 +141,7 @@ public void setSize(ReactViewGroup view, String value) {
142141
/**
143142
* Loads a new ad into a viewGroup
144143
*/
145-
void requestAd() {
144+
private void requestAd() {
146145
// If the props have not yet been set
147146
if (size == null || unitId == null || request == null) {
148147
return;
@@ -165,7 +164,7 @@ void requestAd() {
165164
/**
166165
* Listen to Ad events
167166
*/
168-
void setAdListener() {
167+
private void setAdListener() {
169168
final AdView adView = getAdView();
170169

171170
adView.setAdListener(new AdListener() {
@@ -225,7 +224,7 @@ public void onAdLeftApplication() {
225224
* @param type
226225
* @param payload
227226
*/
228-
void sendEvent(String type, final @Nullable WritableMap payload) {
227+
private void sendEvent(String type, final @Nullable WritableMap payload) {
229228
WritableMap event = Arguments.createMap();
230229
event.putString("type", type);
231230

‎android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobNativeExpress.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.invertase.firebase.admob;
22

3-
import android.support.annotation.Nullable;
4-
53
import com.facebook.react.bridge.Arguments;
64
import com.facebook.react.bridge.ReadableMap;
75
import com.facebook.react.bridge.WritableMap;
@@ -21,10 +19,12 @@
2119

2220
import java.util.Map;
2321

22+
import javax.annotation.Nullable;
23+
2424
public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGroup> {
2525

26-
public static final String REACT_CLASS = "RNFirebaseAdMobNativeExpress";
27-
public static final String BANNER_EVENT = "onBannerEvent";
26+
private static final String REACT_CLASS = "RNFirebaseAdMobNativeExpress";
27+
private static final String BANNER_EVENT = "onBannerEvent";
2828
private ThemedReactContext context;
2929
private ReactViewGroup viewGroup;
3030
private RCTEventEmitter emitter;
@@ -59,7 +59,7 @@ public ReactViewGroup createViewInstance(ThemedReactContext themedReactContext)
5959
return viewGroup;
6060
}
6161

62-
NativeExpressAdView getAdView() {
62+
private NativeExpressAdView getAdView() {
6363
return (NativeExpressAdView) viewGroup.getChildAt(0);
6464
}
6565

@@ -157,7 +157,7 @@ public void setSize(ReactViewGroup view, String value) {
157157
/**
158158
* Loads a new ad into a viewGroup
159159
*/
160-
void requestAd() {
160+
private void requestAd() {
161161
if (size == null || unitId == null || request == null || videoOptions == null) {
162162
return;
163163
}
@@ -179,7 +179,7 @@ void requestAd() {
179179
/**
180180
* Listen to Ad events
181181
*/
182-
void setAdListener() {
182+
private void setAdListener() {
183183
final NativeExpressAdView adView = getAdView();
184184

185185
adView.setAdListener(new AdListener() {
@@ -263,15 +263,14 @@ public void onAdLeftApplication() {
263263
* @param type
264264
* @param payload
265265
*/
266-
void sendEvent(String type, final @Nullable WritableMap payload) {
266+
private void sendEvent(String type, final @Nullable WritableMap payload) {
267267
WritableMap event = Arguments.createMap();
268268
event.putString("type", type);
269269

270270
if (payload != null) {
271271
event.putMap("payload", payload);
272272
}
273273

274-
int id = viewGroup.getId();
275274
emitter.receiveEvent(viewGroup.getId(), BANNER_EVENT, event);
276275
}
277276

‎android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobRewardedVideo.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import android.app.Activity;
5-
import android.support.annotation.Nullable;
65

76
import com.facebook.react.bridge.Arguments;
87
import com.facebook.react.bridge.WritableMap;
@@ -12,11 +11,12 @@
1211
import com.google.android.gms.ads.reward.RewardedVideoAd;
1312
import com.google.android.gms.ads.reward.RewardedVideoAdListener;
1413

14+
import javax.annotation.Nullable;
15+
1516
import io.invertase.firebase.Utils;
1617

1718
public class RNFirebaseAdMobRewardedVideo implements RewardedVideoAdListener {
1819

19-
private RewardedVideoAd mAd;
2020
private String adUnit;
2121
private RNFirebaseAdMob adMob;
2222
private RewardedVideoAd rewardedVideo;
@@ -126,7 +126,7 @@ public void onRewardedVideoStarted() {
126126
* @param type
127127
* @param payload
128128
*/
129-
void sendEvent(String type, final @Nullable WritableMap payload) {
129+
private void sendEvent(String type, final @Nullable WritableMap payload) {
130130
WritableMap map = Arguments.createMap();
131131
map.putString("type", type);
132132
map.putString("adUnit", adUnit);

‎android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdmobInterstitial.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33

44
import android.app.Activity;
5-
import android.support.annotation.Nullable;
65

76
import com.facebook.react.bridge.Arguments;
87
import com.facebook.react.bridge.WritableMap;
98
import com.google.android.gms.ads.AdListener;
109
import com.google.android.gms.ads.AdRequest;
1110
import com.google.android.gms.ads.InterstitialAd;
1211

12+
import javax.annotation.Nullable;
13+
1314
import io.invertase.firebase.Utils;
1415

1516
class RNFirebaseAdmobInterstitial {
1617

1718
private InterstitialAd interstitialAd;
1819
private RNFirebaseAdMob adMob;
19-
private AdListener adListener;
2020
private String adUnit;
2121

2222
RNFirebaseAdmobInterstitial(final String adUnitString, final RNFirebaseAdMob adMobInstance) {
@@ -25,7 +25,7 @@ class RNFirebaseAdmobInterstitial {
2525
interstitialAd = new InterstitialAd(adMob.getContext());
2626
interstitialAd.setAdUnitId(adUnit);
2727

28-
adListener = new AdListener() {
28+
AdListener adListener = new AdListener() {
2929
@Override
3030
public void onAdLoaded() {
3131
sendEvent("onAdLoaded", null);
@@ -96,7 +96,7 @@ public void run() {
9696
* @param type
9797
* @param payload
9898
*/
99-
void sendEvent(String type, final @Nullable WritableMap payload) {
99+
private void sendEvent(String type, final @Nullable WritableMap payload) {
100100
WritableMap map = Arguments.createMap();
101101
map.putString("type", type);
102102
map.putString("adUnit", adUnit);

‎android/src/main/java/io/invertase/firebase/analytics/RNFirebaseAnalytics.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.invertase.firebase.analytics;
22

33
import android.app.Activity;
4-
import android.support.annotation.Nullable;
54
import android.util.Log;
65

76
import com.facebook.react.bridge.Arguments;
@@ -11,12 +10,14 @@
1110
import com.facebook.react.bridge.ReadableMap;
1211
import com.google.firebase.analytics.FirebaseAnalytics;
1312

13+
import javax.annotation.Nullable;
14+
1415

1516
public class RNFirebaseAnalytics extends ReactContextBaseJavaModule {
1617

1718
private static final String TAG = "RNFirebaseAnalytics";
1819

19-
public RNFirebaseAnalytics(ReactApplicationContext reactContext) {
20+
RNFirebaseAnalytics(ReactApplicationContext reactContext) {
2021
super(reactContext);
2122
Log.d(TAG, "New instance");
2223
}

0 commit comments

Comments
 (0)