Skip to content

fix(feature:client): resolve early empty state and dialog layout in identifiers #2415

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
merged 3 commits into from
Jun 27, 2025
Merged

fix(feature:client): resolve early empty state and dialog layout in identifiers #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38832b5
fix(feature:client): resolve early empty state and dialog layout in i…
biplab1 Jun 26, 2025
24c6953
Merge branch 'kmp-impl' into MIFOSAC-461-client-identifiers
biplab1 Jun 26, 2025
3555600
Merge branch 'kmp-impl' into MIFOSAC-461-client-identifiers
niyajali Jun 27, 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
1 change: 0 additions & 1 deletion ...c/commonMain/kotlin/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ private fun ClientIdentifiersItem(
onDocumentClicked: (Int) -> Unit,
) {
var showMenu by remember { mutableStateOf(false) }
val lightGreen = MaterialTheme.colorScheme.tertiaryContainer // Or define a custom one

ElevatedCard(
modifier = Modifier.padding(8.dp),
Expand Down
26 changes: 14 additions & 12 deletions ...ommonMain/kotlin/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import com.mifos.core.data.repository.ClientIdentifiersRepository
import com.mifos.core.domain.useCases.DeleteIdentifierUseCase
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.launch

class ClientIdentifiersViewModel(
Expand All @@ -47,18 +46,21 @@ class ClientIdentifiersViewModel(
}

fun loadIdentifiers(clientId: Int) = viewModelScope.launch {
_clientIdentifiersUiState.value =
ClientIdentifiersUiState.Loading
clientIdentifiersRepository.getClientIdentifiers(clientId)
.catch {
_clientIdentifiersUiState.value =
ClientIdentifiersUiState.Error(
Res.string.feature_client_failed_to_load_client_identifiers,
)
}.collect {
_clientIdentifiersUiState.value =
ClientIdentifiersUiState.ClientIdentifiers(it.data ?: emptyList())
clientIdentifiersRepository.getClientIdentifiers(clientId).collect { result ->
when (result) {
is DataState.Error ->
_clientIdentifiersUiState.value =
ClientIdentifiersUiState.Error(Res.string.feature_client_failed_to_load_client_identifiers)

is DataState.Loading ->
_clientIdentifiersUiState.value =
ClientIdentifiersUiState.Loading

is DataState.Success ->
_clientIdentifiersUiState.value =
ClientIdentifiersUiState.ClientIdentifiers(result.data)
}
}
}

fun deleteIdentifier(clientId: Int, identifierId: Int) = viewModelScope.launch {
Expand Down
5 changes: 5 additions & 0 deletions .../kotlin/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidclient.feature.client.generated.resources.feature_client_identifie
import androidclient.feature.client.generated.resources.feature_client_identifier_message_field_required
import androidclient.feature.client.generated.resources.feature_client_identifier_submit
import androidclient.feature.client.generated.resources.feature_client_identifier_unique_id
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -111,6 +112,10 @@ internal fun ClientIdentifiersDialogScreen(
color = MaterialTheme.colorScheme.surface,
) {
Box(
modifier = Modifier
.height(425.dp)
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surface),
contentAlignment = Alignment.Center,
) {
Column(modifier = Modifier.padding(20.dp)) {
Expand Down
3 changes: 2 additions & 1 deletion feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientList/ClientListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.backhandler.BackHandler
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.PagingData
import com.mifos.core.designsystem.component.MifosScaffold
import com.mifos.core.designsystem.component.MifosSweetError
Expand Down Expand Up @@ -85,7 +86,7 @@ internal fun ClientListScreen(
LaunchedEffect(key1 = true) {
viewModel.getClientList()
}
val isRefreshing by viewModel.isRefreshing.collectAsState()
val isRefreshing by viewModel.isRefreshing.collectAsStateWithLifecycle()
val pullToRefreshState = rememberPullToRefreshState()

val snackbarHostState = remember { SnackbarHostState() }
Expand Down