add builders as extensions

Author: Bas Buijsen

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

@@ -13,11 +13,6 @@ actual class FirebaseAnalytics(val android: com.google.firebase.analytics.Fireba
     actual fun logEvent(name: String, parameters: Map<String, String>?) {
         android.logEvent(name, parameters?.toBundle())
     }
-    actual fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit) {
-        val params = FirebaseAnalyticsParameters()
-        params.block()
-        logEvent(name, params.parameters)
-    }
     actual fun setUserProperty(name: String, value: String) {
         android.setUserProperty(name, value)
     }
@@ -52,16 +47,16 @@ actual class FirebaseAnalytics(val android: com.google.firebase.analytics.Fireba
                 androidConsentSettings.entries.forEach {
                     when (it.key) {
                         ConsentType.AD_PERSONALIZATION ->
-                            this.adUserData = it.value
+                            this.adPersonalization = it.value
 
                         ConsentType.AD_STORAGE ->
-                            this.adUserData = it.value
+                            this.adStorage = it.value
 
                         ConsentType.AD_USER_DATA ->
                             this.adUserData = it.value
 
                         ConsentType.ANALYTICS_STORAGE ->
-                            this.adUserData = it.value
+                            this.analyticsStorage = it.value
                     }
                 }
 

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

@@ -6,7 +6,6 @@ expect val Firebase.analytics: FirebaseAnalytics
 
 expect class FirebaseAnalytics {
     fun logEvent(name: String, parameters: Map<String, String>? = null)
-    fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit)
     fun setUserProperty(name: String, value: String)
     fun setUserId(id: String)
     fun setAnalyticsCollectionEnabled(enabled: Boolean)
@@ -29,6 +28,18 @@ expect class FirebaseAnalytics {
     }
 }
 
+fun FirebaseAnalytics.setConsent(builder: FirebaseAnalyticsConsentBuilder.() -> Unit) {
+    val consentBuilder = FirebaseAnalyticsConsentBuilder()
+    consentBuilder.builder()
+    setConsent(consentBuilder.consentSettings)
+}
+
+fun FirebaseAnalytics.logEvent(name: String, builder: FirebaseAnalyticsParameters.() -> Unit) {
+    val params = FirebaseAnalyticsParameters()
+    params.builder()
+    logEvent(name, params.parameters)
+}
+
 expect class FirebaseAnalyticsException
 
 data class FirebaseAnalyticsParameters(
@@ -37,4 +48,40 @@ data class FirebaseAnalyticsParameters(
     fun param(key: String, value: String) {
         parameters[key] = value
     }
+}
+
+data class FirebaseAnalyticsConsentBuilder(
+    val consentSettings: MutableMap<FirebaseAnalytics.ConsentType, FirebaseAnalytics.ConsentStatus> = mutableMapOf()
+) {
+    var adPersonalization: FirebaseAnalytics.ConsentStatus?
+        get() = consentSettings[FirebaseAnalytics.ConsentType.AD_PERSONALIZATION]
+        set(value) {
+            value?.let {
+                consentSettings[FirebaseAnalytics.ConsentType.AD_PERSONALIZATION] = it
+            }
+        }
+
+    var adStorage: FirebaseAnalytics.ConsentStatus?
+        get() = consentSettings[FirebaseAnalytics.ConsentType.AD_STORAGE]
+        set(value) {
+            value?.let {
+                consentSettings[FirebaseAnalytics.ConsentType.AD_STORAGE] = it
+            }
+        }
+
+    var adUserData: FirebaseAnalytics.ConsentStatus?
+        get() = consentSettings[FirebaseAnalytics.ConsentType.AD_USER_DATA]
+        set(value) {
+            value?.let {
+                consentSettings[FirebaseAnalytics.ConsentType.AD_USER_DATA] = it
+            }
+        }
+
+    var analyticsStorage: FirebaseAnalytics.ConsentStatus?
+        get() = consentSettings[FirebaseAnalytics.ConsentType.ANALYTICS_STORAGE]
+        set(value) {
+            value?.let {
+                consentSettings[FirebaseAnalytics.ConsentType.ANALYTICS_STORAGE] = it
+            }
+        }
 }

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

@@ -18,11 +18,6 @@ actual class FirebaseAnalytics(val ios: FIRAnalytics.Companion) {
         }?.toMap()
         ios.logEventWithName(name, mappedParameters)
     }
-    actual fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit) {
-        val params = FirebaseAnalyticsParameters()
-        params.block()
-        logEvent(name, params.parameters)
-    }
     actual fun setUserProperty(name: String, value: String) {
         ios.setUserPropertyString(value, name)
     }

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

@@ -3,14 +3,6 @@ package dev.gitlive.firebase.analytics
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseException
 import dev.gitlive.firebase.analytics.externals.getAnalytics
-import dev.gitlive.firebase.analytics.externals.jsGetSessionId
-import dev.gitlive.firebase.analytics.externals.jsLogEvent
-import dev.gitlive.firebase.analytics.externals.jsResetAnalyticsData
-import dev.gitlive.firebase.analytics.externals.jsSetAnalyticsCollectionEnabled
-import dev.gitlive.firebase.analytics.externals.jsSetDefaultEventParameters
-import dev.gitlive.firebase.analytics.externals.jsSetSessionTimeoutInterval
-import dev.gitlive.firebase.analytics.externals.jsSetUserId
-import dev.gitlive.firebase.analytics.externals.jsSetUserProperty
 import kotlinx.coroutines.await
 
 actual val Firebase.analytics: FirebaseAnalytics
@@ -24,15 +16,6 @@ actual class FirebaseAnalytics(val js: dev.gitlive.firebase.analytics.externals.
         dev.gitlive.firebase.analytics.externals.logEvent(js, name, parameters)
     }
 
-    actual fun logEvent(
-        name: String,
-        block: FirebaseAnalyticsParameters.() -> Unit
-    ) {
-        val params = FirebaseAnalyticsParameters()
-        params.block()
-        logEvent(name, params.parameters)
-    }
-
     actual fun setUserProperty(name: String, value: String) {
         dev.gitlive.firebase.analytics.externals.setUserProperty(js, name, value)
     }