[STRATCONN-39] Enable manual screen tracking (#27)

* Try to enable manual screen tracking

* Update SNAPSHOT for release

* Remove new package dependencies

* Move variables to global vars

Co-authored-by: Stian Jensen <[email protected]>

Author: briemcnally

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.1.0 / 2020-02-20
+==================
+  * Add support for explicitly tracking screen calls.
+
 2.0.0 / 2019-11-15
 ==================
 *(Supports Android 29+ and Gradle 3.2.1+)*
@@ -37,4 +41,4 @@ Version 1.0.0 (7th September, 2017)
 ===================================
 *(Supports analytics-android 4.2.6 and Firebase Core 11.2.0)*
 
-  * Initial Release 
+  * Initial Release

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.segment.analytics.android.integrations
 
-VERSION=2.0.0-SNAPSHOT
+VERSION=2.1.0-SNAPSHOT
 
 POM_ARTIFACT_ID=firebase
 POM_PACKAGING=aar

src/main/java/com/segment/analytics/android/integrations/firebase/FirebaseIntegration.java

@@ -17,6 +17,7 @@
 import com.segment.analytics.integrations.Integration;
 import com.segment.analytics.integrations.Logger;
 import com.segment.analytics.integrations.TrackPayload;
+import com.segment.analytics.integrations.ScreenPayload;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -64,6 +65,7 @@ public String key() {
   private final Logger logger;
   private final FirebaseAnalytics firebaseAnalytics;
   private static final Map<String, String> EVENT_MAPPER = createEventMap();
+  private Activity currentActivity;
 
   private static Map<String, String> createEventMap() {
     Map<String, String> EVENT_MAPPER = new HashMap<>();
@@ -122,6 +124,20 @@ public void onActivityResumed(Activity activity) {
     }
   }
 
+  @Override
+  public void onActivityStarted(Activity activity) {
+    super.onActivityStarted(activity);
+
+    this.currentActivity = activity;
+  }
+
+  @Override
+  public void onActivityStopped(Activity activity) {
+    super.onActivityStopped(activity);
+
+    this.currentActivity = null;
+  }
+
   @Override
   public void identify(IdentifyPayload identify) {
     super.identify(identify);
@@ -156,6 +172,15 @@ public void track(TrackPayload track) {
     logger.verbose("firebaseAnalytics.logEvent(%s, %s);", eventName, formattedProperties);
   }
 
+  @Override
+  public void screen(ScreenPayload screen) {
+    super.screen(screen);
+
+    if (this.currentActivity != null) {
+      firebaseAnalytics.setCurrentScreen(this.currentActivity, screen.name(), null);
+    }
+  }
+
   private static Bundle formatProperties(Properties properties) {
     Bundle bundle = new Bundle();
     if ((properties.revenue() != 0 || properties.total() != 0)

src/test/java/com/segment/analytics/android/integration/firebase/FirebaseTest.java

@@ -1,5 +1,6 @@
 package com.segment.analytics.android.integration.firebase;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 
@@ -8,6 +9,7 @@
 import com.segment.analytics.android.integrations.firebase.FirebaseIntegration;
 import com.segment.analytics.integrations.IdentifyPayload;
 import com.segment.analytics.integrations.Logger;
+import com.segment.analytics.integrations.ScreenPayload;
 import com.segment.analytics.integrations.TrackPayload;
 
 import org.json.JSONException;
@@ -33,6 +35,8 @@
 import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.isNull;
 import static org.mockito.Mockito.verify;
 
 @RunWith(RobolectricTestRunner.class)
@@ -143,6 +147,16 @@ public void trackWithEventNameTransformation() {
         verify(firebase).logEvent(eq("foo_bar"), bundleEq(expected));
     }
 
+    @Test
+    public void trackScreenWithName() {
+        final Activity activity = PowerMockito.mock(Activity.class);
+        integration.onActivityStarted(activity);
+
+        integration.screen(new ScreenPayload.Builder().anonymousId("1234").name("home_screen").build());
+
+        verify(firebase).setCurrentScreen(any(Activity.class), eq("home_screen"), (String) isNull());
+    }
+
     /**
      * Uses the string representation of the object. Useful for JSON objects.
      * @param expected Expected object
@@ -187,4 +201,4 @@ public boolean matches(Bundle bundle) {
         }
 
     }
-}
+}