Skip to content

feat(feature): Implemented Client Filter functionality #2553

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

Open
techsavvy185 wants to merge 6 commits into
base: development
Choose a base branch
from
Open

feat(feature): Implemented Client Filter functionality #2553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5adcc3e
Implemented Client filter functionality
techsavvy185 Dec 7, 2025
2558169
Implemented Client filter functionality
techsavvy185 Dec 7, 2025
aa8ac5b
Implemented Client filter functionality
techsavvy185 Dec 8, 2025
3b3ea61
Implemented Client filter functionality
techsavvy185 Dec 10, 2025
e196bfb
Merge branch 'development' into client-filter
techsavvy185 Dec 12, 2025
7b41f5b
Merge branch 'development' into client-filter
techsavvy185 Dec 13, 2025
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
108 changes: 77 additions & 31 deletions ...t/src/androidMain/kotlin/com/mifos/feature/client/clientsList/ClientListScreen.android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidclient.feature.client.generated.resources.feature_client_no_more_c
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -41,8 +42,18 @@ internal actual fun LazyColumnForClientListApi(
fetchImage: (Int) -> Unit,
images: Map<Int, ByteArray?>,
modifier: Modifier,
sort: SortTypes?,
onUpdateOffices: (List<String?>) -> Unit,
) {
val clientPagingList = pagingFlow.collectAsLazyPagingItems()

val items = clientPagingList.itemSnapshotList.items
if (items.isNotEmpty()) {
val offices = items.map { it.officeName }
.distinct()
onUpdateOffices(offices)
}

when (clientPagingList.loadState.refresh) {
is LoadState.Error -> {
MifosSweetError(message = stringResource(Res.string.feature_client_failed_to_fetch_clients)) {
Expand All @@ -55,14 +66,29 @@ internal actual fun LazyColumnForClientListApi(
is LoadState.NotLoading -> Unit
}

LazyColumn(
modifier = modifier,
) {
items(
count = clientPagingList.itemCount,
key = { index -> clientPagingList[index]?.id ?: index },
) { index ->
clientPagingList[index]?.let { client ->
if (sort != null) {
val currentItems = clientPagingList.itemSnapshotList.items

val sortedItems = when (sort) {
SortTypes.NAME -> {
currentItems.sortedBy { it.displayName?.lowercase() }
}
SortTypes.ACCOUNT_NUMBER -> {
currentItems.sortedBy { it.accountNo }
}
SortTypes.EXTERNAL_ID -> {
currentItems.sortedBy { it.externalId }
}
else -> currentItems
}

LazyColumn(
modifier = modifier,
) {
items(
items = sortedItems,
key = { client -> client.id },
) { client ->
LaunchedEffect(client.id) {
fetchImage(client.id)
}
Expand All @@ -73,36 +99,56 @@ internal actual fun LazyColumnForClientListApi(
)
}
}

when (clientPagingList.loadState.append) {
is LoadState.Error -> {
item {
MifosSweetError(message = stringResource(Res.string.feature_client_failed_to_more_clients)) {
onRefresh()
} else {
LazyColumn(
modifier = modifier,
) {
items(
count = clientPagingList.itemCount,
key = { index -> clientPagingList[index]?.id ?: index },
) { index ->
clientPagingList[index]?.let { client ->
LaunchedEffect(client.id) {
fetchImage(client.id)
}
ClientItem(
client = client,
byteArray = images[client.id],
onClientClick = onClientSelect,
)
}
}

is LoadState.Loading -> {
item {
MifosPagingAppendProgress()
when (clientPagingList.loadState.append) {
is LoadState.Error -> {
item {
MifosSweetError(message = stringResource(Res.string.feature_client_failed_to_more_clients)) {
onRefresh()
}
}
}
}

is LoadState.NotLoading -> {
if (clientPagingList.loadState.append.endOfPaginationReached &&
clientPagingList.itemCount > 0
) {
is LoadState.Loading -> {
item {
Text(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = DesignToken.padding.extraExtraLarge)
.padding(bottom = DesignToken.padding.extraExtraLarge),
text = stringResource(Res.string.feature_client_no_more_clients_available),
style = MifosTypography.bodyMedium,
textAlign = TextAlign.Center,
)
MifosPagingAppendProgress()
}
}

is LoadState.NotLoading -> {
if (clientPagingList.loadState.append.endOfPaginationReached &&
clientPagingList.itemCount > 0
) {
item {
Text(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = DesignToken.padding.extraExtraLarge)
.padding(bottom = DesignToken.padding.extraExtraLarge),
Comment on lines +143 to +146
Copy link

@coderabbitai coderabbitai bot Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Duplicate padding modifier applied.

The bottom padding is applied twice on the same modifier chain, resulting in double the intended spacing.

                             Text(
                                 modifier = Modifier
                                     .fillMaxWidth()
-                                    .padding(bottom = DesignToken.padding.extraExtraLarge)
                                     .padding(bottom = DesignToken.padding.extraExtraLarge),
                                 text = stringResource(Res.string.feature_client_no_more_clients_available),
🤖 Prompt for AI Agents 
In
feature/client/src/androidMain/kotlin/com/mifos/feature/client/clientsList/ClientListScreen.android.kt
around lines 143 to 146, the Modifier chain applies .padding(bottom =
DesignToken.padding.extraExtraLarge) twice causing double bottom spacing; remove
the duplicate .padding(bottom = DesignToken.padding.extraExtraLarge) so the
modifier only sets the intended single bottom padding (ensure other modifiers
remain in the same order).

text = stringResource(Res.string.feature_client_no_more_clients_available),
style = MifosTypography.bodyMedium,
textAlign = TextAlign.Center,
)
}
}
}
}
Expand Down
Loading