openMF · akashmeruva9 · Jul 29, 2024
diff --git a/app/src/main/java/org/mifos/mobile/navigation/MifosNavGraph.kt b/app/src/main/java/org/mifos/mobile/navigation/MifosNavGraph.kt
@@ -2,17 +2,18 @@ package org.mifos.mobile.navigation
 
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import org.mifos.mobile.feature.auth.navigation.AuthenticationNavigation
 import org.mifos.mobile.feature.auth.navigation.authenticationNavGraph
-import org.mifos.mobile.feature.guarantor.navigation.GuarantorNavigation
-import org.mifos.mobile.feature.guarantor.navigation.GuarantorRoute
+import org.mifos.mobile.feature.beneficiary.navigation.beneficiaryNavGraph
 import org.mifos.mobile.feature.guarantor.navigation.guarantorNavGraph
 import org.mifos.mobile.ui.activities.PassCodeActivity
 
+@RequiresApi(Build.VERSION_CODES.TIRAMISU)
 @Composable
 fun RootNavGraph(
     navController: NavHostController,
@@ -40,6 +41,14 @@ fun RootNavGraph(
             navigateBack = navigateBack,
             loanId = loanId
         )
+
+        beneficiaryNavGraph(
+            navController = navController,
+            navigateBack =  { navController.popBackStack() },
+            startDestination = nestedStartDestination,
+            openQrImportScreen = {},
+            openQrReaderScreen = {}
+        )
     }
 }
 

diff --git a/...c/main/java/org/mifos/mobile/ui/beneficiary/presentation/BeneficiaryAddOptionsFragment.kt b/...c/main/java/org/mifos/mobile/ui/beneficiary/presentation/BeneficiaryAddOptionsFragment.kt
@@ -30,6 +30,8 @@ import org.mifos.mobile.utils.Toaster
 /**
  * Created by dilpreet on 5/7/17.
  */
+// File Can be deleted After fully implementing compose navigation.
+// Has Instances Left out in Add Beneficiary Activity and ThirdPartyTransfer Fragment
 @AndroidEntryPoint
 class BeneficiaryAddOptionsFragment : BaseFragment() {
 
@@ -51,16 +53,15 @@ class BeneficiaryAddOptionsFragment : BaseFragment() {
             setContent {
 
                 MifosMobileTheme {
-                    BeneficiaryScreen(
-                        topAppbarNavigateback = {
-                            requireActivity().onBackPressedDispatcher.onBackPressed()
-                        },
-                        addiconClicked = { addManually() },
-                        scaniconClicked = { addUsingQrCode() },
-                        uploadIconClicked = { addByImportingQrCode() },
-                    )
+//                    BeneficiaryScreen(
+//                        topAppbarNavigateback = {
+//                            requireActivity().onBackPressedDispatcher.onBackPressed()
+//                        },
+//                        addiconClicked = { addManually() },
+//                        scaniconClicked = { addUsingQrCode() },
+//                        uploadIconClicked = { addByImportingQrCode() },
+//                    )
                 }
-
             }
 
         }
@@ -189,4 +190,4 @@ class BeneficiaryAddOptionsFragment : BaseFragment() {
             return fragment
         }
     }
-}
+}
diff --git a/...java/org/mifos/mobile/ui/beneficiary_application/BeneficiaryApplicationComposeFragment.kt b/...java/org/mifos/mobile/ui/beneficiary_application/BeneficiaryApplicationComposeFragment.kt
@@ -20,6 +20,8 @@ import org.mifos.mobile.feature.beneficiary.beneficiary_application.BeneficiaryA
 /**
  * Created by dilpreet on 16/6/17.
  */
