Add analitics (#94)

* fix android release build (proguard) * Add firebase logs and analytics for android side
MixDrinks · Aug 23, 2023 · e7b5e1b · e7b5e1b
1 parent 95e10b4
commit e7b5e1b
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 32 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.ktx.analytics
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
 import com.google.firebase.auth.GoogleAuthProvider
@@ -35,6 +36,10 @@ class MainActivity : AppCompatActivity() {
     private lateinit var register: ActivityResultLauncher<Intent>
     private lateinit var firebaseAuth: FirebaseAuth
 
+    enum class AuthProvider(val trackName: String) {
+        GOOGLE("google"), APPLE("apple")
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val deepLink = intent?.data?.toString()
@@ -60,22 +65,7 @@ class MainActivity : AppCompatActivity() {
         val appleProvider = OAuthProvider.newBuilder("apple.com")
 
         setAppleAuthStart {
-            val pending = firebaseAuth.pendingAuthResult
-            if (pending != null) {
-                pending.addOnSuccessListener { authResult ->
-                    authResult.user.sendNewToken()
-                }.addOnFailureListener { e ->
-                    Firebase.crashlytics.recordException(e)
-                }
-            } else {
-                firebaseAuth.startActivityForSignInWithProvider(this, appleProvider.build())
-                    .addOnSuccessListener { authResult ->
-                        authResult.user.sendNewToken()
-                    }
-                    .addOnFailureListener { e ->
-                        Firebase.crashlytics.recordException(e)
-                    }
-            }
+            signInApple(appleProvider)
         }
 
         setLogout {
@@ -102,6 +92,26 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun signInApple(appleProvider: OAuthProvider.Builder) {
+        authStart(AuthProvider.APPLE)
+        val pending = firebaseAuth.pendingAuthResult
+        if (pending != null) {
+            pending.addOnSuccessListener { authResult ->
+                authResult.user.sendNewToken(AuthProvider.APPLE)
+            }.addOnFailureListener { e ->
+                authFail(AuthProvider.APPLE, e)
+            }
+        } else {
+            firebaseAuth.startActivityForSignInWithProvider(this, appleProvider.build())
+                .addOnSuccessListener { authResult ->
+                    authResult.user.sendNewToken(AuthProvider.APPLE)
+                }
+                .addOnFailureListener { e ->
+                    authFail(AuthProvider.APPLE, e)
+                }
+        }
+    }
+
     private fun signInGoogle() {
         val signInIntent: Intent = googleSignInClient.signInIntent
         register.launch(signInIntent)
@@ -114,24 +124,25 @@ class MainActivity : AppCompatActivity() {
                 update(account)
             }
         } catch (e: ApiException) {
+            authFail(AuthProvider.GOOGLE, e)
             Toast.makeText(this, e.toString(), Toast.LENGTH_SHORT).show()
         }
     }
 
     private fun update(account: GoogleSignInAccount) {
         val credential = GoogleAuthProvider.getCredential(account.idToken, null)
         firebaseAuth.signInWithCredential(credential)
-            .addOnCompleteListener(this) { task ->
-                FirebaseAuth.getInstance().currentUser?.sendNewToken()
+            .addOnCompleteListener(this) { _ ->
+                FirebaseAuth.getInstance().currentUser?.sendNewToken(AuthProvider.GOOGLE)
             }
             .addOnFailureListener { e ->
-                Firebase.crashlytics.recordException(e)
+                authFail(AuthProvider.GOOGLE, e)
             }
     }
 
-    private fun FirebaseUser?.sendNewToken() {
+    private fun FirebaseUser?.sendNewToken(provider: AuthProvider) {
         if (this == null) {
-            Firebase.crashlytics.recordException(Exception("User is null"))
+            authFail(provider, Exception("User is null"))
             return
         }
 
@@ -142,7 +153,22 @@ class MainActivity : AppCompatActivity() {
                 }
             }
             .addOnFailureListener {
-                Firebase.crashlytics.recordException(it)
+                authFail(provider, it)
             }
     }
+
+    private fun authStart(provider: AuthProvider) {
+        Firebase.analytics.logEvent("auth_start", Bundle().apply {
+            putString("provider", provider.trackName)
+        })
+    }
+
+    private fun authFail(provider: AuthProvider, exception: Exception? = null) {
+        Firebase.analytics.logEvent("auth_fail", Bundle().apply {
+            putString("provider", provider.trackName)
+        })
+        if (exception != null) {
+            Firebase.crashlytics.recordException(exception)
+        }
+    }
 }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
         podfile = project.file("../iosApp/Podfile")
         framework {
             baseName = "shared"
-            isStatic = true
+            isStatic = false
         }
         extraSpecAttributes["resources"] =
             "['src/commonMain/resources/**', 'src/iosMain/resources/**']"

diff --git a/shared/src/commonMain/kotlin/org/mixdrinks/app/utils/undomain/LazySuspend.kt b/shared/src/commonMain/kotlin/org/mixdrinks/app/utils/undomain/LazySuspend.kt
@@ -1,8 +1,8 @@
 package org.mixdrinks.app.utils.undomain
 
+import kotlin.concurrent.Volatile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlin.jvm.Volatile
 
 internal class LazySuspend<T>(
     private val block: suspend () -> T,

diff --git a/shared/src/commonMain/kotlin/org/mixdrinks/di/Graph.kt b/shared/src/commonMain/kotlin/org/mixdrinks/di/Graph.kt
@@ -45,7 +45,7 @@ internal class Graph {
 
     val tokenStorage = TokenStorage(settings)
 
-    val httpClient =  HttpClient {
+    private val httpClient = HttpClient {
         install(Logging)
         install(ContentNegotiation) {
             json(json)
@@ -57,16 +57,15 @@ internal class Graph {
         }
     }
 
-    val visitedCocktailsService = Ktorfit.Builder()
+    private val ktorfit = Ktorfit.Builder()
         .httpClient(httpClient)
         .baseUrl(baseUrl)
         .build()
+
+    val visitedCocktailsService = ktorfit
         .create<UserVisitedCocktailsService>()
 
-    val deleteAccountService = Ktorfit.Builder()
-        .httpClient(httpClient)
-        .baseUrl(baseUrl)
-        .build()
+    val deleteAccountService = ktorfit
         .create<DeleteAccountService>()
 
     val snapshotRepository: SnapshotRepository = SnapshotRepository(snapshotService, settings, json)

diff --git a/shared/src/commonMain/kotlin/org/mixdrinks/ui/visited/VisitedCocktailsComponent.kt b/shared/src/commonMain/kotlin/org/mixdrinks/ui/visited/VisitedCocktailsComponent.kt
@@ -10,7 +10,6 @@ import org.mixdrinks.data.SnapshotRepository
 import org.mixdrinks.data.TagsRepository
 import org.mixdrinks.domain.ImageUrlCreators
 import org.mixdrinks.dto.CocktailId
-import org.mixdrinks.ui.auth.AuthBus
 import org.mixdrinks.ui.list.CocktailListMapper
 import org.mixdrinks.ui.list.CocktailsListState
 import org.mixdrinks.ui.widgets.undomain.UiState
@@ -64,7 +63,7 @@ internal class VisitedCocktailsComponent(
     sealed class VisitedCocktailList {
         data class Cocktails(val cocktails: List<CocktailsListState.Cocktails.Cocktail>) : VisitedCocktailList()
 
-        object Empty : VisitedCocktailList()
+        data object Empty : VisitedCocktailList()
     }
 
 }