Merge branch 'development' into loan_application_migration

# Conflicts: # app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt
openMF · Apr 21, 2024 · 452d79d · 452d79d
2 parents 56b9881 + 15a31b1
commit 452d79d
Show file tree

Hide file tree

Showing 9 changed files with 363 additions and 218 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountWithdrawFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountWithdrawFragment.kt
diff --git a/app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt b/app/src/main/java/org/mifos/mobile/ui/loan_account/LoanAccountsDetailFragment.kt
@@ -16,14 +16,16 @@ import org.mifos.mobile.ui.enums.ChargeType
 import org.mifos.mobile.ui.enums.LoanState
 import org.mifos.mobile.ui.fragments.ClientChargeFragment
 import org.mifos.mobile.ui.fragments.GuarantorListFragment
-import org.mifos.mobile.ui.loan_account_summary.LoanAccountSummaryFragment
 import org.mifos.mobile.ui.fragments.LoanAccountTransactionFragment
+import org.mifos.mobile.ui.loan_account_withdraw.LoanAccountWithdrawFragment
+import org.mifos.mobile.ui.fragments.LoanApplicationFragment
 import org.mifos.mobile.ui.fragments.LoanAccountWithdrawFragment
 import org.mifos.mobile.ui.loan_account_application.LoanApplicationFragment
 import org.mifos.mobile.ui.fragments.LoanRepaymentScheduleFragment
 import org.mifos.mobile.ui.fragments.QrCodeDisplayFragment
 import org.mifos.mobile.ui.fragments.SavingsMakeTransferFragment
 import org.mifos.mobile.ui.fragments.base.BaseFragment
+import org.mifos.mobile.ui.loan_account_summary.LoanAccountSummaryFragment
 import org.mifos.mobile.utils.*
 import javax.inject.Inject
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/loan_account_withdraw/LoanAccountWithdrawFragment.kt b/app/src/main/java/org/mifos/mobile/ui/loan_account_withdraw/LoanAccountWithdrawFragment.kt
@@ -0,0 +1,75 @@
+package org.mifos.mobile.ui.loan_account_withdraw
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.mifos.mobile.R
+import org.mifos.mobile.core.ui.theme.MifosMobileTheme
+import org.mifos.mobile.databinding.FragmentLoanWithdrawBinding
+import org.mifos.mobile.models.accounts.loan.LoanWithAssociations
+import org.mifos.mobile.models.accounts.loan.LoanWithdraw
+import org.mifos.mobile.ui.activities.base.BaseActivity
+import org.mifos.mobile.ui.fragments.base.BaseFragment
+import org.mifos.mobile.ui.savings_account_withdraw.SavingsAccountWithdrawScreen
+import org.mifos.mobile.utils.Constants
+import org.mifos.mobile.utils.DateHelper
+import org.mifos.mobile.utils.LoanUiState
+import org.mifos.mobile.utils.ParcelableAndSerializableUtils.getCheckedParcelable
+import org.mifos.mobile.utils.Toaster
+
+/**
+ * Created by dilpreet on 7/6/17.
+ */
+@AndroidEntryPoint
+class LoanAccountWithdrawFragment : BaseFragment() {
+
+    private val viewModel: LoanAccountWithdrawViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.hideToolbar()
+        if (arguments != null) {
+            viewModel.setLoanContent(
+                loanWithAssociations = arguments?.getCheckedParcelable(LoanWithAssociations::class.java, Constants.LOAN_ACCOUNT)
+            )
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                MifosMobileTheme {
+                    LoanAccountWithdrawScreen(
+                        navigateBack = { activity?.supportFragmentManager?.popBackStack() }
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun newInstance(
+            loanWithAssociations: LoanWithAssociations?,
+        ): LoanAccountWithdrawFragment {
+            val fragment = LoanAccountWithdrawFragment()
+            val args = Bundle()
+            args.putParcelable(Constants.LOAN_ACCOUNT, loanWithAssociations)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}