artin/mifos-mobile
1
0
Fork 0
mirror of https://github.com/openMF/mifos-mobile.git synced 2026-02-06 11:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into development

Browse Source
This commit is contained in:
Sk Niyaj Ali 2026-01-26 12:22:43 +05:30 committed by GitHub
commit 153584f4f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 104 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/SavingStatus.kt
View File

@ -18,6 +18,7 @@ enum class SavingStatus(val status: String) {
INACTIVE("Inactive"),
CLOSED("Closed"),
SUBMIT_AND_PENDING_APPROVAL("Submitted and pending approval"),
APPROVED("Approved"),
;
companion object {

139
feature/loan-application/src/commonMain/kotlin/org/mifos/mobile/feature/loan/application/loanType/SelectLoanTypeSceen.kt
View File

@ -9,21 +9,27 @@
*/
package org.mifos.mobile.feature.loan.application.loanType
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
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.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
import androidx.compose.foundation.lazy.staggeredgrid.items
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import mifos_mobile.feature.loan_application.generated.resources.Res
import mifos_mobile.feature.loan_application.generated.resources.feature_select_loan_type_choose_loan
@ -32,9 +38,10 @@ import mifos_mobile.feature.loan_application.generated.resources.feature_select_
import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel
import org.mifos.mobile.core.designsystem.component.BasicDialogState
import org.mifos.mobile.core.designsystem.component.CardVariant
import org.mifos.mobile.core.designsystem.component.MifosBasicDialog
import org.mifos.mobile.core.designsystem.component.MifosCustomCard
import org.mifos.mobile.core.designsystem.component.MifosElevatedScaffold
import org.mifos.mobile.core.designsystem.component.MifosExploreCard
import org.mifos.mobile.core.designsystem.icon.MifosIcons
import org.mifos.mobile.core.designsystem.theme.DesignToken
import org.mifos.mobile.core.designsystem.theme.MifosTypography
@ -112,7 +119,7 @@ internal fun SelectLoanTypeDialog(
}
/**
* Displays the visual layout including the header and a staggered grid of available loan products.
* Displays the visual layout including the header and a vertical list of available loan products.
* Handles Loading, Error, Empty, and Success UI states.
*
* @param state The current UI state containing the list of loan options.
@ -168,44 +175,49 @@ internal fun SelectLoanTypeScreenContent(
}
ScreenUiState.Success -> {
Box(
modifier = Modifier
.fillMaxSize()
.padding(KptTheme.spacing.md)
.padding(top = KptTheme.spacing.md),
) {
val productOptions = state.productOptions ?: emptyList()
if (productOptions.isNotEmpty()) {
Column(
verticalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
modifier = Modifier
.fillMaxSize()
.padding(top = KptTheme.spacing.md),
) {
val productOptions = state.productOptions ?: emptyList()
if (productOptions.isNotEmpty()) {
Text(
text = stringResource(Res.string.feature_select_loan_type_choose_loan),
style = MifosTypography.labelLargeEmphasized,
)
LazyVerticalStaggeredGrid(
columns = StaggeredGridCells.Fixed(2),
horizontalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
verticalItemSpacing = DesignToken.spacing.medium,
content = {
items(productOptions) { loanType ->
MifosExploreCard(
icon = MifosIcons.Money,
text = loanType.name ?: "",
onClick = {
onAction(
SelectLoanTypeAction.NavigateTo(
loanType.id ?: -1,
loanType.name ?: "",
),
)
},
)
}
},
)
Text(
text = stringResource(Res.string.feature_select_loan_type_choose_loan),
style = MifosTypography.labelLargeEmphasized,
modifier = Modifier.padding(horizontal = KptTheme.spacing.md),
)
LazyColumn(
contentPadding = PaddingValues(KptTheme.spacing.md),
verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md),
) {
items(productOptions, key = { it.id ?: -1 }) { loanType ->
val loanName = loanType.name.orEmpty()
LoanTypeListCard(
icon = MifosIcons.Money,
title = loanName,
onClick = {
loanType.id?.let { id ->
onAction(
SelectLoanTypeAction.NavigateTo(
id,
loanName,
),
)
}
},
)
}
}
}
} else {
MifosErrorComponent(
isRetryEnabled = true,
message = stringResource(Res.string.feature_select_loan_type_empty),
onRetry = { onAction(SelectLoanTypeAction.Retry) },
)
}
}
@ -213,3 +225,50 @@ internal fun SelectLoanTypeScreenContent(
}
}
}
@Composable
internal fun LoanTypeListCard(
icon: ImageVector,
title: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
) {
MifosCustomCard(
modifier = modifier.fillMaxWidth(),
onClick = onClick,
variant = CardVariant.ELEVATED,
shape = KptTheme.shapes.medium,
elevation = CardDefaults.elevatedCardElevation(
defaultElevation = KptTheme.elevation.level1,
),
colors = CardDefaults.elevatedCardColors(
containerColor = KptTheme.colorScheme.surface,
contentColor = KptTheme.colorScheme.onSurface,
),
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(KptTheme.spacing.md),
horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md),
verticalAlignment = Alignment.CenterVertically,
) {
Image(
imageVector = icon,
contentDescription = title,
modifier = Modifier.size(DesignToken.sizes.iconLarge),
colorFilter = ColorFilter.tint(KptTheme.colorScheme.primary),
)
Column(
modifier = Modifier.weight(1f),
verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.xs),
) {
Text(
text = title,
style = MifosTypography.titleMediumEmphasized,
color = KptTheme.colorScheme.onSurface,
)
}
}
}
}

4
feature/savings-account/src/commonMain/kotlin/org/mifos/mobile/feature/savingsaccount/savingsAccountDetails/SavingsAccountDetailsViewModel.kt
View File

@ -345,6 +345,10 @@ val SavingStatus.allowedActions: Set<SavingsActionItems>
SavingsActionItems.Transfer,
SavingsActionItems.Transactions,
)
SavingStatus.APPROVED -> setOf(
SavingsActionItems.QrCode,
SavingsActionItems.Transfer,
)
SavingStatus.SUBMIT_AND_PENDING_APPROVAL -> setOf(
SavingsActionItems.QrCode,
)