chore(analytics): add buttonTapped overload for action; reclassify buttons into own interface

bmc08gt · bmc08gt · commit 8ff9cfd303a1 · 2026-02-19T17:02:41.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/accesskey/LoginAccessKeyViewModel.kt b/apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/accesskey/LoginAccessKeyViewModel.kt
@@ -2,6 +2,7 @@ package com.flipcash.app.login.accesskey
 
 import com.flipcash.app.accesskey.BaseAccessKeyViewModel
 import com.flipcash.app.analytics.Action
+import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.FlipcashAnalyticsService
 import com.flipcash.app.auth.AuthManager
 import com.flipcash.app.core.storage.MediaScanner
@@ -26,7 +27,7 @@ class LoginAccessKeyViewModel @Inject constructor(
     private val analytics: FlipcashAnalyticsService,
 ): BaseAccessKeyViewModel(resources, mnemonicManager, mediaScanner, userManager, qrCodeGenerator) {
 
-    suspend fun saveImage(): Result<Boolean> = trackButton(Action.SaveAccessKey)
+    suspend fun saveImage(): Result<Boolean> = trackButton(Button.SaveAccessKey)
         .fold(
             onSuccess = { saveBitmapToFile() },
             onFailure = { Result.failure(it) }
@@ -40,7 +41,7 @@ class LoginAccessKeyViewModel @Inject constructor(
             it
         }
 
-    suspend fun onWroteDownInstead(): Result<Boolean> = trackButton(Action.WroteAccessKey)
+    suspend fun onWroteDownInstead(): Result<Boolean> = trackButton(Button.WroteAccessKey)
         .map {
             uiFlow.update { it.copy(skipState = LoadingSuccessState(loading = true)) }
         }
@@ -59,8 +60,8 @@ class LoginAccessKeyViewModel @Inject constructor(
             it
         }
 
-    private fun trackButton(action: Action): Result<Unit> {
-        analytics.action(action)
+    private fun trackButton(button: Button): Result<Unit> {
+        analytics.buttonTapped(button)
         return Result.success(Unit)
     }
 }
diff --git a/apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/router/LoginViewModel.kt b/apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/router/LoginViewModel.kt
@@ -2,6 +2,7 @@ package com.flipcash.app.login.router
 
 import androidx.lifecycle.viewModelScope
 import com.flipcash.app.analytics.Action
+import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.FlipcashAnalyticsService
 import com.flipcash.app.auth.AuthManager
 import com.flipcash.features.login.R
@@ -63,7 +64,7 @@ class LoginViewModel @Inject constructor(
 
         eventFlow
             .filterIsInstance<Event.CreateAccount>()
-            .onEach { analytics.action(Action.CreateAccount) }
+            .onEach { analytics.buttonTapped(Button.CreateAccount) }
             .map {
                 authManager.createAccount()
                     .onFailure {
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt
@@ -18,6 +18,7 @@ import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
 import com.flipcash.app.analytics.Action
 import com.flipcash.app.analytics.AnalyticsEvent
+import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.FlipcashAnalyticsService
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.ui.TokenIconWithName
@@ -91,7 +92,7 @@ class TokenInfoScreen(
                     state.token.dataOrNull?.let {
                         if (!state.isCashReserve) {
                             AppBarDefaults.Share {
-                                analytics.action(Action.TokenShare)
+                                analytics.buttonTapped(Button.TokenShare)
                                 viewModel.dispatchEvent(TokenInfoViewModel.Event.Share)
                             }
                         }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenInfoScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenInfoScreen.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flipcash.app.analytics.Action
+import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.FlipcashAnalyticsService
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.AppRoute
@@ -295,7 +296,7 @@ private fun BottomBarButtons(
                                 buttonState = ButtonState.Filled20,
                                 text = stringResource(R.string.action_sell),
                             ) {
-                                analytics.action(Action.TokenSell)
+                                analytics.buttonTapped(Button.TokenSell)
                                 dispatch(
                                     TokenInfoViewModel.Event.OpenScreen(
                                         AppRoute.Token.SwapTransact(
diff --git a/apps/flipcash/shared/analytics/build.gradle.kts b/apps/flipcash/shared/analytics/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     id(Plugins.kotlin_ksp)
     id(Plugins.hilt)
     id(Plugins.kotlin_parcelize)
+    id(Plugins.jetbrains_compose_compiler)
 }
 
 android {
@@ -18,6 +19,7 @@ android {
 
     buildFeatures {
         buildConfig = true
+        compose = true
     }
 }
 
diff --git a/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Actions.kt b/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Actions.kt
@@ -2,48 +2,50 @@ package com.flipcash.app.analytics
 
 import com.getcode.libs.analytics.AppAction
 
-sealed class Action : AppAction {
-    data object CreateAccount : Action() {
+sealed interface Action : AppAction {
+    data object CompletedOnboarding : Action {
+        override val value: String = "Complete Onboarding"
+    }
+}
+
+sealed interface Button: AppAction {
+    data object CreateAccount : Button {
         override val value: String = "Button: Create Account"
     }
 
-    data object SaveAccessKey : Action() {
+    data object SaveAccessKey : Button {
         override val value: String = "Button: Save Access Key"
     }
 
-    data object WroteAccessKey : Action() {
+    data object WroteAccessKey : Button {
         override val value: String = "Button: Wrote Access Key"
     }
 
-    data object AllowCamera : Action() {
+    data object AllowCamera : Button {
         override val value: String = "Button: Allow Camera"
     }
 
-    data object AllowPush : Action() {
+    data object AllowPush : Button {
         override val value: String = "Button: Allow Push"
     }
 
-    data object SkipPush : Action() {
+    data object SkipPush : Button {
         override val value: String = "Button: Skip Push"
     }
 
-    data object CompletedOnboarding : Action() {
-        override val value: String = "Complete Onboarding"
-    }
-
-    data object TokenBuyWithReserves : Action() {
+    data object TokenBuyWithReserves : Button {
         override val value: String = "Button: Buy With Reserves"
     }
 
-    data object TokenBuyWithPhantom : Action() {
+    data object TokenBuyWithPhantom : Button {
         override val value: String = "Button: Buy With Phantom"
     }
 
-    data object TokenSell : Action() {
+    data object TokenSell : Button {
         override val value: String = "Button: Sell"
     }
 
-    data object TokenShare : Action() {
+    data object TokenShare : Button {
         override val value: String = "Button: Share Token Info"
     }
 }
diff --git a/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Analytics.kt b/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Analytics.kt
@@ -77,6 +77,10 @@ interface FlipcashAnalyticsService : AnalyticsService {
         mint: Mint,
         error: Throwable? = null
     )
+
+    fun buttonTapped(button: Button) {
+        action(button)
+    }
 }
 
 class StubFlipcashAnalytics : FlipcashAnalyticsService {
diff --git a/apps/flipcash/shared/permissions/src/main/kotlin/com/flipcash/app/permissions/internal/PermissionScreenContent.kt b/apps/flipcash/shared/permissions/src/main/kotlin/com/flipcash/app/permissions/internal/PermissionScreenContent.kt
@@ -27,6 +27,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import cafe.adriel.voyager.core.registry.ScreenRegistry
 import com.flipcash.app.analytics.Action
+import com.flipcash.app.analytics.Button
+import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.theme.FlipcashPreview
 import com.flipcash.shared.permissions.R
@@ -81,14 +83,14 @@ internal fun PermissionScreenContent(
 
 @Composable
 internal fun CameraPermissionScreenContent(onGranted: () -> Unit, onNotGranted: () -> Unit) {
-    val analytics = LocalAnalytics.current
+    val analytics = rememberAnalytics()
     var isResultHandled by remember { mutableStateOf(false) }
     val onNotificationResult: (Boolean) -> Unit = { isGranted ->
         if (!isResultHandled) {
             isResultHandled = true
 
             if (isGranted) {
-                analytics.action(Action.AllowCamera)
+                analytics.buttonTapped(Button.AllowCamera)
                 onGranted()
             } else {
                 onNotGranted()
@@ -158,13 +160,13 @@ internal fun CameraPermissionScreenContent(onGranted: () -> Unit, onNotGranted:
 
 @Composable
 internal fun NotificationScreenContent(onGranted: () -> Unit) {
-    val analytics = LocalAnalytics.current
+    val analytics = rememberAnalytics()
     val onNotificationResult: (Boolean) -> Unit = { isGranted ->
         if (isGranted) {
-            analytics.action(Action.AllowPush)
+            analytics.action(Button.AllowPush)
             onGranted()
         } else {
-            analytics.action(Action.SkipPush)
+            analytics.action(Button.SkipPush)
         }
     }
     val notificationPermissionCheck = notificationPermissionCheck(onResult = {
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/TokenInfoViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/TokenInfoViewModel.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewModelScope
 import com.flipcash.app.analytics.Action
+import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.FlipcashAnalyticsService
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.data.Loadable
@@ -312,7 +313,7 @@ class TokenInfoViewModel @Inject constructor(
                                             stateFlow.value.reservesBalance.formatted()
                                         ),
                                         onClick = {
-                                            analytics.action(Action.TokenBuyWithReserves)
+                                            analytics.buttonTapped(Button.TokenBuyWithReserves)
                                             dispatchEvent(
                                                 Event.OpenScreen(
                                                     AppRoute.Token.SwapTransact(
@@ -368,7 +369,7 @@ class TokenInfoViewModel @Inject constructor(
                                         OnRampFlowTracker.start(
                                             AppRoute.Token.Info(stateFlow.value.token.dataOrNull!!.address)
                                         )
-                                        analytics.action(Action.TokenBuyWithPhantom)
+                                        analytics.buttonTapped(Button.TokenBuyWithPhantom)
                                         dispatchEvent(Event.ConnectPhantomWallet)
                                     }
                                 )

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ plugins {`
`6`	`6`	`id(Plugins.kotlin_ksp)`
`7`	`7`	`id(Plugins.hilt)`
`8`	`8`	`id(Plugins.kotlin_parcelize)`
	`9`	`+ id(Plugins.jetbrains_compose_compiler)`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`android {`
`@@ -18,6 +19,7 @@ android {`
`18`	`19`
`19`	`20`	`buildFeatures {`
`20`	`21`	`buildConfig = true`
	`22`	`+ compose = true`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`
Original file line number	Diff line number	Diff line change
`@@ -2,48 +2,50 @@ package com.flipcash.app.analytics`
`2`	`2`
`3`	`3`	`import com.getcode.libs.analytics.AppAction`
`4`	`4`
`5`		`-sealed class Action : AppAction {`
`6`		`- data object CreateAccount : Action() {`
	`5`	`+sealed interface Action : AppAction {`
	`6`	`+ data object CompletedOnboarding : Action {`
	`7`	`+ override val value: String = "Complete Onboarding"`
	`8`	`+ }`
	`9`	`+}`
	`10`	`+`
	`11`	`+sealed interface Button: AppAction {`
	`12`	`+ data object CreateAccount : Button {`
`7`	`13`	`override val value: String = "Button: Create Account"`
`8`	`14`	`}`
`9`	`15`
`10`		`- data object SaveAccessKey : Action() {`
	`16`	`+ data object SaveAccessKey : Button {`
`11`	`17`	`override val value: String = "Button: Save Access Key"`
`12`	`18`	`}`
`13`	`19`
`14`		`- data object WroteAccessKey : Action() {`
	`20`	`+ data object WroteAccessKey : Button {`
`15`	`21`	`override val value: String = "Button: Wrote Access Key"`
`16`	`22`	`}`
`17`	`23`
`18`		`- data object AllowCamera : Action() {`
	`24`	`+ data object AllowCamera : Button {`
`19`	`25`	`override val value: String = "Button: Allow Camera"`
`20`	`26`	`}`
`21`	`27`
`22`		`- data object AllowPush : Action() {`
	`28`	`+ data object AllowPush : Button {`
`23`	`29`	`override val value: String = "Button: Allow Push"`
`24`	`30`	`}`
`25`	`31`
`26`		`- data object SkipPush : Action() {`
	`32`	`+ data object SkipPush : Button {`
`27`	`33`	`override val value: String = "Button: Skip Push"`
`28`	`34`	`}`
`29`	`35`
`30`		`- data object CompletedOnboarding : Action() {`
`31`		`- override val value: String = "Complete Onboarding"`
`32`		`- }`
`33`		`-`
`34`		`- data object TokenBuyWithReserves : Action() {`
	`36`	`+ data object TokenBuyWithReserves : Button {`
`35`	`37`	`override val value: String = "Button: Buy With Reserves"`
`36`	`38`	`}`
`37`	`39`
`38`		`- data object TokenBuyWithPhantom : Action() {`
	`40`	`+ data object TokenBuyWithPhantom : Button {`
`39`	`41`	`override val value: String = "Button: Buy With Phantom"`
`40`	`42`	`}`
`41`	`43`
`42`		`- data object TokenSell : Action() {`
	`44`	`+ data object TokenSell : Button {`
`43`	`45`	`override val value: String = "Button: Sell"`
`44`	`46`	`}`
`45`	`47`
`46`		`- data object TokenShare : Action() {`
	`48`	`+ data object TokenShare : Button {`
`47`	`49`	`override val value: String = "Button: Share Token Info"`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,10 @@ interface FlipcashAnalyticsService : AnalyticsService {`
`77`	`77`	`mint: Mint,`
`78`	`78`	`error: Throwable? = null`
`79`	`79`	`)`
	`80`	`+`
	`81`	`+ fun buttonTapped(button: Button) {`
	`82`	`+ action(button)`
	`83`	`+ }`
`80`	`84`	`}`
`81`	`85`
`82`	`86`	`class StubFlipcashAnalytics : FlipcashAnalyticsService {`