Moved some things around

Author: sofakingforever

.gitignore

@@ -13,4 +13,6 @@ android-analytics/local\.properties
 
 kotlin-analytics/local\.properties
 
-kotlin-analytics/build/kotlin-build/
+kotlin-analytics/build/
+
+android-analytics/build/

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/kits/logger/LoggerDispatcherImpl.kt renamed to android-analytics/android/src/main/java/com/sofakingforever/analytics/android/kits/logger/LoggerDispatcherImpl.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.Log
 import com.sofakingforever.analytics.AnalyticsDispatcher
 import com.sofakingforever.analytics.AnalyticsKit
+import com.sofakingforever.analytics.android.AndroidAnalyticsDispatcher
 import com.sofakingforever.analytics.events.*
 
 /**
@@ -12,19 +13,18 @@ import com.sofakingforever.analytics.events.*
  * Look at AnswersDispatcher or FirebaseDispatcher to learn more about
  * how to implement your own service dispatcher.
  */
-class LoggerDispatcherImpl(override val init: Boolean) : AnalyticsDispatcher {
+class LoggerDispatcherImpl(override val init: Boolean, override val context: Context) : AndroidAnalyticsDispatcher {
 
 
     override val dispatcherName: String = "LoggerDispatcher"
 
-    constructor() : this(true)
-
+    constructor(context: Context) : this(true, context)
 
     private val tag = dispatcherName
 
     override val kit: AnalyticsKit = LoggerKit.instance
 
-    override fun initDispatcher(context: Context) {
+    override fun initDispatcher() {
         Log.d(tag, "Init Logger Analytics Dispatcher")
     }
 
@@ -36,10 +36,6 @@ class LoggerDispatcherImpl(override val init: Boolean) : AnalyticsDispatcher {
         Log.d(tag, "Tracking event ${event.getEventName(kit)}")
     }
 
-    override fun trackInviteEvent(inviteEvent: InviteEvent) {
-        Log.d(tag, "Tracking inviteEvent ${inviteEvent.packageName}")
-    }
-
 
     override fun setUserProperties(properties: SetUserProperties) {
         Log.d(tag, "Tracking user properties ${properties.getUserProperties(kit)}")

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/kits/logger/LoggerKit.kt renamed to android-analytics/android/src/main/java/com/sofakingforever/analytics/android/kits/logger/LoggerKit.kt

@@ -2,7 +2,6 @@ package com.sofakingforever.analytics
 
 import com.sofakingforever.analytics.events.ContentViewEvent
 import com.sofakingforever.analytics.events.CustomEvent
-import com.sofakingforever.analytics.events.InviteEvent
 import com.sofakingforever.analytics.events.SetUserProperties
 import com.sofakingforever.analytics.events.base.Event
 import com.sofakingforever.analytics.exceptions.UnsupportedEventException
@@ -31,8 +30,6 @@ interface AnalyticsDispatcher {
 
     fun trackCustomEvent(event: CustomEvent)
 
-    fun trackInviteEvent(inviteEvent: InviteEvent)
-
     fun setUserProperties(properties: SetUserProperties)
 
     /**
@@ -56,11 +53,6 @@ interface AnalyticsDispatcher {
                 handled = true
             }
 
-            if (event is InviteEvent) {
-                trackInviteEvent(event)
-                handled = true
-            }
-
             if (event is SetUserProperties) {
                 setUserProperties(event)
                 handled = true

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/AnalyticsDispatcher.kt

@@ -2,7 +2,6 @@ package com.sofakingforever.analytics.events
 
 import com.sofakingforever.analytics.AnalyticsKit
 
-@Deprecated("Use SetUserProperties instead")
 interface SetUserProperty : SetUserProperties {
 
     val key: String

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/events/InviteEvent.kt

@@ -1,13 +1,12 @@
 package com.sofakingforever.analytics.version
 
-import com.sofakingforever.library.BuildConfig
 import com.sofakingforever.repoverse.Version
 import com.sofakingforever.repoverse.resolvers.BintrayVersionResolver
 import com.sofakingforever.repoverse.resolvers.GitHubVersionResolver
 
 object VersionChecker {
 
-    private val currentVersion = Version(BuildConfig.VERSION_NAME)
+    private val currentVersion = Version("1.0.19")
 
     private const val packagePath: String = "sofakingforever/kotlin-analytics"
 

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/events/SetUserProperty.kt

@@ -1,6 +1,6 @@
 package com.sofakingforever.analytics.version
 
-import android.util.Log
+
 import com.sofakingforever.repoverse.Version
 import com.sofakingforever.repoverse.resolvers.RemoteVersionResolver
 
@@ -9,7 +9,7 @@ class VersionResolverCallback(private val currentVersion: Version) : RemoteVersi
     override fun onVersionResolved(latestVersion: Version) {
         if (currentVersion < latestVersion) {
             // user should update
-            Log.w("kotlin-analytics", "Latest library version $latestVersion > $currentVersion (current)")
+            System.out.println("Latest library version $latestVersion > $currentVersion (current)")
         }
     }
 }

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/version/VersionChecker.kt

@@ -1,6 +1,5 @@
 package com.sofakingforever.library
 
-import android.content.Context
 import com.sofakingforever.analytics.Analytics
 import com.sofakingforever.analytics.AnalyticsSettings
 import com.sofakingforever.analytics.exceptions.EventNotTrackedException
@@ -9,26 +8,24 @@ import com.sofakingforever.library.dispatcher.TestKit
 import com.sofakingforever.library.dispatcher.TestableDispatcher
 import com.sofakingforever.library.events.*
 import org.junit.Test
-import org.mockito.Mockito
-import org.mockito.Mockito.mock
 
 class AnalyticsUnitTest {
 
-    private val contextMock = mock(Context::class.java)
+//    private val contextMock = mock(Context::class.java)
 
     private lateinit var analytics: Analytics
 
     private val dispatcher = TestableDispatcher()
     private var raisedException: Exception? = null
 
     init {
-        Mockito.`when`(contextMock.applicationContext).thenReturn(contextMock)
+//        Mockito.`when`(contextMock.applicationContext).thenReturn(contextMock)
     }
 
     @Test
     fun testAnalytics() {
 
-        analytics = Analytics(AnalyticsSettings(contextMock), dispatcher).apply {
+        analytics = Analytics(AnalyticsSettings(), dispatcher).apply {
 
             this.exceptionHandler = object : Analytics.ExceptionHandler {
                 override fun onException(e: Exception) {
@@ -55,6 +52,7 @@ class AnalyticsUnitTest {
         assert(raisedException is EventNotTrackedException)
         assert((raisedException as EventNotTrackedException).cause is UnsupportedEventException)
 
+        Thread.sleep(5000)
     }
 
 

kotlin-analytics/src/main/kotlin/com/sofakingforever/analytics/version/VersionResolverCallback.kt

@@ -1,6 +1,5 @@
 package com.sofakingforever.library
 
-import android.app.Application
 import com.sofakingforever.library.dispatcher.TestableDispatcher
 import com.sofakingforever.library.events.InitDispatcherEvent
 import com.sofakingforever.library.events.TestCustomEvent
@@ -16,7 +15,7 @@ class DispatcherTest {
 
         val dispatcher = TestableDispatcher()
 
-        dispatcher.initDispatcher(Application())
+        dispatcher.initDispatcher()
 
         dispatcher.track(TestCustomEvent(1))
 

kotlin-analytics/src/test/kotlin/com/sofakingforever/library/AnalyticsUnitTest.kt

@@ -1,9 +1,10 @@
 package com.sofakingforever.library.dispatcher
 
-import android.content.Context
 import com.sofakingforever.analytics.AnalyticsDispatcher
 import com.sofakingforever.analytics.AnalyticsKit
-import com.sofakingforever.analytics.events.*
+import com.sofakingforever.analytics.events.ContentViewEvent
+import com.sofakingforever.analytics.events.CustomEvent
+import com.sofakingforever.analytics.events.SetUserProperties
 import com.sofakingforever.analytics.events.base.Event
 import com.sofakingforever.library.events.InitDispatcherEvent
 
@@ -17,8 +18,7 @@ class TestableDispatcher : AnalyticsDispatcher {
     override val dispatcherName: String = DispatcherName
 
     val eventList: MutableList<Event> = mutableListOf()
-
-    override fun initDispatcher(context: Context) {
+    override fun initDispatcher() {
         track(InitDispatcherEvent())
     }
 
@@ -30,10 +30,6 @@ class TestableDispatcher : AnalyticsDispatcher {
         eventList.add(event)
     }
 
-    override fun trackInviteEvent(inviteEvent: InviteEvent) {
-        eventList.add(inviteEvent)
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         eventList.add(properties)
     }