+// File Can be deleted After fully implementing compose navigation.
+// Has Instances left out in Qr Code Import and Qr Code Reader Fragment
 @AndroidEntryPoint
 class BeneficiaryApplicationComposeFragment : BaseFragment() {
 
@@ -41,9 +43,11 @@ class BeneficiaryApplicationComposeFragment : BaseFragment() {
         savedInstanceState: Bundle?,
     ): View {
         return mifosComposeView(requireContext()) {
-            BeneficiaryApplicationScreen(
-                navigateBack = { activity?.onBackPressed() }
-            )
+//            BeneficiaryApplicationScreen(
+//                navigateBack = { activity?.onBackPressed() },
+//                beneficiary = beneficiary,
+//                beneficiaryState = beneficiaryState
+//            )
         }
     }
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/beneficiary_detail/BeneficiaryDetailFragment.kt b/app/src/main/java/org/mifos/mobile/ui/beneficiary_detail/BeneficiaryDetailFragment.kt
@@ -1,5 +1,6 @@
 package org.mifos.mobile.ui.beneficiary_detail;
 
+/*
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -75,6 +76,4 @@ class BeneficiaryDetailFragment : BaseFragment() {
         }
     }
 }
-
-
-
+ */
diff --git a/app/src/main/java/org/mifos/mobile/ui/beneficiary_list/BeneficiaryListComposeFragment.kt b/app/src/main/java/org/mifos/mobile/ui/beneficiary_list/BeneficiaryListComposeFragment.kt
@@ -1,54 +1,64 @@
 package org.mifos.mobile.ui.beneficiary_list
 
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
+import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
-import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.ui.component.mifosComposeView
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.beneficiary.presentation.BeneficiaryAddOptionsFragment
 import org.mifos.mobile.ui.fragments.base.BaseFragment
-import org.mifos.mobile.feature.beneficiary.beneficiary_list.BeneficiaryListScreen
-import org.mifos.mobile.feature.guarantor.R
+import org.mifos.mobile.feature.beneficiary.navigation.BeneficiaryNavigation
+import org.mifos.mobile.feature.beneficiary.navigation.BeneficiaryRoute
+import org.mifos.mobile.navigation.RootNavGraph
 
 @AndroidEntryPoint
 class BeneficiaryListComposeFragment : BaseFragment() {
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
         return mifosComposeView(requireContext()) {
-            BeneficiaryListScreen(
-                navigateBack = { activity?.supportFragmentManager?.popBackStack() },
-                addBeneficiaryClicked = { addBeneficiary() },
-                onBeneficiaryItemClick = { position, beneficiaryList ->
-                    onItemClick(
-                        position = position,
-                        beneficiaryList = beneficiaryList
-                    )
-                },
-            )
-        }
-    }
+                val navController = rememberNavController()
+                RootNavGraph(
+                    startDestination = BeneficiaryRoute.BENEFICIARY_NAVIGATION_ROUTE,
+                    navController = navController,
+                    nestedStartDestination = BeneficiaryNavigation.BeneficiaryList.route,
+                )
 
-    private fun onItemClick(position: Int, beneficiaryList: List<Beneficiary>) {
-        (activity as? BaseActivity)?.replaceFragment(
-            org.mifos.mobile.ui.beneficiary_detail.BeneficiaryDetailFragment.newInstance(beneficiaryList[position]),
-            true,
-            R.id.container,
-        )
+//            BeneficiaryListScreen(
+//                navigateBack = { activity?.supportFragmentManager?.popBackStack() },
+//                addBeneficiaryClicked = { addBeneficiary() },
+//                onBeneficiaryItemClick = { position, beneficiaryList ->
+//                    onItemClick(
+//                        position = position,
+//                        beneficiaryList = beneficiaryList
+//                    )
+//                },
+//            )
+        }
     }
 
