refactor #2516: migrated loan account details screen to compose

openMF · Feb 22, 2024 · d0f198d · d0f198d
1 parent 761f5ef
commit d0f198d
Show file tree

Hide file tree

Showing 21 changed files with 770 additions and 462 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/LoanAccountContainerActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/LoanAccountContainerActivity.kt
@@ -1,10 +1,11 @@
 package org.mifos.mobile.ui.activities
 
 import android.os.Bundle
+import android.view.View
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityContainerBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.LoanAccountsDetailFragment
+import org.mifos.mobile.ui.loan_account.LoanAccountsDetailFragment
 import org.mifos.mobile.utils.Constants
 
 /*

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountContainerActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountContainerActivity.kt
@@ -36,18 +36,6 @@ class SavingsAccountContainerActivity : BaseActivity() {
         }
     }
 
-    fun hideToolbar() {
-        binding.apply {
-            toolbar?.visibility = View.GONE
-        }
-    }
-
-    fun showToolbar() {
-        binding.apply {
-            toolbar?.visibility = View.VISIBLE
-        }
-    }
-
     companion object {
         var transferSuccess = false
     }

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/base/BaseActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/base/BaseActivity.kt
@@ -51,6 +51,16 @@ open class BaseActivity : BasePassCodeActivity(), BaseActivityCallback {
         }
     }
 
+    fun showToolbar() {
+        toolbar = findViewById(R.id.toolbar)
+        toolbar?.visibility = View.VISIBLE
+    }
+
+    fun hideToolbar() {
+        toolbar = findViewById(R.id.toolbar)
+        toolbar?.visibility = View.GONE
+    }
+
     /**
      * Used for removing elevation from toolbar
      */

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/ClientChargeFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/ClientChargeFragment.kt
@@ -18,6 +18,7 @@ import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentClientChargeBinding
 import org.mifos.mobile.models.Charge
 import org.mifos.mobile.ui.activities.SavingsAccountContainerActivity
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.adapters.ClientChargeAdapter
 import org.mifos.mobile.ui.enums.ChargeType
 import org.mifos.mobile.ui.fragments.base.BaseFragment
@@ -49,7 +50,7 @@ class ClientChargeFragment : BaseFragment() {
     private var sweetUIErrorHandler: SweetUIErrorHandler? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        (activity as? SavingsAccountContainerActivity)?.showToolbar()
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             id = arguments?.getLong(Constants.CLIENT_ID)
             chargeType = arguments?.getCheckedSerializable(

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/GuarantorListFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/GuarantorListFragment.kt
@@ -47,6 +47,7 @@ class GuarantorListFragment : BaseFragment() {
     private var disposableDeleteGuarantor: Disposable? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) loanId = requireArguments().getLong(Constants.LOAN_ID)
     }
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountSummaryFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountSummaryFragment.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentLoanAccountSummaryBinding
 import org.mifos.mobile.models.accounts.loan.LoanWithAssociations
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.Constants
 import org.mifos.mobile.utils.CurrencyUtil
@@ -26,6 +27,7 @@ class LoanAccountSummaryFragment : BaseFragment() {
     private var loanWithAssociations: LoanWithAssociations? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             loanWithAssociations = arguments?.getCheckedParcelable(LoanWithAssociations::class.java, Constants.LOAN_ACCOUNT)
         }

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountTransactionFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountTransactionFragment.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.launch
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentLoanAccountTransactionsBinding
 import org.mifos.mobile.models.accounts.loan.LoanWithAssociations
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.adapters.RecentTransactionListAdapter
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.Constants
@@ -50,6 +51,7 @@ class LoanAccountTransactionFragment : BaseFragment() {
     private var sweetUIErrorHandler: SweetUIErrorHandler? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             loanId = arguments?.getLong(Constants.LOAN_ID)
         }

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
@@ -14,6 +14,7 @@ import org.mifos.mobile.R
 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.utils.Constants
 import org.mifos.mobile.utils.DateHelper
@@ -36,6 +37,7 @@ class LoanAccountWithdrawFragment : BaseFragment() {
     private var loanWithAssociations: LoanWithAssociations? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             loanWithAssociations = arguments?.getCheckedParcelable(LoanWithAssociations::class.java, Constants.LOAN_ACCOUNT)
         }