Skip to content

feat(contactlist): add "Add More Contacts" row when in picker mode #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Jun 16, 2026
Merged

feat(contactlist): add "Add More Contacts" row when in picker mode #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/flipcash/core/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,9 @@
<string name="action_invite">Invite</string>
<string name="action_remove">Remove</string>
<string name="action_inviteMoreOptions">More</string>
<string name="title_addMoreContacts">Add More Contacts</string>
<string name="action_add">Add</string>
<string name="action_settings">Settings</string>

<string name="title_noContacts">No Contacts Yet</string>
<string name="subtitle_noContacts">Tap the + button to add contacts</string>
Expand Down
131 changes: 114 additions & 17 deletions ...ct-send/src/main/kotlin/com/flipcash/app/directsend/internal/screens/ContactListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -40,7 +41,10 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewWrapper
import androidx.compose.foundation.border
import androidx.compose.material.icons.filled.Add
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flipcash.app.contacts.device.DeviceContact
import com.flipcash.app.contacts.ui.ContactAvatar
Expand All @@ -58,6 +62,7 @@ import com.getcode.navigation.flow.flowSharedViewModel
import com.getcode.navigation.flow.rememberFlowNavigator
import com.getcode.theme.CodeTheme
import com.getcode.theme.White10
import com.getcode.theme.extraSmall
import com.getcode.ui.components.AppBarDefaults
import com.getcode.ui.components.AppBarWithTitle
import com.getcode.ui.components.CircularIconButton
Expand Down Expand Up @@ -131,18 +136,6 @@ internal fun ContactListScreen() {
state = state.searchState,
contentPadding = PaddingValues(start = CodeTheme.dimens.grid.x1),
)

if (state.isPickerMode) {
CircularIconButton(
onClick = { accessHandle.launch() }) { size ->
Icon(
imageVector = Icons.Default.GroupAdd,
contentDescription = "",
tint = Color.White,
modifier = Modifier.requiredSize(size),
)
}
}
}
}
},
Expand All @@ -161,6 +154,7 @@ internal fun ContactListScreen() {
ContactList(
items = state.listItems,
isPickerMode = state.isPickerMode,
onAddMoreContacts = { accessHandle.launch() },
onItemClick = { contact ->
viewModel.dispatchEvent(SendFlowViewModel.Event.OnContactClicked(contact))
},
Expand Down Expand Up @@ -199,6 +193,7 @@ private fun ContactList(
items: List<ContactListItem>,
modifier: Modifier = Modifier,
isPickerMode: Boolean = false,
onAddMoreContacts: () -> Unit = {},
onItemClick: (ContactListItem.ContactRow) -> Unit = {},
onItemDismissed: (ContactListItem.ContactRow) -> Unit = {},
) {
Expand Down Expand Up @@ -236,7 +231,6 @@ private fun ContactList(
ContactRowItem(
contact = item.contact,
isOnFlipcash = item.isOnFlipcash,
isNonContactDm = item.contact.isUnknown,
lastMessagePreview = item.lastMessagePreview,
unreadCount = item.unreadCount,
showDivider = !isLastInSection,
Expand All @@ -246,6 +240,109 @@ private fun ContactList(
}
}
}

if (isPickerMode) {
item {
PickerModeHeader(
onAddMoreContacts = onAddMoreContacts,
)
}
}
}
}

@Composable
private fun PickerModeHeader(
onAddMoreContacts: () -> Unit,
modifier: Modifier = Modifier,
) {
val avatarSize = CodeTheme.dimens.staticGrid.x8
val overlap = CodeTheme.dimens.staticGrid.x4

Column(modifier = modifier.fillMaxWidth()) {
HorizontalDivider(
color = CodeTheme.colors.divider,
modifier = Modifier
.fillMaxWidth()
.height(1.dp)
.padding(
start = CodeTheme.dimens.inset + CodeTheme.dimens.staticGrid.x8 + CodeTheme.dimens.grid.x3,
end = CodeTheme.dimens.inset,
),
)

Row(
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onAddMoreContacts)
.padding(
horizontal = CodeTheme.dimens.inset,
vertical = CodeTheme.dimens.grid.x3,
),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),
) {
Row(horizontalArrangement = Arrangement.spacedBy(-overlap)) {
Box(
modifier = Modifier
.zIndex(4f)
.requiredSize(avatarSize)
.border(
width = CodeTheme.dimens.border,
color = CodeTheme.colors.background,
shape = CircleShape,
)
.background(
brush = Brush.linearGradient(CodeTheme.colors.contactAvatar.colors),
shape = CircleShape
),
contentAlignment = Alignment.Center,
) {
Icon(
imageVector = Icons.Default.Add,
contentDescription = null,
tint = CodeTheme.colors.textMain,
modifier = Modifier.size(CodeTheme.dimens.staticGrid.x4),
)
}
repeat(2) { i ->
ContactAvatar(
contact = null,
modifier = Modifier
.zIndex((3 - i).toFloat())
.requiredSize(avatarSize)
.border(
width = CodeTheme.dimens.border,
color = CodeTheme.colors.background,
shape = CircleShape,
)
.clip(CircleShape),
)
}
}

Text(
modifier = Modifier.weight(1f),
text = stringResource(R.string.title_addMoreContacts),
style = CodeTheme.typography.textSmall,
color = CodeTheme.colors.textSecondary,
)

Text(
modifier = Modifier
.background(
color = Color.White,
shape = CodeTheme.shapes.extraSmall,
)
.padding(
horizontal = CodeTheme.dimens.grid.x2,
vertical = CodeTheme.dimens.grid.x1,
),
text = stringResource(R.string.action_add),
style = CodeTheme.typography.textMedium,
color = Color.Black,
)
}
}
}

Expand All @@ -254,7 +351,7 @@ private fun ContactGroupHeader(text: String, modifier: Modifier = Modifier) {
Box(
modifier = modifier
.fillMaxWidth()
.height(60.dp),
.height(CodeTheme.dimens.grid.x12),
contentAlignment = Alignment.BottomStart,
) {
Column {
Expand Down Expand Up @@ -282,7 +379,6 @@ private fun ContactRowItem(
contact: DeviceContact,
isOnFlipcash: Boolean,
modifier: Modifier = Modifier,
isNonContactDm: Boolean = false,
lastMessagePreview: String? = null,
unreadCount: Int = 0,
showDivider: Boolean = true,
Expand Down Expand Up @@ -311,7 +407,8 @@ private fun ContactRowItem(
start = CodeTheme.dimens.grid.x1,
end = CodeTheme.dimens.grid.x1,
),
count = unreadCount)
count = unreadCount
)
} else {
Box(modifier = Modifier.requiredWidth(CodeTheme.dimens.inset))
}
Expand Down Expand Up @@ -358,7 +455,7 @@ private fun ContactRowItem(
}

if (isOnFlipcash) {
Icon(
Icon(
painter = painterResource(id = R.drawable.ic_chevron_right),
contentDescription = null,
tint = CodeTheme.colors.textSecondary,
Expand Down
2 changes: 1 addition & 1 deletion apps/flipcash/shared/contacts/src/main/kotlin/com/flipcash/app/contacts/ui/ContactAvatar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private fun BoxWithConstraintsScope.InitialsText(displayName: String) {
Text(
modifier = Modifier.align(Alignment.Center),
text = initials,
fontSize = fontSize,
style = CodeTheme.typography.textSmall.copy(fontSize = fontSize),
color = CodeTheme.colors.textSecondary,
textAlign = TextAlign.Center,
)
Expand Down
Loading