diff --git a/RN-UI-LIB b/RN-UI-LIB index feddb839..d8c9693f 160000 --- a/RN-UI-LIB +++ b/RN-UI-LIB @@ -1 +1 @@ -Subproject commit feddb83978ec080c551f1d9de95b131c42f76dca +Subproject commit d8c9693fc9b2436025c7fa3bec670b79858c8d38 diff --git a/android/app/build.gradle b/android/app/build.gradle index 010b2377..9d443dce 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -263,11 +263,13 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation(platform("com.google.firebase:firebase-bom:32.2.3")) + implementation("com.google.firebase:firebase-analytics") //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native:+" // From node_modules - implementation project(path: ":@react-native-firebase_analytics") + //implementation project(path: ":@react-native-firebase_analytics") implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" diff --git a/android/app/google-services.json b/android/app/google-services.json index 841f2e01..cd024fa2 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,13 +1,72 @@ { "project_info": { "project_number": "60755663443", + "firebase_url": "https://address-verification-app-default-rtdb.firebaseio.com", "project_id": "address-verification-app", "storage_bucket": "address-verification-app.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:60755663443:android:988149d3da3c00d38584a6", + "mobilesdk_app_id": "1:60755663443:android:4a948ee9d0b4e3098584a6", + "android_client_info": { + "package_name": "com.avapp" + } + }, + "oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyA70_d2M2ke-Mu0OHGZ6iZilBbD6A-_z0c" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:60755663443:android:06c549681d7e8ed38584a6", + "android_client_info": { + "package_name": "com.avapp.dev" + } + }, + "oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyA70_d2M2ke-Mu0OHGZ6iZilBbD6A-_z0c" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:60755663443:android:0cc128e56779f1bc8584a6", "android_client_info": { "package_name": "com.avapp.qa" } diff --git a/android/app/src/main/java/com/avapp/MainApplication.java b/android/app/src/main/java/com/avapp/MainApplication.java index eb61e176..20cd25f4 100644 --- a/android/app/src/main/java/com/avapp/MainApplication.java +++ b/android/app/src/main/java/com/avapp/MainApplication.java @@ -1,5 +1,7 @@ package com.avapp; + + import android.app.Application; import android.content.Context; import com.facebook.react.PackageList; @@ -15,11 +17,16 @@ import java.util.List; import com.microsoft.codepush.react.CodePush; import android.database.CursorWindow; import java.lang.reflect.Field; -import io.invertase.firebase.analytics.ReactNativeFirebaseAnalyticsPackage; +import com.google.firebase.analytics.FirebaseAnalytics; +import android.os.Bundle; + + public class MainApplication extends Application implements ReactApplication { + private FirebaseAnalytics mFirebaseAnalytics; + private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { @Override @@ -32,9 +39,7 @@ public class MainApplication extends Application implements ReactApplication { @SuppressWarnings("UnnecessaryLocalVariable") List packages = new PackageList(this).getPackages(); // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); packages.add(new DeviceUtilsModulePackage()); - //packages.add(new ReactNativeFirebaseAnalyticsPackage()); return packages; } @@ -67,6 +72,21 @@ public class MainApplication extends Application implements ReactApplication { ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; SoLoader.init(this, /* native exopackage */ false); initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); + mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); + mFirebaseAnalytics.setAnalyticsCollectionEnabled(true); + + //mFirebaseAnalytics.setMinimumSessionDuration(10000); + + mFirebaseAnalytics.setSessionTimeoutDuration(300); + + + Bundle bundle = new Bundle(); + bundle.putString(FirebaseAnalytics.Param.ITEM_ID,"ID"); + bundle.putString(FirebaseAnalytics.Param.ITEM_NAME,"NAME"); + bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE,"image"); + + mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle); + // https://github.com/rt2zz/redux-persist/issues/284#issuecomment-1011214066 try { diff --git a/android/settings.gradle b/android/settings.gradle index b0f6fa1d..d24ff2c4 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -2,8 +2,6 @@ rootProject.name = 'AVAPP' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app', ':react-native-code-push' include ':react-native-version-number' -include ':@react-native-firebase_analytics' - includeBuild('../node_modules/react-native-gradle-plugin') if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { @@ -14,6 +12,4 @@ if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") } project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app') -project(':react-native-version-number').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number/android') - -project(':@react-native-firebase_analytics').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-firebase/analytics/android') +project(':react-native-version-number').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number/android') \ No newline at end of file diff --git a/config/qa/google-services.json b/config/qa/google-services.json index f48fcb67..cd024fa2 100644 --- a/config/qa/google-services.json +++ b/config/qa/google-services.json @@ -1,13 +1,14 @@ { "project_info": { "project_number": "60755663443", + "firebase_url": "https://address-verification-app-default-rtdb.firebaseio.com", "project_id": "address-verification-app", "storage_bucket": "address-verification-app.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:60755663443:android:988149d3da3c00d38584a6", + "mobilesdk_app_id": "1:60755663443:android:4a948ee9d0b4e3098584a6", "android_client_info": { "package_name": "com.avapp" } @@ -33,6 +34,64 @@ ] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:60755663443:android:06c549681d7e8ed38584a6", + "android_client_info": { + "package_name": "com.avapp.dev" + } + }, + "oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyA70_d2M2ke-Mu0OHGZ6iZilBbD6A-_z0c" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:60755663443:android:0cc128e56779f1bc8584a6", + "android_client_info": { + "package_name": "com.avapp.qa" + } + }, + "oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyA70_d2M2ke-Mu0OHGZ6iZilBbD6A-_z0c" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } } ], "configuration_version": "1"