Flavor support

android/app/build.gradle

@@ -55,8 +55,12 @@ react {
 }
 
 project.ext.envConfigFiles = [
-    debug: ".env",
-    release: ".env.production",
+    productionDebug: ".env.production",
+    productionRelease: ".env.production",
+    adhocRelease: ".env.staging",
+    developmentRelease: ".env",
+    developmentDebug: ".env"
+    e2eRelease: ".env"
 ]
 
 /**
@@ -110,6 +114,20 @@ android {
         versionName "1.3.31-2"
     }
 
+    flavorDimensions "default"
+    productFlavors {
+        production {
+        }
+        e2e {
+        }
+        adhoc {
+            applicationIdSuffix ".adhoc"
+        }
+        development {
+            applicationIdSuffix ".dev"
+        }
+    }
+
     splits {
         abi {
             reset()
@@ -140,19 +158,16 @@ android {
         }
         release {
             signingConfig signingConfigs.release
+            productFlavors.e2e.signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
-        // We need a custom build type, so we can allow http clear text traffic in a release build:
-        e2eRelease {
-            initWith release
-            matchingFallbacks = ['release']
-            signingConfig signingConfigs.debug
-        }
-        internalRelease {
-            initWith release
-            matchingFallbacks = ['release']
-            signingConfig signingConfigs.debug
+    }
+
+    // since we don't need variants adhocDebug and e2eDebug, we can force grade to ignore them
+    variantFilter { variant ->
+        if (variant.name == "adhocDebug" || variant.name == "e2eDebug") {
+            setIgnore(true)
         }
     }
 
@@ -214,16 +229,13 @@ dependencies {
     // Fixes a version conflict between airship and react-native-plaid-link-sdk
     // This may be fixed by a newer version of the plaid SDK (not working as of 10.0.0)
     implementation "androidx.work:work-runtime-ktx:2.8.0"
-    
+
     // This okhttp3 dependency prevents the app from crashing - See https://github.com/plaid/react-native-plaid-link-sdk/issues/74#issuecomment-648435002
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.+"
 
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-def googleServicesFile = rootProject.file('app/google-services.json')
-if (googleServicesFile.exists()) {
-    apply plugin: 'com.google.gms.google-services'  // Google Play services Gradle plugin
-}
+apply plugin: 'com.google.gms.google-services'  // Google Play services Gradle plugin
 apply plugin: 'com.google.firebase.crashlytics'

android/app/google-services.json

@@ -1,47 +1,143 @@
 {
     "project_info": {
-        "project_number": "921154746561",
-        "firebase_url": "https://expensify-chat.firebaseio.com",
-        "project_id": "expensify-chat",
-        "storage_bucket": "expensify-chat.appspot.com"
+      "project_number": "921154746561",
+      "firebase_url": "https://expensify-chat.firebaseio.com",
+      "project_id": "expensify-chat",
+      "storage_bucket": "expensify-chat.appspot.com"
     },
     "client": [
-        {
-            "client_info": {
-                "mobilesdk_app_id": "1:921154746561:android:4f04268f25f84eaf027c40",
-                "android_client_info": {
-                    "package_name": "com.expensify.chat"
-                }
-            },
-            "oauth_client": [
-                {
-                    "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
-                    "client_type": 3
-                }
-            ],
-            "api_key": [
-                {
-                    "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:921154746561:android:4f04268f25f84eaf027c40",
+          "android_client_info": {
+            "package_name": "com.expensify.chat"
+          }
+        },
+        "oauth_client": [
+          {
+            "client_id": "921154746561-o0pgqgc84e3e97s9iljlmimcb5nesqad.apps.googleusercontent.com",
+            "client_type": 1,
+            "android_info": {
+              "package_name": "com.expensify.chat",
+              "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            }
+          },
+          {
+            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+            "client_type": 3
+          }
+        ],
+        "api_key": [
+          {
+            "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": [
+              {
+                "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+                "client_type": 3
+              },
+              {
+                "client_id": "921154746561-080fav7kvk6s70k6nd70mt50isubgff4.apps.googleusercontent.com",
+                "client_type": 2,
+                "ios_info": {
+                  "bundle_id": "com.expensify.chat.adhoc"
                 }
-            ],
-            "services": {
-                "appinvite_service": {
-                    "other_platform_oauth_client": [
-                        {
-                            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
-                            "client_type": 3
-                        },
-                        {
-                            "client_id": "921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com",
-                            "client_type": 2,
-                            "ios_info": {
-                                "bundle_id": "com.chat.expensify.chat"
-                            }
-                        }
-                    ]
+              }
+            ]
+          }
+        }
+      },
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:921154746561:android:333e293a7fef83a8027c40",
+          "android_client_info": {
+            "package_name": "com.expensify.chat.adhoc"
+          }
+        },
+        "oauth_client": [
+          {
+            "client_id": "921154746561-cbegir0tnc2gan6k1gre5vtn75p60hom.apps.googleusercontent.com",
+            "client_type": 1,
+            "android_info": {
+              "package_name": "com.expensify.chat.adhoc",
+              "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            }
+          },
+          {
+            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+            "client_type": 3
+          }
+        ],
+        "api_key": [
+          {
+            "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": [
+              {
+                "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+                "client_type": 3
+              },
+              {
+                "client_id": "921154746561-080fav7kvk6s70k6nd70mt50isubgff4.apps.googleusercontent.com",
+                "client_type": 2,
+                "ios_info": {
+                  "bundle_id": "com.expensify.chat.adhoc"
                 }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:921154746561:android:3b19fdbaedb5b586027c40",
+          "android_client_info": {
+            "package_name": "com.expensify.chat.dev"
+          }
+        },
+        "oauth_client": [
+          {
+            "client_id": "921154746561-svjnccrcn6vet45kn9o7sibb3jemipa6.apps.googleusercontent.com",
+            "client_type": 1,
+            "android_info": {
+              "package_name": "com.expensify.chat.dev",
+              "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
             }
+          },
+          {
+            "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+            "client_type": 3
+          }
+        ],
+        "api_key": [
+          {
+            "current_key": "AIzaSyCVwQb9lBI06bDIwHOw10AkdJyquXoMngk"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": [
+              {
+                "client_id": "921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com",
+                "client_type": 3
+              },
+              {
+                "client_id": "921154746561-080fav7kvk6s70k6nd70mt50isubgff4.apps.googleusercontent.com",
+                "client_type": 2,
+                "ios_info": {
+                  "bundle_id": "com.expensify.chat.adhoc"
+                }
+              }
+            ]
+          }
         }
+      }
     ],
     "configuration_version": "1"
-}
+  }

android/app/src/adhoc/res/drawable/bootsplash.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/windowSplashScreenBackground" />
+    </item>
+
+    <item android:gravity="center" android:drawable="@drawable/ic_bootsplash_adhoc"/>
+</layer-list>

android/app/src/adhoc/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/adhoc/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/adhoc/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">New Expensify AdHoc</string>
+</resources>

android/app/src/development/res/drawable/bootsplash.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/windowSplashScreenBackground" />
+    </item>
+
+    <item android:gravity="center" android:drawable="@drawable/ic_bootsplash_dev"/>
+</layer-list>

android/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/development/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/development/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">New Expensify Dev</string>
+</resources>

android/app/src/main/res/drawable/bootsplash.xml

@@ -5,7 +5,5 @@
         <color android:color="?attr/windowSplashScreenBackground" />
     </item>
 
-    <item android:gravity="fill">
-        <bitmap android:src="?windowSplashScreenAnimatedIcon" android:gravity="center" />
-    </item>
+    <item android:gravity="center" android:drawable="@drawable/ic_bootsplash"/>
 </layer-list>

android/app/src/main/res/drawable/ic_bootsplash.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M74,15.63a42.03,42.03 0,0 0,-24 -7.5A41.77,41.77 0,0 0,8.12 49.87c0,9 2.76,17.26 7.5,24a4.35,4.35 0,0 1,-0.37 5.63c-1.75,1.63 -4.5,1.5 -5.88,-0.38A49.99,49.99 0,0 1,50 0c10.88,0.01 20.88,3.51 29.25,9.38 2,1.5 2,4.26 0.38,5.88a4.35,4.35 0,0 1,-5.63 0.38ZM67.62,24.87L67.62,35.5L45.25,35.5v9.13h18v10.62h-18v9.63L67.5,64.88v10.37L32.25,75.25L32.25,24.87h35.38ZM91.12,21.75a3.78,3.78 0,0 0,-5.87 -0.38,4.35 4.35,0 0,0 -0.5,5.5c4.38,6.63 7,14.63 7,23.13 0,8.5 -2.63,16.75 -7.25,23.5 -1.13,1.75 -1.13,4.13 0.38,5.63 1.75,1.75 4.5,1.62 5.87,-0.38A49.5,49.5 0,0 0,99.88 50a47.66,47.66 0,0 0,-8.75 -28.25ZM26.88,84.88c6.63,4.37 14.63,7 23.13,7 8.63,0 16.75,-2.75 23.5,-7.25a4.35,4.35 0,0 1,5.63 0.37c1.75,1.75 1.62,4.5 -0.38,5.88A50.37,50.37 0,0 1,50 100a49.75,49.75 0,0 1,-28.25 -8.75c-2,-1.38 -2.13,-4.13 -0.38,-5.88 1.38,-1.5 3.75,-1.62 5.5,-0.5Z"
+      android:fillColor="#002E22"
+      android:fillType="evenOdd"/>
+</vector>