[android] - modularise the sdk

platform/android/MapboxGLAndroidSDK/build.gradle

@@ -12,7 +12,6 @@ dependencies {
     }
     implementation dependenciesList.supportAnnotations
     implementation dependenciesList.supportFragmentV4
-    implementation dependenciesList.timber
     implementation dependenciesList.okhttp3
     testImplementation dependenciesList.junit
     testImplementation dependenciesList.mockito
@@ -159,4 +158,4 @@ apply from: "${rootDir}/gradle/gradle-javadoc.gradle"
 apply from: "${rootDir}/gradle/gradle-publish.gradle"
 apply from: "${rootDir}/gradle/gradle-checkstyle.gradle"
 apply from: "${rootDir}/gradle/gradle-tests-staticblockremover.gradle"
-apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"
+apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java

@@ -1,6 +1,6 @@
 package com.mapbox.mapboxsdk;
 
-import timber.log.Timber;
+import com.mapbox.mapboxsdk.log.Logger;
 
 /**
  * Loads the mapbox-gl shared library
@@ -11,6 +11,8 @@
  */
 public abstract class LibraryLoader {
 
+  private static final String TAG = "LibraryLoader";
+
   private static final LibraryLoader DEFAULT = new LibraryLoader() {
     @Override
     public void load(String name) {
@@ -39,7 +41,7 @@ public static void load() {
     try {
       loader.load("mapbox-gl");
     } catch (UnsatisfiedLinkError error) {
-      Timber.e(error, "Failed to load native shared library.");
+      Logger.e(TAG, "Failed to load native shared library.", error);
     }
   }
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java

@@ -9,9 +9,12 @@
 import android.support.annotation.UiThread;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.exceptions.MapboxConfigurationException;
-import com.mapbox.mapboxsdk.maps.Telemetry;
+import com.mapbox.mapboxsdk.log.Logger;
+import com.mapbox.mapboxsdk.maps.TelemetryBase;
+import com.mapbox.mapboxsdk.module.ModuleProvider;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
-import timber.log.Timber;
+
+import static android.content.ContentValues.TAG;
 
 /**
  * The entry point to initialize the Mapbox Android SDK.
@@ -29,6 +32,7 @@ public final class Mapbox {
   private Context context;
   private String accessToken;
   private Boolean connected;
+  private TelemetryBase telemetry;
 
   /**
    * Get an instance of Mapbox.
@@ -116,12 +120,22 @@ public static synchronized Boolean isConnected() {
    */
   private static void initializeTelemetry() {
     try {
-      Telemetry.initialize();
+      INSTANCE.telemetry = ModuleProvider.injectTelemetry();
     } catch (Exception exception) {
-      Timber.e(exception);
+      Logger.e(TAG, "Error occured while initializing telemetry", exception);
     }
   }
 
+  /**
+   * Get an instance of Telemetry if initialised
+   *
+   * @return instance of telemetry
+   */
+  @Nullable
+  public static TelemetryBase getTelemetry() {
+    return INSTANCE.telemetry;
+  }
+
   /**
    * Runtime validation of Mapbox creation.
    */
@@ -145,4 +159,4 @@ static boolean isAccessTokenValid(String accessToken) {
     accessToken = accessToken.trim().toLowerCase(MapboxConstants.MAPBOX_LOCALE);
     return accessToken.length() != 0 && (accessToken.startsWith("pk.") || accessToken.startsWith("sk."));
   }
-}
+}

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java

@@ -0,0 +1,13 @@
+package com.mapbox.mapboxsdk.constants;
+
+public class TelemetryConstants {
+
+  public static final String TWO_FINGER_TAP = "TwoFingerTap";
+  public static final String DOUBLE_TAP = "DoubleTap";
+  public static final String SINGLE_TAP = "SingleTap";
+  public static final String PAN = "Pan";
+  public static final String PINCH = "Pinch";
+  public static final String ROTATION = "Rotation";
+  public static final String PITCH = "Pitch";
+
+}