Analytics logged for screens loaded

projectNEWM · Aug 25, 2024 · 9059f7d · 9059f7d
1 parent fb48ec3
commit 9059f7d
Show file tree

Hide file tree

Showing 18 changed files with 182 additions and 59 deletions.
diff --git a/android/app-newm/src/main/java/io/newm/HomeActivity.kt b/android/app-newm/src/main/java/io/newm/HomeActivity.kt
@@ -80,21 +80,24 @@ class HomeActivity : ComponentActivity() {
                 is Screen.UserAccount -> ui<ProfileUiState> { state, modifier ->
                     ProfileUi(
                         state = state,
-                        modifier = modifier
+                        modifier = modifier,
+                        eventLogger = eventLogger
                     )
                 }
 
                 is NFTLibrary -> ui<NFTLibraryState> { state, modifier ->
                     NFTLibraryScreenUi(
                         state = state,
-                        modifier = modifier
+                        modifier = modifier,
+                        eventLogger = eventLogger
                     )
                 }
 
                 is Screen.EditProfile -> ui<ProfileEditUiState> { state, modifier ->
                     ProfileEditUi(
                         state = state,
-                        modifier = modifier
+                        modifier = modifier,
+                        eventLogger = eventLogger
                     )
                 }
 

diff --git a/android/app-newm/src/main/java/io/newm/LoginActivity.kt b/android/app-newm/src/main/java/io/newm/LoginActivity.kt
@@ -83,15 +83,15 @@ class LoginActivity : ComponentActivity() {
                 }
 
                 is LoginLandingScreen -> ui<WelcomeScreenUiState> { state, modifier ->
-                    WelcomeScreenUi(modifier, state)
+                    WelcomeScreenUi(modifier, state, eventLogger)
                 }
 
                 is LoginScreen -> ui<LoginScreenUiState> { state, modifier ->
                     LoginScreenUi().Content(state, modifier)
                 }
 
                 is ResetPasswordScreen -> ui<ResetPasswordScreenUiState> { state, modifier ->
-                    ResetPasswordScreenUi().Content(state = state, modifier = modifier)
+                    ResetPasswordScreenUi(eventLogger).Content(state = state, modifier = modifier)
                 }
 
                 else -> null

diff --git a/android/app-newm/src/main/java/io/newm/NewmAppComposable.kt b/android/app-newm/src/main/java/io/newm/NewmAppComposable.kt
@@ -129,10 +129,6 @@ internal fun NewmApp(
         modifier = Modifier,
         sheetState = sheetState,
         sheetContent = {
-            LaunchedEffect(Unit) {
-                eventLogger.logPageLoad("Music Player")
-            }
-
             MusicPlayerScreen(
                 eventLogger = eventLogger,
                 onNavigateUp = {
@@ -155,7 +151,6 @@ internal fun NewmApp(
                         MiniPlayer(
                             modifier = Modifier.clickable {
                                 coroutineScope.launch {
-                                    eventLogger.logClickEvent("Mini Player")
                                     sheetState.show()
                                 }
                             },
@@ -221,6 +216,7 @@ internal fun NewmBottomNavigation(
                 selectedLabelColor = DarkPink,
                 onClick = {
                     eventLogger.logClickEvent("Account")
+                    eventLogger.logPageLoad("Account")
                     onNavigationSelected(Screen.UserAccount)
                 },
             )

diff --git a/android/app-newm/src/main/java/io/newm/screens/library/NFTLibraryScreenUi.kt b/android/app-newm/src/main/java/io/newm/screens/library/NFTLibraryScreenUi.kt
@@ -32,6 +32,7 @@ import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material.rememberSwipeableState
 import androidx.compose.material.swipeable
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -72,6 +73,7 @@ import io.newm.screens.library.NFTLibraryEvent.PlaySong
 import io.newm.screens.library.screens.EmptyWalletScreen
 import io.newm.screens.library.screens.LinkWalletScreen
 import io.newm.screens.library.screens.ZeroSearchResults
+import io.newm.shared.public.analytics.NewmAppEventLogger
 import io.newm.shared.public.models.NFTTrack
 import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
@@ -82,7 +84,8 @@ internal const val TAG_NFT_LIBRARY_SCREEN = "TAG_NFT_LIBRARY_SCREEN"
 @Composable
 fun NFTLibraryScreenUi(
     modifier: Modifier = Modifier,
-    state: NFTLibraryState
+    state: NFTLibraryState,
+    eventLogger: NewmAppEventLogger
 ) {
     Column(
         modifier = modifier
@@ -91,22 +94,47 @@ fun NFTLibraryScreenUi(
             .testTag(TAG_NFT_LIBRARY_SCREEN),
     ) {
         when (state) {
-            NFTLibraryState.Loading -> LoadingScreen()
+            NFTLibraryState.Loading -> {
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("NFT Library Loading")
+                }
+                LoadingScreen()
+            }
 
-            is NFTLibraryState.LinkWallet -> LinkWalletScreen(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(horizontal = 16.dp),
-            ) { newmWalletConnectionId ->
-                val eventSink = state.onConnectWallet
-                eventSink(newmWalletConnectionId)
+            is NFTLibraryState.LinkWallet -> {
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("NFT Library Link Wallet")
+                }
+                LinkWalletScreen(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(horizontal = 16.dp),
+                ) { newmWalletConnectionId ->
+                    val eventSink = state.onConnectWallet
+                    eventSink(newmWalletConnectionId)
+                }
+            }
+
+            NFTLibraryState.EmptyWallet -> {
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("NFT Library Empty Wallet")
+                }
+                EmptyWalletScreen(eventLogger)
+            }
+
+            is NFTLibraryState.Error -> {
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("NFT Library Error Screen")
+                }
+                ErrorScreen(state.message)
             }
 
-            NFTLibraryState.EmptyWallet -> EmptyWalletScreen()
-            is NFTLibraryState.Error -> ErrorScreen(state.message)
             is NFTLibraryState.Content -> {
                 val eventSink = state.eventSink
 
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("NFT Library Song List")
+                }
                 Text(
                     text = stringResource(id = R.string.title_nft_library),
                     modifier = Modifier.padding(16.dp),
@@ -129,7 +157,8 @@ fun NFTLibraryScreenUi(
                     onDownloadSong = { trackId -> eventSink(OnDownloadTrack(trackId)) },
                     refresh = { eventSink(NFTLibraryEvent.OnRefresh) },
                     refreshing = state.refreshing,
-                    onApplyFilters = { filters -> eventSink(OnApplyFilters(filters)) }
+                    eventLogger = eventLogger,
+                    onApplyFilters = { filters -> eventSink(OnApplyFilters(filters)) },
                 )
             }
         }
@@ -150,7 +179,8 @@ private fun NFTTracks(
     onDownloadSong: (String) -> Unit,
     refresh: () -> Unit,
     refreshing: Boolean,
-    onApplyFilters: (NFTLibraryFilters) -> Unit
+    eventLogger: NewmAppEventLogger,
+    onApplyFilters: (NFTLibraryFilters) -> Unit,
 ) {
     val scope = rememberCoroutineScope()
     val filterSheetState = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden)
@@ -219,7 +249,7 @@ private fun NFTTracks(
             modifier = Modifier.align(Alignment.TopCenter)
         )
 
-        SongFilterBottomSheet(filterSheetState, filters, onApplyFilters)
+        SongFilterBottomSheet(filterSheetState, filters, onApplyFilters, eventLogger)
     }
 }
 
@@ -257,7 +287,7 @@ private fun TrackRowItemWrapper(
         TrackRowItem(
             track = track,
             onClick = onPlaySong,
-            modifier = if(DOWNLOAD_UI_ENABLED) Modifier.offset {
+            modifier = if (DOWNLOAD_UI_ENABLED) Modifier.offset {
                 IntOffset(
                     x = -swipeableState.offset.value.roundToInt(),
                     y = 0
@@ -340,7 +370,8 @@ fun PreviewNftLibrary() {
                 ),
                 refreshing = false,
                 eventSink = {}
-            )
+            ),
+            eventLogger = NewmAppEventLogger()
         )
     }
 }
@@ -350,7 +381,8 @@ fun PreviewNftLibrary() {
 fun PreviewNftLibraryLoading() {
     NewmTheme(darkTheme = true) {
         NFTLibraryScreenUi(
-            state = NFTLibraryState.Loading
+            state = NFTLibraryState.Loading,
+            eventLogger = NewmAppEventLogger()
         )
     }
 }
@@ -360,7 +392,8 @@ fun PreviewNftLibraryLoading() {
 fun PreviewNftLibraryEmptyWallet() {
     NewmTheme(darkTheme = true) {
         NFTLibraryScreenUi(
-            state = NFTLibraryState.EmptyWallet
+            state = NFTLibraryState.EmptyWallet,
+            eventLogger = NewmAppEventLogger()
         )
     }
 }
diff --git a/android/app-newm/src/main/java/io/newm/screens/library/SongFilterBottomSheet.kt b/android/app-newm/src/main/java/io/newm/screens/library/SongFilterBottomSheet.kt
@@ -19,6 +19,7 @@ import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -39,6 +40,7 @@ import io.newm.core.theme.Purple
 import io.newm.core.theme.White
 import io.newm.core.theme.inter
 import io.newm.core.ui.utils.iconGradient
+import io.newm.shared.public.analytics.NewmAppEventLogger
 
 
 private val buttonGradient =
@@ -49,12 +51,18 @@ private val buttonGradient =
 fun SongFilterBottomSheet(
     sheetState: ModalBottomSheetState,
     filters: NFTLibraryFilters,
-    onApplyFilters: (NFTLibraryFilters) -> Unit
+    onApplyFilters: (NFTLibraryFilters) -> Unit,
+    eventLogger: NewmAppEventLogger
 ) {
     LocalIsBottomBarVisible.current.value = sheetState.targetValue != ModalBottomSheetValue.Expanded
     ModalBottomSheetLayout(
         sheetState = sheetState,
         sheetContent = {
+            if (sheetState.targetValue == ModalBottomSheetValue.Expanded) {
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("NFT Library Filter")
+                }
+            }
             Box(
                 modifier = Modifier
                     .background(Black90)

diff --git a/android/app-newm/src/main/java/io/newm/screens/library/screens/EmptyWalletScreen.kt b/android/app-newm/src/main/java/io/newm/screens/library/screens/EmptyWalletScreen.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -22,7 +23,7 @@ import io.newm.shared.public.analytics.NewmAppEventLogger
 private const val RECORD_STORE_URL = "https://recordstore.newm.io/"
 
 @Composable
-fun EmptyWalletScreen() {
+fun EmptyWalletScreen(eventLogger: NewmAppEventLogger) {
     val context = LocalContext.current
 
     Box(
@@ -48,6 +49,7 @@ fun EmptyWalletScreen() {
                 modifier = Modifier.padding(all = 16.dp),
                 text = "Visit the Record Store",
                 onClick = {
+                    eventLogger.logClickEvent("Visit the Record Store")
                     context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(RECORD_STORE_URL)))
                 },
             )

diff --git a/android/app-newm/src/main/java/io/newm/screens/library/screens/LinkWalletScreen.kt b/android/app-newm/src/main/java/io/newm/screens/library/screens/LinkWalletScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -23,14 +24,14 @@ import io.newm.core.ui.permissions.rememberRequestPermissionIntent
 import io.newm.core.ui.wallet.ConnectWalletPanel
 import io.newm.feature.barcode.scanner.BarcodeScannerActivity
 import io.newm.screens.library.TAG_NFT_LIBRARY_SCREEN
+import io.newm.shared.public.analytics.NewmAppEventLogger
 
 @Composable
 fun LinkWalletScreen(
     modifier: Modifier = Modifier,
     onConnectWallet: (String) -> Unit
 ) {
     val context = LocalContext.current
-
     val launcher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.StartActivityForResult()
     ) { result: ActivityResult ->

diff --git a/android/app-newm/src/main/java/io/newm/screens/profile/ProfileBottomSheetLayout.kt b/android/app-newm/src/main/java/io/newm/screens/profile/ProfileBottomSheetLayout.kt
@@ -12,6 +12,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -20,12 +21,14 @@ import io.newm.core.theme.Black90
 import io.newm.core.theme.Gray400
 import io.newm.core.ui.buttons.PrimaryButton
 import io.newm.core.ui.buttons.SecondaryButton
+import io.newm.shared.public.analytics.NewmAppEventLogger
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun ProfileBottomSheetLayout(
     modifier: Modifier = Modifier,
     sheetState: ModalBottomSheetState,
+    eventLogger: NewmAppEventLogger,
     onLogout: () -> Unit,
     onShowTermsAndConditions: () -> Unit,
     onShowPrivacyPolicy: () -> Unit,
@@ -35,6 +38,11 @@ fun ProfileBottomSheetLayout(
         modifier = modifier,
         sheetState = sheetState,
         sheetContent = {
+            if(sheetState.isVisible) {
+                LaunchedEffect(Unit) {
+                    eventLogger.logPageLoad("Account Options")
+                }
+            }
             Column(
                 modifier = Modifier
                     .fillMaxWidth()

diff --git a/android/app-newm/src/main/java/io/newm/screens/profile/edit/ProfileEditUi.kt b/android/app-newm/src/main/java/io/newm/screens/profile/edit/ProfileEditUi.kt
@@ -43,6 +43,7 @@ import io.newm.screens.profile.ProfileForm
 import io.newm.screens.profile.ProfileHeader
 import io.newm.screens.profile.edit.ProfileEditUiState.Content
 import io.newm.screens.profile.edit.ProfileEditUiState.Loading
+import io.newm.shared.public.analytics.NewmAppEventLogger
 import io.newm.shared.public.models.User
 import io.newm.shared.public.models.canEditName
 import io.newm.shared.public.models.mocks.mockUsers
@@ -54,13 +55,15 @@ internal const val TAG_PROFILE_SCREEN = "TAG_PROFILE_SCREEN"
 fun ProfileEditUi(
     modifier: Modifier,
     state: ProfileEditUiState,
+    eventLogger: NewmAppEventLogger
 ) {
     when (state) {
         Loading -> LoadingScreen()
         is Content -> {
             ProfileEditUiContent(
                 modifier = modifier,
                 state = state,
+                eventLogger = eventLogger
             )
         }
     }
@@ -71,6 +74,7 @@ fun ProfileEditUi(
 private fun ProfileEditUiContent(
     modifier: Modifier = Modifier,
     state: Content,
+    eventLogger: NewmAppEventLogger
 ) {
     val onEvent = state.eventSink
     val profile = state.profile
@@ -81,6 +85,7 @@ private fun ProfileEditUiContent(
     ProfileBottomSheetLayout(
         modifier = modifier,
         sheetState = sheetState,
+        eventLogger = eventLogger,
         onLogout = { onEvent(OnLogout) },
         onShowTermsAndConditions = { onEvent(OnShowTermsAndConditions) },
         onShowPrivacyPolicy = { onEvent(OnShowPrivacyPolicy) }
@@ -170,7 +175,8 @@ private fun ProfileScreenPreview() {
                 confirmPasswordState = TextFieldState(),
                 errorMessage = null,
                 eventSink = {},
-            )
+            ),
+            eventLogger = NewmAppEventLogger()
         )
     }
 }