fix: polish contact add flow

ben-kaufman · ben-kaufman · commit 78aeb7c7e6d4 · 2026-04-24T08:36:53.000-05:00
diff --git a/app/src/main/java/to/bitkit/ui/ContentView.kt b/app/src/main/java/to/bitkit/ui/ContentView.kt
@@ -385,6 +385,7 @@ fun ContentView(
         val hasSeenProfileIntro by settingsViewModel.hasSeenProfileIntro.collectAsStateWithLifecycle()
         val hasSeenContactsIntro by settingsViewModel.hasSeenContactsIntro.collectAsStateWithLifecycle()
         val isProfileAuthenticated by settingsViewModel.isPubkyAuthenticated.collectAsStateWithLifecycle()
+        val hasPubkyContacts by settingsViewModel.hasPubkyContacts.collectAsStateWithLifecycle()
         val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
 
         Box(
@@ -526,6 +527,7 @@ fun ContentView(
                 },
                 hasSeenProfileIntro = hasSeenProfileIntro,
                 hasSeenContactsIntro = hasSeenContactsIntro,
+                hasContacts = hasPubkyContacts,
                 isProfileAuthenticated = isProfileAuthenticated,
                 modifier = Modifier.align(Alignment.TopEnd)
             )
@@ -933,7 +935,8 @@ private fun NavGraphBuilder.contacts(
     settingsViewModel: SettingsViewModel,
     appViewModel: AppViewModel,
 ) {
-    composableWithDefaultTransitions<Routes.Contacts> {
+    composableWithDefaultTransitions<Routes.Contacts> { backStackEntry ->
+        val route = backStackEntry.toRoute<Routes.Contacts>()
         val viewModel: ContactsViewModel = hiltViewModel()
         ContactsScreen(
             viewModel = viewModel,
@@ -946,6 +949,7 @@ private fun NavGraphBuilder.contacts(
                     navController.navigateTo(Routes.AddContact(scannedData))
                 }
             },
+            openAddContactSheet = route.showAddContactSheet,
         )
     }
     composableWithDefaultTransitions<Routes.ContactsIntro> {
@@ -954,12 +958,14 @@ private fun NavGraphBuilder.contacts(
         ContactsIntroScreen(
             onContinue = {
                 settingsViewModel.setHasSeenContactsIntro(true)
-                val destination = when {
-                    isAuthenticated -> Routes.Contacts
-                    hasSeenProfileIntro -> Routes.PubkyChoice
-                    else -> Routes.ProfileIntro
+                when {
+                    isAuthenticated -> navController.navigateTo(
+                        Routes.Contacts(showAddContactSheet = true)
+                    ) { popUpTo(Routes.Home) }
+
+                    hasSeenProfileIntro -> navController.navigateTo(Routes.PubkyChoice) { popUpTo(Routes.Home) }
+                    else -> navController.navigateTo(Routes.ProfileIntro) { popUpTo(Routes.Home) }
                 }
-                navController.navigateTo(destination) { popUpTo(Routes.Home) }
             },
             onBackClick = { navController.popBackStack() },
         )
@@ -986,7 +992,7 @@ private fun NavGraphBuilder.contacts(
             viewModel = viewModel,
             onBackClick = { navController.popBackStack() },
             onContactDeleted = {
-                navController.navigateTo(Routes.Contacts) { popUpTo(Routes.Home) }
+                navController.navigateTo(Routes.Contacts()) { popUpTo(Routes.Home) }
             },
         )
     }
@@ -1894,7 +1900,7 @@ sealed interface Routes {
     data object LanguageSettings : Routes
 
     @Serializable
-    data object Contacts : Routes
+    data class Contacts(val showAddContactSheet: Boolean = false) : Routes
 
     @Serializable
     data object ContactsIntro : Routes
diff --git a/app/src/main/java/to/bitkit/ui/components/CenteredProfileHeader.kt b/app/src/main/java/to/bitkit/ui/components/CenteredProfileHeader.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
@@ -67,6 +68,9 @@ fun CenteredProfileHeader(
 
         Display(
             text = name,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.Center,
             modifier = if (nameTestTag != null) Modifier.testTag(nameTestTag) else Modifier,
         )
 
diff --git a/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt b/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
@@ -73,6 +73,7 @@ fun DrawerMenu(
     modifier: Modifier = Modifier,
     hasSeenProfileIntro: Boolean = false,
     hasSeenContactsIntro: Boolean = false,
+    hasContacts: Boolean = false,
     isProfileAuthenticated: Boolean = false,
 ) {
     val scope = rememberCoroutineScope()
@@ -127,14 +128,14 @@ fun DrawerMenu(
             },
             onClickContacts = {
                 when {
-                    !hasSeenContactsIntro -> {
+                    !hasSeenContactsIntro && !hasContacts -> {
                         onBeforeNavigate(Routes.ContactsIntro)
                         rootNavController.navigateIfNotCurrent(Routes.ContactsIntro)
                     }
 
                     isProfileAuthenticated -> {
-                        onBeforeNavigate(Routes.Contacts)
-                        rootNavController.navigateIfNotCurrent(Routes.Contacts)
+                        onBeforeNavigate(Routes.Contacts())
+                        rootNavController.navigateIfNotCurrent(Routes.Contacts())
                     }
 
                     hasSeenProfileIntro -> {
diff --git a/app/src/main/java/to/bitkit/ui/components/ProfileEditForm.kt b/app/src/main/java/to/bitkit/ui/components/ProfileEditForm.kt
@@ -96,7 +96,7 @@ fun ProfileEditForm(
             colors = AppTextFieldDefaults.transparent,
             modifier = Modifier
                 .fillMaxWidth()
-                .testTag("ProfileEditName"),
+                .testTag("ProfileEditName")
         )
         HorizontalDivider()
         VerticalSpacer(12.dp)
@@ -128,7 +128,7 @@ fun ProfileEditForm(
             maxLines = 4,
             modifier = Modifier
                 .fillMaxWidth()
-                .testTag("ProfileEditBio"),
+                .testTag("ProfileEditBio")
         )
 
         VerticalSpacer(16.dp)
@@ -177,7 +177,7 @@ fun ProfileEditForm(
                         color = Colors.White10,
                         shape = AppShapes.small,
                     )
-                    .testTag("ProfileEditLink_$index"),
+                    .testTag("ProfileEditLink_$index")
             )
             VerticalSpacer(8.dp)
         }
@@ -296,15 +296,15 @@ fun ProfileEditForm(
                 onClick = onCancel,
                 modifier = Modifier
                     .weight(1f)
-                    .testTag("ProfileEditCancel"),
+                    .testTag("ProfileEditCancel")
             )
             PrimaryButton(
                 text = stringResource(R.string.common__save),
                 onClick = onSave,
                 enabled = isSaveEnabled,
                 modifier = Modifier
                     .weight(1f)
-                    .testTag("ProfileEditSave"),
+                    .testTag("ProfileEditSave")
             )
         }
         VerticalSpacer(16.dp)
diff --git a/app/src/main/java/to/bitkit/ui/components/Text.kt b/app/src/main/java/to/bitkit/ui/components/Text.kt
@@ -24,6 +24,8 @@ fun Display(
     fontWeight: FontWeight = FontWeight.Black,
     fontSize: TextUnit = 44.sp,
     color: Color = MaterialTheme.colorScheme.primary,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = if (maxLines == 1) TextOverflow.Ellipsis else TextOverflow.Clip,
     textAlign: TextAlign? = null,
 ) {
     Text(
@@ -33,6 +35,8 @@ fun Display(
             fontSize = fontSize,
             color = color,
         ),
+        maxLines = maxLines,
+        overflow = overflow,
         textAlign = textAlign,
         modifier = modifier,
     )
diff --git a/app/src/main/java/to/bitkit/ui/screens/contacts/AddContactScreen.kt b/app/src/main/java/to/bitkit/ui/screens/contacts/AddContactScreen.kt
@@ -271,7 +271,7 @@ private fun LoadingContent(publicKey: String) {
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
             .fillMaxSize()
-            .padding(horizontal = 32.dp),
+            .padding(horizontal = 32.dp)
     ) {
         VerticalSpacer(24.dp)
 
@@ -287,7 +287,7 @@ private fun LoadingContent(publicKey: String) {
             modifier = Modifier
                 .size(80.dp)
                 .clip(CircleShape)
-                .background(Colors.Gray5),
+                .background(Colors.Gray5)
         ) {
             Display(
                 text = publicKey.take(1).uppercase(),
@@ -306,7 +306,7 @@ private fun LoadingContent(publicKey: String) {
             contentAlignment = Alignment.Center,
             modifier = Modifier
                 .weight(1f)
-                .fillMaxWidth(),
+                .fillMaxWidth()
         ) {
             RotatingEllipses(modifier = Modifier.size(256.dp))
         }
@@ -391,7 +391,7 @@ private fun RotatingEllipses(modifier: Modifier = Modifier) {
                         style = dashedStroke,
                     )
                 }
-            },
+            }
     ) {
         Image(
             painter = painterResource(R.drawable.card),
@@ -411,7 +411,7 @@ private fun ErrorContent(
         verticalArrangement = Arrangement.Center,
         modifier = Modifier
             .fillMaxSize()
-            .padding(horizontal = 32.dp),
+            .padding(horizontal = 32.dp)
     ) {
         BodyM(text = error, color = Colors.White64, textAlign = TextAlign.Center)
         VerticalSpacer(16.dp)
@@ -434,7 +434,7 @@ private fun LoadedContent(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
             .fillMaxSize()
-            .padding(horizontal = 32.dp),
+            .padding(horizontal = 32.dp)
     ) {
         VerticalSpacer(24.dp)
 
diff --git a/app/src/main/java/to/bitkit/ui/screens/contacts/ContactsScreen.kt b/app/src/main/java/to/bitkit/ui/screens/contacts/ContactsScreen.kt
@@ -17,7 +17,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -59,6 +59,7 @@ fun ContactsScreen(
     onClickContact: (String) -> Unit,
     onAddContact: (String) -> Unit = {},
     onScanQr: () -> Unit = {},
+    openAddContactSheet: Boolean = false,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
@@ -72,6 +73,7 @@ fun ContactsScreen(
         onSearchTextChange = { viewModel.onSearchTextChange(it) },
         onAddContact = onAddContact,
         onScanQr = onScanQr,
+        openAddContactSheet = openAddContactSheet,
     )
 }
 
@@ -84,8 +86,9 @@ private fun Content(
     onSearchTextChange: (String) -> Unit,
     onAddContact: (String) -> Unit,
     onScanQr: () -> Unit,
+    openAddContactSheet: Boolean,
 ) {
-    var showAddContactSheet by remember { mutableStateOf(false) }
+    var showAddContactSheet by rememberSaveable { mutableStateOf(openAddContactSheet) }
 
     ScreenColumn {
         AppTopBar(
@@ -329,6 +332,7 @@ private fun Preview() {
             onSearchTextChange = {},
             onAddContact = {},
             onScanQr = {},
+            openAddContactSheet = false,
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/profile/EditProfileScreen.kt b/app/src/main/java/to/bitkit/ui/screens/profile/EditProfileScreen.kt
@@ -224,7 +224,7 @@ private fun AvatarSection(
             .clip(CircleShape)
             .background(Colors.Gray5)
             .testTag("EditProfileAvatar")
-            .clickable(onClick = onClick),
+            .clickable(onClick = onClick)
     ) {
         when {
             newAvatarUri != null -> AsyncImage(
diff --git a/app/src/main/java/to/bitkit/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/to/bitkit/ui/screens/profile/ProfileScreen.kt
@@ -217,7 +217,7 @@ private fun ProfileBody(
                 color = Colors.White64,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .testTag("ProfileViewTagsHeader"),
+                    .testTag("ProfileViewTagsHeader")
             )
             VerticalSpacer(8.dp)
             @OptIn(ExperimentalLayoutApi::class)
diff --git a/app/src/main/java/to/bitkit/viewmodels/SettingsViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/SettingsViewModel.kt
@@ -110,6 +110,8 @@ class SettingsViewModel @Inject constructor(
     }
 
     val isPubkyAuthenticated = pubkyRepo.isAuthenticated
+    val hasPubkyContacts = pubkyRepo.contacts.map { it.isNotEmpty() }
+        .asStateFlow(initialValue = false)
 
     val quickPayIntroSeen = settingsStore.data.map { it.quickPayIntroSeen }
         .asStateFlow(initialValue = false)
diff --git a/app/src/test/java/to/bitkit/ui/screens/profile/EditProfileViewModelTest.kt b/app/src/test/java/to/bitkit/ui/screens/profile/EditProfileViewModelTest.kt
@@ -15,12 +15,17 @@ import to.bitkit.models.PubkyProfile
 import to.bitkit.models.PubkyProfileLink
 import to.bitkit.repositories.PubkyRepo
 import to.bitkit.test.BaseUnitTest
+import to.bitkit.utils.AppError
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class EditProfileViewModelTest : BaseUnitTest() {
+    companion object {
+        private const val TEST_PUBLIC_KEY = "pubkyalice"
+    }
+
     private val context: Context = mock()
     private val pubkyRepo: PubkyRepo = mock()
 
@@ -71,7 +76,7 @@ class EditProfileViewModelTest : BaseUnitTest() {
     @Test
     fun `deleteProfile should show retry dialog when delete still fails`() = test {
         whenever(pubkyRepo.deleteProfileWithSessionRetry()).thenReturn(
-            Result.failure(RuntimeException("expired session")),
+            Result.failure(TestAppError("expired session")),
         )
 
         val sut = createSut()
@@ -87,7 +92,7 @@ class EditProfileViewModelTest : BaseUnitTest() {
     @Test
     fun `disconnectProfile should emit disconnect success`() = test {
         whenever(pubkyRepo.deleteProfileWithSessionRetry()).thenReturn(
-            Result.failure(RuntimeException("expired session")),
+            Result.failure(TestAppError("expired session")),
         )
         whenever(pubkyRepo.signOut()).thenReturn(Result.success(Unit))
 
@@ -109,7 +114,7 @@ class EditProfileViewModelTest : BaseUnitTest() {
     @Test
     fun `dismissDeleteFailureDialog should hide retry dialog`() = test {
         whenever(pubkyRepo.deleteProfileWithSessionRetry()).thenReturn(
-            Result.failure(RuntimeException("expired session")),
+            Result.failure(TestAppError("expired session")),
         )
 
         val sut = createSut()
@@ -142,8 +147,6 @@ class EditProfileViewModelTest : BaseUnitTest() {
         tags = listOf("friend").toImmutableList(),
         status = null,
     )
-
-    companion object {
-        private const val TEST_PUBLIC_KEY = "pubkyalice"
-    }
 }
+
+private class TestAppError(message: String) : AppError(message)

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ fun ProfileEditForm(`
`96`	`96`	`colors = AppTextFieldDefaults.transparent,`
`97`	`97`	`modifier = Modifier`
`98`	`98`	`.fillMaxWidth()`
`99`		`- .testTag("ProfileEditName"),`
	`99`	`+ .testTag("ProfileEditName")`
`100`	`100`	`)`
`101`	`101`	`HorizontalDivider()`
`102`	`102`	`VerticalSpacer(12.dp)`
`@@ -128,7 +128,7 @@ fun ProfileEditForm(`
`128`	`128`	`maxLines = 4,`
`129`	`129`	`modifier = Modifier`
`130`	`130`	`.fillMaxWidth()`
`131`		`- .testTag("ProfileEditBio"),`
	`131`	`+ .testTag("ProfileEditBio")`
`132`	`132`	`)`
`133`	`133`
`134`	`134`	`VerticalSpacer(16.dp)`
`@@ -177,7 +177,7 @@ fun ProfileEditForm(`
`177`	`177`	`color = Colors.White10,`
`178`	`178`	`shape = AppShapes.small,`
`179`	`179`	`)`
`180`		`- .testTag("ProfileEditLink_$index"),`
	`180`	`+ .testTag("ProfileEditLink_$index")`
`181`	`181`	`)`
`182`	`182`	`VerticalSpacer(8.dp)`
`183`	`183`	`}`
`@@ -296,15 +296,15 @@ fun ProfileEditForm(`
`296`	`296`	`onClick = onCancel,`
`297`	`297`	`modifier = Modifier`
`298`	`298`	`.weight(1f)`
`299`		`- .testTag("ProfileEditCancel"),`
	`299`	`+ .testTag("ProfileEditCancel")`
`300`	`300`	`)`
`301`	`301`	`PrimaryButton(`
`302`	`302`	`text = stringResource(R.string.common__save),`
`303`	`303`	`onClick = onSave,`
`304`	`304`	`enabled = isSaveEnabled,`
`305`	`305`	`modifier = Modifier`
`306`	`306`	`.weight(1f)`
`307`		`- .testTag("ProfileEditSave"),`
	`307`	`+ .testTag("ProfileEditSave")`
`308`	`308`	`)`
`309`	`309`	`}`
`310`	`310`	`VerticalSpacer(16.dp)`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ private fun ProfileBody(`
`217`	`217`	`color = Colors.White64,`
`218`	`218`	`modifier = Modifier`
`219`	`219`	`.fillMaxWidth()`
`220`		`- .testTag("ProfileViewTagsHeader"),`
	`220`	`+ .testTag("ProfileViewTagsHeader")`
`221`	`221`	`)`
`222`	`222`	`VerticalSpacer(8.dp)`
`223`	`223`	`@OptIn(ExperimentalLayoutApi::class)`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ class SettingsViewModel @Inject constructor(`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`val isPubkyAuthenticated = pubkyRepo.isAuthenticated`
	`113`	`+ val hasPubkyContacts = pubkyRepo.contacts.map { it.isNotEmpty() }`
	`114`	`+ .asStateFlow(initialValue = false)`
`113`	`115`
`114`	`116`	`val quickPayIntroSeen = settingsStore.data.map { it.quickPayIntroSeen }`
`115`	`117`	`.asStateFlow(initialValue = false)`