diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt index b198a276cc..29b5b60248 100644 --- a/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt +++ b/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.pagingSource import androidx.paging.PagingSource import androidx.paging.PagingState -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.datamanager.DataManagerCenter import com.mifos.core.objects.group.Center import rx.Subscriber diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt index 9b5498cfee..a6b57ab0c5 100644 --- a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt +++ b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.pagingSource import androidx.paging.PagingSource import androidx.paging.PagingState -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.datamanager.DataManagerCharge import com.mifos.core.objects.client.Charges import kotlinx.coroutines.suspendCancellableCoroutine diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt index 685985f1b7..90cd4451eb 100644 --- a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt +++ b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.pagingSource import androidx.paging.PagingSource import androidx.paging.PagingState -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.objects.client.Client import rx.Subscriber diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt index 99b75bdf41..79f51972ff 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import com.mifos.core.network.GenericResponse import org.openapitools.client.models.PostCentersCenterIdResponse import org.openapitools.client.models.PostClientsClientIdResponse diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt index 85a50032d6..fc52c05159 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.groups.CenterInfo +import com.mifos.core.`object`.groups.CenterInfo import com.mifos.core.objects.group.CenterWithAssociations import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt index 95c9899c26..15c8017001 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repository import androidx.paging.PagingData -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.group.Center import com.mifos.core.objects.group.CenterWithAssociations import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt index a1f9fac055..a7f2556114 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.clients.ChargeCreationResponse -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.clients.ChargeCreationResponse +import com.mifos.core.`object`.template.client.ChargeTemplate import com.mifos.core.payloads.ChargesPayload /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt index 9371c69348..aea9ffcb61 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.checkerinboxtask.CheckerInboxSearchTemplate -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.`object`.checkerinboxtask.CheckerTask import com.mifos.core.network.GenericResponse interface CheckerInboxRepository { diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt index c5edfd3a8f..6d80e4e5a4 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask -import com.mifos.core.modelobjects.checkerinboxtask.RescheduleLoansTask +import com.mifos.core.`object`.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.RescheduleLoansTask import kotlinx.coroutines.flow.Flow /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt index e43ab76f20..0c0cedff32 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.noncoreobjects.IdentifierCreationResponse -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate /** * Created by Aditya Gupta on 16/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt index 0897808ecc..54c613a458 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.Identifier import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt index f3afef8eb3..d40b275409 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repository import androidx.paging.PagingData -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.client.Client import kotlinx.coroutines.flow.Flow import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt index 233d599c5a..6f775b968c 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repository import com.mifos.core.data.CenterPayload -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt index ca28f1d060..66b94c4aaa 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.group.GroupPayload import com.mifos.core.objects.organisation.Office import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt index d26f97310a..8a5f51c6dc 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import com.mifos.core.network.GenericResponse import okhttp3.ResponseBody diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt index c6a18b39c5..e5bb2d89c5 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.network.GenericResponse import com.mifos.core.objects.collectionsheet.CenterDetail import com.mifos.core.objects.collectionsheet.CollectionSheetPayload diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt index b939a78dfa..2ce4203438 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import com.mifos.core.objects.accounts.loan.Loans import com.mifos.core.payloads.GroupLoanPayload import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt index efbfa98fb6..d53b2bb6b2 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.loan.LoanApproval +import com.mifos.core.`object`.account.loan.LoanApproval import com.mifos.core.network.GenericResponse import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt index 8847405d4d..e4a588449a 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.loan.LoanDisbursement +import com.mifos.core.`object`.account.loan.LoanDisbursement import com.mifos.core.network.GenericResponse import com.mifos.core.objects.templates.loans.LoanTransactionTemplate import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt index f3c7215bd5..eaec4f937e 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repository import com.mifos.core.data.LoansPayload -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.organisations.LoanProducts import com.mifos.core.objects.accounts.loan.Loans import com.mifos.core.objects.templates.loans.LoanTemplate import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt index f1c11675d6..0459e8a7d2 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.clients.ChargeCreationResponse +import com.mifos.core.`object`.clients.ChargeCreationResponse import com.mifos.core.payloads.ChargesPayload import okhttp3.ResponseBody diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt index 6a036c00d9..eb2a233970 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt index 5057618c87..271541341f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLocation /** * Created by Aditya Gupta on 06/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt index d8b8af5121..cea110c57e 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.clients.ClientAddressRequest -import com.mifos.core.modelobjects.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressResponse import com.mifos.core.network.GenericResponse /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt index ab888fe03c..46ce994967 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem /** * Created by Aditya Gupta on 12/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt index 042b2a5380..584428ebdb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse /** * Created by Aditya Gupta on 12/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt index 28c31ef76f..70aba7ebcb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.loan.SavingsApproval +import com.mifos.core.`object`.account.loan.SavingsApproval import com.mifos.core.network.GenericResponse import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt index 09138163b0..bbd02d39cb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.organisations.ProductSavings +import com.mifos.core.`object`.organisations.ProductSavings import com.mifos.core.objects.client.Savings import com.mifos.core.objects.templates.savings.SavingProductsTemplate import com.mifos.core.payloads.SavingsPayload diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt index a1e6ce5cd3..62bb00508b 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SearchRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SearchRepository.kt index 7882d4c868..c4ef7bc5d1 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SearchRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SearchRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import kotlinx.coroutines.flow.Flow /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt index 42fc3cc306..b82b0942f5 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt index 87236537f1..37a4d26a9d 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repository import com.mifos.core.data.CenterPayload -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt index 414844bb5b..c5eaa17e25 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.group.GroupPayload import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt index 3c6e0e0cc8..9949f4924d 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt index 158f56b19b..810c5893b4 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt index f77693b3cb..7878349644 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ActivateRepository -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerCenter import com.mifos.core.network.datamanager.DataManagerClient diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt index c30c38dd7b..424e54f7de 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CenterDetailsRepository -import com.mifos.core.modelobjects.groups.CenterInfo +import com.mifos.core.`object`.groups.CenterInfo import com.mifos.core.network.datamanager.DataManagerCenter import com.mifos.core.network.datamanager.DataManagerRunReport import com.mifos.core.objects.group.CenterWithAssociations diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterListRepositoryImp.kt index da51be3d76..97de7e2939 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterListRepositoryImp.kt @@ -14,7 +14,7 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import com.mifos.core.data.pagingSource.CenterListPagingSource import com.mifos.core.data.repository.CenterListRepository -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.datamanager.DataManagerCenter import com.mifos.core.objects.group.Center import com.mifos.core.objects.group.CenterWithAssociations diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt index 5229c36347..83b3471199 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ChargeDialogRepository -import com.mifos.core.modelobjects.clients.ChargeCreationResponse -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.clients.ChargeCreationResponse +import com.mifos.core.`object`.template.client.ChargeTemplate import com.mifos.core.network.DataManager import com.mifos.core.payloads.ChargesPayload import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt index 451b8f0425..aeda638afe 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CheckerInboxRepository -import com.mifos.core.modelobjects.checkerinboxtask.CheckerInboxSearchTemplate -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.`object`.checkerinboxtask.CheckerTask import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerCheckerInbox import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt index 3bf897f94e..3bd94e878e 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CheckerInboxTasksRepository -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask -import com.mifos.core.modelobjects.checkerinboxtask.RescheduleLoansTask +import com.mifos.core.`object`.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.RescheduleLoansTask import com.mifos.core.network.datamanager.DataManagerCheckerInbox import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt index d12dd5396e..0214332aeb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ClientIdentifierDialogRepository -import com.mifos.core.modelobjects.noncoreobjects.IdentifierCreationResponse -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import com.mifos.core.network.datamanager.DataManagerClient import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt index 26e7f2e6d6..93587154bf 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ClientIdentifiersRepository -import com.mifos.core.modelobjects.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.Identifier import com.mifos.core.network.datamanager.DataManagerClient import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt index b27a97ffd4..b2c3658c00 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt @@ -14,7 +14,7 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import com.mifos.core.data.pagingSource.ClientListPagingSource import com.mifos.core.data.repository.ClientListRepository -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.objects.client.Client import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewCenterRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewCenterRepositoryImp.kt index 2d03b5d144..719376fbc1 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewCenterRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewCenterRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.CreateNewCenterRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.datamanager.DataManagerCenter import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt index aac390b2d3..de7684d7a5 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CreateNewGroupRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.datamanager.DataManagerGroups import com.mifos.core.network.datamanager.DataManagerOffices import com.mifos.core.objects.group.GroupPayload diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt index cdf6ff8858..435ca77cf9 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.DocumentListRepository -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerDocument import okhttp3.ResponseBody diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt index e524d57706..81b6dc6a1c 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.network.DataManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerCollectionSheet diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt index 2984cf851e..7ae1e0d47f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GroupLoanAccountRepository -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import com.mifos.core.network.DataManager import com.mifos.core.objects.accounts.loan.Loans import com.mifos.core.payloads.GroupLoanPayload diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt index 0bf65dd8b6..e5c0197c33 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GroupsListRepository -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.datamanager.DataManagerGroups import com.mifos.core.objects.group.Group import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt index 517767436e..71228eb35c 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanAccountApprovalRepository -import com.mifos.core.modelobjects.account.loan.LoanApproval +import com.mifos.core.`object`.account.loan.LoanApproval import com.mifos.core.network.DataManager import com.mifos.core.network.GenericResponse import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt index 55926a2ca7..eaeddb5b42 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanAccountDisbursementRepository -import com.mifos.core.modelobjects.account.loan.LoanDisbursement +import com.mifos.core.`object`.account.loan.LoanDisbursement import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.objects.templates.loans.LoanTransactionTemplate diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt index 43bbc46c0a..1c95f3a8aa 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.LoansPayload import com.mifos.core.data.repository.LoanAccountRepository -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.organisations.LoanProducts import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.objects.accounts.loan.Loans import com.mifos.core.objects.templates.loans.LoanTemplate diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt index dafb7a3886..988439191f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanChargeDialogRepository -import com.mifos.core.modelobjects.clients.ChargeCreationResponse +import com.mifos.core.`object`.clients.ChargeCreationResponse import com.mifos.core.network.DataManager import com.mifos.core.payloads.ChargesPayload import okhttp3.ResponseBody diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt index 6699e6fb7e..29b1a3c6bc 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanRepaymentRepository -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt index eeaf82ad76..a391429b92 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.PathTrackingRepository -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLocation import com.mifos.core.network.datamanager.DataManagerDataTable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt index b546fe6a30..408c66bcf8 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.PinPointClientRepository -import com.mifos.core.modelobjects.clients.ClientAddressRequest -import com.mifos.core.modelobjects.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressResponse import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerClient import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt index b3012f4daf..fd44fad8e7 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ReportCategoryRepository -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import com.mifos.core.network.datamanager.DataManagerRunReport import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt index 4df680460d..ca1cbdb31d 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import com.mifos.core.network.datamanager.DataManagerRunReport import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt index 0434034b06..b6ecb60c28 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SavingsAccountApprovalRepository -import com.mifos.core.modelobjects.account.loan.SavingsApproval +import com.mifos.core.`object`.account.loan.SavingsApproval import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerSavings import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt index fb8c7edb03..08ff7059ff 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SavingsAccountRepository -import com.mifos.core.modelobjects.organisations.ProductSavings +import com.mifos.core.`object`.organisations.ProductSavings import com.mifos.core.network.datamanager.DataManagerSavings import com.mifos.core.objects.client.Savings import com.mifos.core.objects.templates.savings.SavingProductsTemplate diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt index e83aac8efa..228d21f879 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SavingsAccountTransactionRepository -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.network.datamanager.DataManagerSavings import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SearchRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SearchRepositoryImp.kt index 41efb7cef5..ed8c747bd9 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SearchRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SearchRepositoryImp.kt @@ -12,7 +12,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.common.network.Dispatcher import com.mifos.core.common.network.MifosDispatchers import com.mifos.core.data.repository.SearchRepository -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import com.mifos.core.network.datamanager.DataManagerSearch import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt index 89e3fb2cbc..6ed4410b08 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SurveySubmitRepository -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard import com.mifos.core.network.datamanager.DataManagerSurveys import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCenterPayloadsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCenterPayloadsRepositoryImp.kt index 294eefbc5b..b1df51ded2 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCenterPayloadsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCenterPayloadsRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.SyncCenterPayloadsRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.datamanager.DataManagerCenter import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt index ccae4662ff..3053822968 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncGroupPayloadsRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.datamanager.DataManagerGroups import com.mifos.core.objects.group.GroupPayload import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt index 8b33866ab5..dae1fbc628 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncLoanRepaymentTransactionRepository -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt index cfef121c61..c654020b9b 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncSavingsAccountTransactionRepository -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.network.datamanager.DataManagerSavings import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt index d9b4697429..ce652a6ee8 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt @@ -12,8 +12,8 @@ package com.mifos.core.databasehelper import android.os.AsyncTask import com.mifos.core.data.CenterPayload import com.mifos.core.data.CenterPayload_Table -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.accounts.CenterAccounts import com.mifos.core.objects.group.Center import com.mifos.core.objects.group.CenterDate diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt index 836cfba1f4..be9ee58192 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt @@ -10,7 +10,7 @@ package com.mifos.core.databasehelper import android.os.AsyncTask -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.client.Charges import com.mifos.core.objects.client.Charges_Table import com.mifos.core.objects.client.ClientDate diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt index d802e5853b..b51e0efa71 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt @@ -14,7 +14,7 @@ import com.google.gson.GsonBuilder import com.google.gson.reflect.TypeToken import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.MapDeserializer -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.accounts.ClientAccounts import com.mifos.core.objects.accounts.loan.LoanAccount import com.mifos.core.objects.accounts.loan.LoanAccount_Table diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt index efe6f7d0f6..aa8492abf3 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.accounts.GroupAccounts import com.mifos.core.objects.accounts.loan.LoanAccount import com.mifos.core.objects.accounts.loan.LoanAccount_Table diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt index 50a036cc51..e88c1a3360 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.PaymentTypeOption import com.mifos.core.objects.accounts.loan.ActualDisbursementDate import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt index f0314a6f4f..8f1dbddebd 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.PaymentTypeOption import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest_Table diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt index 7ad6cef2bb..d709142339 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt +++ b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt @@ -9,13 +9,13 @@ */ package com.mifos.core.objects.accounts.loan -import com.mifos.core.modelobjects.account.loan.AmortizationType -import com.mifos.core.modelobjects.account.loan.Currency -import com.mifos.core.modelobjects.account.loan.InterestCalculationPeriodType -import com.mifos.core.modelobjects.account.loan.InterestRateFrequencyType -import com.mifos.core.modelobjects.account.loan.InterestType -import com.mifos.core.modelobjects.account.loan.RepaymentFrequencyType -import com.mifos.core.modelobjects.account.loan.TermPeriodFrequencyType +import com.mifos.core.`object`.account.loan.AmortizationType +import com.mifos.core.`object`.account.loan.Currency +import com.mifos.core.`object`.account.loan.InterestCalculationPeriodType +import com.mifos.core.`object`.account.loan.InterestRateFrequencyType +import com.mifos.core.`object`.account.loan.InterestType +import com.mifos.core.`object`.account.loan.RepaymentFrequencyType +import com.mifos.core.`object`.account.loan.TermPeriodFrequencyType data class Loan( var id: Int? = null, diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt index c9b3f87627..dcdb4dffe5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt @@ -12,15 +12,15 @@ package com.mifos.core.objects.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel -import com.mifos.core.modelobjects.account.loan.AmortizationType -import com.mifos.core.modelobjects.account.loan.Currency -import com.mifos.core.modelobjects.account.loan.InterestCalculationPeriodType -import com.mifos.core.modelobjects.account.loan.InterestRateFrequencyType -import com.mifos.core.modelobjects.account.loan.InterestType -import com.mifos.core.modelobjects.account.loan.RepaymentFrequencyType -import com.mifos.core.modelobjects.account.loan.RepaymentSchedule -import com.mifos.core.modelobjects.account.loan.TermPeriodFrequencyType -import com.mifos.core.modelobjects.account.loan.Transaction +import com.mifos.core.`object`.account.loan.AmortizationType +import com.mifos.core.`object`.account.loan.Currency +import com.mifos.core.`object`.account.loan.InterestCalculationPeriodType +import com.mifos.core.`object`.account.loan.InterestRateFrequencyType +import com.mifos.core.`object`.account.loan.InterestType +import com.mifos.core.`object`.account.loan.RepaymentFrequencyType +import com.mifos.core.`object`.account.loan.RepaymentSchedule +import com.mifos.core.`object`.account.loan.TermPeriodFrequencyType +import com.mifos.core.`object`.account.loan.Transaction import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt index 3004eecd8b..78d7ceef1e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt +++ b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt @@ -10,13 +10,13 @@ package com.mifos.core.objects.accounts.loan import android.os.Parcelable -import com.mifos.core.modelobjects.account.loan.AmortizationType -import com.mifos.core.modelobjects.account.loan.Currency -import com.mifos.core.modelobjects.account.loan.InterestCalculationPeriodType -import com.mifos.core.modelobjects.account.loan.InterestRateFrequencyType -import com.mifos.core.modelobjects.account.loan.InterestType -import com.mifos.core.modelobjects.account.loan.RepaymentFrequencyType -import com.mifos.core.modelobjects.account.loan.TermPeriodFrequencyType +import com.mifos.core.`object`.account.loan.AmortizationType +import com.mifos.core.`object`.account.loan.Currency +import com.mifos.core.`object`.account.loan.InterestCalculationPeriodType +import com.mifos.core.`object`.account.loan.InterestRateFrequencyType +import com.mifos.core.`object`.account.loan.InterestType +import com.mifos.core.`object`.account.loan.RepaymentFrequencyType +import com.mifos.core.`object`.account.loan.TermPeriodFrequencyType import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt index a495c3b643..433c403d42 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt +++ b/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt @@ -12,7 +12,7 @@ package com.mifos.core.objects.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel -import com.mifos.core.modelobjects.account.loan.Currency +import com.mifos.core.`object`.account.loan.Currency import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ModelContainer import com.raizlabs.android.dbflow.annotation.PrimaryKey diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt b/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt index 1e7dd6b825..5d0f6c4e3f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt +++ b/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt @@ -10,8 +10,8 @@ package com.mifos.core.objects.accounts.savings import android.os.Parcelable -import com.mifos.core.modelobjects.account.saving.ChargeCalculationType -import com.mifos.core.modelobjects.account.saving.ChargeTimeType +import com.mifos.core.`object`.account.saving.ChargeCalculationType +import com.mifos.core.`object`.account.saving.ChargeTimeType import kotlinx.parcelize.Parcelize import javax.annotation.processing.Generated diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt b/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt index 006365068f..d1a6279545 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt @@ -12,12 +12,12 @@ package com.mifos.core.objects.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel -import com.mifos.core.modelobjects.account.saving.InterestCalculationDaysInYearType -import com.mifos.core.modelobjects.account.saving.InterestCalculationType -import com.mifos.core.modelobjects.account.saving.InterestCompoundingPeriodType -import com.mifos.core.modelobjects.account.saving.InterestPostingPeriodType -import com.mifos.core.modelobjects.account.saving.LockinPeriodFrequencyType -import com.mifos.core.modelobjects.account.saving.Timeline +import com.mifos.core.`object`.account.saving.InterestCalculationDaysInYearType +import com.mifos.core.`object`.account.saving.InterestCalculationType +import com.mifos.core.`object`.account.saving.InterestCompoundingPeriodType +import com.mifos.core.`object`.account.saving.InterestPostingPeriodType +import com.mifos.core.`object`.account.saving.LockinPeriodFrequencyType +import com.mifos.core.`object`.account.saving.Timeline import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt b/core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt index 0dfbf80f9a..5384a6ec8a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt +++ b/core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt @@ -12,7 +12,7 @@ package com.mifos.core.objects.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel -import com.mifos.core.modelobjects.clients.Address +import com.mifos.core.`object`.clients.Address import com.mifos.core.objects.noncore.DataTablePayload import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt index d39cf16a03..38b7d4c320 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt +++ b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt @@ -10,8 +10,8 @@ package com.mifos.core.objects.collectionsheet import android.os.Parcelable -import com.mifos.core.modelobjects.collectionsheets.AttendanceTypeOption -import com.mifos.core.modelobjects.collectionsheets.LoanCollectionSheet +import com.mifos.core.`object`.collectionsheets.AttendanceTypeOption +import com.mifos.core.`object`.collectionsheets.LoanCollectionSheet import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt index eb851bef6b..5fe3435712 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt +++ b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt @@ -12,7 +12,7 @@ package com.mifos.core.objects.collectionsheet import android.os.Parcelable import com.mifos.core.model.BulkRepaymentTransactions import com.mifos.core.model.ClientsAttendance -import com.mifos.core.modelobjects.collectionsheets.BulkSavingsDueTransaction +import com.mifos.core.`object`.collectionsheets.BulkSavingsDueTransaction import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt index e314b6f884..1c2fff279d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt +++ b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt @@ -10,9 +10,9 @@ package com.mifos.core.objects.collectionsheet import android.os.Parcelable -import com.mifos.core.modelobjects.collectionsheets.AttendanceTypeOption -import com.mifos.core.modelobjects.collectionsheets.SavingsProduct -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.collectionsheets.AttendanceTypeOption +import com.mifos.core.`object`.collectionsheets.SavingsProduct +import com.mifos.core.`object`.organisations.LoanProducts import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt index 4a3f8e066f..05e1d9e9cf 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt +++ b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt @@ -10,7 +10,7 @@ package com.mifos.core.objects.collectionsheet import android.os.Parcelable -import com.mifos.core.modelobjects.account.loan.PaymentTypeOptions +import com.mifos.core.`object`.account.loan.PaymentTypeOptions import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt index 2baf445af2..c08c2ba7b3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt +++ b/core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt @@ -10,7 +10,7 @@ package com.mifos.core.objects.collectionsheet import android.os.Parcelable -import com.mifos.core.modelobjects.collectionsheets.CollectionMeetingCalendar +import com.mifos.core.`object`.collectionsheets.CollectionMeetingCalendar import com.mifos.core.objects.accounts.loan.Status import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt b/core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt index 133d31224a..b4c988de1d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt @@ -10,7 +10,7 @@ package com.mifos.core.objects.group import android.os.Parcelable -import com.mifos.core.modelobjects.collectionsheets.CollectionMeetingCalendar +import com.mifos.core.`object`.collectionsheets.CollectionMeetingCalendar import com.mifos.core.objects.Timeline import com.mifos.core.objects.client.Status import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt b/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt index c6a9b67600..d41e283db6 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt @@ -12,8 +12,8 @@ package com.mifos.core.objects.templates.loans import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel -import com.mifos.core.modelobjects.template.loan.Currency -import com.mifos.core.modelobjects.template.loan.Type +import com.mifos.core.`object`.template.loan.Currency +import com.mifos.core.`object`.template.loan.Type import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ModelContainer import com.raizlabs.android.dbflow.annotation.PrimaryKey diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt b/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt index 3d2c6b4e24..947a71ad7a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt @@ -10,32 +10,32 @@ package com.mifos.core.objects.templates.loans import android.os.Parcelable -import com.mifos.core.modelobjects.account.loan.AccountLinkingOptions -import com.mifos.core.modelobjects.template.loan.AmortizationType -import com.mifos.core.modelobjects.template.loan.AmortizationTypeOptions -import com.mifos.core.modelobjects.template.loan.ChargeOptions -import com.mifos.core.modelobjects.template.loan.Currency -import com.mifos.core.modelobjects.template.loan.DaysInMonthType -import com.mifos.core.modelobjects.template.loan.DaysInYearType -import com.mifos.core.modelobjects.template.loan.FundOptions -import com.mifos.core.modelobjects.template.loan.InterestCalculationPeriodType -import com.mifos.core.modelobjects.template.loan.InterestRateFrequencyType -import com.mifos.core.modelobjects.template.loan.InterestRateFrequencyTypeOptions -import com.mifos.core.modelobjects.template.loan.InterestType -import com.mifos.core.modelobjects.template.loan.InterestTypeOptions -import com.mifos.core.modelobjects.template.loan.LoanCollateralOptions -import com.mifos.core.modelobjects.template.loan.LoanOfficerOptions -import com.mifos.core.modelobjects.template.loan.LoanPurposeOptions -import com.mifos.core.modelobjects.template.loan.Product -import com.mifos.core.modelobjects.template.loan.ProductOptions -import com.mifos.core.modelobjects.template.loan.RepaymentFrequencyDaysOfWeekTypeOptions -import com.mifos.core.modelobjects.template.loan.RepaymentFrequencyNthDayTypeOptions -import com.mifos.core.modelobjects.template.loan.RepaymentFrequencyType -import com.mifos.core.modelobjects.template.loan.RepaymentFrequencyTypeOptions -import com.mifos.core.modelobjects.template.loan.TermFrequencyTypeOptions -import com.mifos.core.modelobjects.template.loan.TermPeriodFrequencyType -import com.mifos.core.modelobjects.template.loan.Timeline -import com.mifos.core.modelobjects.template.loan.TransactionProcessingStrategyOptions +import com.mifos.core.`object`.account.loan.AccountLinkingOptions +import com.mifos.core.`object`.template.loan.AmortizationType +import com.mifos.core.`object`.template.loan.AmortizationTypeOptions +import com.mifos.core.`object`.template.loan.ChargeOptions +import com.mifos.core.`object`.template.loan.Currency +import com.mifos.core.`object`.template.loan.DaysInMonthType +import com.mifos.core.`object`.template.loan.DaysInYearType +import com.mifos.core.`object`.template.loan.FundOptions +import com.mifos.core.`object`.template.loan.InterestCalculationPeriodType +import com.mifos.core.`object`.template.loan.InterestRateFrequencyType +import com.mifos.core.`object`.template.loan.InterestRateFrequencyTypeOptions +import com.mifos.core.`object`.template.loan.InterestType +import com.mifos.core.`object`.template.loan.InterestTypeOptions +import com.mifos.core.`object`.template.loan.LoanCollateralOptions +import com.mifos.core.`object`.template.loan.LoanOfficerOptions +import com.mifos.core.`object`.template.loan.LoanPurposeOptions +import com.mifos.core.`object`.template.loan.Product +import com.mifos.core.`object`.template.loan.ProductOptions +import com.mifos.core.`object`.template.loan.RepaymentFrequencyDaysOfWeekTypeOptions +import com.mifos.core.`object`.template.loan.RepaymentFrequencyNthDayTypeOptions +import com.mifos.core.`object`.template.loan.RepaymentFrequencyType +import com.mifos.core.`object`.template.loan.RepaymentFrequencyTypeOptions +import com.mifos.core.`object`.template.loan.TermFrequencyTypeOptions +import com.mifos.core.`object`.template.loan.TermPeriodFrequencyType +import com.mifos.core.`object`.template.loan.Timeline +import com.mifos.core.`object`.template.loan.TransactionProcessingStrategyOptions import com.mifos.core.objects.noncore.DataTable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt b/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt index 27665fea26..baf4106c6e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt @@ -10,7 +10,7 @@ package com.mifos.core.objects.templates.loans import android.os.Parcelable -import com.mifos.core.modelobjects.template.loan.Type +import com.mifos.core.`object`.template.loan.Type import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt b/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt index a195878819..5ce0384e91 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt @@ -10,9 +10,9 @@ package com.mifos.core.objects.templates.savings import android.os.Parcelable -import com.mifos.core.modelobjects.account.saving.FieldOfficerOptions -import com.mifos.core.modelobjects.commonfiles.InterestType -import com.mifos.core.modelobjects.template.saving.AccountOptions +import com.mifos.core.`object`.account.saving.FieldOfficerOptions +import com.mifos.core.`object`.commonfiles.InterestType +import com.mifos.core.`object`.template.saving.AccountOptions import com.mifos.core.objects.accounts.savings.Currency import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt b/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt index f3c7773956..b06dd31f00 100644 --- a/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.objects.zipmodels -import com.mifos.core.modelobjects.organisations.ProductSavings +import com.mifos.core.`object`.organisations.ProductSavings import com.mifos.core.objects.templates.savings.SavingProductsTemplate /** diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt index eaf7b1457f..7b6fccf05f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ActivateRepository -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import org.openapitools.client.models.PostCentersCenterIdResponse diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt index 23ad48ad10..256230f7a9 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ActivateRepository -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import org.openapitools.client.models.PostClientsClientIdResponse diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt index 7c420a937b..b4f0450b70 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ActivateRepository -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import com.mifos.core.network.GenericResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt index c24517a931..0f12e3a027 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PinPointClientRepository -import com.mifos.core.modelobjects.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressRequest import com.mifos.core.network.GenericResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt index ee29e9a99f..3f874e22a9 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountApprovalRepository -import com.mifos.core.modelobjects.account.loan.SavingsApproval +import com.mifos.core.`object`.account.loan.SavingsApproval import com.mifos.core.network.GenericResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt index 4e6dc4b74b..6448162495 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.SyncCenterPayloadsRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt index beaa76c78b..e85a3db400 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ChargeDialogRepository -import com.mifos.core.modelobjects.clients.ChargeCreationResponse +import com.mifos.core.`object`.clients.ChargeCreationResponse import com.mifos.core.payloads.ChargesPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt index 3755138979..76369d0f1f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientIdentifierDialogRepository -import com.mifos.core.modelobjects.noncoreobjects.IdentifierCreationResponse -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt index 8733ceffcd..6734eefe5a 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewGroupRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.group.GroupPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt index b53da639fb..6e78c6ddbc 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.LoanChargeDialogRepository -import com.mifos.core.modelobjects.clients.ChargeCreationResponse +import com.mifos.core.`object`.clients.ChargeCreationResponse import com.mifos.core.payloads.ChargesPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt index 412fd55c9c..475191255f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.CreateNewCenterRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt index b986c5eb17..a3f96e1cb5 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewGroupRepository -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.group.GroupPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt index 5a8005f092..8235e6f2f2 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.objects.collectionsheet.CollectionSheetResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt index 9cf2410081..f0f067b9b9 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.objects.collectionsheet.CollectionSheetResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt index f1ddcbd716..01e5044e29 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ChargeDialogRepository -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.template.client.ChargeTemplate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt index c75bc4cea8..62f19a6f19 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.LoanAccountRepository -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.organisations.LoanProducts import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt index 9044affe05..a913b1e0c6 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CenterDetailsRepository -import com.mifos.core.modelobjects.groups.CenterInfo +import com.mifos.core.`object`.groups.CenterInfo import com.mifos.core.objects.group.CenterWithAssociations import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt index 8693b19c83..f4aaa81c5f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CenterListRepository -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.group.Center import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt index 23ad87993e..5f328a0f38 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CheckerInboxRepository -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.CheckerTask import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt index c8d7e1a43e..733308fb66 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientIdentifierDialogRepository -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt index 3c77f49ecc..d63f4744c3 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientIdentifiersRepository -import com.mifos.core.modelobjects.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.Identifier import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt index 487b5d611b..15219c2ff1 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PinPointClientRepository -import com.mifos.core.modelobjects.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.ClientAddressResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt index 9c1d7e0c4e..7a878ffaa7 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.DocumentListRepository -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt index 9ea2ce48ff..3ad08d9dff 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GroupLoanAccountRepository -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt index b9171cb721..8d92840cab 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportCategoryRepository -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt index 6226f936fd..3168842578 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt index e0b756c191..fd9a368e3f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt index 4033e4a1ef..a483909e02 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt index 431b60beaa..6b54acc0b4 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt index 991bf55820..c6a39de2e5 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt index dbc3fc7f43..791a9aa76c 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PathTrackingRepository -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLocation import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt index 6975a7559c..5f56765e84 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountTransactionRepository -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt index 1fc3d68936..ffb8d33239 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PinPointClientRepository -import com.mifos.core.modelobjects.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressRequest import com.mifos.core.network.GenericResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/Changes.kt b/core/model/src/main/kotlin/com/mifos/core/object/Changes.kt similarity index 96% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/Changes.kt rename to core/model/src/main/kotlin/com/mifos/core/object/Changes.kt index b0d4198c45..829420addd 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/Changes.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/Changes.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects +package com.mifos.core.`object` import android.os.Parcelable import com.google.gson.annotations.Expose diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/ErrorSyncServerMessage.kt b/core/model/src/main/kotlin/com/mifos/core/object/ErrorSyncServerMessage.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/ErrorSyncServerMessage.kt rename to core/model/src/main/kotlin/com/mifos/core/object/ErrorSyncServerMessage.kt index 64c5a9c91f..46e319114b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/ErrorSyncServerMessage.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/ErrorSyncServerMessage.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects +package com.mifos.core.`object` /** * Created by Rajan Maurya on 23/07/16. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/SearchedEntity.kt b/core/model/src/main/kotlin/com/mifos/core/object/SearchedEntity.kt similarity index 89% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/SearchedEntity.kt rename to core/model/src/main/kotlin/com/mifos/core/object/SearchedEntity.kt index 8703449d42..7b6a2c55f7 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/SearchedEntity.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/SearchedEntity.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects +package com.mifos.core.`object` import android.os.Parcelable -import com.mifos.core.modelobjects.commonfiles.InterestType +import com.mifos.core.`object`.commonfiles.InterestType import kotlinx.parcelize.Parcelize /** diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/AccountLinkingOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/AccountLinkingOptions.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/AccountLinkingOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/AccountLinkingOptions.kt index b178b93474..c95a9d6c73 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/AccountLinkingOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/AccountLinkingOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/AmortizationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/AmortizationType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/AmortizationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/AmortizationType.kt index 668fa3d7d9..45d15f69ab 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/AmortizationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/AmortizationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Currency.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/Currency.kt index d712a40aa9..13646ca487 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/DaysInMonthType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/DaysInMonthType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/DaysInMonthType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/DaysInMonthType.kt index 54a249bddf..3dd917f8ea 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/DaysInMonthType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/DaysInMonthType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/DaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/DaysInYearType.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/DaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/DaysInYearType.kt index 8151311e8c..b1acef55ea 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/DaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/DaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestCalculationPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestCalculationPeriodType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestCalculationPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestCalculationPeriodType.kt index 258e9d7eea..9106e24dc6 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestCalculationPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestCalculationPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestRateFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestRateFrequencyType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestRateFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestRateFrequencyType.kt index 9574b0f514..dd0bef43b5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestRateFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestRateFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestType.kt index 3bd64efb4f..dbb97ca60e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanApproval.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanApproval.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanApproval.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanApproval.kt index d12ee47687..c275e75258 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanApproval.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanApproval.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanApprovalRequest.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanApprovalRequest.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanApprovalRequest.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanApprovalRequest.kt index 0b0a10baa7..14093597d9 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanApprovalRequest.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanApprovalRequest.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanDisbursement.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanDisbursement.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanDisbursement.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanDisbursement.kt index fb6749f00d..ab6af8c546 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanDisbursement.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanDisbursement.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanPurposeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanPurposeOptions.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanPurposeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanPurposeOptions.kt index 33de036119..679db4203a 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanPurposeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanPurposeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanRepaymentResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanRepaymentResponse.kt similarity index 88% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanRepaymentResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanRepaymentResponse.kt index 65676283aa..783526250f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/LoanRepaymentResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/LoanRepaymentResponse.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import com.google.gson.annotations.Expose -import com.mifos.core.modelobjects.Changes +import com.mifos.core.`object`.Changes import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentDetailData.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentDetailData.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentDetailData.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentDetailData.kt index 862fb30ad7..4f9d22274c 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentDetailData.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentDetailData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentType.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentType.kt index e7ac0a11d5..fc1611fb71 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentTypeOptions.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentTypeOptions.kt index 19002d5d6a..f9586dae19 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/PaymentTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/PaymentTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Period.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Period.kt similarity index 97% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Period.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/Period.kt index 1cc0554a06..8494ef6b5e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Period.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Period.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyDayOfWeekType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyDayOfWeekType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyDayOfWeekType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyDayOfWeekType.kt index 0e80fa30a3..bf3b32a9e1 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyDayOfWeekType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyDayOfWeekType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyNthDayType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyNthDayType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyNthDayType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyNthDayType.kt index 2b774029f8..2708a4f230 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyNthDayType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyNthDayType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyType.kt index 56f2b3b17c..82397d4f99 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyTypeOptions.kt index 887fa03768..5c0c2f2a8e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentSchedule.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentSchedule.kt similarity index 97% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentSchedule.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentSchedule.kt index a9d1879108..8cb5dc9663 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/RepaymentSchedule.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/RepaymentSchedule.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/SavingsApproval.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/SavingsApproval.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/SavingsApproval.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/SavingsApproval.kt index a8fdba5f68..93f1ff061f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/SavingsApproval.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/SavingsApproval.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TermFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/TermFrequencyTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TermFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/TermFrequencyTypeOptions.kt index 8e3e96a77b..3a8635e84c 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TermFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/TermFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TermPeriodFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/TermPeriodFrequencyType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TermPeriodFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/TermPeriodFrequencyType.kt index 0785bd20bd..e0a503d8a5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TermPeriodFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/TermPeriodFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Transaction.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Transaction.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Transaction.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/Transaction.kt index f0f8b6325d..7f2654001c 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Transaction.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Transaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TransactionProcessingStrategy.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/TransactionProcessingStrategy.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TransactionProcessingStrategy.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/TransactionProcessingStrategy.kt index 88b8e939f8..ef253e7d9b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/TransactionProcessingStrategy.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/TransactionProcessingStrategy.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Type.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Type.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Type.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/loan/Type.kt index 69ab37b68f..ab15c6f9fa 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/loan/Type.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/loan/Type.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.loan +package com.mifos.core.`object`.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/ChargeCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/ChargeCalculationType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/ChargeCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/ChargeCalculationType.kt index 9d3831fee1..c82f7eacf6 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/ChargeCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/ChargeTimeType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/ChargeTimeType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/ChargeTimeType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/ChargeTimeType.kt index 1b3d468643..4edce3c05b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/ChargeTimeType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/FieldOfficerOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/FieldOfficerOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/FieldOfficerOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/FieldOfficerOptions.kt index 34e90e0dbe..6017cba53f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/FieldOfficerOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/FieldOfficerOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCalculationDaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCalculationDaysInYearType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCalculationDaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCalculationDaysInYearType.kt index c0c419cffe..f1e148277f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCalculationDaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCalculationDaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCalculationType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCalculationType.kt index 44cc0fba01..8c2b647ee5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCompoundingPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCompoundingPeriodType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCompoundingPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCompoundingPeriodType.kt index b056383d91..9e546802eb 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestCompoundingPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestCompoundingPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestPostingPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestPostingPeriodType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestPostingPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestPostingPeriodType.kt index 104d5b5d38..f7b7f241e9 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/InterestPostingPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/InterestPostingPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/LockinPeriodFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/LockinPeriodFrequencyType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/LockinPeriodFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/LockinPeriodFrequencyType.kt index a218926048..7491494ee8 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/LockinPeriodFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/LockinPeriodFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/SavingsAccountTransactionResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/SavingsAccountTransactionResponse.kt similarity index 87% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/SavingsAccountTransactionResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/SavingsAccountTransactionResponse.kt index e6e0753f2a..af95482f63 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/SavingsAccountTransactionResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/SavingsAccountTransactionResponse.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import com.google.gson.annotations.Expose -import com.mifos.core.modelobjects.Changes +import com.mifos.core.`object`.Changes /** * Created by ishankhanna on 12/06/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/Timeline.kt b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/Timeline.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/Timeline.kt rename to core/model/src/main/kotlin/com/mifos/core/object/account/saving/Timeline.kt index 21d6c4a7fb..2c3a99990a 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/account/saving/Timeline.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/account/saving/Timeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.account.saving +package com.mifos.core.`object`.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/CheckerInboxSearchTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/CheckerInboxSearchTemplate.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/CheckerInboxSearchTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/CheckerInboxSearchTemplate.kt index b5cef7833b..6854ad2be5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/CheckerInboxSearchTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/CheckerInboxSearchTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.checkerinboxtask +package com.mifos.core.`object`.checkerinboxtask import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/CheckerTask.kt b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/CheckerTask.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/CheckerTask.kt rename to core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/CheckerTask.kt index b4dcb9fb4f..ba9f6350e7 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/CheckerTask.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/CheckerTask.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.checkerinboxtask +package com.mifos.core.`object`.checkerinboxtask import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/RescheduleLoansTask.kt b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/RescheduleLoansTask.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/RescheduleLoansTask.kt rename to core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/RescheduleLoansTask.kt index 803df755df..be332a86a0 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/RescheduleLoansTask.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/RescheduleLoansTask.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.checkerinboxtask +package com.mifos.core.`object`.checkerinboxtask import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/RescheduleReasonCodeValue.kt b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/RescheduleReasonCodeValue.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/RescheduleReasonCodeValue.kt rename to core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/RescheduleReasonCodeValue.kt index c190a7b635..61cc12b196 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/checkerinboxtask/RescheduleReasonCodeValue.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/checkerinboxtask/RescheduleReasonCodeValue.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.checkerinboxtask +package com.mifos.core.`object`.checkerinboxtask import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ActivatePayload.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/ActivatePayload.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ActivatePayload.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/ActivatePayload.kt index 0fbf6ea3b6..860e88bb7c 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ActivatePayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/ActivatePayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Address.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/Address.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Address.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/Address.kt index 8dc6852cfd..ca7797a09e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Address.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/Address.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ChargeCreationResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/ChargeCreationResponse.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ChargeCreationResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/ChargeCreationResponse.kt index 9641413eaf..6ab6442d85 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ChargeCreationResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/ChargeCreationResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ChargesRename.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/ChargesRename.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ChargesRename.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/ChargesRename.kt index 0928fd1414..e0c5df5005 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ChargesRename.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/ChargesRename.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients /** * Created by nellyk on 2/15/2016. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ClientAddressRequest.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/ClientAddressRequest.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ClientAddressRequest.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/ClientAddressRequest.kt index 95149fa822..495c6ccf97 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ClientAddressRequest.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/ClientAddressRequest.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ClientAddressResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/ClientAddressResponse.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ClientAddressResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/ClientAddressResponse.kt index e843ff78b5..b27252846e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/ClientAddressResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/ClientAddressResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Page.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/Page.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Page.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/Page.kt index 7830dfbfa7..e29a383098 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Page.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/Page.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients /** * Created by ishankhanna on 09/02/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Permission.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/Permission.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Permission.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/Permission.kt index 5916d8c38a..266378bb2a 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Permission.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/Permission.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients /** * Created by ishankhanna on 09/02/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Role.kt b/core/model/src/main/kotlin/com/mifos/core/object/clients/Role.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Role.kt rename to core/model/src/main/kotlin/com/mifos/core/object/clients/Role.kt index c378a57c92..1763f62fee 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/clients/Role.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/clients/Role.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.clients +package com.mifos.core.`object`.clients /** * Created by ishankhanna on 09/02/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/AttendanceTypeOption.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/AttendanceTypeOption.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/AttendanceTypeOption.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/AttendanceTypeOption.kt index ea67a5d8fc..a706144c59 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/AttendanceTypeOption.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/AttendanceTypeOption.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/BulkSavingsDueTransaction.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/BulkSavingsDueTransaction.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/BulkSavingsDueTransaction.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/BulkSavingsDueTransaction.kt index 305bf77bc6..7728df101d 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/BulkSavingsDueTransaction.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/BulkSavingsDueTransaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionFrequency.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionFrequency.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionFrequency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionFrequency.kt index d202800200..402b04e736 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionFrequency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionFrequency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets /** * Created by ishankhanna on 16/07/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionMeetingCalendar.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionMeetingCalendar.kt similarity index 96% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionMeetingCalendar.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionMeetingCalendar.kt index e91ca003aa..e14c2e49cc 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionMeetingCalendar.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionMeetingCalendar.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionSheetRequestPayload.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionSheetRequestPayload.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionSheetRequestPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionSheetRequestPayload.kt index aeb91cb4f2..11bcf5b9e2 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/CollectionSheetRequestPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/CollectionSheetRequestPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/EntityType.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/EntityType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/EntityType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/EntityType.kt index bc683c59f2..da8dcc6ea3 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/EntityType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/EntityType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/LoanAndClientName.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/LoanAndClientName.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/LoanAndClientName.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/LoanAndClientName.kt index 166651809d..0d20ba2e0d 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/LoanAndClientName.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/LoanAndClientName.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/LoanCollectionSheet.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/LoanCollectionSheet.kt similarity index 96% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/LoanCollectionSheet.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/LoanCollectionSheet.kt index eb0e76db56..0d439ad799 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/LoanCollectionSheet.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/LoanCollectionSheet.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcel import android.os.Parcelable -import com.mifos.core.modelobjects.account.loan.Currency +import com.mifos.core.`object`.account.loan.Currency /** * Created by Tarun on 06-07-2017. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/SavingsProduct.kt b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/SavingsProduct.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/SavingsProduct.kt rename to core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/SavingsProduct.kt index 0aacf4bc7b..cf16f1ad12 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/collectionsheets/SavingsProduct.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/collectionsheets/SavingsProduct.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.collectionsheets +package com.mifos.core.`object`.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/commonfiles/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/object/commonfiles/InterestType.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/commonfiles/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/commonfiles/InterestType.kt index ccc455b7d6..808841eb72 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/commonfiles/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/commonfiles/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.commonfiles +package com.mifos.core.`object`.commonfiles import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Account.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Account.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Account.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Account.kt index 77a807b6f7..21cef44ebd 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Account.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Account.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/AttendanceType.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/AttendanceType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/AttendanceType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/AttendanceType.kt index d45ff5abd4..9d3c60f927 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/AttendanceType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/AttendanceType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Client.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Client.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Client.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Client.kt index 24b856b886..7c8058493b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Client.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Client.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/CollectionMeetingCalendar.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/CollectionMeetingCalendar.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/CollectionMeetingCalendar.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/CollectionMeetingCalendar.kt index 3170062785..32298be6ec 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/CollectionMeetingCalendar.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/CollectionMeetingCalendar.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/CollectionSheet.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/CollectionSheet.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/CollectionSheet.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/CollectionSheet.kt index 39e02d9ab9..5cd4612066 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/CollectionSheet.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/CollectionSheet.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import com.google.gson.Gson diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Currency.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Currency.kt index 77f944137e..c9d6bb9dd5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/EntityType.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/EntityType.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/EntityType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/EntityType.kt index d856df8189..4c091ff4e6 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/EntityType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/EntityType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Loan.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Loan.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Loan.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Loan.kt index 5e5875d366..8b6085de51 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Loan.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Loan.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MeetingCenter.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MeetingCenter.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MeetingCenter.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MeetingCenter.kt index d4c179de13..f36ae43f0e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MeetingCenter.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MeetingCenter.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MeetingDate.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MeetingDate.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MeetingDate.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MeetingDate.kt index 6a47cde6c7..fe80f57bb3 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MeetingDate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MeetingDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MifosGroup.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MifosGroup.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MifosGroup.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MifosGroup.kt index 8979e10a34..b13b75cfde 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/MifosGroup.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/MifosGroup.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/OfflineCenter.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/OfflineCenter.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/OfflineCenter.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/OfflineCenter.kt index ff086e6941..68f2f9856a 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/OfflineCenter.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/OfflineCenter.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/RepaymentTransaction.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/RepaymentTransaction.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/RepaymentTransaction.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/RepaymentTransaction.kt index 55d4e9e14f..0394187ac0 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/RepaymentTransaction.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/RepaymentTransaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Status.kt b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Status.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Status.kt rename to core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Status.kt index 8ac2450ec2..bcf70b9be3 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/databaseobjects/Status.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/databaseobjects/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.databaseobjects +package com.mifos.core.`object`.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/error/Arg.kt b/core/model/src/main/kotlin/com/mifos/core/object/error/Arg.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/error/Arg.kt rename to core/model/src/main/kotlin/com/mifos/core/object/error/Arg.kt index c5987c4710..fb46368209 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/error/Arg.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/error/Arg.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.error +package com.mifos.core.`object`.error import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/error/Errors.kt b/core/model/src/main/kotlin/com/mifos/core/object/error/Errors.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/error/Errors.kt rename to core/model/src/main/kotlin/com/mifos/core/object/error/Errors.kt index a5d3ecb4a2..dac02010e2 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/error/Errors.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/error/Errors.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.error +package com.mifos.core.`object`.error import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/error/MifosError.kt b/core/model/src/main/kotlin/com/mifos/core/object/error/MifosError.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/error/MifosError.kt rename to core/model/src/main/kotlin/com/mifos/core/object/error/MifosError.kt index 31473cf22f..fbec61b952 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/error/MifosError.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/error/MifosError.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.error +package com.mifos.core.`object`.error import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/groups/CenterInfo.kt b/core/model/src/main/kotlin/com/mifos/core/object/groups/CenterInfo.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/groups/CenterInfo.kt rename to core/model/src/main/kotlin/com/mifos/core/object/groups/CenterInfo.kt index 5c59309524..a5717f00cc 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/groups/CenterInfo.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/groups/CenterInfo.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.groups +package com.mifos.core.`object`.groups import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/nav/ClientArgs.kt b/core/model/src/main/kotlin/com/mifos/core/object/nav/ClientArgs.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/nav/ClientArgs.kt rename to core/model/src/main/kotlin/com/mifos/core/object/nav/ClientArgs.kt index 8d4408487c..3ca4cfe1c0 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/nav/ClientArgs.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/nav/ClientArgs.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.nav +package com.mifos.core.`object`.nav import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/nav/DataTableNavigationArg.kt b/core/model/src/main/kotlin/com/mifos/core/object/nav/DataTableNavigationArg.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/nav/DataTableNavigationArg.kt rename to core/model/src/main/kotlin/com/mifos/core/object/nav/DataTableNavigationArg.kt index 763de0dfd2..35f3a8bf5a 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/nav/DataTableNavigationArg.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/nav/DataTableNavigationArg.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.nav +package com.mifos.core.`object`.nav data class DataTableNavigationArg( diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/Document.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/Document.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/Document.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/Document.kt index 56d5e450cb..05c04e05e3 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/Document.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/Document.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/DocumentType.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/DocumentType.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/DocumentType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/DocumentType.kt index 2177323016..3d30ca21ea 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/DocumentType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/DocumentType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/Identifier.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/Identifier.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/Identifier.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/Identifier.kt index c0573b53ab..c3a2cabacb 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/Identifier.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/Identifier.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierCreationResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierCreationResponse.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierCreationResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierCreationResponse.kt index c7a46d6afb..547dc26532 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierCreationResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierCreationResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierPayload.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierPayload.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierPayload.kt index e3002c97bb..7f8ed85cb7 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierTemplate.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierTemplate.kt index 3d37157754..c1507c852b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierType.kt b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierType.kt index 3a367724cd..c738d6023b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/noncoreobjects/IdentifierType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/noncoreobjects/IdentifierType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.noncoreobjects +package com.mifos.core.`object`.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AccountingRule.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/AccountingRule.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AccountingRule.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/AccountingRule.kt index 74e5c3372d..60ef1348e1 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AccountingRule.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/AccountingRule.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AllowAttributeOverrides.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/AllowAttributeOverrides.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AllowAttributeOverrides.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/AllowAttributeOverrides.kt index cb3b195d3e..5a522e8b8f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AllowAttributeOverrides.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/AllowAttributeOverrides.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AmortizationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/AmortizationType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AmortizationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/AmortizationType.kt index 39b18a4c42..4cd4a7c579 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/AmortizationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/AmortizationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ClientClassificationOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/ClientClassificationOptions.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ClientClassificationOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/ClientClassificationOptions.kt index 272a6b00b2..6865d7e7d2 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ClientClassificationOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/ClientClassificationOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ClientTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/ClientTypeOptions.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ClientTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/ClientTypeOptions.kt index 0f8ea7e6eb..d9dd1f7951 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ClientTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/ClientTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/Currency.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/Currency.kt index e1c1ce9a7e..c247b3ff04 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/DaysInMonthType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/DaysInMonthType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/DaysInMonthType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/DaysInMonthType.kt index 60fdb7383b..39b10cb7e0 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/DaysInMonthType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/DaysInMonthType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/DaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/DaysInYearType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/DaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/DaysInYearType.kt index 65933aa313..b8988f45c2 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/DaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/DaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/GenderOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/GenderOptions.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/GenderOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/GenderOptions.kt index cef9e25a44..2301380b12 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/GenderOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/GenderOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationDaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationDaysInYearType.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationDaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationDaysInYearType.kt index e5168ac05b..cb7850d688 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationDaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationDaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationPeriodType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationPeriodType.kt index fc5a827475..45cbe4b856 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationTypeOptions.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationTypeOptions.kt index 1dc81008b8..e70d1f81a6 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCalculationTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCalculationTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCompoundingPeriod.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCompoundingPeriod.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCompoundingPeriod.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCompoundingPeriod.kt index 46639daa44..305a7ed17f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestCompoundingPeriod.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestCompoundingPeriod.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestPostingPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestPostingPeriodType.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestPostingPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestPostingPeriodType.kt index 4ebc9959f5..df1694f982 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestPostingPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestPostingPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestRateFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestRateFrequencyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestRateFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestRateFrequencyType.kt index 980c75b969..52521d6f35 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestRateFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestRateFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestType.kt index dcc3124331..492134e809 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanFund.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanFund.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanFund.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanFund.kt index 82883f4547..dd5457843f 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanFund.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanFund.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nellyk on 2/21/2016. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanProducts.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanProducts.kt similarity index 99% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanProducts.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanProducts.kt index ed0b8d6c0e..633bb1608e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanProducts.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanProducts.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanPurpose.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanPurpose.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanPurpose.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanPurpose.kt index 9b7d2078f0..ba21e3e690 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/LoanPurpose.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/LoanPurpose.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nellyk on 2/21/2016. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ProductSavings.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/ProductSavings.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ProductSavings.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/ProductSavings.kt index a08f9c3b6a..f0401ee483 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/ProductSavings.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/ProductSavings.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations /** * Created by nellyk on 12/15/2015. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/RepaymentFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/organisations/RepaymentFrequencyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/RepaymentFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/organisations/RepaymentFrequencyType.kt index 1272d06279..3af1e17777 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/organisations/RepaymentFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/organisations/RepaymentFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.organisations +package com.mifos.core.`object`.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/responses/SaveResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/responses/SaveResponse.kt similarity index 89% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/responses/SaveResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/responses/SaveResponse.kt index a6e4cc97df..e2aa41e49b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/responses/SaveResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/responses/SaveResponse.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.responses +package com.mifos.core.`object`.responses import com.google.gson.Gson import com.google.gson.annotations.SerializedName -import com.mifos.core.modelobjects.Changes +import com.mifos.core.`object`.Changes class SaveResponse { @SerializedName("groupId") diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/ColumnHeader.kt b/core/model/src/main/kotlin/com/mifos/core/object/runreport/ColumnHeader.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/ColumnHeader.kt rename to core/model/src/main/kotlin/com/mifos/core/object/runreport/ColumnHeader.kt index 5207da6534..81f5dcac69 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/ColumnHeader.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/runreport/ColumnHeader.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.runreport +package com.mifos.core.`object`.runreport import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/DataRow.kt b/core/model/src/main/kotlin/com/mifos/core/object/runreport/DataRow.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/DataRow.kt rename to core/model/src/main/kotlin/com/mifos/core/object/runreport/DataRow.kt index a46db05efa..9948269fff 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/DataRow.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/runreport/DataRow.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.runreport +package com.mifos.core.`object`.runreport import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/FullParameterListResponse.kt b/core/model/src/main/kotlin/com/mifos/core/object/runreport/FullParameterListResponse.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/FullParameterListResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/object/runreport/FullParameterListResponse.kt index 2cc8a00c30..46b8feb1c5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/FullParameterListResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/runreport/FullParameterListResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.runreport +package com.mifos.core.`object`.runreport import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/client/ClientReportTypeItem.kt b/core/model/src/main/kotlin/com/mifos/core/object/runreport/client/ClientReportTypeItem.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/client/ClientReportTypeItem.kt rename to core/model/src/main/kotlin/com/mifos/core/object/runreport/client/ClientReportTypeItem.kt index 7cc7932614..18e7a98680 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/runreport/client/ClientReportTypeItem.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/runreport/client/ClientReportTypeItem.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.runreport.client +package com.mifos.core.`object`.runreport.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/surveys/Scorecard.kt b/core/model/src/main/kotlin/com/mifos/core/object/surveys/Scorecard.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/surveys/Scorecard.kt rename to core/model/src/main/kotlin/com/mifos/core/object/surveys/Scorecard.kt index b341327470..70f608abeb 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/surveys/Scorecard.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/surveys/Scorecard.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.surveys +package com.mifos.core.`object`.surveys import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/surveys/ScorecardValues.kt b/core/model/src/main/kotlin/com/mifos/core/object/surveys/ScorecardValues.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/surveys/ScorecardValues.kt rename to core/model/src/main/kotlin/com/mifos/core/object/surveys/ScorecardValues.kt index 49061da070..2e21182bcd 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/surveys/ScorecardValues.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/surveys/ScorecardValues.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.surveys +package com.mifos.core.`object`.surveys import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/systems/Code.kt b/core/model/src/main/kotlin/com/mifos/core/object/systems/Code.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/systems/Code.kt rename to core/model/src/main/kotlin/com/mifos/core/object/systems/Code.kt index 9d8d2befd9..a37c3d0cf7 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/systems/Code.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/systems/Code.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.systems +package com.mifos.core.`object`.systems /** * Created by ishankhanna on 16/06/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/systems/CodeValue.kt b/core/model/src/main/kotlin/com/mifos/core/object/systems/CodeValue.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/systems/CodeValue.kt rename to core/model/src/main/kotlin/com/mifos/core/object/systems/CodeValue.kt index 7bc2ae201d..a8c70b5f5c 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/systems/CodeValue.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/systems/CodeValue.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.systems +package com.mifos.core.`object`.systems /** * Created by ishankhanna on 16/06/14. diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeAppliesTo.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeAppliesTo.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeAppliesTo.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeAppliesTo.kt index d7cff82010..c255a6155e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeAppliesTo.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeAppliesTo.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeCalculationType.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeCalculationType.kt index 93ee2d9b55..3f7f827adc 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeOptions.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeOptions.kt index 6201fcf96f..16beb0dd00 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargePaymentMode.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargePaymentMode.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargePaymentMode.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargePaymentMode.kt index a68160af77..15866c8996 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargePaymentMode.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargePaymentMode.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeTemplate.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeTemplate.kt index 2c22e00bcf..3ab70eaead 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeTimeType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeTimeType.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeTimeType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeTimeType.kt index 916bc29fe0..d1de5e97b4 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/ChargeTimeType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/Currency.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/Currency.kt index 37401bc593..6f484e2fdc 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/IncomeOrLiabilityAccount.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/client/IncomeOrLiabilityAccount.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/IncomeOrLiabilityAccount.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/client/IncomeOrLiabilityAccount.kt index b0dc7cc0d1..80a1d24ecb 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/client/IncomeOrLiabilityAccount.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/client/IncomeOrLiabilityAccount.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.client +package com.mifos.core.`object`.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AccountingRule.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AccountingRule.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AccountingRule.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/AccountingRule.kt index 1ff2a3b99d..818dd3c144 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AccountingRule.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AccountingRule.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AllowAttributeOverrides.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AllowAttributeOverrides.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AllowAttributeOverrides.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/AllowAttributeOverrides.kt index 75fe56df90..e084e3b97a 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AllowAttributeOverrides.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AllowAttributeOverrides.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AmortizationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AmortizationType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AmortizationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/AmortizationType.kt index 574416fd8d..bcf8cb1511 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AmortizationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AmortizationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AmortizationTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AmortizationTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AmortizationTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/AmortizationTypeOptions.kt index d65ed77547..d2240e9595 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/AmortizationTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/AmortizationTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/CalendarOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/CalendarOptions.kt similarity index 96% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/CalendarOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/CalendarOptions.kt index a2eb15701d..1c80621abc 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/CalendarOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/CalendarOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/CalendarOptionsType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/CalendarOptionsType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/CalendarOptionsType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/CalendarOptionsType.kt index 1cc225e65c..3a310d8c18 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/CalendarOptionsType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/CalendarOptionsType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeAppliesTo.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeAppliesTo.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeAppliesTo.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeAppliesTo.kt index e28b246f24..2e6026e569 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeAppliesTo.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeAppliesTo.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeCalculationType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeCalculationType.kt index bf9faa7c84..e055e7d0ca 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeOptions.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeOptions.kt index 3680b11124..cea6c38fd4 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargePaymentMode.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargePaymentMode.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargePaymentMode.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargePaymentMode.kt index 24c6dffc70..8e65af6961 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargePaymentMode.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargePaymentMode.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeTimeType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeTimeType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeTimeType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeTimeType.kt index 2e79d094e4..c7655a43a5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ChargeTimeType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Charges.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Charges.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Charges.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Charges.kt index 80e6f91da3..62ce14b6aa 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Charges.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Charges.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Currency.kt similarity index 93% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Currency.kt index 8ef8b05dab..9b2409f5e8 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/DaysInMonthType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/DaysInMonthType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/DaysInMonthType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/DaysInMonthType.kt index c304e25e11..ed38bfeba9 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/DaysInMonthType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/DaysInMonthType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/DaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/DaysInYearType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/DaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/DaysInYearType.kt index ace520b109..9a80a1663e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/DaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/DaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/EntityType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/EntityType.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/EntityType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/EntityType.kt index 49c9ff9521..5b4f57acee 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/EntityType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/EntityType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Frequency.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Frequency.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Frequency.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Frequency.kt index 0efc9a122c..416836a707 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Frequency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Frequency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/FundOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/FundOptions.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/FundOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/FundOptions.kt index 415863ea4c..c36e69aba7 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/FundOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/FundOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Group.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Group.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Group.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Group.kt index a4225db201..a788c04f6b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Group.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Group.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/GroupLoanTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/GroupLoanTemplate.kt similarity index 98% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/GroupLoanTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/GroupLoanTemplate.kt index e2a180c05f..c45c08dcdb 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/GroupLoanTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/GroupLoanTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/GroupTimeline.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/GroupTimeline.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/GroupTimeline.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/GroupTimeline.kt index 143ebf4096..9da2910522 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/GroupTimeline.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/GroupTimeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestCalculationPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestCalculationPeriodType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestCalculationPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestCalculationPeriodType.kt index 07fa78c41c..25814b5e99 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestCalculationPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestCalculationPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestCalculationPeriodTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestCalculationPeriodTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestCalculationPeriodTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestCalculationPeriodTypeOptions.kt index 74d7695058..f624d04557 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestCalculationPeriodTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestCalculationPeriodTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRateFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRateFrequencyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRateFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRateFrequencyType.kt index df99425ab6..2ed5f0a552 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRateFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRateFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRateFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRateFrequencyTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRateFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRateFrequencyTypeOptions.kt index c4a5946502..ccee074747 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRateFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRateFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRecalculationCompoundingType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRecalculationCompoundingType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRecalculationCompoundingType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRecalculationCompoundingType.kt index 6a613aed99..d4a17226f9 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRecalculationCompoundingType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRecalculationCompoundingType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRecalculationData.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRecalculationData.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRecalculationData.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRecalculationData.kt index 6a5c479d7f..1c9c4e2570 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestRecalculationData.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestRecalculationData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestType.kt index ce36c12aaf..92cd0c6b30 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestTypeOptions.kt index e4a6c488bb..916f850569 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/InterestTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/InterestTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanCollateralOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanCollateralOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanCollateralOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanCollateralOptions.kt index 8aeea76bf1..8ddbec0db5 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanCollateralOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanCollateralOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanOfficerOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanOfficerOptions.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanOfficerOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanOfficerOptions.kt index 8f6bdab055..1e05afbe7e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanOfficerOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanOfficerOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanPurposeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanPurposeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanPurposeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanPurposeOptions.kt index 88b1011337..1056d676e6 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/LoanPurposeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/LoanPurposeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/OverdueCharges.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/OverdueCharges.kt similarity index 90% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/OverdueCharges.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/OverdueCharges.kt index b84601a44a..0ea7d65589 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/OverdueCharges.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/OverdueCharges.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/PreClosureInterestCalculationStrategy.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/PreClosureInterestCalculationStrategy.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/PreClosureInterestCalculationStrategy.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/PreClosureInterestCalculationStrategy.kt index f64a575662..c24fe18859 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/PreClosureInterestCalculationStrategy.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/PreClosureInterestCalculationStrategy.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Product.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Product.kt similarity index 98% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Product.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Product.kt index d4fc145554..2c2d5e3be3 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Product.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Product.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ProductOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ProductOptions.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ProductOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/ProductOptions.kt index 26aad15eb7..11f668321d 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/ProductOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/ProductOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RecalculationRestFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RecalculationRestFrequencyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RecalculationRestFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RecalculationRestFrequencyType.kt index 09318c871f..34ce9de2e7 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RecalculationRestFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RecalculationRestFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt index ed4368ce5a..e40dd7959e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyNthDayTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyNthDayTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyNthDayTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyNthDayTypeOptions.kt index 8818742428..3277e70549 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyNthDayTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyNthDayTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyType.kt index 7bda44617a..9cee67910e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyTypeOptions.kt index dc7bb2062c..2e48277252 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepaymentFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepaymentFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepeatsOnNthDayOfMonth.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepeatsOnNthDayOfMonth.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepeatsOnNthDayOfMonth.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepeatsOnNthDayOfMonth.kt index 6a94b56361..01169a4f2c 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RepeatsOnNthDayOfMonth.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RepeatsOnNthDayOfMonth.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RescheduleStrategyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RescheduleStrategyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RescheduleStrategyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/RescheduleStrategyType.kt index 9d38852498..b022a557cb 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/RescheduleStrategyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/RescheduleStrategyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Status.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Status.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Status.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Status.kt index 6674798e56..3c174a9d6e 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Status.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TaxGroup.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TaxGroup.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TaxGroup.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/TaxGroup.kt index 559bea86d5..4c91813b4b 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TaxGroup.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TaxGroup.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TermFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TermFrequencyTypeOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TermFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/TermFrequencyTypeOptions.kt index 5394b9ad3b..1597806b9d 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TermFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TermFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TermPeriodFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TermPeriodFrequencyType.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TermPeriodFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/TermPeriodFrequencyType.kt index ff22637bda..17121c5a55 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TermPeriodFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TermPeriodFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Timeline.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Timeline.kt similarity index 91% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Timeline.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Timeline.kt index 3369a08836..0f8302162d 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Timeline.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Timeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TransactionProcessingStrategyOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TransactionProcessingStrategyOptions.kt similarity index 92% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TransactionProcessingStrategyOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/TransactionProcessingStrategyOptions.kt index bf6c4b42da..be638601c1 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/TransactionProcessingStrategyOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/TransactionProcessingStrategyOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Type.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Type.kt similarity index 95% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Type.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/loan/Type.kt index 49ce5afd72..4b9664cd16 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/loan/Type.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/loan/Type.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.loan +package com.mifos.core.`object`.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/saving/AccountOptions.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/saving/AccountOptions.kt similarity index 89% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/saving/AccountOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/saving/AccountOptions.kt index f0afa8f942..030b4b6965 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/saving/AccountOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/saving/AccountOptions.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.saving +package com.mifos.core.`object`.template.saving import android.os.Parcelable -import com.mifos.core.modelobjects.account.loan.InterestType +import com.mifos.core.`object`.account.loan.InterestType import kotlinx.parcelize.Parcelize /* diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/saving/TagId.kt b/core/model/src/main/kotlin/com/mifos/core/object/template/saving/TagId.kt similarity index 89% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/template/saving/TagId.kt rename to core/model/src/main/kotlin/com/mifos/core/object/template/saving/TagId.kt index 4ebbd44b42..802b46fa49 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/template/saving/TagId.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/template/saving/TagId.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.template.saving +package com.mifos.core.`object`.template.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/users/User.kt b/core/model/src/main/kotlin/com/mifos/core/object/users/User.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/users/User.kt rename to core/model/src/main/kotlin/com/mifos/core/object/users/User.kt index 0126b429bd..60dcc35bc1 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/users/User.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/users/User.kt @@ -7,9 +7,9 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.users +package com.mifos.core.`object`.users -import com.mifos.core.modelobjects.clients.Role +import com.mifos.core.`object`.clients.Role class User { // {"username":"User1","userId":1,"base64EncodedAuthenticationKey":"VXNlcjE6dGVjaDRtZg\u003d diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/users/UserLatLng.kt b/core/model/src/main/kotlin/com/mifos/core/object/users/UserLatLng.kt similarity index 97% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/users/UserLatLng.kt rename to core/model/src/main/kotlin/com/mifos/core/object/users/UserLatLng.kt index 5332b7deea..4196162b95 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/users/UserLatLng.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/users/UserLatLng.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.users +package com.mifos.core.`object`.users import android.os.Parcel import android.os.Parcelable diff --git a/core/model/src/main/kotlin/com/mifos/core/modelobjects/users/UserLocation.kt b/core/model/src/main/kotlin/com/mifos/core/object/users/UserLocation.kt similarity index 94% rename from core/model/src/main/kotlin/com/mifos/core/modelobjects/users/UserLocation.kt rename to core/model/src/main/kotlin/com/mifos/core/object/users/UserLocation.kt index b82f114da0..acb27ad1bc 100644 --- a/core/model/src/main/kotlin/com/mifos/core/modelobjects/users/UserLocation.kt +++ b/core/model/src/main/kotlin/com/mifos/core/object/users/UserLocation.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.modelobjects.users +package com.mifos.core.`object`.users import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/network/src/main/java/com/mifos/core/network/DataManager.kt b/core/network/src/main/java/com/mifos/core/network/DataManager.kt index 113ed5d230..b66d1ccaef 100644 --- a/core/network/src/main/java/com/mifos/core/network/DataManager.kt +++ b/core/network/src/main/java/com/mifos/core/network/DataManager.kt @@ -9,15 +9,15 @@ */ package com.mifos.core.network -import com.mifos.core.modelobjects.account.loan.LoanApproval -import com.mifos.core.modelobjects.clients.ChargeCreationResponse -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.databaseobjects.CollectionSheet -import com.mifos.core.modelobjects.databaseobjects.OfflineCenter -import com.mifos.core.modelobjects.organisations.LoanProducts -import com.mifos.core.modelobjects.responses.SaveResponse -import com.mifos.core.modelobjects.template.client.ChargeTemplate -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.account.loan.LoanApproval +import com.mifos.core.`object`.clients.ChargeCreationResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.databaseobjects.CollectionSheet +import com.mifos.core.`object`.databaseobjects.OfflineCenter +import com.mifos.core.`object`.organisations.LoanProducts +import com.mifos.core.`object`.responses.SaveResponse +import com.mifos.core.`object`.template.client.ChargeTemplate +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.network.model.CollectionSheetPayload import com.mifos.core.network.model.Payload diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt index 40a160edd1..d71d34d8bf 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt @@ -11,9 +11,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.data.CenterPayload import com.mifos.core.databasehelper.DatabaseHelperCenter -import com.mifos.core.modelobjects.clients.ActivatePayload -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.clients.ActivatePayload +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.BaseApiManager import com.mifos.core.network.mappers.centers.GetCentersResponseMapper import com.mifos.core.network.mappers.offices.GetOfficeResponseMapper diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt index bd436014da..c9302b4282 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt @@ -10,7 +10,7 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperCharge -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.network.BaseApiManager import com.mifos.core.objects.client.Charges import rx.Observable diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt index d18cb2a82b..36f18eb220 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.modelobjects.checkerinboxtask.CheckerInboxSearchTemplate -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask -import com.mifos.core.modelobjects.checkerinboxtask.RescheduleLoansTask +import com.mifos.core.`object`.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.`object`.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.RescheduleLoansTask import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import rx.Observable diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt index 32c8d74377..39909aa77c 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt @@ -10,14 +10,14 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperClient -import com.mifos.core.modelobjects.clients.ActivatePayload -import com.mifos.core.modelobjects.clients.ClientAddressRequest -import com.mifos.core.modelobjects.clients.ClientAddressResponse -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.noncoreobjects.Identifier -import com.mifos.core.modelobjects.noncoreobjects.IdentifierCreationResponse -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.clients.ActivatePayload +import com.mifos.core.`object`.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.mappers.clients.GetClientResponseMapper diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt index 00344a074c..660f47c104 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.model.IndividualCollectionSheetPayload diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt index 4979b3e353..a018336bd7 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt @@ -11,7 +11,7 @@ package com.mifos.core.network.datamanager import com.google.gson.JsonArray import com.mifos.core.databasehelper.DatabaseHelperDataTable -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLocation import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.mappers.dataTable.GetDataTablesResponseMapper diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt index a05ec24c14..cbbac99667 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import okhttp3.MultipartBody diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt index 72cec3f18f..92b6f48dce 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt @@ -11,9 +11,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperClient import com.mifos.core.databasehelper.DatabaseHelperGroups -import com.mifos.core.modelobjects.clients.ActivatePayload -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.clients.ActivatePayload +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.mappers.groups.GetGroupsResponseMapper diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt index c3ed91edcd..8c4c32f3a7 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt @@ -11,9 +11,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.data.LoansPayload import com.mifos.core.databasehelper.DatabaseHelperLoan -import com.mifos.core.modelobjects.account.loan.LoanDisbursement -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.account.loan.LoanDisbursement +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.organisations.LoanProducts import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt index 7edd3625f8..f9049c153a 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.modelobjects.groups.CenterInfo -import com.mifos.core.modelobjects.runreport.FullParameterListResponse -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.groups.CenterInfo +import com.mifos.core.`object`.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import com.mifos.core.network.BaseApiManager import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt index 11218945dd..37b45bbc7f 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperSavings -import com.mifos.core.modelobjects.account.loan.SavingsApproval -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse -import com.mifos.core.modelobjects.organisations.ProductSavings +import com.mifos.core.`object`.account.loan.SavingsApproval +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.organisations.ProductSavings import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSearch.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSearch.kt index 9cd30726e3..191cab77fe 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSearch.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSearch.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import com.mifos.core.network.BaseApiManager import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt index 36adb595f5..c33a558c42 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt @@ -10,7 +10,7 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperSurveys -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard import com.mifos.core.network.BaseApiManager import com.mifos.core.objects.survey.QuestionDatas import com.mifos.core.objects.survey.ResponseDatas diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt index ebca833fed..05245f03a1 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.mappers.centers -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.group.Center import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetCentersResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt index 3de94f7f75..d814b99c72 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.client.Client import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt index fb810e30ef..3a55cd2125 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.modelobjects.noncoreobjects.DocumentType -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.DocumentType +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsAllowedDocumentTypes import org.openapitools.client.models.GetClientsClientIdIdentifiersTemplateResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt index b291b9249e..c51880453f 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.modelobjects.noncoreobjects.DocumentType -import com.mifos.core.modelobjects.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.DocumentType +import com.mifos.core.`object`.noncoreobjects.Identifier import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsClientIdIdentifiersResponse import org.openapitools.client.models.GetClientsDocumentType diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt index 60798dad9e..ee937c0fae 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.mappers.groups -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.group.Group import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetGroupsResponse diff --git a/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt b/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt index bd7a82eef4..aca100d7eb 100644 --- a/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt +++ b/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.model -import com.mifos.core.modelobjects.surveys.ScorecardValues +import com.mifos.core.`object`.surveys.ScorecardValues import java.util.Date /** diff --git a/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt b/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt index 49487bee2e..55509d97e8 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt @@ -11,11 +11,11 @@ package com.mifos.core.network.services import com.mifos.core.data.CenterPayload import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.clients.ActivatePayload -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.databaseobjects.CollectionSheet -import com.mifos.core.modelobjects.databaseobjects.OfflineCenter -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.clients.ActivatePayload +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.databaseobjects.CollectionSheet +import com.mifos.core.`object`.databaseobjects.OfflineCenter +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.GenericResponse import com.mifos.core.network.model.CollectionSheetPayload import com.mifos.core.network.model.Payload diff --git a/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt b/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt index 62d296281a..3b39ad96e2 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.clients.ChargeCreationResponse -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.clients.ChargeCreationResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.template.client.ChargeTemplate import com.mifos.core.objects.client.Charges import com.mifos.core.payloads.ChargesPayload import okhttp3.ResponseBody diff --git a/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt b/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt index ae44f50880..1f444b5ea7 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.checkerinboxtask.CheckerInboxSearchTemplate -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask -import com.mifos.core.modelobjects.checkerinboxtask.RescheduleLoansTask +import com.mifos.core.`object`.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.`object`.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.RescheduleLoansTask import com.mifos.core.network.GenericResponse import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt b/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt index 714d7ffa0a..25762e09b1 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt @@ -10,14 +10,14 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.clients.ActivatePayload -import com.mifos.core.modelobjects.clients.ClientAddressRequest -import com.mifos.core.modelobjects.clients.ClientAddressResponse -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.noncoreobjects.Identifier -import com.mifos.core.modelobjects.noncoreobjects.IdentifierCreationResponse -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.clients.ActivatePayload +import com.mifos.core.`object`.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.ClientAccounts import com.mifos.core.objects.client.Client diff --git a/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt b/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt index 0dc366bc99..c0d49dabed 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt @@ -10,7 +10,7 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.network.GenericResponse import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.network.model.RequestCollectionSheetPayload diff --git a/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt b/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt index 48c32acd87..24982d3776 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt @@ -11,7 +11,7 @@ package com.mifos.core.network.services import com.google.gson.JsonArray import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLocation import com.mifos.core.network.GenericResponse import com.mifos.core.objects.noncore.DataTable import retrofit2.http.Body diff --git a/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt b/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt index 73bfad4841..292cc557af 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt @@ -10,7 +10,7 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import com.mifos.core.network.GenericResponse import okhttp3.MultipartBody import okhttp3.ResponseBody diff --git a/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt b/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt index f0e3bc4be2..2060747826 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.clients.ActivatePayload -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.clients.ActivatePayload +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.GroupAccounts import com.mifos.core.objects.group.Group diff --git a/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt b/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt index 0335972440..607ebef1bc 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt @@ -11,12 +11,12 @@ package com.mifos.core.network.services import com.mifos.core.data.LoansPayload import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.account.loan.LoanApproval -import com.mifos.core.modelobjects.account.loan.LoanDisbursement -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse -import com.mifos.core.modelobjects.clients.Page -import com.mifos.core.modelobjects.organisations.LoanProducts -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.account.loan.LoanApproval +import com.mifos.core.`object`.account.loan.LoanDisbursement +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.clients.Page +import com.mifos.core.`object`.organisations.LoanProducts +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import com.mifos.core.objects.accounts.loan.LoanWithAssociations diff --git a/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt b/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt index a364c9153d..2d47dd4ea8 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.groups.CenterInfo -import com.mifos.core.modelobjects.runreport.FullParameterListResponse -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.groups.CenterInfo +import com.mifos.core.`object`.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query diff --git a/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt b/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt index b374b66bc7..f4cd3550b2 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.account.loan.SavingsApproval -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse -import com.mifos.core.modelobjects.organisations.ProductSavings +import com.mifos.core.`object`.account.loan.SavingsApproval +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.organisations.ProductSavings import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations diff --git a/core/network/src/main/java/com/mifos/core/network/services/SearchService.kt b/core/network/src/main/java/com/mifos/core/network/services/SearchService.kt index b9a24231cf..c830747579 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/SearchService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/SearchService.kt @@ -10,7 +10,7 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt b/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt index 1519996b6f..d698a57e19 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt @@ -10,7 +10,7 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard import com.mifos.core.objects.survey.Survey import retrofit2.http.Body import retrofit2.http.GET diff --git a/core/testing/src/main/java/com/mifos/core/testing/repository/TestSearchRepository.kt b/core/testing/src/main/java/com/mifos/core/testing/repository/TestSearchRepository.kt index f18f25484a..fdce61f10d 100644 --- a/core/testing/src/main/java/com/mifos/core/testing/repository/TestSearchRepository.kt +++ b/core/testing/src/main/java/com/mifos/core/testing/repository/TestSearchRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.testing.repository import com.mifos.core.data.repository.SearchRepository -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.map diff --git a/core/ui/src/main/java/com/mifos/core/ui/util/SearchResultPreviewParameter.kt b/core/ui/src/main/java/com/mifos/core/ui/util/SearchResultPreviewParameter.kt index 79659a01da..7aeeb4e7a0 100644 --- a/core/ui/src/main/java/com/mifos/core/ui/util/SearchResultPreviewParameter.kt +++ b/core/ui/src/main/java/com/mifos/core/ui/util/SearchResultPreviewParameter.kt @@ -10,7 +10,7 @@ package com.mifos.core.ui.util import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import com.mifos.core.ui.util.SearchResultPreviewData.searchResults class SearchResultPreviewParameter : PreviewParameterProvider> { diff --git a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt index 04b644b57e..903abfa383 100644 --- a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt +++ b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt @@ -55,7 +55,7 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt index 22652d253e..e1f3457b45 100644 --- a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt +++ b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt @@ -17,7 +17,7 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.ActivateCenterUseCase import com.mifos.core.domain.useCases.ActivateClientUseCase import com.mifos.core.domain.useCases.ActivateGroupUseCase -import com.mifos.core.modelobjects.clients.ActivatePayload +import com.mifos.core.`object`.clients.ActivatePayload import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt index c6794011f6..8118a1c061 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt @@ -61,7 +61,7 @@ import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.groups.CenterInfo +import com.mifos.core.`object`.groups.CenterInfo import com.mifos.core.objects.group.CenterWithAssociations import com.mifos.feature.center.R diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt index 36a638aeed..6e27675dac 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.center.centerDetails -import com.mifos.core.modelobjects.groups.CenterInfo +import com.mifos.core.`object`.groups.CenterInfo import com.mifos.core.objects.group.CenterWithAssociations /** diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt index 36bdc94e89..5c14ea54cf 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.GetCenterDetailsUseCase -import com.mifos.core.modelobjects.groups.CenterInfo +import com.mifos.core.`object`.groups.CenterInfo import com.mifos.feature.center.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt index b82345bc9e..e2f408cf85 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt @@ -78,7 +78,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.LightGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.CheckerTask import com.mifos.core.ui.components.SelectionModeTopAppBar import com.mifos.feature.checkerInboxTask.checkerInboxDialog.CheckerInboxTasksFilterDialog import com.mifos.feature.checker_inbox_task.R diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt index d023362b92..0a50e03f04 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.checkerInboxTask.checkerInbox -import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask +import com.mifos.core.`object`.checkerinboxtask.CheckerTask sealed class CheckerInboxUiState { diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt index 74bdd6c09c..be99c27f0b 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt @@ -12,7 +12,7 @@ package com.mifos.feature.checkerInboxTask.checkerInboxDialog import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.mifos.core.modelobjects.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.`object`.checkerinboxtask.CheckerInboxSearchTemplate import com.mifos.core.network.datamanager.DataManagerCheckerInbox import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt index 438669473d..c889f29b9c 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt @@ -66,7 +66,7 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.template.client.ChargeTemplate import com.mifos.core.payloads.ChargesPayload import com.mifos.feature.client.R import java.text.SimpleDateFormat diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt index 4bc58f0f5a..84fee0afa7 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientChargeDialog -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.template.client.ChargeTemplate /** * Created by Aditya Gupta on 13/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt index 628e275b9b..358d847b46 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.CreateChargesUseCase import com.mifos.core.domain.useCases.GetAllChargesV2UseCase -import com.mifos.core.modelobjects.template.client.ChargeTemplate +import com.mifos.core.`object`.template.client.ChargeTemplate import com.mifos.core.payloads.ChargesPayload import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt index 3c5d2503c3..c5fba8ac2e 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt @@ -61,7 +61,7 @@ import com.mifos.core.designsystem.theme.LightGreen import com.mifos.core.designsystem.theme.White import com.mifos.core.designsystem.theme.identifierTextStyleDark import com.mifos.core.designsystem.theme.identifierTextStyleLight -import com.mifos.core.modelobjects.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.Identifier import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.client.R import com.mifos.feature.client.clientIdentifiersDialog.ClientIdentifiersDialogScreen diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt index 9e0e9badf5..f09b075984 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientIdentifiers -import com.mifos.core.modelobjects.noncoreobjects.Identifier +import com.mifos.core.`object`.noncoreobjects.Identifier /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt index 5478964135..04ca92da39 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientIdentifiersDialog -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt index 9cd7c8a9e8..e61bc8c1bb 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt @@ -55,8 +55,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt index abdf633780..fd7a7f69e3 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt @@ -14,8 +14,8 @@ import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.CreateClientIdentifierUseCase import com.mifos.core.domain.useCases.GetClientIdentifierTemplateUseCase -import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload -import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate +import com.mifos.core.`object`.noncoreobjects.IdentifierPayload +import com.mifos.core.`object`.noncoreobjects.IdentifierTemplate import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt index 38ba142fd5..d86d3a8104 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.data.repository.ClientListRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.modelobjects.clients.Page +import com.mifos.core.`object`.clients.Page import com.mifos.core.objects.client.Client import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt index 64c4986d8c..58d8ca8bb5 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientPinpoint -import com.mifos.core.modelobjects.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.ClientAddressResponse /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt index ee7e5b7ddb..534ac4289a 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt @@ -17,7 +17,7 @@ import com.mifos.core.domain.useCases.AddClientPinpointLocationUseCase import com.mifos.core.domain.useCases.DeleteClientAddressPinpointUseCase import com.mifos.core.domain.useCases.GetClientPinpointLocationsUseCase import com.mifos.core.domain.useCases.UpdateClientPinpointUseCase -import com.mifos.core.modelobjects.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressRequest import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt index 0110d5763c..7571eb23ed 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt @@ -76,8 +76,8 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.clients.ClientAddressRequest -import com.mifos.core.modelobjects.clients.ClientAddressResponse +import com.mifos.core.`object`.clients.ClientAddressRequest +import com.mifos.core.`object`.clients.ClientAddressResponse import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt index 7811c7ddbf..40d7229aab 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt @@ -66,8 +66,8 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.surveys.Scorecard -import com.mifos.core.modelobjects.surveys.ScorecardValues +import com.mifos.core.`object`.surveys.Scorecard +import com.mifos.core.`object`.surveys.ScorecardValues import com.mifos.core.objects.survey.Survey import com.mifos.feature.client.R import com.mifos.feature.client.clientSurveySubmit.SurveySubmitScreen diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt index 8aeb19f3a0..73fbb842fc 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt @@ -40,7 +40,7 @@ import androidx.compose.ui.unit.sp import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt index 3bf562a206..587581f9fc 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientSurveySubmit -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard /** * Created by Aditya Gupta on 13/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt index 15e2cc3785..5e3f52d52c 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.SurveySubmitRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.modelobjects.surveys.Scorecard +import com.mifos.core.`object`.surveys.Scorecard import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt index fee37430cc..565ca61325 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt @@ -58,7 +58,7 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.objects.collectionsheet.CenterDetail import com.mifos.core.objects.collectionsheet.CollectionSheetPayload import com.mifos.core.objects.collectionsheet.CollectionSheetResponse diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt index 8207be7ca9..aff51e8da9 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt @@ -22,7 +22,7 @@ import com.mifos.core.domain.useCases.GetOfficeListUseCase import com.mifos.core.domain.useCases.GetStaffInOfficeUseCase import com.mifos.core.domain.useCases.SubmitCollectionSheetUseCase import com.mifos.core.domain.useCases.SubmitProductiveSheetUseCase -import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload +import com.mifos.core.`object`.collectionsheets.CollectionSheetRequestPayload import com.mifos.core.objects.collectionsheet.CenterDetail import com.mifos.core.objects.collectionsheet.CollectionSheetPayload import com.mifos.core.objects.collectionsheet.CollectionSheetResponse diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt index 2786069db3..578b9712a5 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt @@ -65,8 +65,8 @@ import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.LightGray import com.mifos.core.designsystem.theme.White import com.mifos.core.model.BulkRepaymentTransactions -import com.mifos.core.modelobjects.account.loan.PaymentTypeOptions -import com.mifos.core.modelobjects.collectionsheets.LoanAndClientName +import com.mifos.core.`object`.account.loan.PaymentTypeOptions +import com.mifos.core.`object`.collectionsheets.LoanAndClientName import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.objects.collectionsheet.ClientCollectionSheet import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt index a4bf74bfc5..5924b967bd 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt @@ -16,7 +16,7 @@ import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.SaveIndividualCollectionSheetUseCase -import com.mifos.core.modelobjects.collectionsheets.LoanAndClientName +import com.mifos.core.`object`.collectionsheets.LoanAndClientName import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.objects.collectionsheet.ClientCollectionSheet import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt index 660dcce23c..0b3fb80ba8 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt @@ -17,8 +17,8 @@ import androidx.navigation.navArgument import androidx.navigation.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.account.loan.PaymentTypeOptions -import com.mifos.core.modelobjects.collectionsheets.LoanAndClientName +import com.mifos.core.`object`.account.loan.PaymentTypeOptions +import com.mifos.core.`object`.collectionsheets.LoanAndClientName import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet import com.mifos.feature.individualCollectionSheet.generateCollectionSheet.GenerateCollectionSheetScreen diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt index bb4254d71c..4ef6cb0ebe 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt @@ -52,8 +52,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.model.BulkRepaymentTransactions -import com.mifos.core.modelobjects.account.loan.PaymentTypeOptions -import com.mifos.core.modelobjects.collectionsheets.LoanAndClientName +import com.mifos.core.`object`.account.loan.PaymentTypeOptions +import com.mifos.core.`object`.collectionsheets.LoanAndClientName import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.feature.collection_sheet.R diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt index 4944f24385..d6f5603f3e 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt @@ -15,8 +15,8 @@ import androidx.lifecycle.viewModelScope import coil.request.ImageResult import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.account.loan.PaymentTypeOptions -import com.mifos.core.modelobjects.collectionsheets.LoanAndClientName +import com.mifos.core.`object`.account.loan.PaymentTypeOptions +import com.mifos.core.`object`.collectionsheets.LoanAndClientName import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.network.utils.ImageLoaderUtils import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt index 8095b5f172..f70a348bd7 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.viewModelScope import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.DataTableRepository -import com.mifos.core.modelobjects.nav.DataTableNavigationArg +import com.mifos.core.`object`.nav.DataTableNavigationArg import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt index 181339762d..d7f295a563 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt @@ -17,7 +17,7 @@ import androidx.navigation.navArgument import androidx.navigation.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.nav.DataTableNavigationArg +import com.mifos.core.`object`.nav.DataTableNavigationArg import com.mifos.core.objects.client.Client import com.mifos.core.objects.navigation.DataTableDataNavigationArg import com.mifos.core.objects.noncore.DataTable diff --git a/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt b/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt index 2392033725..e893fd0fc2 100644 --- a/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt +++ b/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt @@ -70,7 +70,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import com.mifos.core.network.GenericResponse import com.mifos.feature.document.R import java.io.File diff --git a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt index 65f7a5123a..3fa03b4074 100644 --- a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt +++ b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt @@ -71,7 +71,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.document.R import com.mifos.feature.document.documentDialog.DocumentDialogScreen diff --git a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt index 6077da8e6c..6f04e9980a 100644 --- a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt +++ b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.document.documentList -import com.mifos.core.modelobjects.noncoreobjects.Document +import com.mifos.core.`object`.noncoreobjects.Document /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt index c6883f538d..8e35413287 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt @@ -71,7 +71,7 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.group.GroupPayload import com.mifos.core.objects.organisation.Office import com.mifos.feature.groups.R diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt index b491479521..2e601c6cac 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.groups.createNewGroup -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.organisation.Office /** diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt b/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt index 82ccd72aa5..776ec79f2a 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt @@ -17,7 +17,7 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.responses.SaveResponse +import com.mifos.core.`object`.responses.SaveResponse import com.mifos.core.objects.accounts.savings.DepositType import com.mifos.core.objects.client.Client import com.mifos.feature.groups.createNewGroup.CreateNewGroupScreen diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt index 7639aeb8cc..17757d3925 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt @@ -67,8 +67,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.organisations.LoanProducts -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.organisations.LoanProducts +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import com.mifos.core.payloads.GroupLoanPayload import com.mifos.feature.loan.R import java.text.SimpleDateFormat diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt index 209385b334..e471803adf 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.groupLoanAccount -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.template.loan.GroupLoanTemplate /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt index 204f5266ab..9b5e768007 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt @@ -17,8 +17,8 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.CreateGroupLoansAccountUseCase import com.mifos.core.domain.useCases.GetAllLoanUseCase import com.mifos.core.domain.useCases.GetGroupLoansAccountTemplateUseCase -import com.mifos.core.modelobjects.organisations.LoanProducts -import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate +import com.mifos.core.`object`.organisations.LoanProducts +import com.mifos.core.`object`.template.loan.GroupLoanTemplate import com.mifos.core.payloads.GroupLoanPayload import com.mifos.feature.loan.R import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt index 18cfc09d8e..38b23d1b40 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt @@ -68,7 +68,7 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.organisations.LoanProducts import com.mifos.core.objects.noncore.DataTable import com.mifos.core.objects.templates.loans.LoanTemplate import com.mifos.feature.loan.R diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt index 02aacda12c..79da2491e8 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanAccount -import com.mifos.core.modelobjects.organisations.LoanProducts +import com.mifos.core.`object`.organisations.LoanProducts /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt index 6483a92bb3..eb23198bd5 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt @@ -59,7 +59,7 @@ import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.account.loan.LoanApproval +import com.mifos.core.`object`.account.loan.LoanApproval import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.loan.LoanWithAssociations import com.mifos.feature.loan.R diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt index 1a46ad6262..e5466c71b2 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.google.gson.Gson import com.mifos.core.data.repository.LoanAccountApprovalRepository -import com.mifos.core.modelobjects.account.loan.LoanApproval +import com.mifos.core.`object`.account.loan.LoanApproval import com.mifos.core.network.GenericResponse import com.mifos.core.objects.accounts.loan.LoanApprovalData import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt index bb38d62c83..bc2237e940 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt @@ -61,7 +61,7 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.account.loan.LoanDisbursement +import com.mifos.core.`object`.account.loan.LoanDisbursement import com.mifos.core.objects.PaymentTypeOption import com.mifos.core.objects.templates.loans.LoanTransactionTemplate import com.mifos.feature.loan.R diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt index 35ac989483..80c7121486 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanAccountDisbursementRepository import com.mifos.core.model.APIEndPoint -import com.mifos.core.modelobjects.account.loan.LoanDisbursement +import com.mifos.core.`object`.account.loan.LoanDisbursement import com.mifos.core.network.GenericResponse import com.mifos.core.objects.templates.loans.LoanTransactionTemplate import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt index c041e591dd..defdbd4147 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt @@ -69,7 +69,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.PaymentTypeOption import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt index 985214ba8b..dcbff15dd7 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanRepayment -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate /** diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt index e8807137d2..00afbc2fbe 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.ViewModel import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanRepaymentRepository -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import com.mifos.core.objects.accounts.loan.LoanWithAssociations import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt index a750f1442c..4148345340 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt @@ -45,8 +45,8 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.modelobjects.account.loan.Period -import com.mifos.core.modelobjects.account.loan.RepaymentSchedule +import com.mifos.core.`object`.account.loan.Period +import com.mifos.core.`object`.account.loan.RepaymentSchedule import com.mifos.core.objects.accounts.loan.LoanWithAssociations import com.mifos.feature.loan.R diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt index c3edc172bd..5ef1140a42 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt @@ -64,8 +64,8 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.account.loan.Transaction -import com.mifos.core.modelobjects.account.loan.Type +import com.mifos.core.`object`.account.loan.Transaction +import com.mifos.core.`object`.account.loan.Type import com.mifos.core.objects.accounts.loan.LoanWithAssociations import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.loan.R diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt index 83c424203a..2719bac04d 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt @@ -15,7 +15,7 @@ import com.mifos.core.common.utils.FileUtils.LOG_TAG import com.mifos.core.data.CenterPayload_Table.errorMessage import com.mifos.core.data.repository.SyncLoanRepaymentTransactionRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse +import com.mifos.core.`object`.account.loan.LoanRepaymentResponse import com.mifos.core.objects.PaymentTypeOption import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest import com.mifos.feature.offline.R diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt index efd9cc1593..27a12e27b4 100644 --- a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt @@ -78,8 +78,8 @@ import com.mifos.core.designsystem.component.PermissionBox import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.users.UserLatLng -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLatLng +import com.mifos.core.`object`.users.UserLocation import com.mifos.feature.path.tracking.R @Composable diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt index a0886b1875..61a97b560e 100644 --- a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.pathTracking -import com.mifos.core.modelobjects.users.UserLocation +import com.mifos.core.`object`.users.UserLocation /** * Created by Aditya Gupta on 06/08/23. diff --git a/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt b/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt index e0295819ea..b7e77d4b97 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt @@ -17,8 +17,8 @@ import androidx.navigation.navArgument import androidx.navigation.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.runreport.FullParameterListResponse -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import com.mifos.feature.report.report.ReportScreen import com.mifos.feature.report.reportDetail.ReportDetailScreen import com.mifos.feature.report.runReport.RunReportScreen diff --git a/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt b/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt index 486984446f..ebc8fc7bdb 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt @@ -47,7 +47,7 @@ import com.mifos.core.designsystem.component.PermissionBox import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import com.mifos.feature.report.R import kotlinx.coroutines.launch diff --git a/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt b/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt index 843d63fb20..da5f9df283 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.FullParameterListResponse import com.mifos.feature.report.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt index 4293a6c2c9..4cea0f8ea4 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt @@ -64,9 +64,9 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.runreport.DataRow -import com.mifos.core.modelobjects.runreport.FullParameterListResponse -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.DataRow +import com.mifos.core.`object`.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import com.mifos.feature.report.R @Composable diff --git a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt index df13277993..3daf8e1833 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt @@ -20,9 +20,9 @@ import com.mifos.core.domain.useCases.GetReportParameterDetailsUseCase import com.mifos.core.domain.useCases.GetRunReportOfficesUseCase import com.mifos.core.domain.useCases.GetRunReportProductUseCase import com.mifos.core.domain.useCases.GetRunReportWithQueryUseCase -import com.mifos.core.modelobjects.runreport.DataRow -import com.mifos.core.modelobjects.runreport.FullParameterListResponse -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.DataRow +import com.mifos.core.`object`.runreport.FullParameterListResponse +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import com.mifos.feature.report.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt index 53ca81cd76..948e1c8c29 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt @@ -66,7 +66,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem import com.mifos.feature.report.R @Composable diff --git a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt index 1d20992c0e..44de65edf6 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.report.runReport -import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem +import com.mifos.core.`object`.runreport.client.ClientReportTypeItem sealed class RunReportUiState { diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt index 3e8457cf06..46f3daee36 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt @@ -72,8 +72,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.account.saving.FieldOfficerOptions -import com.mifos.core.modelobjects.organisations.ProductSavings +import com.mifos.core.`object`.account.saving.FieldOfficerOptions +import com.mifos.core.`object`.organisations.ProductSavings import com.mifos.core.objects.client.Savings import com.mifos.core.objects.templates.savings.SavingProductsTemplate import com.mifos.core.objects.zipmodels.SavingProductsAndTemplate diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt index d749601756..32b5f07656 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt @@ -57,7 +57,7 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.modelobjects.account.loan.SavingsApproval +import com.mifos.core.`object`.account.loan.SavingsApproval import com.mifos.core.network.GenericResponse import com.mifos.feature.savings.R import java.text.SimpleDateFormat diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt index b3c54d9bf7..1a3c22dcbb 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.ApproveSavingsApplicationUseCase -import com.mifos.core.modelobjects.account.loan.SavingsApproval +import com.mifos.core.`object`.account.loan.SavingsApproval import com.mifos.core.network.GenericResponse import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt index ef85c7d9d3..d50b03fdf1 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt @@ -70,7 +70,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate import com.mifos.feature.savings.R diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt index f988eb4f88..6131cb4484 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.savings.savingsAccountTransaction -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate /** diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt index 880fcb967a..48142fd233 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt @@ -19,7 +19,7 @@ import com.mifos.core.datastore.PrefManager import com.mifos.core.domain.useCases.GetSavingsAccountTransactionTemplateUseCase import com.mifos.core.domain.useCases.GetSavingsAccountTransactionUseCase import com.mifos.core.domain.useCases.ProcessTransactionUseCase -import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.`object`.account.saving.SavingsAccountTransactionResponse import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.objects.accounts.savings.SavingsTransactionData import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate diff --git a/feature/search/src/main/java/com/mifos/feature/search/SearchScreen.kt b/feature/search/src/main/java/com/mifos/feature/search/SearchScreen.kt index 64d1656bfd..5dcea476fe 100644 --- a/feature/search/src/main/java/com/mifos/feature/search/SearchScreen.kt +++ b/feature/search/src/main/java/com/mifos/feature/search/SearchScreen.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mifos.core.designsystem.component.MifosScaffold -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import com.mifos.core.ui.components.FabButton import com.mifos.core.ui.components.FabButtonState import com.mifos.core.ui.components.FabType diff --git a/feature/search/src/main/java/com/mifos/feature/search/SearchUiState.kt b/feature/search/src/main/java/com/mifos/feature/search/SearchUiState.kt index 4b2133d5be..14c1c1c6d4 100644 --- a/feature/search/src/main/java/com/mifos/feature/search/SearchUiState.kt +++ b/feature/search/src/main/java/com/mifos/feature/search/SearchUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.search -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity data class SearchUiState( val isLoading: Boolean = false, diff --git a/feature/search/src/main/java/com/mifos/feature/search/SearchViewModel.kt b/feature/search/src/main/java/com/mifos/feature/search/SearchViewModel.kt index 679a8aec39..2f415bdc5d 100644 --- a/feature/search/src/main/java/com/mifos/feature/search/SearchViewModel.kt +++ b/feature/search/src/main/java/com/mifos/feature/search/SearchViewModel.kt @@ -13,7 +13,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.data.repository.SearchRepository -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/search/src/main/java/com/mifos/feature/search/components/SearchScreenResult.kt b/feature/search/src/main/java/com/mifos/feature/search/components/SearchScreenResult.kt index d10bcf6259..eecad6be00 100644 --- a/feature/search/src/main/java/com/mifos/feature/search/components/SearchScreenResult.kt +++ b/feature/search/src/main/java/com/mifos/feature/search/components/SearchScreenResult.kt @@ -35,7 +35,7 @@ import com.amulyakhare.textdrawable.TextDrawable import com.amulyakhare.textdrawable.util.ColorGenerator import com.google.accompanist.drawablepainter.rememberDrawablePainter import com.mifos.core.designsystem.component.MifosCircularProgress -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.core.ui.util.DevicePreviews import com.mifos.core.ui.util.SearchResultPreviewParameter diff --git a/feature/search/src/main/java/com/mifos/feature/search/navigation/SearchNavigation.kt b/feature/search/src/main/java/com/mifos/feature/search/navigation/SearchNavigation.kt index fe97aa62e6..c7009797f3 100644 --- a/feature/search/src/main/java/com/mifos/feature/search/navigation/SearchNavigation.kt +++ b/feature/search/src/main/java/com/mifos/feature/search/navigation/SearchNavigation.kt @@ -16,7 +16,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.modelobjects.SearchedEntity +import com.mifos.core.`object`.SearchedEntity import com.mifos.core.ui.components.FabType import com.mifos.feature.search.SearchScreenRoute