support more types for logging events

Author: Bas Buijsen

firebase-analytics/src/androidMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -1,16 +1,21 @@
 package dev.gitlive.firebase.analytics
 
 import android.os.Bundle
+import android.os.IBinder
+import android.os.Parcelable
+import android.util.Size
+import android.util.SizeF
 import com.google.firebase.analytics.analytics
 import com.google.firebase.analytics.setConsent
 import dev.gitlive.firebase.Firebase
 import kotlinx.coroutines.tasks.await
+import java.io.Serializable
 
 actual val Firebase.analytics: FirebaseAnalytics
     get() = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
 
 actual class FirebaseAnalytics(val android: com.google.firebase.analytics.FirebaseAnalytics) {
-    actual fun logEvent(name: String, parameters: Map<String, String>?) {
+    actual fun logEvent(name: String, parameters: Map<String, Any>?) {
         android.logEvent(name, parameters?.toBundle())
     }
     actual fun setUserProperty(name: String, value: String) {
@@ -79,6 +84,15 @@ actual class FirebaseAnalytics(val android: com.google.firebase.analytics.Fireba
 
 actual class FirebaseAnalyticsException(message: String): Exception(message)
 
-fun Map<String, String>.toBundle() = Bundle().apply {
-    forEach { (key, value) -> putString(key, value) }
-}
+fun Map<String, Any>.toBundle() = Bundle().apply {
+    forEach { (key, value) ->
+        when(value::class) {
+            String::class -> putString(key, value as String)
+            Int::class -> putInt(key, value as Int)
+            Long::class -> putLong(key, value as Long)
+            Double::class -> putDouble(key, value as Double)
+            Boolean::class -> putBoolean(key, value as Boolean)
+        }
+
+    }
+}

firebase-analytics/src/commonMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -5,7 +5,7 @@ import dev.gitlive.firebase.Firebase
 expect val Firebase.analytics: FirebaseAnalytics
 
 expect class FirebaseAnalytics {
-    fun logEvent(name: String, parameters: Map<String, String>? = null)
+    fun logEvent(name: String, parameters: Map<String, Any>? = null)
     fun setUserProperty(name: String, value: String)
     fun setUserId(id: String)
     fun setAnalyticsCollectionEnabled(enabled: Boolean)
@@ -43,11 +43,27 @@ fun FirebaseAnalytics.logEvent(name: String, builder: FirebaseAnalyticsParameter
 expect class FirebaseAnalyticsException
 
 data class FirebaseAnalyticsParameters(
-    val parameters: MutableMap<String, String> = mutableMapOf()
+    val parameters: MutableMap<String, Any> = mutableMapOf()
 ) {
     fun param(key: String, value: String) {
         parameters[key] = value
     }
+
+    fun param(key: String, value: Double) {
+        parameters[key] = value
+    }
+
+    fun param(key: String, value: Long) {
+        parameters[key] = value
+    }
+
+    fun param(key: String, value: Int) {
+        parameters[key] = value
+    }
+
+    fun param(key: String, value: Boolean) {
+        parameters[key] = value
+    }
 }
 
 data class FirebaseAnalyticsConsentBuilder(

firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -12,10 +12,8 @@ actual val Firebase.analytics: FirebaseAnalytics
     get() = FirebaseAnalytics(FIRAnalytics)
 
 actual class FirebaseAnalytics(val ios: FIRAnalytics.Companion) {
-    actual fun logEvent(name: String, parameters: Map<String, String>?) {
-        val mappedParameters: Map<Any?, String>? = parameters?.map {
-            it.key to it.value
-        }?.toMap()
+    actual fun logEvent(name: String, parameters: Map<String, Any>?) {
+        val mappedParameters: Map<Any?, Any>? = parameters?.map { it.key to it.value }?.toMap()
         ios.logEventWithName(name, mappedParameters)
     }
     actual fun setUserProperty(name: String, value: String) {
@@ -39,16 +37,12 @@ actual class FirebaseAnalytics(val ios: FIRAnalytics.Companion) {
     actual suspend fun getSessionId(): Long? = ios.awaitResult { sessionIDWithCompletion(it) }
 
     actual fun setDefaultEventParameters(parameters: Map<String, String>) {
-        val mappedParameters: Map<Any?, String> = parameters.map {
-            it.key to it.value
-        }.toMap()
+        val mappedParameters: Map<Any?, String> = parameters.map { it.key to it.value }.toMap()
         ios.setDefaultEventParameters(mappedParameters)
     }
 
     actual fun setConsent(consentSettings: Map<ConsentType, ConsentStatus>) {
-        val mappedConsentSettings: Map<Any?, *> = consentSettings.map {
-            it.key.name to it.value.name
-        }.toMap()
+        val mappedConsentSettings: Map<Any?, *> = consentSettings.map { it.key.name to it.value.name }.toMap()
         ios.setConsent(mappedConsentSettings)
     }
 

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -11,7 +11,7 @@ actual val Firebase.analytics: FirebaseAnalytics
 actual class FirebaseAnalytics(val js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics) {
     actual fun logEvent(
         name: String,
-        parameters: Map<String, String>?
+        parameters: Map<String, Any>?
     ) {
         dev.gitlive.firebase.analytics.externals.logEvent(js, name, parameters)
     }

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/externals/analytics.kt

@@ -6,7 +6,7 @@ import kotlin.js.Promise
 
 external fun getAnalytics(app: FirebaseApp? = definedExternally): FirebaseAnalytics
 
-external fun logEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, String>?)
+external fun logEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, Any>?)
 external fun setUserProperty(app: FirebaseAnalytics, name: String, value: String)
 external fun setUserId(app: FirebaseAnalytics, id: String)
 external fun resetAnalyticsData(app: FirebaseAnalytics)