Implement traking (#95)

* Implement firebase traking * fix detetk issue
MixDrinks · Oct 12, 2023 · 182933a · 182933a
1 parent e7b5e1b
commit 182933a
Show file tree

Hide file tree

Showing 19 changed files with 155 additions and 68 deletions.
diff --git a/androidApp/src/androidMain/kotlin/org/mixdrinks/MainActivity.kt b/androidApp/src/androidMain/kotlin/org/mixdrinks/MainActivity.kt
@@ -17,6 +17,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.firebase.FirebaseApp
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
@@ -27,12 +28,13 @@ import com.google.firebase.ktx.Firebase
 import setAppleAuthStart
 import setGoogleAuthStart
 import setLogout
+import trackAnalyticsCallback
 
 
 @Keep
 class MainActivity : AppCompatActivity() {
 
-    lateinit var googleSignInClient: GoogleSignInClient
+    private lateinit var googleSignInClient: GoogleSignInClient
     private lateinit var register: ActivityResultLauncher<Intent>
     private lateinit var firebaseAuth: FirebaseAuth
 
@@ -42,6 +44,18 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        trackAnalyticsCallback = { action, data ->
+            FirebaseAnalytics.getInstance(applicationContext)
+                .logEvent(
+                    action,
+                    Bundle().apply {
+                        data.forEach { (key, value) ->
+                            putString(key, value)
+                        }
+                    })
+        }
+
         val deepLink = intent?.data?.toString()
         window.statusBarColor = android.graphics.Color.parseColor("#FF2B4718")
         setContent {
@@ -75,15 +89,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onStart() {
         super.onStart()
-        firebaseAuth.currentUser?.getIdToken(true)
-            ?.addOnCompleteListener {
-                it.result?.token?.let { token ->
-                    NewToken(token)
-                }
-            }
-            ?.addOnFailureListener {
-                Firebase.crashlytics.recordException(it)
-            }
+        firebaseAuth.currentUser?.sendNewToken()
         register = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == RESULT_OK) {
                 val task: Task<GoogleSignInAccount> = GoogleSignIn.getSignedInAccountFromIntent(result.data)
@@ -97,14 +103,14 @@ class MainActivity : AppCompatActivity() {
         val pending = firebaseAuth.pendingAuthResult
         if (pending != null) {
             pending.addOnSuccessListener { authResult ->
-                authResult.user.sendNewToken(AuthProvider.APPLE)
+                authResult.user.sendNewToken()
             }.addOnFailureListener { e ->
                 authFail(AuthProvider.APPLE, e)
             }
         } else {
             firebaseAuth.startActivityForSignInWithProvider(this, appleProvider.build())
                 .addOnSuccessListener { authResult ->
-                    authResult.user.sendNewToken(AuthProvider.APPLE)
+                    authResult.user.sendNewToken()
                 }
                 .addOnFailureListener { e ->
                     authFail(AuthProvider.APPLE, e)
@@ -133,16 +139,16 @@ class MainActivity : AppCompatActivity() {
         val credential = GoogleAuthProvider.getCredential(account.idToken, null)
         firebaseAuth.signInWithCredential(credential)
             .addOnCompleteListener(this) { _ ->
-                FirebaseAuth.getInstance().currentUser?.sendNewToken(AuthProvider.GOOGLE)
+                FirebaseAuth.getInstance().currentUser?.sendNewToken()
             }
             .addOnFailureListener { e ->
                 authFail(AuthProvider.GOOGLE, e)
             }
     }
 
-    private fun FirebaseUser?.sendNewToken(provider: AuthProvider) {
+    private fun FirebaseUser?.sendNewToken() {
         if (this == null) {
-            authFail(provider, Exception("User is null"))
+            Firebase.crashlytics.recordException(Exception("User is null"))
             return
         }
 
@@ -153,7 +159,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
             .addOnFailureListener {
-                authFail(provider, it)
+                Firebase.crashlytics.recordException(it)
             }
     }
 

diff --git a/iosApp/Podfile b/iosApp/Podfile
@@ -1,3 +1,9 @@
+use_frameworks!
+
+platform :ios, '15.0'
+
+install! 'cocoapods', :deterministic_uuids => false
+
 target 'iosApp' do
   use_frameworks!
   platform :ios, '14.1'
@@ -7,4 +13,4 @@ end
 pod 'GoogleSignIn'
 pod 'FirebaseCore'
 pod 'FirebaseAuth'
-pod 'FirebaseAnalytics'
+pod 'FirebaseAnalytics'
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -129,7 +129,7 @@
 				7555FF79242A565900829871 /* Resources */,
 				F85CB1118929364A9C6EFABC /* Frameworks */,
 				2134C13603D0B299603D9F49 /* [CP] Copy Pods Resources */,
-				A53E69582B14720372B84606 /* [CP] Embed Pods Frameworks */,
+				558627EC635BACAE0E100860 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -213,43 +213,43 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		98D614C51D2DA07C614CC46E /* [CP] Check Pods Manifest.lock */ = {
+		558627EC635BACAE0E100860 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A53E69582B14720372B84606 /* [CP] Embed Pods Frameworks */ = {
+		98D614C51D2DA07C614CC46E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/iosApp/iosApp/MainViewModel.swift b/iosApp/iosApp/MainViewModel.swift
@@ -135,13 +135,14 @@ class MainViewModel: NSObject, ObservableObject, ASAuthorizationControllerDelega
 
         GIDSignIn.sharedInstance.signIn(withPresenting: getUiWindow().rootViewController!) { [unowned self] result, error in
             guard error == nil else {
-                fatalError("Error is null")
+                print("error google \(error)")
+                return
             }
 
             guard let user = result?.user,
                   let idToken = user.idToken?.tokenString
             else {
-                fatalError("resul?.User is null")
+                return
             }
 
             let credential = GoogleAuthProvider.credential(withIDToken: idToken,

diff --git a/iosApp/iosApp/iOSApp.swift b/iosApp/iosApp/iOSApp.swift
@@ -15,7 +15,14 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ app: UIApplication,
                      open url: URL,
                      options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
-        return GIDSignIn.sharedInstance.handle(url)
+        var handled: Bool
+
+        handled = GIDSignIn.sharedInstance.handle(url)
+        if handled {
+          return true
+        }
+        // Handle other custom URL types.
+        return false
     }
 
 }
@@ -26,7 +33,14 @@ struct iOSApp: App {
 
     var body: some Scene {
         WindowGroup {
-            ContentView()
+            ZStack {
+                GeometryReader { reader in
+                    Color.black
+                        .frame(height: reader.safeAreaInsets.top, alignment: .top)
+                        .ignoresSafeArea()
+                }
+                ContentView()
+            }
         }
     }
 }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -33,6 +33,12 @@ kotlin {
         }
         extraSpecAttributes["resources"] =
             "['src/commonMain/resources/**', 'src/iosMain/resources/**']"
+        podfile = project.file("../iosApp/Podfile")
+
+        pod("GoogleSignIn")
+        pod("FirebaseCore")
+        pod("FirebaseAuth")
+        pod("FirebaseAnalytics")
     }
 
     sourceSets {
@@ -73,6 +79,8 @@ kotlin {
                 api("androidx.activity:activity-compose:1.7.2")
                 api("androidx.appcompat:appcompat:1.6.1")
                 api("androidx.core:core-ktx:1.10.1")
+                implementation(platform("com.google.firebase:firebase-bom:32.3.1"))
+                implementation("com.google.firebase:firebase-analytics-ktx")
             }
         }
         val iosX64Main by getting
@@ -109,6 +117,7 @@ android {
 }
 
 dependencies {
+    implementation("com.google.firebase:firebase-common-ktx:20.4.0")
     add("kspCommonMainMetadata", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
     add("kspAndroid", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
     add("kspIosX64", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")

diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml
diff --git a/shared/src/androidMain/kotlin/main.android.kt b/shared/src/androidMain/kotlin/main.android.kt
@@ -1,10 +1,7 @@
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import com.arkivanov.decompose.DefaultComponentContext
 import com.arkivanov.decompose.defaultComponentContext
-import com.arkivanov.essenty.backhandler.BackDispatcher
-import com.arkivanov.essenty.lifecycle.LifecycleRegistry
 import org.mixdrinks.app.MixDrinksApp
 import org.mixdrinks.di.GraphHolder
 import org.mixdrinks.ui.auth.AuthCallbacks

diff --git a/shared/src/androidMain/kotlin/trackEvent.kt b/shared/src/androidMain/kotlin/trackEvent.kt
@@ -0,0 +1,4 @@
+var trackAnalyticsCallback: (action: String, data: Map<String, String>) -> Unit = { _, _ -> }
+actual fun trackEvent(action: String, data: Map<String, String>) {
+    trackAnalyticsCallback(action, data)
+}
diff --git a/shared/src/commonMain/kotlin/org/mixdrinks/data/Tracking.kt b/shared/src/commonMain/kotlin/org/mixdrinks/data/Tracking.kt
@@ -0,0 +1,17 @@
+package org.mixdrinks.data
+
+import trackEvent
+
+object Tracking {
+
+    fun track(
+        action: String,
+        screen: String,
+        data: Map<String, String> = emptyMap(),
+    ) {
+        val mapToSend = data.toMutableMap()
+        mapToSend["screen"] = screen
+
+        trackEvent(action, mapToSend)
+    }
+}
diff --git a/shared/src/commonMain/kotlin/org/mixdrinks/ui/items/ItemDetailsView.kt b/shared/src/commonMain/kotlin/org/mixdrinks/ui/items/ItemDetailsView.kt
@@ -62,9 +62,10 @@ internal fun ItemViewContent(
             )
         }
         cocktailListInserter(
-            cocktails,
-            predefineComponent::navigateToDetails,
-            predefineComponent::navigateToTagCocktails
+            cocktails = cocktails,
+            onClick = predefineComponent::navigateToDetails,
+            onTagClick = predefineComponent::navigateToTagCocktails,
+            trackingScreen = "page_item_details"
         )
     }
 }