Merge remote-tracking branch 'origin/main' into HEAD

* origin/main:
  Setup v1.1.296 (code-payments#12)
  chore: allow screens to track own screen views on composition (code-payments#8)

Author: bmc08gt

api/src/main/java/com/getcode/manager/AnalyticsManager.kt

@@ -14,20 +14,40 @@ import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
+interface AnalyticsService {
+    fun open(screen: AnalyticsManager.Screen)
+    fun login(ownerPublicKey: String, autoCompleteCount: Int, inputChangeCount: Int)
+    fun logout()
+    fun track(event: AnalyticsManager.Name, vararg properties: Pair<AnalyticsManager.Property, String>)
+}
+
+class AnalyticsServiceNull : AnalyticsService {
+    override fun open(screen: AnalyticsManager.Screen) = Unit
+
+    override fun login(ownerPublicKey: String, autoCompleteCount: Int, inputChangeCount: Int) = Unit
+
+    override fun logout() = Unit
+
+    override fun track(
+        event: AnalyticsManager.Name,
+        vararg properties: Pair<AnalyticsManager.Property, String>
+    ) = Unit
+}
+
 @Singleton
-class AnalyticsManager @Inject constructor(private val mixpanelAPI: MixpanelAPI) {
+class AnalyticsManager @Inject constructor(private val mixpanelAPI: MixpanelAPI): AnalyticsService {
     private var grabStartMillis: Long = 0L
     private var cashLinkGrabStartMillis: Long = 0L
 
-    fun open(screen: Screen) {
+    override fun open(screen: Screen) {
         track(Name.Open, Pair(Property.Screen, screen.value))
     }
 
-    fun logout() {
+    override fun logout() {
         track(Name.Logout)
     }
 
-    fun login(ownerPublicKey: String, autoCompleteCount: Int, inputChangeCount: Int) {
+    override fun login(ownerPublicKey: String, autoCompleteCount: Int, inputChangeCount: Int) {
         track(
             Name.Login,
             Pair(Property.OwnerPublicKey, ownerPublicKey),
@@ -151,8 +171,11 @@ class AnalyticsManager @Inject constructor(private val mixpanelAPI: MixpanelAPI)
         Timber.i("Bill scanned. From start: " + (System.currentTimeMillis() - (timeAppInit ?: 0)))
     }
 
-    private fun track(event: Name, vararg properties: Pair<Property, String>) {
-        if (BuildConfig.DEBUG) return //no logging in debug
+    override fun track(event: Name, vararg properties: Pair<Property, String>) {
+        if (BuildConfig.DEBUG) {
+            Timber.d("debug track $event, ${properties.map { "${it.first.name}, ${it.second}" }}")
+            return
+        } //no logging in debug
 
         val jsonObject = JSONObject()
         properties.forEach { property ->

app/build.gradle.kts

@@ -20,7 +20,7 @@ android {
 
     defaultConfig {
         applicationId = "com.getcode"
-        versionCode = 295
+        versionCode = 296
         versionName = "1.1.$versionCode"
 
         minSdk = Android.minSdkVersion

app/src/main/java/com/getcode/Analytics.kt

@@ -0,0 +1,8 @@
+package com.getcode
+
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.staticCompositionLocalOf
+import com.getcode.manager.AnalyticsService
+import com.getcode.manager.AnalyticsServiceNull
+
+val LocalAnalytics: ProvidableCompositionLocal<AnalyticsService> = staticCompositionLocalOf { AnalyticsServiceNull() }

app/src/main/java/com/getcode/analytics/AnalyticsScreenWatcher.kt

@@ -0,0 +1,15 @@
+package com.getcode.analytics
+
+import androidx.compose.runtime.Composable
+import androidx.lifecycle.LifecycleOwner
+import com.getcode.manager.AnalyticsManager
+
+@Composable
+fun AnalyticsScreenWatcher(
+    lifecycleOwner: LifecycleOwner,
+    event: AnalyticsManager.Screen,
+) {
+    AnalyticsWatcher(lifecycleOwner = lifecycleOwner, onEvent = { analytics, context ->
+        analytics.open(event)
+    })
+}

app/src/main/java/com/getcode/analytics/AnalyticsWatcher.kt

@@ -0,0 +1,35 @@
+package com.getcode.analytics
+
+import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import com.getcode.LocalAnalytics
+import com.getcode.manager.AnalyticsService
+import com.getcode.util.RepeatOnLifecycle
+
+@Composable
+fun AnalyticsWatcher(
+    lifecycleOwner: LifecycleOwner,
+    onEvent: (AnalyticsService, Context) -> Unit,
+    onDispose: (AnalyticsService, Context) -> Unit = { _, _ -> },
+) {
+    val context = LocalContext.current
+    val analyticsService = LocalAnalytics.current
+
+    val updatedOnEvent by rememberUpdatedState(newValue = onEvent)
+    val updatedOnDispose by rememberUpdatedState(newValue = onDispose)
+
+    RepeatOnLifecycle(
+        lifecycleOwner = lifecycleOwner,
+        targetState = Lifecycle.State.RESUMED,
+        doOnDispose = {
+            updatedOnDispose(analyticsService, context)
+        },
+    ) {
+        updatedOnEvent(analyticsService, context)
+    }
+}

app/src/main/java/com/getcode/navigation/BottomSheetNavigator.kt

@@ -102,16 +102,19 @@ fun BottomSheetNavigator(
 }
 
 @OptIn(ExperimentalMaterialApi::class)
-public class BottomSheetNavigator @InternalVoyagerApi constructor(
+class BottomSheetNavigator @InternalVoyagerApi constructor(
     private val navigator: Navigator,
     private val sheetState: ModalBottomSheetState,
     private val coroutineScope: CoroutineScope
 ) : Stack<Screen> by navigator {
 
-    public val isVisible: Boolean
+    val isVisible: Boolean
         get() = sheetState.isVisible
 
-    public fun show(screen: Screen) {
+    val progress: Float
+        get() = sheetState.progress
+
+    fun show(screen: Screen) {
         coroutineScope.launch {
             replaceAll(screen)
             sheetState.show()

app/src/main/java/com/getcode/navigation/MainScreens.kt

@@ -3,9 +3,14 @@ package com.getcode.navigation
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
@@ -41,13 +46,23 @@ data object AccountModal: MainGraph, ModalRoot {
     override fun Content() {
         val navigator = LocalCodeNavigator.current
         val viewModel = getViewModel<AccountSheetViewModel>()
+
+        val showClose by remember(navigator.progress, navigator.lastItem) {
+            derivedStateOf {
+                // show if navigating open
+                if (navigator.progress > 0f && !navigator.isVisible) return@derivedStateOf true
+                // otherwise only show if actively on screen
+                navigator.lastItem is ModalRoot
+            }
+        }
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .fillMaxHeight(sheetHeight)
         ) {
             SheetTitle(
-                closeButton = navigator.lastItem is AccountModal,
+                modifier = Modifier.padding(horizontal = 20.dp),
+                closeButton = showClose,
                 onCloseIconClicked = { navigator.hide() })
             AccountHome(viewModel = viewModel)
         }
@@ -69,6 +84,7 @@ data object FaqScreen: MainGraph, NamedScreen {
                 .fillMaxHeight(sheetHeight)
         ) {
             SheetTitle(
+                modifier = Modifier.padding(horizontal = 20.dp),
                 title = name,
                 // hide while transitioning to/from other destinations
                 backButton = navigator.lastItem is FaqScreen,

app/src/main/java/com/getcode/navigation/Navigator.kt

@@ -15,6 +15,7 @@ val LocalCodeNavigator: ProvidableCompositionLocal<CodeNavigator> =
 class NavigatorNull : CodeNavigator {
     override val lastItem: Screen? = null
     override val isVisible: Boolean = false
+    override val progress: Float = 0f
 
     override var screensNavigator: Navigator? = null
 
@@ -43,6 +44,7 @@ class NavigatorNull : CodeNavigator {
 interface CodeNavigator {
     val lastItem: Screen?
     val isVisible: Boolean
+    val progress: Float
     var screensNavigator: Navigator?
     fun show(screen: Screen)
     fun hide()
@@ -68,12 +70,16 @@ class CombinedNavigator(
 ) : CodeNavigator {
     override var screensNavigator: Navigator? = null
 
+
     override val lastItem: Screen?
         get() = if (isVisible) sheetNavigator.lastItemOrNull else screensNavigator?.lastItemOrNull
 
     override val isVisible: Boolean
         get() = sheetNavigator.isVisible
 
+    override val progress: Float
+        get() = sheetNavigator.progress
+
 
     override fun show(screen: Screen) {
         sheetNavigator.show(screen)

app/src/main/java/com/getcode/util/RepeatOnLifecycle.kt

@@ -0,0 +1,30 @@
+package com.getcode.util
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
+
+@Composable
+fun RepeatOnLifecycle(
+    lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
+    targetState: Lifecycle.State,
+    doOnDispose: () -> Unit = {},
+    action: suspend () -> Unit,
+) {
+    DisposableEffect(lifecycleOwner) {
+        val job = lifecycleOwner.lifecycleScope.launch {
+            lifecycleOwner.repeatOnLifecycle(targetState) {
+                action()
+            }
+        }
+        onDispose {
+            job.cancel()
+            doOnDispose()
+        }
+    }
+}

app/src/main/java/com/getcode/view/MainActivity.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.os.Debug
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.core.util.Consumer
@@ -15,6 +16,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import androidx.navigation.findNavController
 import com.getcode.CodeApp
+import com.getcode.LocalAnalytics
 import com.getcode.manager.AnalyticsManager
 import com.getcode.manager.AuthManager
 import com.getcode.manager.SessionManager
@@ -76,8 +78,10 @@ class MainActivity : FragmentActivity() {
         authManager.init(this)
         setFullscreen()
         setContent {
-//            currentNavHostController = appState.navController
-            CodeApp()
+            //            currentNavHostController = appState.navController
+            CompositionLocalProvider(LocalAnalytics provides analyticsManager) {
+                CodeApp()
+            }
         }
     }
 

app/src/main/java/com/getcode/view/main/account/AccountAccessKey.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -22,6 +23,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.getcode.App
 import com.getcode.R
+import com.getcode.analytics.AnalyticsScreenWatcher
+import com.getcode.manager.AnalyticsManager
 import com.getcode.manager.TopBarManager
 import com.getcode.theme.BrandLight
 import com.getcode.util.IntentUtils
@@ -76,6 +79,11 @@ fun AccountAccessKey(navController: NavController) {
         }
     }
 
+    AnalyticsScreenWatcher(
+        lifecycleOwner = LocalLifecycleOwner.current,
+        event = AnalyticsManager.Screen.Backup
+    )
+
     ConstraintLayout(
         modifier = Modifier
             .fillMaxSize()

app/src/main/java/com/getcode/view/main/account/AccountDeposit.kt

@@ -10,11 +10,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.getcode.R
+import com.getcode.analytics.AnalyticsScreenWatcher
+import com.getcode.manager.AnalyticsManager
 import com.getcode.manager.SessionManager
 import com.getcode.solana.organizer.AccountType
 import com.getcode.theme.*
@@ -32,6 +35,11 @@ fun AccountDeposit() {
     val localClipboardManager = LocalClipboardManager.current
     var isCopied by remember { mutableStateOf(false) }
 
+    AnalyticsScreenWatcher(
+        lifecycleOwner = LocalLifecycleOwner.current,
+        event = AnalyticsManager.Screen.Deposit
+    )
+
     Column(
         modifier = Modifier
             .background(Brand)

app/src/main/java/com/getcode/view/main/account/AccountDetails.kt

@@ -22,12 +22,6 @@ fun AccountDetails(
     viewModel: AccountSheetViewModel = hiltViewModel(),
 ) {
     val dataState by viewModel.stateFlow.collectAsState()
-    val context = LocalContext.current
-
-    fun onPage(page: AccountPage) {
-        onPageSelected(page)
-        viewModel.dispatchEvent(AccountSheetViewModel.Event.Navigate(page))
-    }
 
     Box(modifier = Modifier.fillMaxHeight()) {
         Column(
@@ -48,7 +42,7 @@ fun AccountDetails(
                             positiveText = App.getInstance()
                                 .getString(R.string.action_viewAccessKey),
                             negativeText = App.getInstance().getString(R.string.action_cancel),
-                            onPositive = { onPage(AccountPage.ACCESS_KEY) },
+                            onPositive = { onPageSelected(AccountPage.ACCESS_KEY) },
                             onNegative = {}
                         )
                     )
@@ -58,11 +52,11 @@ fun AccountDetails(
                     name = R.string.title_phoneNumber,
                     icon = R.drawable.ic_menu_phone,
                     isPhoneLinked = dataState.isPhoneLinked,
-                ) { onPage(AccountPage.PHONE) },
+                ) { onPageSelected(AccountPage.PHONE) },
                 AccountMainItem(
                     name = R.string.action_deleteAccount,
                     icon = R.drawable.ic_delete
-                 ) { onPage(AccountPage.DELETE_ACCOUNT) },
+                 ) { onPageSelected(AccountPage.DELETE_ACCOUNT) },
             )
 
             for (action in actions) {