Fix inappmessaging-display sdk size issues. (#635)

* Increase the size of the table to accommodate inappmessaging-display.

* Fix tests.

Author: rlazo

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/measurement/apksize/ApkSizeTableBuilder.groovy

@@ -29,11 +29,11 @@ class ApkSizeTableBuilder {
           throw new IllegalStateException("No sizes added")
         }
 
-        def table = "|------------------        APK Sizes        ------------------|\n"
-        table +=    "|--    project    --|--  build type   --|--  size in bytes  --|\n"
+        def table = "|--------------------        APK Sizes        ------------------|\n"
+        table +=    "|---    project    ---|--  build type   --|--  size in bytes  --|\n"
 
         table += sdkSizes.collect {
-            sprintf("|%-19s|%-19s|%-21s|", it.get(0), it.get(1), it.get(2))
+            sprintf("|%-21s|%-19s|%-21s|", it.get(0), it.get(1), it.get(2))
         }.join("\n")
 
         return table

buildSrc/src/test/groovy/com/google/firebase/gradle/plugins/measurement/apksize/ApkSizeTableBuilderTest.groovy

@@ -25,8 +25,8 @@ import org.junit.runners.JUnit4
 public class ApkSizeTableBuilderTest {
 
   private static final String HEADER =
-      "|------------------        APK Sizes        ------------------|\n" +
-      "|--    project    --|--  build type   --|--  size in bytes  --|\n"
+      "|--------------------        APK Sizes        ------------------|\n" +
+      "|---    project    ---|--  build type   --|--  size in bytes  --|\n"
 
   @Test(expected = IllegalStateException.class)
   public void toTableString_throwsWhenZeroAdded() {
@@ -37,7 +37,7 @@ public class ApkSizeTableBuilderTest {
   @Test
   public void toTableString_withOneMeasurement() {
     def expected = HEADER +
-        "|firebase foo       |debug              |255000               |"
+        "|firebase foo         |debug              |255000               |"
 
     def builder = new ApkSizeTableBuilder()
     builder.addApkSize("firebase foo", "debug", 255000)
@@ -48,9 +48,9 @@ public class ApkSizeTableBuilderTest {
   @Test
   public void toTableString_withThreeMeasurements() {
     def expected = HEADER +
-        "|firebase foo       |debug              |255000               |\n" +
-        "|google loo         |release            |4000                 |\n" +
-        "|Appy Snap App      |Snappy             |781000               |"
+        "|firebase foo         |debug              |255000               |\n" +
+        "|google loo           |release            |4000                 |\n" +
+        "|Appy Snap App        |Snappy             |781000               |"
 
     def builder = new ApkSizeTableBuilder()
     builder.addApkSize("firebase foo", "debug", 255000)

tools/measurement/apksize/src/inappmessagingdisplay/inappmessaging-display.gradle

@@ -30,4 +30,7 @@ android {
 }
 dependencies {
     inappmessagingdisplayImplementation project(":firebase-inappmessaging-display")
+    inappmessagingdisplayImplementation ("com.google.firebase:firebase-inappmessaging:17.0.3") {
+        exclude group: "com.google.firebase", module: "firebase-common"
+    }
 }

tools/measurement/apksize/src/inappmessagingdisplay/java/com.google.apksize/InAppMessagingDisplay.java

@@ -14,25 +14,55 @@
 
 package com.google.apksize;
 
+import android.app.Activity;
 import android.content.Context;
-import com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener;
-import com.google.firebase.inappmessaging.model.Action;
-import com.google.firebase.inappmessaging.model.CampaignMetadata;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks;
+import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay;
 import com.google.firebase.inappmessaging.model.InAppMessage;
 
 public class InAppMessagingDisplay implements SampleCode {
+  private static final String SAMPLE_TEXT = "My sample text";
+  private static final String ACTION_URL = "https://www.example.com";
+  private static final String CAMPAIGN_ID = "my_campaign";
+  private static final String TITLE = "Title";
 
-  public class MyClickListener implements FirebaseInAppMessagingClickListener {
+  public static class DisplayCallback implements FirebaseInAppMessagingDisplayCallbacks {
     @Override
-    public void messageClicked(InAppMessage inAppMessage, Action action) {
-      String url = action.getActionUrl();
-      CampaignMetadata metadata = inAppMessage.getCampaignMetadata();
+    public Task<Void> impressionDetected() {
+      return new TaskCompletionSource<Void>().getTask();
+    }
+
+    @Override
+    public Task<Void> messageDismissed(InAppMessagingDismissType dismissType) {
+      return new TaskCompletionSource<Void>().getTask();
+    }
+
+    @Override
+    public Task<Void> messageClicked() {
+      return new TaskCompletionSource<Void>().getTask();
+    }
+
+    @Override
+    public Task<Void> displayErrorEncountered(InAppMessagingErrorReason InAppMessagingErrorReason) {
+      return new TaskCompletionSource<Void>().getTask();
     }
   }
 
   @Override
   public void runSample(Context context) {
-    MyClickListener listener = new MyClickListener();
-    FirebaseInAppMessaging.getInstance().addClickListener(listener);
+    InAppMessage message =
+        InAppMessage.builder()
+            .setBody(InAppMessage.Text.builder().setText(SAMPLE_TEXT).build())
+            .setAction(InAppMessage.Action.builder().setActionUrl(ACTION_URL).build())
+            .setCampaignId(CAMPAIGN_ID)
+            .setTitle(InAppMessage.Text.builder().setText(TITLE).build())
+            .build();
+
+    // NOTE: Context is *not guaranteed* to be an Activity. This is **fine** in this case because we
+    // only want to compile the APK to measure it size, and it will not be run.
+    FirebaseInAppMessagingDisplay.getInstance()
+        .testMessage((Activity) context, message, new DisplayCallback());
   }
 }