Skip to content

Commit 022f367

Browse files
committed
collateral data screen added
1 parent 13dbeba commit 022f367

File tree

7 files changed

+41
-38
lines changed

7 files changed

+41
-38
lines changed

cmp-navigation/src/commonMain/kotlin/cmp/navigation/authenticated/AuthenticatedNavbarNavigationScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ internal fun AuthenticatedNavbarNavigationScreenContent(
347347
onCreateCenter = navController::navigateCreateCenterScreenRoute,
348348
onCreateGroup = navController::navigateToCreateNewGroupScreen,
349349
onCenter = navController::navigateCenterDetailsScreenRoute,
350-
onClient =navController::navigateToClientProfileRoute,
350+
onClient = navController::navigateToClientProfileRoute,
351351
onGroup = navController::navigateToGroupDetailsScreen,
352352
onLoan = navController::navigateToLoanAccountSummaryScreen,
353353
onSavings = navController::navigateClientDetailsScreen,

core/network/src/commonMain/kotlin/com/mifos/core/network/model/CollateralItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ data class CollateralItemResult(
2828
val collateralId: Int,
2929
val basePrice: Double,
3030
val pctToBase: Double,
31-
val quantity: Double
31+
val quantity: Double,
3232
)

core/ui/src/commonMain/kotlin/com/mifos/core/ui/components/MifosActionsListingCardComponent.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -539,16 +539,16 @@ fun MifosActionsShareListingComponent(
539539
MifosListingRowItem(
540540
key = stringResource(Res.string.client_share_accounts_pending_for_approval_shares),
541541
value = (
542-
pendingForApprovalShares
543-
?: stringResource(Res.string.listing_component_identifier_not_available)
544-
).toString(),
542+
pendingForApprovalShares
543+
?: stringResource(Res.string.listing_component_identifier_not_available)
544+
).toString(),
545545
)
546546
MifosListingRowItem(
547547
key = stringResource(Res.string.client_share_accounts_approved_shares),
548548
value = (
549-
approvedShares
550-
?: stringResource(Res.string.listing_component_identifier_not_available)
551-
).toString(),
549+
approvedShares
550+
?: stringResource(Res.string.listing_component_identifier_not_available)
551+
).toString(),
552552
)
553553
}
554554
}
@@ -629,7 +629,7 @@ fun MifosActionsChargeListingComponent(
629629
verticalAlignment = Alignment.CenterVertically,
630630
horizontalArrangement = Arrangement.SpaceBetween,
631631

632-
) {
632+
) {
633633
Column(
634634
modifier = Modifier.weight(1f),
635635
verticalArrangement = Arrangement.spacedBy(DesignToken.padding.extraExtraSmall),
@@ -805,7 +805,7 @@ fun MifosActionsSavingsListingComponent(
805805
imageVector = menuItem.icon,
806806
contentDescription = "",
807807

808-
)
808+
)
809809

810810
Text(
811811
modifier = Modifier.fillMaxWidth(),

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientCollateralDetails/ClientCollateralDetailRoute.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
/*
2+
* Copyright 2025 Mifos Initiative
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
7+
*
8+
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
9+
*/
110
package com.mifos.feature.client.clientCollateralDetails
211

3-
import androidx.compose.material3.Text
412
import androidx.navigation.NavController
513
import androidx.navigation.NavGraphBuilder
614
import androidx.navigation.compose.composable

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientCollateralDetails/ClientCollateralDetailScreen.kt

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,40 @@
1+
/*
2+
* Copyright 2025 Mifos Initiative
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
7+
*
8+
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
9+
*/
110
package com.mifos.feature.client.clientCollateralDetails
211

312
import androidclient.feature.client.generated.resources.Res
4-
import androidclient.feature.client.generated.resources.client_collateral_title
5-
import androidclient.feature.client.generated.resources.client_product_shares_account
613
import androidclient.feature.client.generated.resources.client_profile_general_action_title_collateral_data
714
import androidclient.feature.client.generated.resources.client_savings_item
8-
import androidclient.feature.client.generated.resources.filter
9-
import androidclient.feature.client.generated.resources.search
1015
import androidx.compose.foundation.layout.Arrangement
1116
import androidx.compose.foundation.layout.Column
1217
import androidx.compose.foundation.layout.Row
13-
import androidx.compose.foundation.layout.Spacer
1418
import androidx.compose.foundation.layout.fillMaxSize
1519
import androidx.compose.foundation.layout.fillMaxWidth
1620
import androidx.compose.foundation.layout.padding
1721
import androidx.compose.foundation.lazy.LazyColumn
18-
import androidx.compose.material3.Icon
22+
import androidx.compose.foundation.lazy.items
1923
import androidx.compose.material3.Text
2024
import androidx.compose.runtime.Composable
2125
import androidx.compose.runtime.getValue
22-
import androidx.compose.runtime.remember
2326
import androidx.compose.ui.Modifier
2427
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2528
import androidx.navigation.NavController
2629
import com.mifos.core.designsystem.component.MifosScaffold
27-
import com.mifos.core.designsystem.theme.MifosTypography
28-
import com.mifos.core.designsystem.utils.onClick
29-
import com.mifos.core.ui.components.MifosBreadcrumbNavBar
30-
import androidx.compose.foundation.lazy.items
31-
import androidx.compose.material3.MaterialTheme
3230
import com.mifos.core.designsystem.theme.DesignToken
31+
import com.mifos.core.designsystem.theme.MifosTypography
3332
import com.mifos.core.network.model.CollateralItemResult
3433
import com.mifos.core.ui.components.MifosActionsCollateralDataListingComponent
34+
import com.mifos.core.ui.components.MifosBreadcrumbNavBar
3535
import com.mifos.core.ui.components.MifosEmptyCard
3636
import com.mifos.core.ui.components.MifosErrorComponent
3737
import com.mifos.core.ui.components.MifosProgressIndicator
38-
import com.mifos.feature.client.clientCollateral.ClientCollateralAction
39-
import com.mifos.feature.client.shareAccounts.ShareAccountsAction
40-
import org.jetbrains.compose.resources.painterResource
4138
import org.jetbrains.compose.resources.stringResource
4239
import org.koin.compose.viewmodel.koinViewModel
4340

@@ -47,13 +44,11 @@ internal fun ClientCollateralDetailScreen(
4744
modifier: Modifier = Modifier,
4845
viewModel: ClientCollateralDetailViewmodel = koinViewModel(),
4946
) {
50-
5147
val state by viewModel.stateFlow.collectAsStateWithLifecycle()
5248
ClientCollateralDetailScreenContent(
5349
state = state,
5450
navController = navController,
5551
)
56-
5752
}
5853

5954
@Composable
@@ -63,7 +58,6 @@ internal fun ClientCollateralDetailScreenContent(
6358
modifier: Modifier = Modifier,
6459
onAction: (ClientCollateralDetailsAction) -> Unit = {},
6560
) {
66-
6761
MifosScaffold(
6862
title = "",
6963
onBackPressed = { },

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientCollateralDetails/ClientCollateralDetailViewmodel.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Copyright 2025 Mifos Initiative
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
7+
*
8+
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
9+
*/
110
package com.mifos.feature.client.clientCollateralDetails
211

312
import androidx.lifecycle.SavedStateHandle
@@ -6,20 +15,13 @@ import androidx.navigation.toRoute
615
import com.mifos.core.common.utils.DataState
716
import com.mifos.core.data.repository.ClientDetailsRepository
817
import com.mifos.core.data.util.NetworkMonitor
9-
import com.mifos.core.network.model.CollateralItem
1018
import com.mifos.core.network.model.CollateralItemResult
11-
import com.mifos.core.ui.components.ResultStatus
1219
import com.mifos.core.ui.util.BaseViewModel
13-
import com.mifos.feature.client.clientCollateral.ClientCollateralAction
14-
import com.mifos.feature.client.clientCollateral.ClientCollateralEvent
1520
import com.mifos.feature.client.clientCollateral.ClientCollateralRoute
16-
import com.mifos.feature.client.clientCollateral.ClientCollateralState
17-
import com.mifos.feature.client.clientCollateral.ClientCollateralState.DialogState
1821
import kotlinx.coroutines.flow.first
1922
import kotlinx.coroutines.flow.update
2023
import kotlinx.coroutines.launch
2124

22-
2325
internal class ClientCollateralDetailViewmodel(
2426
savedStateHandle: SavedStateHandle,
2527
private val repo: ClientDetailsRepository,
@@ -91,7 +93,6 @@ internal class ClientCollateralDetailViewmodel(
9193
ClientCollateralDetailsAction.OnRetry -> getCollaterals()
9294
}
9395
}
94-
9596
}
9697

9798
data class ClientCollateralDetailsState(

feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ fun NavGraphBuilder.clientNavGraph(
242242
)
243243

244244
clientCollateralDetailDestination(
245-
navController = navController
245+
navController = navController,
246246
)
247247

248248
clientRecurringDepositAccountDestination(

0 commit comments

Comments
 (0)