refactor: savings module (openMF#2635)

akashmeruva9 · Jul 1, 2024 · 0dbbea9 · 0dbbea9
1 parent dc68f7a
commit 0dbbea9
Show file tree

Hide file tree

Showing 60 changed files with 358 additions and 514 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -76,10 +76,13 @@ dependencies {
     implementation(projects.core.data)
     implementation(projects.core.datastore)
     implementation(projects.ui)
+
     implementation(projects.feature.loan)
     implementation(projects.feature.registration)
     implementation(projects.feature.beneficiary)
     implementation(projects.feature.guarantor)
+    implementation(projects.feature.savings)
+
 
 
     implementation("androidx.legacy:legacy-support-v4:1.0.0")

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountApplicationActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountApplicationActivity.kt
@@ -5,7 +5,7 @@ import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivitySavingsAccountApplicationBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.core.model.enums.SavingsAccountState
-import org.mifos.mobile.ui.savings_account_application.SavingsAccountApplicationFragment.Companion.newInstance
+import org.mifos.mobile.ui.savings_account.SavingsAccountApplicationFragment.Companion.newInstance
 
 /*
 * Created by saksham on 30/June/2018

diff --git a/app/src/main/java/org/mifos/mobile/ui/home/HomeOldFragment.kt b/app/src/main/java/org/mifos/mobile/ui/home/HomeOldFragment.kt
@@ -33,7 +33,7 @@ import org.mifos.mobile.ui.client_charge.ClientChargeComposeFragment
 import org.mifos.mobile.core.model.enums.AccountType
 import org.mifos.mobile.core.model.enums.ChargeType
 import org.mifos.mobile.ui.fragments.base.BaseFragment
-import org.mifos.mobile.ui.savings_make_transfer.SavingsMakeTransferComposeFragment
+import org.mifos.mobile.ui.savings_account.SavingsMakeTransferComposeFragment
 import org.mifos.mobile.ui.third_party_transfer.ThirdPartyTransferComposeFragment
 import org.mifos.mobile.ui.user_profile.UserProfileActivity
 import org.mifos.mobile.core.datastore.PreferencesHelper

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
@@ -25,11 +25,10 @@ import org.mifos.mobile.ui.loan_account_transaction.LoanAccountTransactionFragme
 import org.mifos.mobile.ui.loan_account_withdraw.LoanAccountWithdrawFragment
 import org.mifos.mobile.ui.loan_account_application.LoanApplicationFragment
 import org.mifos.mobile.ui.loan_repayment_schedule.LoanRepaymentScheduleFragment
-import org.mifos.mobile.ui.savings_make_transfer.SavingsMakeTransferFragment
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.ui.loan_account_summary.LoanAccountSummaryFragment
 import org.mifos.mobile.ui.qr_code_display.QrCodeDisplayComposeFragment
-import org.mifos.mobile.ui.savings_make_transfer.SavingsMakeTransferComposeFragment
+import org.mifos.mobile.ui.savings_account.SavingsMakeTransferComposeFragment
 import org.mifos.mobile.utils.*
 import javax.inject.Inject
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/savings_account/SavingAccountsDetailFragment.kt b/app/src/main/java/org/mifos/mobile/ui/savings_account/SavingAccountsDetailFragment.kt
@@ -16,19 +16,16 @@ import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 import org.mifos.mobile.ui.activities.SavingsAccountContainerActivity
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.client_charge.ClientChargeComposeFragment
-import org.mifos.mobile.ui.savings_account_transaction.SavingAccountsTransactionComposeFragment
-import org.mifos.mobile.ui.savings_account_application.SavingsAccountApplicationFragment
-import org.mifos.mobile.ui.savings_account_withdraw.SavingsAccountWithdrawFragment
-import org.mifos.mobile.ui.savings_make_transfer.SavingsMakeTransferFragment
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.ui.qr_code_display.QrCodeDisplayComposeFragment
-import org.mifos.mobile.ui.savings_make_transfer.SavingsMakeTransferComposeFragment
 import org.mifos.mobile.core.common.Network
 import org.mifos.mobile.core.datastore.PreferencesHelper
 import org.mifos.mobile.core.model.entity.accounts.savings.SavingsWithAssociations
 import org.mifos.mobile.core.model.enums.AccountType
 import org.mifos.mobile.core.model.enums.ChargeType
 import org.mifos.mobile.core.model.enums.SavingsAccountState
+import org.mifos.mobile.feature.savings.savings_account.SavingAccountsDetailViewModel
+import org.mifos.mobile.feature.savings.savings_account.SavingsAccountDetailScreen
 import org.mifos.mobile.utils.QrCodeGenerator
 import javax.inject.Inject
 

diff --git a/...tion/SavingAccountsTransactionFragment.kt → ...ount/SavingAccountsTransactionFragment.kt b/...tion/SavingAccountsTransactionFragment.kt → ...ount/SavingAccountsTransactionFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.savings_account_transaction
+package org.mifos.mobile.ui.savings_account
 
 import android.content.Intent
 import android.net.Uri
@@ -42,6 +42,7 @@ import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getChec
 import org.mifos.mobile.utils.StatusUtils
 import org.mifos.mobile.utils.Toaster
 import org.mifos.mobile.core.common.utils.getDatePickerDialog
+import org.mifos.mobile.feature.savings.savings_account_transaction.SavingAccountsTransactionViewModel
 import java.time.Instant
 import javax.inject.Inject
 

diff --git a/...tion/SavingsAccountApplicationFragment.kt → ...ount/SavingsAccountApplicationFragment.kt b/...tion/SavingsAccountApplicationFragment.kt → ...ount/SavingsAccountApplicationFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.savings_account_application
+package org.mifos.mobile.ui.savings_account
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -16,6 +16,8 @@ import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.model.entity.accounts.savings.SavingsWithAssociations
 import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getCheckedParcelable
 import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getCheckedSerializable
+import org.mifos.mobile.feature.savings.savings_account_application.SavingsAccountApplicationScreen
+import org.mifos.mobile.feature.savings.savings_account_application.SavingsAccountApplicationViewModel
 
 /*
 * Created by saksham on 30/June/2018

diff --git a/...vingsAccountTransactionComposeFragment.kt → ...vingsAccountTransactionComposeFragment.kt b/...vingsAccountTransactionComposeFragment.kt → ...vingsAccountTransactionComposeFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.savings_account_transaction
+package org.mifos.mobile.ui.savings_account
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,6 +10,8 @@ import org.mifos.mobile.core.ui.component.mifosComposeView
 import org.mifos.mobile.ui.activities.SavingsAccountContainerActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.core.common.Constants
+import org.mifos.mobile.feature.savings.savings_account_transaction.SavingAccountsTransactionViewModel
+import org.mifos.mobile.feature.savings.savings_account_transaction.SavingsAccountTransactionScreen
 
 
 @AndroidEntryPoint

diff --git a/...ithdraw/SavingsAccountWithdrawFragment.kt → ...account/SavingsAccountWithdrawFragment.kt b/...ithdraw/SavingsAccountWithdrawFragment.kt → ...account/SavingsAccountWithdrawFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.savings_account_withdraw
+package org.mifos.mobile.ui.savings_account
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,6 +13,8 @@ import org.mifos.mobile.ui.activities.SavingsAccountContainerActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.core.model.entity.accounts.savings.SavingsWithAssociations
 import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getCheckedParcelable
+import org.mifos.mobile.feature.savings.savings_account_withdraw.SavingsAccountWithdrawScreen
+import org.mifos.mobile.feature.savings.savings_account_withdraw.SavingsAccountWithdrawViewModel
 
 /*
 * Created by saksham on 02/July/2018

diff --git a/...fer/SavingsMakeTransferComposeFragment.kt → ...unt/SavingsMakeTransferComposeFragment.kt b/...fer/SavingsMakeTransferComposeFragment.kt → ...unt/SavingsMakeTransferComposeFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.savings_make_transfer
+package org.mifos.mobile.ui.savings_account
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -15,7 +15,9 @@ import org.mifos.mobile.ui.transfer_process.TransferProcessComposeFragment
 import org.mifos.mobile.core.model.entity.payload.TransferPayload
 import org.mifos.mobile.core.common.utils.DateHelper
 import org.mifos.mobile.core.common.utils.getTodayFormatted
-
+import org.mifos.mobile.feature.savings.savings_make_transfer.ReviewTransferPayload
+import org.mifos.mobile.feature.savings.savings_make_transfer.SavingsMakeTransferScreen
+import org.mifos.mobile.feature.savings.savings_make_transfer.SavingsMakeTransferViewModel
 
 @AndroidEntryPoint
 class SavingsMakeTransferComposeFragment : BaseFragment() {