-
Notifications
You must be signed in to change notification settings - Fork 603
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Migrate LoanAccountSummary fragment to compose (#2124)
* MIFOSAC-184 Migrate loan account summary to compose backUp backup backup backup * fix: build fail (#2118) * refactor: refactor About activity to compose (#2115) * refactor: refactor About activity to compose * fix : added text style * refactor: refactor Create new center fragment to compose (#2116) * refactor: refactor Create new center fragment to compose * fix: fix build fail * refactor: refactor client charge fragment to compose (#2120) * Migrate Data Table Fragment to compose (#2119) migrate dataTable to compose topbar fix removed extra file fix topbar made required changes * add scrollState * removed unused function remove extra icon added horizontal padding 24.dp fix scale Fix scale --------- Co-authored-by: Aditya Gupta <[email protected]>
- Loading branch information
1 parent
fb969f6
commit 49bd77e
Showing
7 changed files
with
1,060 additions
and
294 deletions.
There are no files selected for viewing
343 changes: 59 additions & 284 deletions
343
...c/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryFragment.kt
Large diffs are not rendered by default.
Oops, something went wrong.
370 changes: 370 additions & 0 deletions
370
...ain/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryFragmentOld.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,370 @@ | ||
| ///* | ||
| // * This project is licensed under the open source MPL V2. | ||
| // * See https://github.com/openMF/android-client/blob/master/LICENSE.md | ||
| // */ | ||
| //package com.mifos.mifosxdroid.online.loanaccountsummary | ||
| // | ||
| //import android.os.Bundle | ||
| //import android.util.Log | ||
| //import android.view.LayoutInflater | ||
| //import android.view.Menu | ||
| //import android.view.MenuItem | ||
| //import android.view.View | ||
| //import android.view.ViewGroup | ||
| //import android.widget.Toast | ||
| //import androidx.core.content.ContextCompat | ||
| //import androidx.lifecycle.ViewModelProvider | ||
| //import androidx.navigation.fragment.findNavController | ||
| //import androidx.navigation.fragment.navArgs | ||
| //import com.mifos.core.common.utils.Constants | ||
| //import com.mifos.core.objects.accounts.loan.LoanWithAssociations | ||
| //import com.mifos.core.objects.client.Charges | ||
| //import com.mifos.mifosxdroid.R | ||
| //import com.mifos.mifosxdroid.core.ProgressableFragment | ||
| //import com.mifos.mifosxdroid.databinding.FragmentLoanAccountSummaryBinding | ||
| //import com.mifos.utils.DateHelper | ||
| //import dagger.hilt.android.AndroidEntryPoint | ||
| // | ||
| ///** | ||
| // * Created by ishankhanna on 09/05/14. | ||
| // */ | ||
| //@AndroidEntryPoint | ||
| //class LoanAccountSummaryFragmentOld : ProgressableFragment() { | ||
| // | ||
| // private lateinit var binding: FragmentLoanAccountSummaryBinding | ||
| // private val arg: LoanAccountSummaryFragmentArgs by navArgs() | ||
| // | ||
| // var loanAccountNumber = 0 | ||
| // | ||
| // private lateinit var viewModel: LoanAccountSummaryViewModel | ||
| // | ||
| // var chargesList: MutableList<Charges> = ArrayList() | ||
| // | ||
| // // Action Identifier in the onProcessTransactionClicked Method | ||
| // private var processLoanTransactionAction = -1 | ||
| // private var parentFragment = true | ||
| // private var clientLoanWithAssociations: LoanWithAssociations? = null | ||
| // override fun onCreate(savedInstanceState: Bundle?) { | ||
| // super.onCreate(savedInstanceState) | ||
| // loanAccountNumber = arg.loanAccountNumber | ||
| // parentFragment = arg.parentFragment | ||
| // //Necessary Call to add and update the Menu in a Fragment | ||
| // setHasOptionsMenu(true) | ||
| // } | ||
| // | ||
| // override fun onCreateView( | ||
| // inflater: LayoutInflater, | ||
| // container: ViewGroup?, | ||
| // savedInstanceState: Bundle? | ||
| // ): View { | ||
| // binding = FragmentLoanAccountSummaryBinding.inflate(inflater, container, false) | ||
| // viewModel = ViewModelProvider(this)[LoanAccountSummaryViewModel::class.java] | ||
| // inflateLoanAccountSummary() | ||
| // | ||
| // viewModel.loanAccountSummaryUiState.observe(viewLifecycleOwner) { | ||
| // when (it) { | ||
| // is LoanAccountSummaryUiState.ShowFetchingError -> { | ||
| // showProgressbar(false) | ||
| // showFetchingError(it.message) | ||
| // } | ||
| // | ||
| // is LoanAccountSummaryUiState.ShowLoanById -> { | ||
| // showProgressbar(false) | ||
| // showLoanById(it.loanWithAssociations) | ||
| // } | ||
| // | ||
| // is LoanAccountSummaryUiState.ShowProgressbar -> showProgressbar(true) | ||
| // } | ||
| // } | ||
| // | ||
| // return binding.root | ||
| // } | ||
| // | ||
| // override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| // super.onViewCreated(view, savedInstanceState) | ||
| // | ||
| // binding.btProcessLoanTransaction.setOnClickListener { | ||
| // onProcessTransactionClicked() | ||
| // } | ||
| // } | ||
| // | ||
| // private fun inflateLoanAccountSummary() { | ||
| // showProgress(true) | ||
| // setToolbarTitle(resources.getString(R.string.loanAccountSummary)) | ||
| // //TODO Implement cases to enable/disable repayment button | ||
| // binding.btProcessLoanTransaction.isEnabled = false | ||
| // viewModel.loadLoanById(loanAccountNumber) | ||
| // } | ||
| // | ||
| // private fun onProcessTransactionClicked() { | ||
| // when (processLoanTransactionAction) { | ||
| // TRANSACTION_REPAYMENT -> { | ||
| // makeRepayment(clientLoanWithAssociations) | ||
| // } | ||
| // | ||
| // ACTION_APPROVE_LOAN -> { | ||
| // approveLoan() | ||
| // } | ||
| // | ||
| // ACTION_DISBURSE_LOAN -> { | ||
| // disburseLoan() | ||
| // } | ||
| // | ||
| // else -> { | ||
| // Log.i(requireActivity().localClassName, "TRANSACTION ACTION NOT SET") | ||
| // } | ||
| // } | ||
| // } | ||
| // | ||
| // override fun onDetach() { | ||
| // super.onDetach() | ||
| // if (!parentFragment) { | ||
| // requireActivity().finish() | ||
| // } | ||
| // } | ||
| // | ||
| // override fun onPrepareOptionsMenu(menu: Menu) { | ||
| // menu.clear() | ||
| // menu.add(Menu.NONE, MENU_ITEM_DATA_TABLES, Menu.NONE, Constants.DATA_TABLE_LOAN_NAME) | ||
| // menu.add( | ||
| // Menu.NONE, | ||
| // MENU_ITEM_LOAN_TRANSACTIONS, | ||
| // Menu.NONE, | ||
| // resources.getString(R.string.transactions) | ||
| // ) | ||
| // menu.add( | ||
| // Menu.NONE, | ||
| // MENU_ITEM_REPAYMENT_SCHEDULE, | ||
| // Menu.NONE, | ||
| // resources.getString(R.string.loan_repayment_schedule) | ||
| // ) | ||
| // menu.add(Menu.NONE, MENU_ITEM_DOCUMENTS, Menu.NONE, resources.getString(R.string.documents)) | ||
| // menu.add(Menu.NONE, MENU_ITEM_CHARGES, Menu.NONE, resources.getString(R.string.charges)) | ||
| // super.onPrepareOptionsMenu(menu) | ||
| // } | ||
| // | ||
| // override fun onOptionsItemSelected(item: MenuItem): Boolean { | ||
| // val id = item.itemId | ||
| // when (id) { | ||
| // MENU_ITEM_REPAYMENT_SCHEDULE -> loadRepaymentSchedule(loanAccountNumber) | ||
| // MENU_ITEM_LOAN_TRANSACTIONS -> loadLoanTransactions(loanAccountNumber) | ||
| // MENU_ITEM_DOCUMENTS -> loadDocuments() | ||
| // MENU_ITEM_CHARGES -> loadLoanCharges() | ||
| // MENU_ITEM_DATA_TABLES -> loadLoanDataTables() | ||
| // else -> { | ||
| // } | ||
| // } | ||
| // return super.onOptionsItemSelected(item) | ||
| // } | ||
| // | ||
| // private fun inflateLoanSummary(loanWithAssociations: LoanWithAssociations) { | ||
| // binding.tvAmountDisbursed.text = loanWithAssociations.summary | ||
| // .principalDisbursed.toString() | ||
| // try { | ||
| // binding.tvDisbursementDate.text = loanWithAssociations | ||
| // .timeline.actualDisbursementDate?.let { | ||
| // DateHelper.getDateAsString( | ||
| // it as List<Int> | ||
| // ) | ||
| // } | ||
| // } catch (exception: IndexOutOfBoundsException) { | ||
| // Toast.makeText( | ||
| // activity, | ||
| // resources.getString(R.string.loan_rejected_message), | ||
| // Toast.LENGTH_SHORT | ||
| // ).show() | ||
| // } | ||
| // binding.tvInArrears.text = loanWithAssociations.summary.totalOverdue.toString() | ||
| // binding.tvPrincipal.text = loanWithAssociations.summary | ||
| // .principalDisbursed.toString() | ||
| // binding.tvLoanPrincipalDue.text = loanWithAssociations.summary | ||
| // .principalOutstanding.toString() | ||
| // binding.tvLoanPrincipalPaid.text = loanWithAssociations.summary | ||
| // .principalPaid.toString() | ||
| // binding.tvInterest.text = loanWithAssociations.summary.interestCharged.toString() | ||
| // binding.tvLoanInterestDue.text = loanWithAssociations.summary | ||
| // .interestOutstanding.toString() | ||
| // binding.tvLoanInterestPaid.text = loanWithAssociations.summary | ||
| // .interestPaid.toString() | ||
| // binding.tvFees.text = loanWithAssociations.summary.feeChargesCharged.toString() | ||
| // binding.tvLoanFeesDue.text = loanWithAssociations.summary | ||
| // .feeChargesOutstanding.toString() | ||
| // binding.tvLoanFeesPaid.text = loanWithAssociations.summary | ||
| // .feeChargesPaid.toString() | ||
| // binding.tvPenalty.text = loanWithAssociations.summary | ||
| // .penaltyChargesCharged.toString() | ||
| // binding.tvLoanPenaltyDue.text = loanWithAssociations.summary | ||
| // .penaltyChargesOutstanding.toString() | ||
| // binding.tvLoanPenaltyPaid.text = loanWithAssociations.summary | ||
| // .penaltyChargesPaid.toString() | ||
| // binding.tvTotal.text = loanWithAssociations.summary | ||
| // .totalExpectedRepayment.toString() | ||
| // binding.tvTotalDue.text = loanWithAssociations.summary.totalOutstanding.toString() | ||
| // binding.tvTotalPaid.text = loanWithAssociations.summary.totalRepayment.toString() | ||
| // } | ||
| // | ||
| // private fun loadDocuments() { | ||
| // val action = | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToDocumentListFragment( | ||
| // loanAccountNumber, | ||
| // Constants.ENTITY_TYPE_LOANS | ||
| // ) | ||
| // findNavController().navigate(action) | ||
| // } | ||
| // | ||
| // private fun loadLoanCharges() { | ||
| // val action = | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToLoanChargeFragment( | ||
| // loanAccountNumber, | ||
| // chargesList.toTypedArray() | ||
| // ) | ||
| // findNavController().navigate(action) | ||
| // } | ||
| // | ||
| // private fun approveLoan() { | ||
| // val action = clientLoanWithAssociations?.let { | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToLoanAccountApproval( | ||
| // loanAccountNumber, | ||
| // it | ||
| // ) | ||
| // } | ||
| // action?.let { findNavController().navigate(it) } | ||
| // } | ||
| // | ||
| // private fun disburseLoan() { | ||
| // val action = | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToLoanAccountDisbursementFragment( | ||
| // loanAccountNumber | ||
| // ) | ||
| // findNavController().navigate(action) | ||
| // } | ||
| // | ||
| // private fun loadLoanDataTables() { | ||
| // val action = | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToDataTableFragment( | ||
| // Constants.DATA_TABLE_NAME_LOANS, | ||
| // loanAccountNumber | ||
| // ) | ||
| // findNavController().navigate(action) | ||
| // } | ||
| // | ||
| // private fun showLoanById(loanWithAssociations: LoanWithAssociations) { | ||
| // /* Activity is null - Fragment has been detached; no need to do anything. */ | ||
| // if (activity == null) return | ||
| // clientLoanWithAssociations = loanWithAssociations | ||
| // binding.tvClientName.text = loanWithAssociations.clientName | ||
| // binding.tvLoanProductShortName.text = loanWithAssociations.loanProductName | ||
| // binding.tvLoanAccountNumber.text = "#" + loanWithAssociations.accountNo | ||
| // binding.tvLoanOfficer.text = loanWithAssociations.loanOfficerName | ||
| // //TODO Implement QuickContactBadge | ||
| // //quickContactBadge.setImageToDefault(); | ||
| // binding.btProcessLoanTransaction.isEnabled = true | ||
| // if (loanWithAssociations.status.active == true) { | ||
| // inflateLoanSummary(loanWithAssociations) | ||
| // // if Loan is already active | ||
| // // the Transaction Would be Make Repayment | ||
| // binding.viewStatusIndicator.setBackgroundColor( | ||
| // ContextCompat.getColor(requireActivity(), R.color.light_green) | ||
| // ) | ||
| // binding.btProcessLoanTransaction.text = "Make Repayment" | ||
| // processLoanTransactionAction = TRANSACTION_REPAYMENT | ||
| // } else if (loanWithAssociations.status.pendingApproval == true) { | ||
| // // if Loan is Pending for Approval | ||
| // // the Action would be Approve Loan | ||
| // binding.viewStatusIndicator.setBackgroundColor( | ||
| // ContextCompat.getColor(requireActivity(), R.color.light_yellow) | ||
| // ) | ||
| // binding.btProcessLoanTransaction.text = "Approve Loan" | ||
| // processLoanTransactionAction = ACTION_APPROVE_LOAN | ||
| // } else if (loanWithAssociations.status.waitingForDisbursal == true) { | ||
| // // if Loan is Waiting for Disbursal | ||
| // // the Action would be Disburse Loan | ||
| // binding.viewStatusIndicator.setBackgroundColor( | ||
| // ContextCompat.getColor(requireActivity(), R.color.blue) | ||
| // ) | ||
| // binding.btProcessLoanTransaction.text = "Disburse Loan" | ||
| // processLoanTransactionAction = ACTION_DISBURSE_LOAN | ||
| // } else if (loanWithAssociations.status.closedObligationsMet == true) { | ||
| // inflateLoanSummary(loanWithAssociations) | ||
| // // if Loan is Closed after the obligations are met | ||
| // // the make payment will be disabled so that no more payment can be collected | ||
| // binding.viewStatusIndicator.setBackgroundColor( | ||
| // ContextCompat.getColor(requireActivity(), R.color.black) | ||
| // ) | ||
| // binding.btProcessLoanTransaction.isEnabled = false | ||
| // binding.btProcessLoanTransaction.text = "Make Repayment" | ||
| // } else { | ||
| // inflateLoanSummary(loanWithAssociations) | ||
| // binding.viewStatusIndicator.setBackgroundColor( | ||
| // ContextCompat.getColor(requireActivity(), R.color.black) | ||
| // ) | ||
| // binding.btProcessLoanTransaction.isEnabled = false | ||
| // binding.btProcessLoanTransaction.text = "Loan Closed" | ||
| // } | ||
| // } | ||
| // | ||
| // private fun showFetchingError(s: String?) { | ||
| // Toast.makeText(activity, s, Toast.LENGTH_SHORT).show() | ||
| // } | ||
| // | ||
| // private fun showProgressbar(b: Boolean) { | ||
| // showProgress(b) | ||
| // } | ||
| // | ||
| // override fun onSaveInstanceState(savedInstanceState: Bundle) { | ||
| // super.onSaveInstanceState(savedInstanceState) | ||
| // savedInstanceState.putParcelable("LoanWithAssociation", clientLoanWithAssociations) | ||
| // } | ||
| // | ||
| // override fun onActivityCreated(savedInstanceState: Bundle?) { | ||
| // super.onActivityCreated(savedInstanceState) | ||
| // if (savedInstanceState != null) { | ||
| // // Restore last state for checked position. | ||
| // clientLoanWithAssociations = savedInstanceState.getParcelable("LoanWithAssociation") | ||
| // } | ||
| // } | ||
| // | ||
| // private fun makeRepayment(loan: LoanWithAssociations?) { | ||
| // val action = loan?.let { | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToLoanRepaymentFragment( | ||
| // it | ||
| // ) | ||
| // } | ||
| // action?.let { findNavController().navigate(it) } | ||
| // } | ||
| // | ||
| // private fun loadRepaymentSchedule(loanId: Int) { | ||
| // val action = | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToLoanRepaymentScheduleFragment( | ||
| // loanId | ||
| // ) | ||
| // findNavController().navigate(action) | ||
| // } | ||
| // | ||
| // private fun loadLoanTransactions(loanId: Int) { | ||
| // val action = | ||
| // LoanAccountSummaryFragmentDirections.actionLoanAccountSummaryFragmentToLoanTransactionsFragment( | ||
| // loanId | ||
| // ) | ||
| // findNavController().navigate(action) | ||
| // } | ||
| // | ||
| // companion object { | ||
| // const val MENU_ITEM_DATA_TABLES = 1001 | ||
| // const val MENU_ITEM_REPAYMENT_SCHEDULE = 1002 | ||
| // const val MENU_ITEM_LOAN_TRANSACTIONS = 1003 | ||
| // const val MENU_ITEM_DOCUMENTS = 1004 | ||
| // const val MENU_ITEM_CHARGES = 1005 | ||
| // | ||
| // /* | ||
| // Set of Actions and Transactions that can be performed depending on the status of the Loan | ||
| // Actions are performed to change the status of the loan | ||
| // Transactions are performed to do repayments | ||
| // */ | ||
| // private const val ACTION_NOT_SET = -1 | ||
| // private const val ACTION_APPROVE_LOAN = 0 | ||
| // private const val ACTION_DISBURSE_LOAN = 1 | ||
| // private const val TRANSACTION_REPAYMENT = 2 | ||
| // } | ||
| //} | ||
| // |
Oops, something went wrong.