Analytics: create AnalyticsTracker interface

vector/src/main/java/im/vector/app/core/di/SingletonModule.kt

@@ -33,6 +33,7 @@ import im.vector.app.core.error.DefaultErrorFormatter
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.time.Clock
 import im.vector.app.core.time.DefaultClock
+import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.impl.DefaultVectorAnalytics
 import im.vector.app.features.invite.AutoAcceptInvites
@@ -64,6 +65,9 @@ abstract class VectorBindModule {
     @Binds
     abstract fun bindVectorAnalytics(analytics: DefaultVectorAnalytics): VectorAnalytics
 
+    @Binds
+    abstract fun bindAnalyticsTracker(analytics: DefaultVectorAnalytics): AnalyticsTracker
+
     @Binds
     abstract fun bindErrorFormatter(formatter: DefaultErrorFormatter): ErrorFormatter
 

vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.analytics
+
+import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
+import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
+
+interface AnalyticsTracker {
+    /**
+     * Capture an Event
+     */
+    fun capture(event: VectorAnalyticsEvent)
+
+    /**
+     * Track a displayed screen
+     */
+    fun screen(screen: VectorAnalyticsScreen)
+}

vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt

@@ -16,11 +16,9 @@
 
 package im.vector.app.features.analytics
 
-import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
-import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import kotlinx.coroutines.flow.Flow
 
-interface VectorAnalytics {
+interface VectorAnalytics : AnalyticsTracker {
     /**
      * Return a Flow of Boolean, true if the user has given their consent
      */
@@ -60,14 +58,4 @@ interface VectorAnalytics {
      * To be called when application is started
      */
     fun init()
-
-    /**
-     * Capture an Event
-     */
-    fun capture(event: VectorAnalyticsEvent)
-
-    /**
-     * Track a displayed screen
-     */
-    fun screen(screen: VectorAnalyticsScreen)
 }