Skip to content

Commit 151725f

Browse files
thatfiredevdpebot
thatfiredev
and
dpebot
authored
refactor(admob): delete unused snippets (firebase#291)
Co-authored-by: DPE bot <dpebot@google.com>
1 parent 3f7aaf3 commit 151725f

File tree

44 files changed

+87
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+87
-321
lines changed

‎admob/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ dependencies {
2626
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2727
implementation 'androidx.browser:browser:1.0.0'
2828
implementation 'androidx.appcompat:appcompat:1.2.0'
29-
implementation "com.google.firebase:firebase-ads:19.7.0"
29+
implementation "com.google.firebase:firebase-ads:20.0.0"
3030
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
3131
implementation "androidx.multidex:multidex:2.0.1"
3232

3333
// [START gradle_play_config]
34-
implementation 'com.google.android.gms:play-services-ads:19.7.0'
34+
implementation 'com.google.android.gms:play-services-ads:20.0.0'
3535
// [END gradle_play_config]
3636

3737
// For an optimal experience using AdMob, add the Firebase SDK
3838
// for Google Analytics. This is recommended, but not required.
39-
implementation 'com.google.firebase:firebase-analytics:18.0.2'
39+
implementation 'com.google.firebase:firebase-analytics:18.0.3'
4040

41-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31"
41+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
4242
}
4343

4444
apply plugin: 'com.google.gms.google-services'

‎admob/app/src/main/java/com/google/firebase/example/admob/MainActivity.java

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
package com.google.firebase.example.admob;
22

3-
import android.content.Context;
43
import android.os.Bundle;
5-
import android.util.Log;
6-
import android.view.View;
7-
import android.widget.Button;
84

95
import androidx.appcompat.app.AppCompatActivity;
106

11-
import com.google.android.gms.ads.AdListener;
12-
import com.google.android.gms.ads.AdRequest;
13-
import com.google.android.gms.ads.AdView;
14-
import com.google.android.gms.ads.InterstitialAd;
15-
import com.google.android.gms.ads.LoadAdError;
167
import com.google.android.gms.ads.MobileAds;
178

18-
import devrel.firebase.google.com.firebaseoptions.R;
19-
209
public class MainActivity extends AppCompatActivity {
2110

22-
private static final String TAG = "MainActivity";
23-
24-
private AdView mAdView;
25-
private InterstitialAd mInterstitialAd;
26-
private Button mLoadInterstitialButton;
27-
private Context context = this;
28-
2911
// [START ads_on_create]
3012
@Override
3113
protected void onCreate(Bundle savedInstanceState) {
@@ -35,111 +17,4 @@ protected void onCreate(Bundle savedInstanceState) {
3517
}
3618
// [END ads_on_create]
3719

38-
private void loadBannerAd() {
39-
// [SNIPPET load_banner_ad]
40-
// Load an ad into the AdView.
41-
// [START load_banner_ad]
42-
43-
// Initialize the Google Mobile Ads SDK
44-
MobileAds.initialize(context);
45-
46-
AdRequest adRequest = new AdRequest.Builder().build();
47-
mAdView.loadAd(adRequest);
48-
// [END load_banner_ad]
49-
}
50-
51-
private void initInterstitialAd() {
52-
// [START instantiate_interstitial_ad]
53-
// Create an InterstitialAd object. This same object can be re-used whenever you want to
54-
// show an interstitial.
55-
mInterstitialAd = new InterstitialAd(context);
56-
mInterstitialAd.setAdUnitId(getString(R.string.interstitial_ad_unit_id));
57-
// [END instantiate_interstitial_ad]
58-
}
59-
60-
private void createInterstitialAdListener() {
61-
// [START create_interstitial_ad_listener]
62-
mInterstitialAd.setAdListener(new AdListener() {
63-
@Override
64-
public void onAdClosed() {
65-
requestNewInterstitial();
66-
beginSecondActivity();
67-
}
68-
69-
@Override
70-
public void onAdLoaded() {
71-
// Ad received, ready to display
72-
// ...
73-
}
74-
75-
@Override
76-
public void onAdFailedToLoad(LoadAdError loadAdError) {
77-
Log.w(TAG, "onAdFailedToLoad:" + loadAdError.getMessage());
78-
}
79-
});
80-
// [END create_interstitial_ad_listener]
81-
}
82-
83-
private void displayInterstitialAd() {
84-
// [START display_interstitial_ad]
85-
mLoadInterstitialButton = findViewById(R.id.loadInterstitialButton);
86-
mLoadInterstitialButton.setOnClickListener(new View.OnClickListener() {
87-
@Override
88-
public void onClick(View v) {
89-
if (mInterstitialAd.isLoaded()) {
90-
mInterstitialAd.show();
91-
} else {
92-
beginSecondActivity();
93-
}
94-
}
95-
});
96-
// [END display_interstitial_ad]
97-
}
98-
99-
/**
100-
* Load a new interstitial ad asynchronously.
101-
*/
102-
// [START request_new_interstitial]
103-
private void requestNewInterstitial() {
104-
AdRequest adRequest = new AdRequest.Builder()
105-
.build();
106-
107-
mInterstitialAd.loadAd(adRequest);
108-
}
109-
// [END request_new_interstitial]
110-
111-
private void beginSecondActivity() { }
112-
113-
// [START add_lifecycle_methods]
114-
/** Called when leaving the activity */
115-
@Override
116-
public void onPause() {
117-
if (mAdView != null) {
118-
mAdView.pause();
119-
}
120-
super.onPause();
121-
}
122-
123-
/** Called when returning to the activity */
124-
@Override
125-
public void onResume() {
126-
super.onResume();
127-
if (mAdView != null) {
128-
mAdView.resume();
129-
}
130-
if (!mInterstitialAd.isLoaded()) {
131-
requestNewInterstitial();
132-
}
133-
}
134-
135-
/** Called before the activity is destroyed */
136-
@Override
137-
public void onDestroy() {
138-
if (mAdView != null) {
139-
mAdView.destroy();
140-
}
141-
super.onDestroy();
142-
}
143-
// [END add_lifecycle_methods]
144-
14520
}

‎admob/app/src/main/java/com/google/firebase/example/admob/kotlin/MainActivity.kt

Lines changed: 0 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,16 @@
11
package com.google.firebase.example.admob.kotlin
22

33
import android.os.Bundle
4-
import android.util.Log
5-
import android.widget.Button
64
import androidx.appcompat.app.AppCompatActivity
7-
import com.google.android.gms.ads.AdView
8-
import com.google.android.gms.ads.AdListener
9-
import com.google.android.gms.ads.AdRequest
10-
import com.google.android.gms.ads.InterstitialAd
11-
import com.google.android.gms.ads.LoadAdError
125
import com.google.android.gms.ads.MobileAds
13-
import devrel.firebase.google.com.firebaseoptions.R
146

157
class MainActivity : AppCompatActivity() {
168

17-
private lateinit var adView: AdView
18-
private lateinit var interstitialAd: InterstitialAd
19-
private lateinit var loadInterstitialButton: Button
20-
private val context = this
21-
229
// [START ads_on_create]
2310
override fun onCreate(savedInstanceState: Bundle?) {
2411
super.onCreate(savedInstanceState)
2512
// ...
2613
MobileAds.initialize(this)
2714
}
2815
// [END ads_on_create]
29-
30-
private fun loadAdBanner() {
31-
// [SNIPPET load_banner_ad]
32-
// Load an ad into the AdView.
33-
// [START load_banner_ad]
34-
35-
// Initialize the Google Mobile Ads SDK
36-
MobileAds.initialize(context)
37-
38-
val adRequest = AdRequest.Builder().build()
39-
40-
adView.loadAd(adRequest)
41-
// [END load_banner_ad]
42-
}
43-
44-
private fun initInterstitialAd() {
45-
// [START instantiate_interstitial_ad]
46-
// Create an InterstitialAd object. This same object can be re-used whenever you want to
47-
// show an interstitial.
48-
interstitialAd = InterstitialAd(context)
49-
interstitialAd.adUnitId = getString(R.string.interstitial_ad_unit_id)
50-
// [END instantiate_interstitial_ad]
51-
}
52-
53-
private fun createAdListener() {
54-
// [START create_interstitial_ad_listener]
55-
interstitialAd.adListener = object : AdListener() {
56-
override fun onAdClosed() {
57-
requestNewInterstitial()
58-
beginSecondActivity()
59-
}
60-
61-
override fun onAdLoaded() {
62-
// Ad received, ready to display
63-
// ...
64-
}
65-
66-
override fun onAdFailedToLoad(error: LoadAdError) {
67-
Log.w(TAG, "onAdFailedToLoad: ${error.message}")
68-
}
69-
}
70-
// [END create_interstitial_ad_listener]
71-
}
72-
73-
private fun displayInterstitialAd() {
74-
// [START display_interstitial_ad]
75-
loadInterstitialButton.setOnClickListener {
76-
if (interstitialAd.isLoaded) {
77-
interstitialAd.show()
78-
} else {
79-
beginSecondActivity()
80-
}
81-
}
82-
// [END display_interstitial_ad]
83-
}
84-
85-
/**
86-
* Load a new interstitial ad asynchronously.
87-
*/
88-
// [START request_new_interstitial]
89-
private fun requestNewInterstitial() {
90-
val adRequest = AdRequest.Builder()
91-
.build()
92-
93-
interstitialAd.loadAd(adRequest)
94-
}
95-
// [END request_new_interstitial]
96-
97-
private fun beginSecondActivity() { }
98-
99-
// [START add_lifecycle_methods]
100-
/** Called when leaving the activity */
101-
public override fun onPause() {
102-
adView.pause()
103-
super.onPause()
104-
}
105-
106-
/** Called when returning to the activity */
107-
public override fun onResume() {
108-
super.onResume()
109-
adView.resume()
110-
if (!interstitialAd.isLoaded) {
111-
requestNewInterstitial()
112-
}
113-
}
114-
115-
/** Called before the activity is destroyed */
116-
public override fun onDestroy() {
117-
adView.destroy()
118-
super.onDestroy()
119-
}
120-
// [END add_lifecycle_methods]
121-
122-
companion object {
123-
private const val TAG = "MainActivity"
124-
}
12516
}

‎admob/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'com.google.gms:google-services:4.3.5'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
1212
}
1313
}
1414

‎analytics/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ android {
2424
dependencies {
2525
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
27-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31"
27+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
2828

29-
implementation "com.google.firebase:firebase-analytics:18.0.2"
30-
implementation "com.google.firebase:firebase-analytics-ktx:18.0.2"
29+
implementation "com.google.firebase:firebase-analytics:18.0.3"
30+
implementation "com.google.firebase:firebase-analytics-ktx:18.0.3"
3131
}
3232

3333
apply plugin: 'com.google.gms.google-services'

‎analytics/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'com.google.gms:google-services:4.3.5'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
1212
}
1313
}
1414

‎appindexing/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
2727
implementation "com.google.firebase:firebase-appindexing:19.2.0"
28-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31"
28+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
2929
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3030
}
3131

‎appindexing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'com.google.gms:google-services:4.3.5'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
1212
}
1313
}
1414

‎auth/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31"
25+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
2626

2727
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2828
implementation 'androidx.appcompat:appcompat:1.2.0'

‎auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'com.google.gms:google-services:4.3.5'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
1212
}
1313
}
1414

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'com.google.gms:google-services:4.3.5'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
1212
}
1313
}
1414

0 commit comments

Comments
 (0)