feat : New Recurring deposits details screen (#2539)

revanthkumarJ · web-flow · commit 891a0534bde4 · 2025-11-07T12:46:06.000+05:30
diff --git a/cmp-navigation/build.gradle.kts b/cmp-navigation/build.gradle.kts
@@ -46,6 +46,7 @@ kotlin {
             implementation(projects.feature.pathTracking)
             implementation(projects.feature.report)
             implementation(projects.feature.savings)
+            implementation(projects.feature.recurringDeposit)
             implementation(projects.feature.settings)
             implementation(projects.feature.search)
 
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt
@@ -31,6 +31,7 @@ import com.mifos.feature.loan.di.LoanModule
 import com.mifos.feature.note.di.NoteModule
 import com.mifos.feature.offline.di.OfflineModule
 import com.mifos.feature.path.tracking.di.PathTrackingModule
+import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.di.RecurringDepositModule
 import com.mifos.feature.report.di.ReportModule
 import com.mifos.feature.savings.di.SavingsModule
 import com.mifos.feature.search.di.SearchModule
@@ -83,6 +84,7 @@ object KoinModules {
             OfflineModule,
             PathTrackingModule,
             ReportModule,
+            RecurringDepositModule,
             SavingsModule,
             SearchModule,
             SettingsModule,
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerRecurringAccount.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerRecurringAccount.kt
@@ -9,7 +9,6 @@
  */
 package com.mifos.core.network.datamanager
 
-import com.mifos.core.datastore.UserPreferencesRepository
 import com.mifos.core.model.objects.payloads.RecurringDepositAccountPayload
 import com.mifos.core.network.BaseApiManager
 import com.mifos.room.entities.accounts.recurring.RecurringDeposit
@@ -18,7 +17,6 @@ import kotlinx.coroutines.flow.Flow
 
 class DataManagerRecurringAccount(
     val mBaseApiManager: BaseApiManager,
-    private val prefManager: UserPreferencesRepository,
 ) {
 
     fun createRecurringDepositAccount(
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt
@@ -24,6 +24,7 @@ import com.mifos.core.network.datamanager.DataManagerIdentifiers
 import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.core.network.datamanager.DataManagerNote
 import com.mifos.core.network.datamanager.DataManagerOffices
+import com.mifos.core.network.datamanager.DataManagerRecurringAccount
 import com.mifos.core.network.datamanager.DataManagerRunReport
 import com.mifos.core.network.datamanager.DataManagerSavings
 import com.mifos.core.network.datamanager.DataManagerSearch
@@ -52,5 +53,6 @@ val DataManagerModule = module {
     single { DataManagerStaff(get(), get(), get()) }
     single { DataManagerSurveys(get(), get(), get()) }
     single { DataManagerIdentifiers(get()) }
+    single { DataManagerRecurringAccount(get()) }
     single { DataManagerShare(get()) }
 }
diff --git a/core/ui/src/commonMain/kotlin/com/mifos/core/ui/components/MifosProgressIndicator.kt b/core/ui/src/commonMain/kotlin/com/mifos/core/ui/components/MifosProgressIndicator.kt
@@ -119,6 +119,32 @@ fun MifosPagingAppendProgress(modifier: Modifier = Modifier) {
     }
 }
 
+@Composable
+fun MifosProgressIndicatorMini(
+    modifier: Modifier = Modifier,
+) {
+    val composition by rememberLottieComposition {
+        LottieCompositionSpec.JsonString(
+            Res.readBytes(LottieConstants.LOADING_ANIMATION).decodeToString(),
+        )
+    }
+    val progress by animateLottieCompositionAsState(composition)
+
+    Box(
+        modifier = modifier.fillMaxWidth(),
+        contentAlignment = Alignment.Center,
+    ) {
+        Image(
+            painter = rememberLottiePainter(
+                composition = composition,
+                progress = { progress },
+            ),
+            contentDescription = "Lottie animation",
+            modifier = Modifier.height(100.dp),
+        )
+    }
+}
+
 @Preview
 @Composable
 private fun Loading_Preview() {
@@ -127,6 +153,14 @@ private fun Loading_Preview() {
     }
 }
 
+@Preview
+@Composable
+private fun MifosProgressIndicatorMini() {
+    MifosTheme {
+        MifosProgressIndicatorMini()
+    }
+}
+
 @Preview
 @Composable
 private fun Overlay_Loading_Preview() {
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationRoute.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationRoute.kt
@@ -25,7 +25,7 @@ fun NavGraphBuilder.clientApplyNewApplicationRoute(
     onNavigateApplyLoanAccount: (Int) -> Unit,
     onNavigateApplySavingsAccount: (Int) -> Unit,
     onNavigateApplyShareAccount: (Int) -> Unit,
-    onNavigateApplyRecurringAccount: () -> Unit,
+    onNavigateApplyRecurringAccount: (Int) -> Unit,
     onNavigateApplyFixedAccount: () -> Unit,
     navController: NavController,
 ) {
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationsScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationsScreen.kt
@@ -62,7 +62,7 @@ internal fun ClientApplyNewApplicationsScreen(
     onNavigateApplyLoanAccount: (Int) -> Unit,
     onNavigateApplySavingsAccount: (Int) -> Unit,
     onNavigateApplyShareAccount: (Int) -> Unit,
-    onNavigateApplyRecurringAccount: () -> Unit,
+    onNavigateApplyRecurringAccount: (Int) -> Unit,
     onNavigateApplyFixedAccount: () -> Unit,
     navController: NavController,
     viewModel: ClientApplyNewApplicationsViewModel = koinViewModel(),
@@ -79,7 +79,9 @@ internal fun ClientApplyNewApplicationsScreen(
                         state.clientId,
                     )
 
-                    ClientApplyNewApplicationsItem.NewRecurringAccount -> onNavigateApplyRecurringAccount()
+                    ClientApplyNewApplicationsItem.NewRecurringAccount -> onNavigateApplyRecurringAccount(
+                        state.clientId,
+                    )
                     ClientApplyNewApplicationsItem.NewSavingsAccount -> onNavigateApplySavingsAccount(
                         state.clientId,
                     )
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt
@@ -356,7 +356,7 @@ fun NavGraphBuilder.clientNavGraph(
         createShareAccountDestination(
             navController = navController,
         )
-        recurringAccountDestination()
+        recurringAccountDestination(navController)
         fixedAccountDestination()
     }
 }
diff --git a/feature/recurringDeposit/src/commonMain/composeResources/values/string.xml b/feature/recurringDeposit/src/commonMain/composeResources/values/string.xml
@@ -15,4 +15,14 @@
     <string name="step_interest">Interest</string>
     <string name="step_charges">Charges</string>
     <string name="create_recurring_deposit_account">Create Recurring Deposit Account</string>
+    
+    <!-- Details Page Strings -->
+    <string name="select">Select</string>
+    <string name="cancel">Cancel</string>
+    <string name="product_name">Product Name</string>
+    <string name="submitted_on">Submitted On</string>
+    <string name="field_officer">Field Officer</string>
+    <string name="external_id">External Id</string>
+    <string name="back">Back</string>
+    <string name="next">Next</string>
 </resources>
diff --git a/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountRoute.kt b/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountRoute.kt
@@ -15,19 +15,24 @@ import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
 
 @Serializable
-data object RecurringAccountRoute
+data class RecurringAccountRoute(
+    val clientId: Int = -1,
+)
 
-fun NavGraphBuilder.recurringAccountDestination() {
+fun NavGraphBuilder.recurringAccountDestination(
+    navController: NavController,
+) {
     composable<RecurringAccountRoute> {
         RecurringAccountScreen(
             onNavigateBack = {},
             onFinish = {},
+            navController = navController,
         )
     }
 }
 
-fun NavController.navigateToRecurringAccountRoute() {
+fun NavController.navigateToRecurringAccountRoute(clientId: Int) {
     this.navigate(
-        RecurringAccountRoute,
+        RecurringAccountRoute(clientId = clientId),
     )
 }
diff --git a/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountScreen.kt b/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountScreen.kt
@@ -16,14 +16,19 @@ import androidclient.feature.recurringdeposit.generated.resources.step_details
 import androidclient.feature.recurringdeposit.generated.resources.step_interest
 import androidclient.feature.recurringdeposit.generated.resources.step_settings
 import androidclient.feature.recurringdeposit.generated.resources.step_terms
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
 import com.mifos.core.designsystem.component.MifosScaffold
+import com.mifos.core.ui.components.MifosBreadcrumbNavBar
+import com.mifos.core.ui.components.MifosErrorComponent
+import com.mifos.core.ui.components.MifosProgressIndicator
 import com.mifos.core.ui.components.MifosStepper
 import com.mifos.core.ui.components.Step
 import com.mifos.core.ui.util.EventsEffect
@@ -33,13 +38,15 @@ import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.pages.Inter
 import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.pages.SettingPage
 import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.pages.TermsPage
 import org.jetbrains.compose.resources.stringResource
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 internal fun RecurringAccountScreen(
+    navController: NavController,
     onNavigateBack: () -> Unit,
     onFinish: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: RecurringAccountViewModel = viewModel(),
+    viewModel: RecurringAccountViewModel = koinViewModel(),
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
 
@@ -54,19 +61,22 @@ internal fun RecurringAccountScreen(
         modifier = modifier,
         state = state,
         onAction = { viewModel.trySendAction(it) },
+        navController = navController,
     )
 }
 
 @Composable
 private fun RecurringAccountScaffold(
     state: RecurringAccountState,
+    navController: NavController,
     modifier: Modifier = Modifier,
     onAction: (RecurringAccountAction) -> Unit,
 ) {
     val steps = listOf(
         Step(name = stringResource(Res.string.step_details)) {
             DetailsPage(
-                onNext = { onAction(RecurringAccountAction.NextStep) },
+                state = state,
+                onAction = onAction,
             )
         },
         Step(name = stringResource(Res.string.step_terms)) {
@@ -96,17 +106,38 @@ private fun RecurringAccountScaffold(
         onBackPressed = { onAction(RecurringAccountAction.NavigateBack) },
         modifier = modifier,
     ) { paddingValues ->
-        if (state.dialogState == null) {
-            MifosStepper(
-                steps = steps,
-                currentIndex = state.currentStep,
-                onStepChange = { newIndex ->
-                    onAction(RecurringAccountAction.OnStepChange(newIndex))
-                },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(paddingValues),
-            )
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(paddingValues),
+        ) {
+            MifosBreadcrumbNavBar(navController)
+            when (state.state) {
+                is RecurringAccountState.State.Error -> {
+                    MifosErrorComponent(
+                        message = state.state.message,
+                        isRetryEnabled = true,
+                    ) {
+                        onAction(RecurringAccountAction.Retry)
+                    }
+                }
+
+                is RecurringAccountState.State.Loading -> {
+                    MifosProgressIndicator()
+                }
+
+                is RecurringAccountState.State.Success -> {
+                    MifosStepper(
+                        steps = steps,
+                        currentIndex = state.currentStep,
+                        onStepChange = { newIndex ->
+                            onAction(RecurringAccountAction.OnStepChange(newIndex))
+                        },
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                    )
+                }
+            }
         }
     }
 }
diff --git a/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountViewModel.kt b/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountViewModel.kt
diff --git a/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/di/RecurringDepositModule.kt b/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/di/RecurringDepositModule.kt
diff --git a/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/pages/DetailsPage.kt b/feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/pages/DetailsPage.kt

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ fun NavGraphBuilder.clientNavGraph(`
`356`	`356`	`createShareAccountDestination(`
`357`	`357`	`navController = navController,`
`358`	`358`	`)`
`359`		`- recurringAccountDestination()`
	`359`	`+ recurringAccountDestination(navController)`
`360`	`360`	`fixedAccountDestination()`
`361`	`361`	`}`
`362`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,19 +15,24 @@ import androidx.navigation.compose.composable`
`15`	`15`	`import kotlinx.serialization.Serializable`
`16`	`16`
`17`	`17`	`@Serializable`
`18`		`-data object RecurringAccountRoute`
	`18`	`+data class RecurringAccountRoute(`
	`19`	`+ val clientId: Int = -1,`
	`20`	`+)`
`19`	`21`
`20`		`-fun NavGraphBuilder.recurringAccountDestination() {`
	`22`	`+fun NavGraphBuilder.recurringAccountDestination(`
	`23`	`+ navController: NavController,`
	`24`	`+) {`
`21`	`25`	`composable<RecurringAccountRoute> {`
`22`	`26`	`RecurringAccountScreen(`
`23`	`27`	`onNavigateBack = {},`
`24`	`28`	`onFinish = {},`
	`29`	`+ navController = navController,`
`25`	`30`	`)`
`26`	`31`	`}`
`27`	`32`	`}`
`28`	`33`
`29`		`-fun NavController.navigateToRecurringAccountRoute() {`
	`34`	`+fun NavController.navigateToRecurringAccountRoute(clientId: Int) {`
`30`	`35`	`this.navigate(`
`31`		`- RecurringAccountRoute,`
	`36`	`+ RecurringAccountRoute(clientId = clientId),`
`32`	`37`	`)`
`33`	`38`	`}`