-    private fun addBeneficiary() {
-        (activity as? BaseActivity)?.replaceFragment(
-            BeneficiaryAddOptionsFragment.newInstance(),
-            true,
-            R.id.container,
-        )
-    }
+//    private fun onItemClick(position: Int, beneficiaryList: List<Beneficiary>) {
+//        (activity as? BaseActivity)?.replaceFragment(
+//            org.mifos.mobile.ui.beneficiary_detail.BeneficiaryDetailFragment.newInstance(beneficiaryList[position]),
+//            true,
+//            R.id.container,
+//        )
+//    }
+//
+//    private fun addBeneficiary() {
+//        (activity as? BaseActivity)?.replaceFragment(
+//            BeneficiaryAddOptionsFragment.newInstance(),
+//            true,
+//            R.id.container,
+//        )
+//    }
 
     override fun onResume() {
         super.onResume()

diff --git a/.../mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationScreen.kt b/.../mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationScreen.kt
@@ -14,11 +14,14 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.ui.component.MFScaffold
 import org.mifos.mobile.core.ui.component.MifosErrorComponent
 import org.mifos.mobile.core.ui.component.MifosProgressIndicator
 import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 import org.mifos.mobile.core.common.Network
+import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getCheckedParcelable
+import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getCheckedSerializable
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.model.entity.beneficiary.BeneficiaryPayload
 import org.mifos.mobile.core.model.entity.templates.beneficiary.BeneficiaryTemplate
@@ -29,10 +32,19 @@ import org.mifos.mobile.feature.beneficiary.R
 @Composable
 fun BeneficiaryApplicationScreen(
     viewModel: BeneficiaryApplicationViewModel = hiltViewModel(),
-    navigateBack: () -> Unit
+    navigateBack: () -> Unit,
+    beneficiary: Beneficiary?,
+    beneficiaryState: BeneficiaryState?
 ) {
-    val beneficiaryState by viewModel.beneficiaryState.collectAsStateWithLifecycle()
-    val beneficiary by viewModel.beneficiary.collectAsStateWithLifecycle()
+    beneficiaryState?.let {
+        viewModel.initArgs(
+            beneficiaryState = beneficiaryState,
+            beneficiary = beneficiary
+        )
+    }
+
+    val newBeneficiaryState by viewModel.beneficiaryState.collectAsStateWithLifecycle()
+    val newBeneficiary by viewModel.beneficiary.collectAsStateWithLifecycle()
     val uiState by viewModel.beneficiaryUiState.collectAsStateWithLifecycle()
 
     LaunchedEffect(key1 = Unit) {
@@ -42,8 +54,8 @@ fun BeneficiaryApplicationScreen(
     BeneficiaryApplicationScreen (
         uiState = uiState,
         navigateBack = navigateBack,
-        beneficiaryState = beneficiaryState,
-        beneficiary = beneficiary,
+        beneficiaryState = newBeneficiaryState,
+        beneficiary = newBeneficiary,
         onRetry = { viewModel.loadBeneficiaryTemplate() },
         onSubmit = { viewModel.submitBeneficiary(it) }
     )

diff --git a/...n/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailScreen.kt b/...n/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailScreen.kt
@@ -31,7 +31,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
+import org.mifos.mobile.core.model.enums.BeneficiaryState
 import org.mifos.mobile.core.ui.component.MifosAlertDialog
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
 import org.mifos.mobile.core.ui.theme.MifosMobileTheme
@@ -41,16 +43,24 @@ import org.mifos.mobile.feature.beneficiary.R
 fun BeneficiaryDetailScreen(
     viewModel: BeneficiaryDetailViewModel = hiltViewModel(),
     navigateBack: () -> Unit,
-    updateBeneficiary: () -> Unit,
+    updateBeneficiary: ( beneficiary : Beneficiary? ) -> Unit,
+    beneficiary: Beneficiary?
 ) {
+    beneficiary?.let {
+        viewModel.setBeneficiary(beneficiary)
+    }
     val uiState by viewModel.beneficiaryDetailsUiStates.collectAsStateWithLifecycle()
     val beneficiary by viewModel.beneficiary.collectAsStateWithLifecycle()
 
     BeneficiaryDetailScreen(
         beneficiary = beneficiary,
         uiState = uiState,
         navigateBack = navigateBack,
-        updateBeneficiary = updateBeneficiary,
+        updateBeneficiary = {
+            updateBeneficiary.invoke(
+                viewModel.getBeneficiary()
+            )
+        },
         deleteBeneficiary = {
             viewModel.deleteBeneficiary(it)
         }