chore: add connect account flow for identity reveal

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt

@@ -30,7 +30,9 @@ import com.getcode.view.main.getKin.BuyKinScreen
 import com.getcode.view.main.getKin.GetKinSheet
 import com.getcode.view.main.getKin.GetKinSheetViewModel
 import com.getcode.view.main.tip.EnterTipScreen
-import com.getcode.view.main.tip.RequestTipScreen
+import com.getcode.view.main.tip.IdentityConnectionReason
+import com.getcode.view.main.tip.ConnectAccountScreen
+import com.getcode.view.main.tip.TipConnectViewModel
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -393,23 +395,32 @@ data class EnterTipModal(val isInChat: Boolean = false) : MainGraph, ModalRoot {
 }
 
 @Parcelize
-data object RequestTip : MainGraph, ModalContent {
+data class ConnectAccount(
+    private val reason: IdentityConnectionReason = IdentityConnectionReason.TipCard,
+) : MainGraph, ModalContent {
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
 
     @Composable
     override fun Content() {
         val navigator = LocalCodeNavigator.current
+        val viewModel = getViewModel<TipConnectViewModel>()
         ModalContainer(
             backButtonEnabled = {
                 if (navigator.isVisible) {
-                    it is RequestTip
+                    it is ConnectAccount
                 } else {
                     navigator.progress > 0f
                 }
             }
         ) {
-            RequestTipScreen(getViewModel())
+
+            ConnectAccountScreen(viewModel)
+        }
+
+
+        LaunchedEffect(viewModel, reason) {
+            viewModel.dispatchEvent(TipConnectViewModel.Event.OnReasonChanged(reason))
         }
     }
 }

app/src/main/java/com/getcode/view/main/chat/conversation/ChatConversationScreen.kt

@@ -4,7 +4,6 @@ package com.getcode.view.main.chat.conversation
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -24,20 +23,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.withStyle
 import androidx.paging.compose.LazyPagingItems
-import com.getcode.manager.BottomBarManager
+import com.getcode.navigation.core.LocalCodeNavigator
+import com.getcode.navigation.screens.ConnectAccount
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.CodeScaffold
 import com.getcode.ui.components.chat.utils.ChatItem
 import com.getcode.ui.components.chat.ChatInput
 import com.getcode.ui.components.chat.MessageList
 import com.getcode.ui.components.chat.MessageListEvent
 import com.getcode.ui.components.chat.utils.HandleMessageChanges
+import com.getcode.view.main.tip.IdentityConnectionReason
 import kotlinx.coroutines.delay
 
 @Composable
@@ -46,13 +43,14 @@ fun ChatConversationScreen(
     messages: LazyPagingItems<ChatItem>,
     dispatchEvent: (ConversationViewModel.Event) -> Unit,
 ) {
+    val navigator = LocalCodeNavigator.current
     CodeScaffold(
         topBar = {
             IdentityRevealHeader(state = state) {
                 if (state.identityAvailable) {
                     dispatchEvent(ConversationViewModel.Event.RevealIdentity)
                 } else {
-                    // TODO: connect UI flow
+                    navigator.push(ConnectAccount(IdentityConnectionReason.IdentityReveal))
                 }
             }
         },

app/src/main/java/com/getcode/view/main/chat/conversation/ConversationViewModel.kt

@@ -12,6 +12,7 @@ import androidx.paging.map
 import com.getcode.BuildConfig
 import com.getcode.R
 import com.getcode.manager.BottomBarManager
+import com.getcode.manager.TopBarManager
 import com.getcode.model.ConversationWithLastPointers
 import com.getcode.model.Feature
 import com.getcode.model.ID
@@ -34,6 +35,7 @@ import com.getcode.utils.timestamp
 import com.getcode.view.BaseViewModel2
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter

app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt

@@ -43,7 +43,7 @@ import com.getcode.navigation.screens.BuyMoreKinModal
 import com.getcode.navigation.screens.BuySellScreen
 import com.getcode.navigation.screens.HomeResult
 import com.getcode.navigation.screens.RequestKinModal
-import com.getcode.navigation.screens.RequestTip
+import com.getcode.navigation.screens.ConnectAccount
 import com.getcode.theme.BrandLight
 import com.getcode.theme.BrandMuted
 import com.getcode.theme.CodeTheme
@@ -114,7 +114,7 @@ fun GetKinSheet(
                 if (dataState.isTipCardConnected) {
                     navigator.hideWithResult(HomeResult.ShowTipCard)
                 } else {
-                    navigator.push(RequestTip)
+                    navigator.push(ConnectAccount())
                 }
             },
         ),

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

@@ -161,6 +161,10 @@ private fun HomeScan(
         mutableStateOf(dataState.autoStartCamera == true)
     }
 
+    LaunchedEffect(previewing) {
+        homeViewModel.onCameraScanning(previewing)
+    }
+
     val focusManager = LocalFocusManager.current
 
     var deepLinkSaved by remember(deepLink) {

app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt

@@ -238,6 +238,7 @@ class HomeViewModel @Inject constructor(
             .flatMapLatest { tipController.connectedAccount }
             .filterNotNull()
             .distinctUntilChanged()
+            .filter { uiFlow.value.isCameraScanEnabled }
             .onEach {
                 when (it) {
                     is TwitterUser -> {
@@ -375,6 +376,10 @@ class HomeViewModel @Inject constructor(
         }
     }
 
+    fun onCameraScanning(scanning: Boolean) {
+        uiFlow.update { it.copy(isCameraScanEnabled = scanning) }
+    }
+
     fun onCameraPermissionChanged(isGranted: Boolean) {
         uiFlow.update { it.copy(isCameraPermissionGranted = isGranted) }
     }

…etcode/view/main/tip/RequestTipScreen.kt …de/view/main/tip/ConnectAccountScreen.ktapp/src/main/java/com/getcode/view/main/tip/RequestTipScreen.kt renamed to app/src/main/java/com/getcode/view/main/tip/ConnectAccountScreen.kt app/src/main/java/com/getcode/view/main/tip/RequestTipScreen.kt renamed to app/src/main/java/com/getcode/view/main/tip/ConnectAccountScreen.kt

@@ -45,8 +45,13 @@ import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
+enum class IdentityConnectionReason {
+    TipCard,
+    IdentityReveal,
+}
+
 @Composable
-fun RequestTipScreen(
+fun ConnectAccountScreen(
     viewModel: TipConnectViewModel = hiltViewModel()
 ) {
     val state by viewModel.stateFlow.collectAsState()
@@ -59,7 +64,10 @@ fun RequestTipScreen(
             .onEach {
                 composeTweet(context, it.intent)
                 delay(1_000)
-                navigator.hide()
+                when (state.reason) {
+                    IdentityConnectionReason.IdentityReveal -> navigator.pop()
+                    else -> navigator.hide()
+                }
             }
             .launchIn(this)
     }
@@ -78,11 +86,19 @@ fun RequestTipScreen(
 @Composable
 private fun ColumnScope.RequestContent(state: TipConnectViewModel.State, onClick: () -> Unit) {
     Text(
-        text = stringResource(id = R.string.title_requestTip),
+        text = when(state.reason) {
+            IdentityConnectionReason.TipCard -> stringResource(id = R.string.title_requestTip)
+            IdentityConnectionReason.IdentityReveal -> stringResource(id = R.string.title_connectAccount)
+            null -> ""
+        },
         style = CodeTheme.typography.displayMedium.bolded()
     )
     Text(
-        text = stringResource(id = R.string.subtitle_tipCardForX),
+        text = when(state.reason) {
+            IdentityConnectionReason.TipCard -> stringResource(id = R.string.subtitle_tipCardForX)
+            IdentityConnectionReason.IdentityReveal -> stringResource(id = R.string.subtitle_connectXAccount)
+            null -> ""
+        },
         style = CodeTheme.typography.textSmall
     )
     Spacer(modifier = Modifier.weight(0.3f))
@@ -142,6 +158,8 @@ private fun composeTweet(context: Context, intent: Intent) {
 @Composable
 private fun Preview_TweetPreview() {
     CodeTheme {
-        TweetPreview(xMessage = "I’m connecting my X account with @getcode so I can receive tips from people all over the world. My accountForX=fh5g376")
+        TweetPreview(xMessage = "I’m connecting my X account with @getcode\n" +
+                "\n" +
+                "CodeAccount:349pQtzGmiBxU9vADVf6AUdMLLXyCCU3Zu4smrQPXved:zGmiBxU9vADVf6AUdMLLXyCCU3Zu4smrQP")
     }
 }

app/src/main/java/com/getcode/view/main/tip/TipConnectViewModel.kt

@@ -1,18 +1,17 @@
 package com.getcode.view.main.tip
 
 import android.content.Intent
-import android.net.Uri
 import androidx.lifecycle.viewModelScope
 import com.getcode.R
 import com.getcode.network.TipController
-import com.getcode.network.repository.urlEncode
 import com.getcode.util.IntentUtils
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.view.BaseViewModel2
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
@@ -21,30 +20,48 @@ class TipConnectViewModel @Inject constructor(
     resources: ResourceHelper,
     tipController: TipController,
 ) : BaseViewModel2<TipConnectViewModel.State, TipConnectViewModel.Event>(
-    initialState = State(""),
+    initialState = State(null, ""),
     updateStateForEvent = updateStateForEvent
 ) {
 
     data class State(
+        val reason: IdentityConnectionReason?,
         val xMessage: String,
     )
 
     sealed interface Event {
-        data class UpdateMessage(val message: String): Event
-        data object PostToX: Event
-        data class OpenX(val intent: Intent): Event
+        data class OnReasonChanged(val reason: IdentityConnectionReason) : Event
+        data class UpdateMessage(val message: String) : Event
+        data object PostToX : Event
+        data class OpenX(val intent: Intent) : Event
     }
 
     init {
-        val verificationMessage = tipController.generateTipVerification()
-        if (verificationMessage != null) {
-            val message = """
-                ${resources.getString(R.string.subtitle_linkingTwitter)}
-                
-                $verificationMessage
-            """.trimIndent()
-            dispatchEvent(Event.UpdateMessage(message))
-        }
+        eventFlow
+            .filterIsInstance<Event.OnReasonChanged>()
+            .map { it.reason }
+            .mapNotNull {
+                val verificationMessage = tipController.generateTipVerification() ?: return@mapNotNull null
+                when (it) {
+                    IdentityConnectionReason.TipCard -> {
+                        """
+                            ${resources.getString(R.string.subtitle_linkingTwitter)}
+                            
+                            $verificationMessage
+                        """.trimIndent()
+                    }
+
+                    IdentityConnectionReason.IdentityReveal -> {
+                        """
+                            ${resources.getString(R.string.subtitle_linkingTwitterToRevealIdentity)}
+                            
+                            $verificationMessage
+                        """.trimIndent()
+                    }
+                }
+            }.onEach {
+                dispatchEvent(Event.UpdateMessage(it))
+            }.launchIn(viewModelScope)
 
         eventFlow
             .filterIsInstance<Event.PostToX>()
@@ -58,6 +75,7 @@ class TipConnectViewModel @Inject constructor(
     companion object {
         val updateStateForEvent: (Event) -> ((State) -> State) = { event ->
             when (event) {
+                is Event.OnReasonChanged -> { state -> state.copy(reason = event.reason) }
                 is Event.UpdateMessage -> { state -> state.copy(xMessage = event.message) }
                 is Event.OpenX -> { state -> state }
                 Event.PostToX -> { state -> state }

app/src/main/res/values/strings.xml

@@ -45,4 +45,8 @@
     <string name="title_accessKeySnapshotDescription">Warning! This image gives access to all the funds you have in Code. Do not share this image with anyone else.\nKeep it secure and safe.</string>
     <string name="prompt_title_revealIdentity">Reveal your identity?</string>
     <string name="prompt_subtitle_revealIdentity">%1$s will be able to see that you are %2$s.</string>
+
+    <string name="subtitle_linkingTwitterToRevealIdentity">I\'m connecting my X account with @getcode</string>
+    <string name="title_connectAccount">Connect Account</string>
+    <string name="subtitle_connectXAccount">Connecting your X account allows you to reveal your identity to the people you tip. To connect your account post to X.</string>
 </resources>