Skip to content

Commit c2ae5a8

Browse files
markarndtmarkarndt
authored
Merge branch 'master' into mea-storage-emulator-android-snippets
2 parents 3dc86f2 + a0de4f5 commit c2ae5a8

File tree

103 files changed

+1079
-358
lines changed

Some content is hidden

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

103 files changed

+1079
-358
lines changed

‎admob/app/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,24 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
namespace 'devrel.firebase.google.com.firebaseoptions'
2223
}
2324

2425
dependencies {
2526
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2627
implementation 'androidx.browser:browser:1.0.0'
27-
implementation 'androidx.appcompat:appcompat:1.5.1'
28-
implementation "com.google.firebase:firebase-ads:21.2.0"
28+
implementation 'androidx.appcompat:appcompat:1.6.0'
29+
implementation "com.google.firebase:firebase-ads:21.5.0"
2930
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
3031
implementation "androidx.multidex:multidex:2.0.1"
3132

3233
// [START gradle_play_config]
33-
implementation 'com.google.android.gms:play-services-ads:21.2.0'
34+
implementation 'com.google.android.gms:play-services-ads:21.5.0'
3435
// [END gradle_play_config]
3536

3637
// For an optimal experience using AdMob, add the Firebase SDK
3738
// for Google Analytics. This is recommended, but not required.
38-
implementation 'com.google.firebase:firebase-analytics:21.1.1'
39+
implementation 'com.google.firebase:firebase-analytics:21.2.0'
3940
}
4041

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

‎admob/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="devrel.firebase.google.com.firebaseoptions">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

‎admob/build.gradle

Lines changed: 3 additions & 3 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:7.2.2'
10-
classpath 'com.google.gms:google-services:4.3.13'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
9+
classpath 'com.android.tools.build:gradle:7.4.1'
10+
classpath 'com.google.gms:google-services:4.3.15'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
1212
}
1313
}
1414

‎admob/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎analytics/app/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
namespace 'com.google.firebase.example.analytics'
2223
}
2324
repositories {
2425
maven {
@@ -29,11 +30,11 @@ repositories {
2930

3031
dependencies {
3132
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
32-
implementation 'androidx.appcompat:appcompat:1.5.1'
33-
implementation "com.google.firebase:firebase-analytics:21.1.1"
34-
implementation "com.google.firebase:firebase-analytics-ktx:21.1.1"
33+
implementation 'androidx.appcompat:appcompat:1.6.0'
34+
implementation "com.google.firebase:firebase-analytics:21.2.0"
35+
implementation "com.google.firebase:firebase-analytics-ktx:21.2.0"
3536
// Ironsource and AppLovin libraries used for ad_impression snippets
36-
implementation 'com.applovin:applovin-sdk:11.4.6'
37+
implementation 'com.applovin:applovin-sdk:11.5.1'
3738
implementation 'com.ironsource.sdk:mediationsdk:7.2.4.1'
3839

3940
}

‎analytics/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.firebase.example.analytics">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,15 @@ protected void onCreate(Bundle savedInstanceState) {
5353

5454
recordImageView();
5555

56-
recordScreenView();
57-
5856
logCustomEvent();
5957
}
6058

59+
@Override
60+
public void onResume() {
61+
super.onResume();
62+
recordScreenView();
63+
}
64+
6165
public void enhancedEcommerce() {
6266
// [START create_items]
6367
Bundle itemJeggings = new Bundle();

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ package com.google.firebase.example.analytics.kotlin
33
import android.os.Bundle
44
import android.os.Parcelable
55
import androidx.appcompat.app.AppCompatActivity
6+
import com.applovin.mediation.MaxAd
7+
import com.applovin.mediation.MaxAdRevenueListener
68
import com.google.firebase.analytics.FirebaseAnalytics
79
import com.google.firebase.analytics.ktx.analytics
810
import com.google.firebase.analytics.ktx.logEvent
911
import com.google.firebase.example.analytics.R
1012
import com.google.firebase.ktx.Firebase
11-
// importing libraries to support 3rd party ad_impression snippets
12-
import com.ironsource.mediationsdk.impressionData.ImpressionDataListener
1313
import com.ironsource.mediationsdk.impressionData.ImpressionData
14-
import com.applovin.mediation.MaxAd
15-
import com.applovin.mediation.MaxAdRevenueListener
16-
14+
import com.ironsource.mediationsdk.impressionData.ImpressionDataListener
1715

18-
class MainActivity : AppCompatActivity(),
16+
class MainActivity :
17+
AppCompatActivity(),
1918
// importing libraries to support 3rd party ad_impression snippets
20-
MaxAdRevenueListener, ImpressionDataListener {
19+
MaxAdRevenueListener,
20+
ImpressionDataListener {
2121

2222
// [START declare_analytics]
2323
private lateinit var firebaseAnalytics: FirebaseAnalytics
@@ -27,7 +27,6 @@ class MainActivity : AppCompatActivity(),
2727
super.onCreate(savedInstanceState)
2828
setContentView(R.layout.activity_main)
2929

30-
3130
// [START shared_app_measurement]
3231
// Obtain the FirebaseAnalytics instance.
3332
firebaseAnalytics = Firebase.analytics
@@ -39,11 +38,14 @@ class MainActivity : AppCompatActivity(),
3938

4039
recordImageView()
4140

42-
recordScreenView()
43-
4441
logCustomEvent()
4542
}
4643

44+
public override fun onResume() {
45+
super.onResume()
46+
recordScreenView()
47+
}
48+
4749
fun enhancedEcommerce() {
4850
// [START create_items]
4951
val itemJeggings = Bundle().apply {
@@ -88,8 +90,10 @@ class MainActivity : AppCompatActivity(),
8890
firebaseAnalytics.logEvent(FirebaseAnalytics.Event.VIEW_ITEM_LIST) {
8991
param(FirebaseAnalytics.Param.ITEM_LIST_ID, "L001")
9092
param(FirebaseAnalytics.Param.ITEM_LIST_NAME, "Related products")
91-
param(FirebaseAnalytics.Param.ITEMS,
92-
arrayOf(itemJeggingsWithIndex, itemBootsWithIndex, itemSocksWithIndex))
93+
param(
94+
FirebaseAnalytics.Param.ITEMS,
95+
arrayOf(itemJeggingsWithIndex, itemBootsWithIndex, itemSocksWithIndex)
96+
)
9397
}
9498
// [END view_item_list]
9599

@@ -294,4 +298,4 @@ class MainActivity : AppCompatActivity(),
294298
}
295299
}
296300
// [END ad_impression_ironsource]
297-
}
301+
}

‎analytics/build.gradle

Lines changed: 3 additions & 3 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:7.2.2'
10-
classpath 'com.google.gms:google-services:4.3.13'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
9+
classpath 'com.android.tools.build:gradle:7.4.1'
10+
classpath 'com.google.gms:google-services:4.3.15'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
1212
}
1313
}
1414

‎analytics/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)