From 8691223301597256a870c67eec7f2e848b4de323 Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Tue, 12 Sep 2023 20:25:58 +0530 Subject: [PATCH] fix: Project Cleanup --- .../findbugs/android-exclude-filter.xml | 4 +- mifosng-android/src/main/AndroidManifest.xml | 32 +-- .../java/com/mifos/{ => application}/App.kt | 4 +- .../{ => activity/about}/AboutActivity.kt | 3 +- .../{ => activity/home}/HomeActivity.kt | 5 +- .../activity/login}/LoginActivity.kt | 6 +- .../activity/login}/LoginRepository.kt | 2 +- .../activity/login}/LoginRepositoryImp.kt | 5 +- .../activity/login}/LoginUiState.kt | 2 +- .../activity/login}/LoginViewModel.kt | 5 +- .../pathtracking/PathTrackingActivity.kt | 2 - .../pathtracking}/PathTrackingRepository.kt | 2 +- .../PathTrackingRepositoryImp.kt | 2 +- .../pathtracking}/PathTrackingUiState.kt | 2 +- .../pathtracking}/PathTrackingViewModel.kt | 4 +- .../PinPointClientRepository.kt | 2 +- .../PinPointClientRepositoryImp.kt | 2 +- .../pinpointclient}/PinPointClientUiState.kt | 2 +- .../PinPointClientViewModel.kt | 4 +- .../pinpointclient/PinpointClientActivity.kt | 2 - .../setting}/SettingsActivity.kt | 5 +- .../setting}/SettingsFragment.kt | 3 +- .../splashscreen}/SplashScreenActivity.kt | 4 +- .../adapters/IdentifierListAdapter.kt | 2 +- .../mifosxdroid/core/MifosBaseActivity.kt | 2 +- .../mifos/mifosxdroid/core/util/Toaster.kt | 2 +- .../chargedialog/ChargeDialogFragment.kt | 2 - .../chargedialog}/ChargeDialogRepository.kt | 2 +- .../ChargeDialogRepositoryImp.kt | 2 +- .../chargedialog}/ChargeDialogUiState.kt | 2 +- .../chargedialog}/ChargeDialogViewModel.kt | 4 +- .../DataTableRowDialogFragment.kt | 2 - .../DataTableRowDialogRepository.kt | 2 +- .../DataTableRowDialogRepositoryImp.kt | 2 +- .../DataTableRowDialogUiState.kt | 2 +- .../DataTableRowDialogViewModel.kt | 4 +- .../documentdialog/DocumentDialogFragment.kt | 2 - .../DocumentDialogRepository.kt | 2 +- .../DocumentDialogRepositoryImp.kt | 2 +- .../documentdialog}/DocumentDialogUiState.kt | 2 +- .../DocumentDialogViewModel.kt | 4 +- .../IdentifierDialogFragment.kt | 2 - .../IdentifierDialogRepository.kt | 2 +- .../IdentifierDialogRepositoryImp.kt | 2 +- .../IdentifierDialogUiState.kt | 2 +- .../IdentifierDialogViewModel.kt | 4 +- .../LoanChargeDialogFragment.kt | 2 - .../LoanChargeDialogRepository.kt | 2 +- .../LoanChargeDialogRepositoryImp.kt | 2 +- .../LoanChargeDialogUiState.kt | 2 +- .../LoanChargeDialogViewModel.kt | 4 +- .../SyncCentersDialogFragment.kt | 2 - .../SyncCentersDialogRepository.kt | 2 +- .../SyncCentersDialogRepositoryImp.kt | 2 +- .../SyncCentersDialogUiState.kt | 2 +- .../SyncCentersDialogViewModel.kt | 4 +- .../SyncClientsDialogFragment.kt | 2 - .../SyncClientsDialogRepository.kt | 2 +- .../SyncClientsDialogRepositoryImp.kt | 2 +- .../SyncClientsDialogUiState.kt | 2 +- .../SyncClientsDialogViewModel.kt | 4 +- .../SyncGroupsDialogFragment.kt | 2 - .../SyncGroupsDialogRepository.kt | 2 +- .../SyncGroupsDialogRepositoryImp.kt | 2 +- .../SyncGroupsDialogUiState.kt | 2 +- .../SyncGroupsDialogViewModel.kt | 4 +- .../SyncSurveysDialogFragment.kt | 2 - .../SyncSurveysDialogRepository.kt | 2 +- .../SyncSurveysDialogRepositoryImp.kt | 5 +- .../SyncSurveysDialogUiState.kt | 2 +- .../SyncSurveysDialogViewModel.kt | 4 +- .../injection/module/RepositoryModule.kt | 240 +++++++++--------- .../OfflineDashboardFragment.kt | 2 - .../OfflineDashboardRepository.kt | 2 +- .../OfflineDashboardRepositoryImp.kt | 2 +- .../OfflineDashboardUiState.kt | 2 +- .../OfflineDashboardViewModel.kt | 4 +- .../SyncCenterPayloadsFragment.kt | 2 - .../SyncCenterPayloadsRepository.kt | 2 +- .../SyncCenterPayloadsRepositoryImp.kt | 2 +- .../SyncCenterPayloadsUiState.kt | 2 +- .../SyncCenterPayloadsViewModel.kt | 4 +- .../SyncClientPayloadsFragment.kt | 2 - .../SyncClientPayloadsRepository.kt | 2 +- .../SyncClientPayloadsRepositoryImp.kt | 2 +- .../SyncClientPayloadsUiState.kt | 2 +- .../SyncClientPayloadsViewModel.kt | 4 +- .../SyncGroupPayloadsFragment.kt | 2 - .../SyncGroupPayloadsRepository.kt | 2 +- .../SyncGroupPayloadsRepositoryImp.kt | 5 +- .../SyncGroupPayloadsUiState.kt | 2 +- .../SyncGroupPayloadsViewModel.kt | 4 +- .../SyncLoanRepaymentTransactionFragment.kt | 2 - .../SyncLoanRepaymentTransactionRepository.kt | 2 +- ...ncLoanRepaymentTransactionRepositoryImp.kt | 2 +- .../SyncLoanRepaymentTransactionUiState.kt | 2 +- .../SyncLoanRepaymentTransactionViewModel.kt | 4 +- .../SyncSavingsAccountTransactionFragment.kt | 2 - ...SyncSavingsAccountTransactionRepository.kt | 2 +- ...cSavingsAccountTransactionRepositoryImp.kt | 2 +- .../SyncSavingsAccountTransactionUiState.kt | 2 +- .../SyncSavingsAccountTransactionViewModel.kt | 4 +- .../mifosxdroid/online/ClientActivity.kt | 1 + .../online/activate/ActivateFragment.kt | 3 - .../online/activate}/ActivateRepository.kt | 2 +- .../online/activate}/ActivateRepositoryImp.kt | 2 +- .../online/activate}/ActivateUiState.kt | 2 +- .../online/activate}/ActivateViewModel.kt | 4 +- .../centerdetails/CenterDetailsFragment.kt | 3 - .../centerdetails}/CenterDetailsRepository.kt | 2 +- .../CenterDetailsRepositoryImp.kt | 2 +- .../centerdetails}/CenterDetailsUiState.kt | 2 +- .../centerdetails}/CenterDetailsViewModel.kt | 6 +- .../online/centerlist/CenterListFragment.kt | 4 +- .../centerlist}/CenterListRepository.kt | 2 +- .../centerlist}/CenterListRepositoryImp.kt | 2 +- .../online/centerlist}/CenterListUiState.kt | 2 +- .../online/centerlist}/CenterListViewModel.kt | 4 +- .../clientcharge/ClientChargeFragment.kt | 2 - .../clientcharge}/ClientChargeRepository.kt | 2 +- .../ClientChargeRepositoryImp.kt | 2 +- .../clientcharge}/ClientChargeUiState.kt | 2 +- .../clientcharge}/ClientChargeViewModel.kt | 4 +- .../clientdetails/ClientDetailsFragment.kt | 3 - .../clientdetails}/ClientDetailsRepository.kt | 2 +- .../ClientDetailsRepositoryImp.kt | 2 +- .../clientdetails}/ClientDetailsUiState.kt | 2 +- .../clientdetails}/ClientDetailsViewModel.kt | 5 +- .../ClientIdentifiersFragment.kt | 2 - .../ClientIdentifiersRepository.kt | 2 +- .../ClientIdentifiersRepositoryImp.kt | 2 +- .../ClientIdentifiersUiState.kt | 2 +- .../ClientIdentifiersViewModel.kt | 4 +- .../online/clientlist/ClientListFragment.kt | 4 +- .../clientlist}/ClientListRepository.kt | 2 +- .../clientlist}/ClientListRepositoryImp.kt | 5 +- .../online/clientlist}/ClientListUiState.kt | 2 +- .../online/clientlist}/ClientListViewModel.kt | 4 +- .../CollectionSheetFragment.kt | 2 - .../CollectionSheetRepository.kt | 2 +- .../CollectionSheetRepositoryImp.kt | 2 +- .../CollectionSheetUiState.kt | 2 +- .../CollectionSheetViewModel.kt | 4 +- .../NewIndividualCollectionSheetFragment.kt | 2 - .../NewIndividualCollectionSheetRepository.kt | 2 +- ...wIndividualCollectionSheetRepositoryImp.kt | 2 +- .../NewIndividualCollectionSheetUiState.kt | 2 +- .../NewIndividualCollectionSheetViewModel.kt | 4 +- ...ndividualCollectionSheetDetailsFragment.kt | 2 - ...ividualCollectionSheetDetailsRepository.kt | 2 +- ...dualCollectionSheetDetailsRepositoryImp.kt | 2 +- ...IndividualCollectionSheetDetailsUiState.kt | 2 +- ...dividualCollectionSheetDetailsViewModel.kt | 4 +- .../CreateNewCenterFragment.kt | 2 - .../CreateNewCenterRepository.kt | 2 +- .../CreateNewCenterRepositoryImp.kt | 2 +- .../CreateNewCenterUiState.kt | 2 +- .../CreateNewCenterViewModel.kt | 4 +- .../CreateNewClientFragment.kt | 2 - .../CreateNewClientRepository.kt | 2 +- .../CreateNewClientRepositoryImp.kt | 3 +- .../CreateNewClientUiState.kt | 2 +- .../CreateNewClientViewModel.kt | 4 +- .../createnewgroup/CreateNewGroupFragment.kt | 2 - .../CreateNewGroupRepository.kt | 2 +- .../CreateNewGroupRepositoryImp.kt | 2 +- .../createnewgroup}/CreateNewGroupUiState.kt | 2 +- .../CreateNewGroupViewModel.kt | 4 +- .../online/datatable/DataTableFragment.kt | 2 - .../online/datatable}/DataTableRepository.kt | 2 +- .../datatable}/DataTableRepositoryImp.kt | 2 +- .../online/datatable}/DataTableUiState.kt | 2 +- .../online/datatable}/DataTableViewModel.kt | 4 +- .../datatabledata/DataTableDataFragment.kt | 3 - .../datatabledata}/DataTableDataRepository.kt | 2 +- .../DataTableDataRepositoryImp.kt | 2 +- .../datatabledata}/DataTableDataUiState.kt | 2 +- .../datatabledata}/DataTableDataViewModel.kt | 4 +- .../DataTableListFragment.kt | 2 - .../DataTableListRepository.kt | 2 +- .../DataTableListRepositoryImp.kt | 2 +- .../DataTableListUiState.kt | 2 +- .../DataTableListViewModel.kt | 4 +- .../documentlist/DocumentListFragment.kt | 2 - .../documentlist}/DocumentListRepository.kt | 2 +- .../DocumentListRepositoryImp.kt | 2 +- .../documentlist}/DocumentListUiState.kt | 2 +- .../documentlist}/DocumentListViewModel.kt | 6 +- .../GenerateCollectionSheetFragment.kt | 2 - .../GenerateCollectionSheetRepository.kt | 2 +- .../GenerateCollectionSheetRepositoryImp.kt | 2 +- .../GenerateCollectionSheetUiState.kt | 2 +- .../GenerateCollectionSheetViewModel.kt | 6 +- .../groupdetails/GroupDetailsFragment.kt | 4 - .../groupdetails}/GroupDetailsRepository.kt | 2 +- .../GroupDetailsRepositoryImp.kt | 2 +- .../groupdetails}/GroupDetailsUiState.kt | 2 +- .../groupdetails}/GroupDetailsViewModel.kt | 4 +- .../online/grouplist/GroupListFragment.kt | 3 - .../online/grouplist}/GroupListRepository.kt | 2 +- .../grouplist}/GroupListRepositoryImp.kt | 2 +- .../online/grouplist}/GroupListUiState.kt | 2 +- .../online/grouplist}/GroupListViewModel.kt | 5 +- .../GroupLoanAccountFragment.kt | 2 - .../GroupLoanAccountRepository.kt | 2 +- .../GroupLoanAccountRepositoryImp.kt | 2 +- .../GroupLoanAccountUiState.kt | 2 +- .../GroupLoanAccountViewModel.kt | 4 +- .../online/groupslist/GroupsListFragment.kt | 4 +- .../groupslist}/GroupsListRepository.kt | 2 +- .../groupslist}/GroupsListRepositoryImp.kt | 5 +- .../online/groupslist}/GroupsListUiState.kt | 2 +- .../online/groupslist}/GroupsListViewModel.kt | 4 +- .../online/loanaccount/LoanAccountFragment.kt | 2 - .../loanaccount}/LoanAccountRepository.kt | 2 +- .../loanaccount}/LoanAccountRepositoryImp.kt | 2 +- .../online/loanaccount}/LoanAccountUiState.kt | 2 +- .../loanaccount}/LoanAccountViewModel.kt | 4 +- .../LoanAccountApproval.kt | 2 - .../LoanAccountApprovalRepository.kt | 2 +- .../LoanAccountApprovalRepositoryImp.kt | 2 +- .../LoanAccountApprovalUiState.kt | 2 +- .../LoanAccountApprovalViewModel.kt | 4 +- .../LoanAccountDisbursementFragment.kt | 2 - .../LoanAccountDisbursementRepository.kt | 2 +- .../LoanAccountDisbursementRepositoryImp.kt | 2 +- .../LoanAccountDisbursementUiState.kt | 2 +- .../LoanAccountDisbursementViewModel.kt | 4 +- .../LoanAccountSummaryFragment.kt | 3 - .../LoanAccountSummaryRepository.kt | 2 +- .../LoanAccountSummaryRepositoryImp.kt | 2 +- .../LoanAccountSummaryUiState.kt | 2 +- .../LoanAccountSummaryViewModel.kt | 4 +- .../online/loancharge/LoanChargeFragment.kt | 2 - .../loancharge}/LoanChargeRepository.kt | 2 +- .../loancharge}/LoanChargeRepositoryImp.kt | 2 +- .../online/loancharge}/LoanChargeUiState.kt | 2 +- .../online/loancharge}/LoanChargeViewModel.kt | 4 +- .../loanrepayment/LoanRepaymentFragment.kt | 2 - .../loanrepayment}/LoanRepaymentRepository.kt | 2 +- .../LoanRepaymentRepositoryImp.kt | 2 +- .../loanrepayment}/LoanRepaymentUiState.kt | 2 +- .../loanrepayment}/LoanRepaymentViewModel.kt | 4 +- .../LoanRepaymentScheduleFragment.kt | 2 - .../LoanRepaymentScheduleRepository.kt | 2 +- .../LoanRepaymentScheduleRepositoryImp.kt | 2 +- .../LoanRepaymentScheduleUiState.kt | 2 +- .../LoanRepaymentScheduleViewModel.kt | 4 +- .../LoanTransactionsFragment.kt | 4 - .../LoanTransactionsRepository.kt | 2 +- .../LoanTransactionsRepositoryImp.kt | 2 +- .../LoanTransactionsUiState.kt | 2 +- .../LoanTransactionsViewModel.kt | 4 +- .../mifosxdroid/online/note/NoteFragment.kt | 2 - .../online/note}/NoteRepository.kt | 2 +- .../online/note}/NoteRepositoryImp.kt | 2 +- .../online/note}/NoteUiState.kt | 2 +- .../online/note}/NoteViewModel.kt | 4 +- .../{ => runreports}/RunReportsActivity.kt | 2 +- .../reportcategory/ReportCategoryFragment.kt | 2 - .../ReportCategoryRepository.kt | 2 +- .../ReportCategoryRepositoryImp.kt | 2 +- .../reportcategory}/ReportCategoryUiState.kt | 2 +- .../ReportCategoryViewModel.kt | 4 +- .../reportdetail/ReportDetailFragment.kt | 2 - .../reportdetail}/ReportDetailRepository.kt | 2 +- .../ReportDetailRepositoryImp.kt | 2 +- .../reportdetail}/ReportDetailUiState.kt | 2 +- .../reportdetail}/ReportDetailViewModel.kt | 4 +- .../SavingsAccountSummaryFragment.kt | 3 - .../SavingsAccountSummaryRepository.kt | 2 +- .../SavingsAccountSummaryRepositoryImp.kt | 2 +- .../SavingsAccountSummaryUiState.kt | 2 +- .../SavingsAccountSummaryViewModel.kt | 4 +- .../SavingsAccountTransactionFragment.kt | 2 - .../SavingsAccountTransactionRepository.kt | 2 +- .../SavingsAccountTransactionRepositoryImp.kt | 2 +- .../SavingsAccountTransactionUiState.kt | 2 +- .../SavingsAccountTransactionViewModel.kt | 4 +- .../savingsaccount}/SavingAccountUiState.kt | 2 +- .../savingsaccount}/SavingAccountViewModel.kt | 4 +- .../savingsaccount/SavingsAccountFragment.kt | 2 - .../SavingsAccountRepository.kt | 2 +- .../SavingsAccountRepositoryImp.kt | 2 +- .../SavingsAccountActivateFragment.kt | 2 - .../SavingsAccountActivateRepository.kt | 2 +- .../SavingsAccountActivateRepositoryImp.kt | 2 +- .../SavingsAccountActivateUiState.kt | 2 +- .../SavingsAccountActivateViewModel.kt | 4 +- .../SavingsAccountApprovalFragment.kt | 2 - .../SavingsAccountApprovalRepository.kt | 2 +- .../SavingsAccountApprovalRepositoryImp.kt | 2 +- .../SavingsAccountApprovalUiState.kt | 2 +- .../SavingsAccountApprovalViewModel.kt | 4 +- .../online/search/SearchFragment.kt | 5 +- .../online/search}/SearchRepository.kt | 2 +- .../online/search}/SearchRepositoryImp.kt | 2 +- .../online/search}/SearchUiState.kt | 2 +- .../online/search}/SearchViewModel.kt | 4 +- .../online/sign/SignatureFragment.kt | 2 - .../online/sign}/SignatureRepository.kt | 2 +- .../online/sign}/SignatureRepositoryImp.kt | 2 +- .../online/sign}/SignatureUiState.kt | 2 +- .../online/sign}/SignatureViewModel.kt | 4 +- .../online/surveylist/SurveyListFragment.kt | 2 - .../surveylist}/SurveyListRepository.kt | 2 +- .../surveylist}/SurveyListRepositoryImp.kt | 2 +- .../online/surveylist}/SurveyListUiState.kt | 2 +- .../online/surveylist}/SurveyListViewModel.kt | 4 +- .../{ => surveyquestion}/Communicator.kt | 2 +- .../SurveyQuestionActivity.kt | 4 +- .../SurveyQuestionFragment.kt | 2 +- .../surveysubmit/SurveySubmitFragment.kt | 6 +- .../surveysubmit}/SurveySubmitRepository.kt | 2 +- .../SurveySubmitRepositoryImp.kt | 2 +- .../surveysubmit}/SurveySubmitUiState.kt | 2 +- .../surveysubmit}/SurveySubmitViewModel.kt | 4 +- .../mifosxdroid/passcode/PassCodeActivity.kt | 4 +- .../java/com/mifos/mifosxdroid/views/Font.kt | 4 +- .../main/java/com/mifos/utils/PrefManager.kt | 2 +- .../src/main/res/layout/activity_home.xml | 2 +- .../src/main/res/layout/activity_splash.xml | 2 +- .../src/main/res/layout/fragment_splash.xml | 2 +- .../src/main/res/menu/splash_screen.xml | 2 +- .../main/res/navigation/home_nav_graph.xml | 6 +- .../src/main/res/navigation/nav_graph.xml | 2 +- .../viewmodels/CenterListViewModelTest.kt | 7 +- .../viewmodels/ClientChargeViewModelTest.kt | 5 +- .../viewmodels/ClientListViewModelTest.kt | 7 +- .../viewmodels/DocumentListViewModelTest.kt | 5 +- .../viewmodels/GroupsListViewModelTest.kt | 5 +- .../viewmodels/LoanChargeViewModelTest.kt | 5 +- .../mifos/viewmodels/LoginViewModelTest.kt | 5 +- .../mifos/viewmodels/SearchViewModelTest.kt | 5 +- .../SyncClientPayloadsViewModelTest.kt | 5 +- 335 files changed, 460 insertions(+), 705 deletions(-) rename mifosng-android/src/main/java/com/mifos/{ => application}/App.kt (95%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/{ => activity/about}/AboutActivity.kt (95%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/{ => activity/home}/HomeActivity.kt (98%) rename mifosng-android/src/main/java/com/mifos/{ui/activities => mifosxdroid/activity/login}/LoginActivity.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/activity/login}/LoginRepository.kt (85%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/activity/login}/LoginRepositoryImp.kt (82%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/activity/login}/LoginUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/activity/login}/LoginViewModel.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/activity/pathtracking}/PathTrackingRepository.kt (81%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/activity/pathtracking}/PathTrackingRepositoryImp.kt (90%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/activity/pathtracking}/PathTrackingUiState.kt (88%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/activity/pathtracking}/PathTrackingViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/activity/pinpointclient}/PinPointClientRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/activity/pinpointclient}/PinPointClientRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/activity/pinpointclient}/PinPointClientUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/activity/pinpointclient}/PinPointClientViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/{ => activity/setting}/SettingsActivity.kt (91%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/{ => activity/setting}/SettingsFragment.kt (98%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/{ => activity/splashscreen}/SplashScreenActivity.kt (92%) mode change 100755 => 100644 rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/chargedialog}/ChargeDialogRepository.kt (88%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/chargedialog}/ChargeDialogRepositoryImp.kt (92%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/chargedialog}/ChargeDialogUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/chargedialog}/ChargeDialogViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/datatablerowdialog}/DataTableRowDialogRepository.kt (81%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/datatablerowdialog}/DataTableRowDialogRepositoryImp.kt (90%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/datatablerowdialog}/DataTableRowDialogUiState.kt (85%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/datatablerowdialog}/DataTableRowDialogViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/documentdialog}/DocumentDialogRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/documentdialog}/DocumentDialogRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/documentdialog}/DocumentDialogUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/documentdialog}/DocumentDialogViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/identifierdialog}/IdentifierDialogRepository.kt (88%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/identifierdialog}/IdentifierDialogRepositoryImp.kt (93%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/identifierdialog}/IdentifierDialogUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/identifierdialog}/IdentifierDialogViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/loanchargedialog}/LoanChargeDialogRepository.kt (87%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/loanchargedialog}/LoanChargeDialogRepositoryImp.kt (92%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/loanchargedialog}/LoanChargeDialogUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/loanchargedialog}/LoanChargeDialogViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/synccenterdialog}/SyncCentersDialogRepository.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/synccenterdialog}/SyncCentersDialogRepositoryImp.kt (98%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/synccenterdialog}/SyncCentersDialogUiState.kt (94%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/synccenterdialog}/SyncCentersDialogViewModel.kt (99%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/syncclientsdialog}/SyncClientsDialogRepository.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/syncclientsdialog}/SyncClientsDialogRepositoryImp.kt (97%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/syncclientsdialog}/SyncClientsDialogUiState.kt (91%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/syncclientsdialog}/SyncClientsDialogViewModel.kt (99%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/syncgroupsdialog}/SyncGroupsDialogRepository.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/syncgroupsdialog}/SyncGroupsDialogRepositoryImp.kt (97%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/syncgroupsdialog}/SyncGroupsDialogUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/syncgroupsdialog}/SyncGroupsDialogViewModel.kt (99%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/syncsurveysdialog}/SyncSurveysDialogRepository.kt (89%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/dialogfragments/syncsurveysdialog}/SyncSurveysDialogRepositoryImp.kt (87%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/dialogfragments/syncsurveysdialog}/SyncSurveysDialogUiState.kt (95%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/dialogfragments/syncsurveysdialog}/SyncSurveysDialogViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/offlinedashbarod}/OfflineDashboardRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/offlinedashbarod}/OfflineDashboardRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/offline/offlinedashbarod}/OfflineDashboardUiState.kt (95%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/offline/offlinedashbarod}/OfflineDashboardViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/synccenterpayloads}/SyncCenterPayloadsRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/synccenterpayloads}/SyncCenterPayloadsRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/offline/synccenterpayloads}/SyncCenterPayloadsUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/offline/synccenterpayloads}/SyncCenterPayloadsViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncclientpayloads}/SyncClientPayloadsRepository.kt (89%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncclientpayloads}/SyncClientPayloadsRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/offline/syncclientpayloads}/SyncClientPayloadsUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/offline/syncclientpayloads}/SyncClientPayloadsViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncgrouppayloads}/SyncGroupPayloadsRepository.kt (89%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncgrouppayloads}/SyncGroupPayloadsRepositoryImp.kt (86%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/offline/syncgrouppayloads}/SyncGroupPayloadsUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/offline/syncgrouppayloads}/SyncGroupPayloadsViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncloanrepaymenttransacition}/SyncLoanRepaymentTransactionRepository.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncloanrepaymenttransacition}/SyncLoanRepaymentTransactionRepositoryImp.kt (95%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/offline/syncloanrepaymenttransacition}/SyncLoanRepaymentTransactionUiState.kt (94%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/offline/syncloanrepaymenttransacition}/SyncLoanRepaymentTransactionViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncsavingsaccounttransaction}/SyncSavingsAccountTransactionRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/offline/syncsavingsaccounttransaction}/SyncSavingsAccountTransactionRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/offline/syncsavingsaccounttransaction}/SyncSavingsAccountTransactionUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/offline/syncsavingsaccounttransaction}/SyncSavingsAccountTransactionViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/activate}/ActivateRepository.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/activate}/ActivateRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/activate}/ActivateUiState.kt (86%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/activate}/ActivateViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/centerdetails}/CenterDetailsRepository.kt (88%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/centerdetails}/CenterDetailsRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/centerdetails}/CenterDetailsUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/centerdetails}/CenterDetailsViewModel.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/centerlist}/CenterListRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/centerlist}/CenterListRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/centerlist}/CenterListUiState.kt (94%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/centerlist}/CenterListViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientcharge}/ClientChargeRepository.kt (84%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientcharge}/ClientChargeRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/clientcharge}/ClientChargeUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/clientcharge}/ClientChargeViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientdetails}/ClientDetailsRepository.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientdetails}/ClientDetailsRepositoryImp.kt (95%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/clientdetails}/ClientDetailsUiState.kt (94%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/clientdetails}/ClientDetailsViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientidentifiers}/ClientIdentifiersRepository.kt (89%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientidentifiers}/ClientIdentifiersRepositoryImp.kt (93%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/clientidentifiers}/ClientIdentifiersUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/clientidentifiers}/ClientIdentifiersViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientlist}/ClientListRepository.kt (87%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/clientlist}/ClientListRepositoryImp.kt (83%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/clientlist}/ClientListUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/clientlist}/ClientListViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/collectionsheet}/CollectionSheetRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/collectionsheet}/CollectionSheetRepositoryImp.kt (93%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/collectionsheet}/CollectionSheetUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/collectionsheet}/CollectionSheetViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/collectionsheetindividual}/NewIndividualCollectionSheetRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/collectionsheetindividual}/NewIndividualCollectionSheetRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/collectionsheetindividual}/NewIndividualCollectionSheetUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/collectionsheetindividual}/NewIndividualCollectionSheetViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/collectionsheetindividualdetails}/IndividualCollectionSheetDetailsRepository.kt (83%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/collectionsheetindividualdetails}/IndividualCollectionSheetDetailsRepositoryImp.kt (90%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/collectionsheetindividualdetails}/IndividualCollectionSheetDetailsUiState.kt (82%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/collectionsheetindividualdetails}/IndividualCollectionSheetDetailsViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/createnewcenter}/CreateNewCenterRepository.kt (87%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/createnewcenter}/CreateNewCenterRepositoryImp.kt (92%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/createnewcenter}/CreateNewCenterUiState.kt (91%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/createnewcenter}/CreateNewCenterViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/createnewclient}/CreateNewClientRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/createnewclient}/CreateNewClientRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/createnewclient}/CreateNewClientUiState.kt (95%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/createnewclient}/CreateNewClientViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/createnewgroup}/CreateNewGroupRepository.kt (87%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/createnewgroup}/CreateNewGroupRepositoryImp.kt (93%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/createnewgroup}/CreateNewGroupUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/createnewgroup}/CreateNewGroupViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/datatable}/DataTableRepository.kt (82%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/datatable}/DataTableRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/datatable}/DataTableUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/datatable}/DataTableViewModel.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/datatabledata}/DataTableDataRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/datatabledata}/DataTableDataRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/datatabledata}/DataTableDataUiState.kt (91%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/datatabledata}/DataTableDataViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/datatablelistfragment}/DataTableListRepository.kt (90%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/datatablelistfragment}/DataTableListRepositoryImp.kt (95%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/datatablelistfragment}/DataTableListUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/datatablelistfragment}/DataTableListViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/documentlist}/DocumentListRepository.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/documentlist}/DocumentListRepositoryImp.kt (95%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/documentlist}/DocumentListUiState.kt (91%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/documentlist}/DocumentListViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/generatecollectionsheet}/GenerateCollectionSheetRepository.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/generatecollectionsheet}/GenerateCollectionSheetRepositoryImp.kt (97%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/generatecollectionsheet}/GenerateCollectionSheetUiState.kt (96%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/generatecollectionsheet}/GenerateCollectionSheetViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/groupdetails}/GroupDetailsRepository.kt (89%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/groupdetails}/GroupDetailsRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/groupdetails}/GroupDetailsUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/groupdetails}/GroupDetailsViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/grouplist}/GroupListRepository.kt (88%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/grouplist}/GroupListRepositoryImp.kt (92%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/grouplist}/GroupListUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/grouplist}/GroupListViewModel.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/grouploanaccount}/GroupLoanAccountRepository.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/grouploanaccount}/GroupLoanAccountRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/grouploanaccount}/GroupLoanAccountUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/grouploanaccount}/GroupLoanAccountViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/groupslist}/GroupsListRepository.kt (86%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/groupslist}/GroupsListRepositoryImp.kt (83%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/groupslist}/GroupsListUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/groupslist}/GroupsListViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccount}/LoanAccountRepository.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccount}/LoanAccountRepositoryImp.kt (94%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loanaccount}/LoanAccountUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loanaccount}/LoanAccountViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccountapproval}/LoanAccountApprovalRepository.kt (83%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccountapproval}/LoanAccountApprovalRepositoryImp.kt (90%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loanaccountapproval}/LoanAccountApprovalUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loanaccountapproval}/LoanAccountApprovalViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccountdisbursement}/LoanAccountDisbursementRepository.kt (89%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccountdisbursement}/LoanAccountDisbursementRepositoryImp.kt (93%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loanaccountdisbursement}/LoanAccountDisbursementUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loanaccountdisbursement}/LoanAccountDisbursementViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccountsummary}/LoanAccountSummaryRepository.kt (81%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanaccountsummary}/LoanAccountSummaryRepositoryImp.kt (89%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loanaccountsummary}/LoanAccountSummaryUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loanaccountsummary}/LoanAccountSummaryViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loancharge}/LoanChargeRepository.kt (81%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loancharge}/LoanChargeRepositoryImp.kt (90%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loancharge}/LoanChargeUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loancharge}/LoanChargeViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanrepayment}/LoanRepaymentRepository.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanrepayment}/LoanRepaymentRepositoryImp.kt (95%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loanrepayment}/LoanRepaymentUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loanrepayment}/LoanRepaymentViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanrepaymentschedule}/LoanRepaymentScheduleRepository.kt (81%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loanrepaymentschedule}/LoanRepaymentScheduleRepositoryImp.kt (89%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loanrepaymentschedule}/LoanRepaymentScheduleUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loanrepaymentschedule}/LoanRepaymentScheduleViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loantransactions}/LoanTransactionsRepository.kt (82%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/loantransactions}/LoanTransactionsRepositoryImp.kt (89%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/loantransactions}/LoanTransactionsUiState.kt (88%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/loantransactions}/LoanTransactionsViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/note}/NoteRepository.kt (83%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/note}/NoteRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/note}/NoteUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/note}/NoteViewModel.kt (93%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/online/{ => runreports}/RunReportsActivity.kt (99%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/runreports/reportcategory}/ReportCategoryRepository.kt (84%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/runreports/reportcategory}/ReportCategoryRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/runreports/reportcategory}/ReportCategoryUiState.kt (86%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/runreports/reportcategory}/ReportCategoryViewModel.kt (95%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/runreports/reportdetail}/ReportDetailRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/runreports/reportdetail}/ReportDetailRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/runreports/reportdetail}/ReportDetailUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/runreports/reportdetail}/ReportDetailViewModel.kt (98%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingaccountsummary}/SavingsAccountSummaryRepository.kt (85%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingaccountsummary}/SavingsAccountSummaryRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/savingaccountsummary}/SavingsAccountSummaryUiState.kt (88%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/savingaccountsummary}/SavingsAccountSummaryViewModel.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingaccounttransaction}/SavingsAccountTransactionRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingaccounttransaction}/SavingsAccountTransactionRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/savingaccounttransaction}/SavingsAccountTransactionUiState.kt (92%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/savingaccounttransaction}/SavingsAccountTransactionViewModel.kt (96%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/savingsaccount}/SavingAccountUiState.kt (93%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/savingsaccount}/SavingAccountViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingsaccount}/SavingsAccountRepository.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingsaccount}/SavingsAccountRepositoryImp.kt (96%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingsaccountactivate}/SavingsAccountActivateRepository.kt (82%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingsaccountactivate}/SavingsAccountActivateRepositoryImp.kt (90%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/savingsaccountactivate}/SavingsAccountActivateUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/savingsaccountactivate}/SavingsAccountActivateViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingsaccountapproval}/SavingsAccountApprovalRepository.kt (85%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/savingsaccountapproval}/SavingsAccountApprovalRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/savingsaccountapproval}/SavingsAccountApprovalUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/savingsaccountapproval}/SavingsAccountApprovalViewModel.kt (92%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/search}/SearchRepository.kt (86%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/search}/SearchRepositoryImp.kt (92%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/search}/SearchUiState.kt (90%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/search}/SearchViewModel.kt (93%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/sign}/SignatureRepository.kt (88%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/sign}/SignatureRepositoryImp.kt (93%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/sign}/SignatureUiState.kt (89%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/sign}/SignatureViewModel.kt (94%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/surveylist}/SurveyListRepository.kt (91%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/surveylist}/SurveyListRepositoryImp.kt (95%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/surveylist}/SurveyListUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/surveylist}/SurveyListViewModel.kt (97%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/online/{ => surveyquestion}/Communicator.kt (86%) rename mifosng-android/src/main/java/com/mifos/mifosxdroid/online/{ => surveyquestion}/SurveyQuestionActivity.kt (97%) mode change 100755 => 100644 rename mifosng-android/src/main/java/com/mifos/mifosxdroid/online/{ => surveyquestion}/SurveyQuestionFragment.kt (98%) mode change 100755 => 100644 rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/surveysubmit}/SurveySubmitRepository.kt (82%) rename mifosng-android/src/main/java/com/mifos/{repositories => mifosxdroid/online/surveysubmit}/SurveySubmitRepositoryImp.kt (91%) rename mifosng-android/src/main/java/com/mifos/{states => mifosxdroid/online/surveysubmit}/SurveySubmitUiState.kt (87%) rename mifosng-android/src/main/java/com/mifos/{viewmodels => mifosxdroid/online/surveysubmit}/SurveySubmitViewModel.kt (92%) diff --git a/config/quality/findbugs/android-exclude-filter.xml b/config/quality/findbugs/android-exclude-filter.xml index add12ee7096..42cf76ce73d 100644 --- a/config/quality/findbugs/android-exclude-filter.xml +++ b/config/quality/findbugs/android-exclude-filter.xml @@ -9,13 +9,13 @@ - + - + diff --git a/mifosng-android/src/main/AndroidManifest.xml b/mifosng-android/src/main/AndroidManifest.xml index ef06c0da450..0bece6bf4e6 100755 --- a/mifosng-android/src/main/AndroidManifest.xml +++ b/mifosng-android/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ android:required="true" /> @@ -60,7 +60,7 @@ android:screenOrientation="portrait" /> @@ -81,27 +81,27 @@ android:name=".online.CentersActivity" android:label="@string/title_activity_centers" android:screenOrientation="portrait" - android:parentActivityName=".HomeActivity"> + android:parentActivityName=".activity.home.HomeActivity"> + android:value=".activity.home.HomeActivity" /> + android:parentActivityName=".activity.home.HomeActivity"> + android:value=".activity.home.HomeActivity" /> + android:parentActivityName=".activity.home.HomeActivity"> + android:value=".activity.home.HomeActivity" /> + android:parentActivityName=".activity.home.HomeActivity"> + android:value=".activity.home.HomeActivity" /> - diff --git a/mifosng-android/src/main/java/com/mifos/App.kt b/mifosng-android/src/main/java/com/mifos/application/App.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/App.kt rename to mifosng-android/src/main/java/com/mifos/application/App.kt index 77dcc9d3682..c6b57c24403 100644 --- a/mifosng-android/src/main/java/com/mifos/App.kt +++ b/mifosng-android/src/main/java/com/mifos/application/App.kt @@ -2,11 +2,10 @@ * This project is licensed under the open source MPL V2. * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos +package com.mifos.application import android.content.Context import android.graphics.Typeface -import android.os.Build import android.os.StrictMode import android.os.StrictMode.VmPolicy import android.preference.PreferenceManager @@ -16,7 +15,6 @@ import com.evernote.android.job.JobManager import com.facebook.stetho.Stetho import com.joanzapata.iconify.Iconify import com.joanzapata.iconify.fonts.MaterialModule -import com.mifos.mifosxdroid.injection.module.ApplicationModule import com.mifos.mifosxdroid.offlinejobs.OfflineJobCreator import com.mifos.mobile.passcode.utils.ForegroundChecker import com.mifos.utils.LanguageHelper.onAttach diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/AboutActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/about/AboutActivity.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/AboutActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/about/AboutActivity.kt index 576c1b18b6c..ed7651df7ab 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/AboutActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/about/AboutActivity.kt @@ -1,8 +1,9 @@ -package com.mifos.mifosxdroid +package com.mifos.mifosxdroid.activity.about import android.content.Intent import android.net.Uri import android.os.Bundle +import com.mifos.mifosxdroid.BuildConfig import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.databinding.ActivityAboutBinding import dagger.hilt.android.AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/home/HomeActivity.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/home/HomeActivity.kt index 1f8e230775a..ba167a85296 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/home/HomeActivity.kt @@ -1,8 +1,6 @@ -package com.mifos.mifosxdroid +package com.mifos.mifosxdroid.activity.home -import android.content.Intent import android.os.Bundle -import android.os.Handler import android.view.Menu import android.view.MenuItem import android.view.View @@ -17,6 +15,7 @@ import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.setupWithNavController import androidx.test.espresso.IdlingResource import com.google.android.material.navigation.NavigationView +import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.databinding.ActivityHomeBinding import com.mifos.mifosxdroid.databinding.ViewNavDrawerHeaderBinding diff --git a/mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginActivity.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginActivity.kt index 27a6611b036..abf277afa39 100644 --- a/mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginActivity.kt @@ -2,7 +2,7 @@ * This project is licensed under the open source MPL V2. * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.ui.activities +package com.mifos.mifosxdroid.activity.login import android.content.Intent import android.os.Bundle @@ -18,20 +18,18 @@ import android.widget.Toast import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import com.mifos.api.BaseApiManager -import com.mifos.mifosxdroid.HomeActivity +import com.mifos.mifosxdroid.activity.home.HomeActivity import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.ActivityLoginBinding import com.mifos.mifosxdroid.passcode.PassCodeActivity -import com.mifos.states.LoginUiState import com.mifos.utils.Constants import com.mifos.utils.Network import com.mifos.utils.PrefManager import com.mifos.utils.PrefManager.savePostAuthenticationResponse import com.mifos.utils.PrefManager.saveToken import com.mifos.utils.ValidationUtil -import com.mifos.viewmodels.LoginViewModel import dagger.hilt.android.AndroidEntryPoint import org.apache.fineract.client.models.PostAuthenticationResponse import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoginRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginRepository.kt similarity index 85% rename from mifosng-android/src/main/java/com/mifos/repositories/LoginRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginRepository.kt index 438c3cba513..7c04b297298 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoginRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.activity.login import org.apache.fineract.client.models.PostAuthenticationResponse import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoginRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginRepositoryImp.kt similarity index 82% rename from mifosng-android/src/main/java/com/mifos/repositories/LoginRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginRepositoryImp.kt index 732ef40464c..9927b2fc0df 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoginRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.activity.login import com.mifos.api.datamanager.DataManagerAuth import org.apache.fineract.client.models.PostAuthenticationResponse @@ -9,7 +9,8 @@ import javax.inject.Inject * Created by Aditya Gupta on 06/08/23. */ -class LoginRepositoryImp @Inject constructor(private val dataManagerAuth: DataManagerAuth) : LoginRepository { +class LoginRepositoryImp @Inject constructor(private val dataManagerAuth: DataManagerAuth) : + LoginRepository { override fun login(username: String, password: String): Observable { return dataManagerAuth.login(username, password) diff --git a/mifosng-android/src/main/java/com/mifos/states/LoginUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/LoginUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginUiState.kt index 3f680b74ed5..e9d46286776 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoginUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.activity.login import org.apache.fineract.client.models.PostAuthenticationResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginViewModel.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginViewModel.kt index 78c02e7993a..61cdc5df97b 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/login/LoginViewModel.kt @@ -1,11 +1,8 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.activity.login import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.mifos.repositories.LoginRepository -import com.mifos.states.LoginUiState -import com.mifos.utils.PrefManager import dagger.hilt.android.lifecycle.HiltViewModel import org.apache.fineract.client.models.PostAuthenticationResponse import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt index b463c929ef0..ccc16468521 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt @@ -28,11 +28,9 @@ import com.mifos.mifosxdroid.adapters.PathTrackingAdapter import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.databinding.ActivityPathTrackerBinding import com.mifos.objects.user.UserLocation -import com.mifos.states.PathTrackingUiState import com.mifos.utils.CheckSelfPermissionAndRequest import com.mifos.utils.Constants import com.mifos.utils.PrefManager -import com.mifos.viewmodels.PathTrackingViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/PathTrackingRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingRepository.kt similarity index 81% rename from mifosng-android/src/main/java/com/mifos/repositories/PathTrackingRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingRepository.kt index 5815b1cf13a..00ca88d2287 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/PathTrackingRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.activity.pathtracking import com.mifos.objects.user.UserLocation import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/PathTrackingRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingRepositoryImp.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/PathTrackingRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingRepositoryImp.kt index a67bd3a4015..75e903706b3 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/PathTrackingRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.activity.pathtracking import com.mifos.api.datamanager.DataManagerDataTable import com.mifos.objects.user.UserLocation diff --git a/mifosng-android/src/main/java/com/mifos/states/PathTrackingUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingUiState.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/states/PathTrackingUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingUiState.kt index 59ff8bf5bf9..f842a08567c 100644 --- a/mifosng-android/src/main/java/com/mifos/states/PathTrackingUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.activity.pathtracking import com.mifos.objects.user.UserLocation diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/PathTrackingViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/PathTrackingViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingViewModel.kt index 8a3eb60bb15..b6249e69472 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/PathTrackingViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.activity.pathtracking import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.user.UserLocation -import com.mifos.repositories.PathTrackingRepository -import com.mifos.states.PathTrackingUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/repositories/PinPointClientRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/PinPointClientRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientRepository.kt index 17c51d93c31..60c26084e1e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/PinPointClientRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.activity.pinpointclient import com.mifos.api.GenericResponse import com.mifos.objects.client.ClientAddressRequest diff --git a/mifosng-android/src/main/java/com/mifos/repositories/PinPointClientRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/PinPointClientRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientRepositoryImp.kt index e91bd016b0f..c971f001258 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/PinPointClientRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.activity.pinpointclient import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerClient diff --git a/mifosng-android/src/main/java/com/mifos/states/PinPointClientUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/PinPointClientUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientUiState.kt index 5a146aa3110..cd5b8bac1a2 100644 --- a/mifosng-android/src/main/java/com/mifos/states/PinPointClientUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.activity.pinpointclient import com.mifos.objects.client.ClientAddressResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/PinPointClientViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/PinPointClientViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientViewModel.kt index b825f9096d3..a389bd06ec1 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/PinPointClientViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinPointClientViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.activity.pinpointclient import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.api.GenericResponse import com.mifos.mifosxdroid.R import com.mifos.objects.client.ClientAddressRequest import com.mifos.objects.client.ClientAddressResponse -import com.mifos.repositories.PinPointClientRepository -import com.mifos.states.PinPointClientUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinpointClientActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinpointClientActivity.kt index f5b56bf04d7..16e53b83379 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinpointClientActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pinpointclient/PinpointClientActivity.kt @@ -24,11 +24,9 @@ import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.ActivityPinpointLocationBinding import com.mifos.objects.client.ClientAddressRequest import com.mifos.objects.client.ClientAddressResponse -import com.mifos.states.PinPointClientUiState import com.mifos.utils.CheckSelfPermissionAndRequest.checkSelfPermission import com.mifos.utils.CheckSelfPermissionAndRequest.requestPermission import com.mifos.utils.Constants -import com.mifos.viewmodels.PinPointClientViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/setting/SettingsActivity.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/setting/SettingsActivity.kt index 06a278f515c..61cbbf9acba 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/setting/SettingsActivity.kt @@ -1,10 +1,11 @@ -package com.mifos.mifosxdroid +package com.mifos.mifosxdroid.activity.setting import android.content.Intent import android.os.Bundle import androidx.core.app.ActivityCompat -import androidx.navigation.findNavController import androidx.navigation.fragment.NavHostFragment +import com.mifos.mifosxdroid.activity.home.HomeActivity +import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.utils.Constants diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/setting/SettingsFragment.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/setting/SettingsFragment.kt index 9f0d3bebe3f..9d00d03feb1 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/setting/SettingsFragment.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package com.mifos.mifosxdroid +package com.mifos.mifosxdroid.activity.setting import android.content.Intent import android.content.SharedPreferences @@ -8,6 +8,7 @@ import android.os.Bundle import androidx.preference.* import androidx.preference.Preference.OnPreferenceChangeListener import android.widget.Toast +import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogFragment import com.mifos.mifosxdroid.online.DashboardActivity import com.mifos.mifosxdroid.passcode.PassCodeActivity diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/splashscreen/SplashScreenActivity.kt old mode 100755 new mode 100644 similarity index 92% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/splashscreen/SplashScreenActivity.kt index c5d3c856c6f..92fa834200d --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/splashscreen/SplashScreenActivity.kt @@ -2,14 +2,14 @@ * This project is licensed under the open source MPL V2. * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.mifosxdroid +package com.mifos.mifosxdroid.activity.splashscreen import android.content.Intent import android.os.Bundle import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.mifos.api.BaseUrl import com.mifos.mifosxdroid.core.MifosBaseActivity -import com.mifos.ui.activities.LoginActivity +import com.mifos.mifosxdroid.activity.login.LoginActivity import com.mifos.mifosxdroid.passcode.PassCodeActivity import com.mifos.mobile.passcode.utils.PassCodeConstants import com.mifos.utils.PrefManager diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.kt index 441499542eb..b3da2842802 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/IdentifierListAdapter.kt @@ -8,7 +8,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.mifos.App.Companion.context +import com.mifos.application.App.Companion.context import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.databinding.RowIdentifierListBinding import com.mifos.objects.noncore.Identifier diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt index 36b3112ca7c..e9f36a0e0f9 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt @@ -16,7 +16,7 @@ import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import com.mifos.mifosxdroid.R -import com.mifos.mifosxdroid.SplashScreenActivity +import com.mifos.mifosxdroid.activity.splashscreen.SplashScreenActivity import com.mifos.mifosxdroid.passcode.PassCodeActivity import com.mifos.mobile.passcode.BasePassCodeActivity import com.mifos.utils.Constants diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/util/Toaster.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/util/Toaster.kt index 47fa3864123..fe36556b2fe 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/util/Toaster.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/util/Toaster.kt @@ -8,7 +8,7 @@ import android.view.View import android.widget.TextView import com.google.android.material.R import com.google.android.material.snackbar.Snackbar -import com.mifos.App +import com.mifos.application.App /** * @author fomenkoo diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogFragment.kt index fe65863bf2b..2bfdee59f80 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogFragment.kt @@ -25,11 +25,9 @@ import com.mifos.objects.client.ChargeCreationResponse import com.mifos.objects.client.Charges import com.mifos.objects.templates.clients.ChargeTemplate import com.mifos.services.data.ChargesPayload -import com.mifos.states.ChargeDialogUiState import com.mifos.utils.Constants import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.ChargeDialogViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ChargeDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogRepository.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/repositories/ChargeDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogRepository.kt index ddef5c5be56..03465d37195 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ChargeDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.chargedialog import com.mifos.objects.client.ChargeCreationResponse import com.mifos.objects.templates.clients.ChargeTemplate diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ChargeDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogRepositoryImp.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/repositories/ChargeDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogRepositoryImp.kt index f74a95b18c8..5f153100b5a 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ChargeDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.chargedialog import com.mifos.api.DataManager import com.mifos.objects.client.ChargeCreationResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/ChargeDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/ChargeDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogUiState.kt index 4cd451866d8..a120f756780 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ChargeDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.chargedialog import com.mifos.objects.client.ChargeCreationResponse import com.mifos.objects.templates.clients.ChargeTemplate diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ChargeDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ChargeDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogViewModel.kt index 11002b96267..49f338f77af 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ChargeDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/chargedialog/ChargeDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.chargedialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,9 +6,7 @@ import androidx.lifecycle.ViewModel import com.mifos.objects.client.ChargeCreationResponse import com.mifos.objects.templates.clients.ChargeOptions import com.mifos.objects.templates.clients.ChargeTemplate -import com.mifos.repositories.ChargeDialogRepository import com.mifos.services.data.ChargesPayload -import com.mifos.states.ChargeDialogUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogFragment.kt index 4370e7a292e..f47a723dbef 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogFragment.kt @@ -25,10 +25,8 @@ import com.mifos.mifosxdroid.formwidgets.FormSpinner import com.mifos.mifosxdroid.formwidgets.FormToggleButton import com.mifos.mifosxdroid.formwidgets.FormWidget import com.mifos.objects.noncore.DataTable -import com.mifos.states.DataTableRowDialogUiState import com.mifos.utils.Constants import com.mifos.utils.SafeUIBlockingUtility -import com.mifos.viewmodels.DataTableRowDialogViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRowDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogRepository.kt similarity index 81% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableRowDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogRepository.kt index a964c5d1064..17e7258a216 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRowDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.datatablerowdialog import com.mifos.api.GenericResponse import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRowDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogRepositoryImp.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableRowDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogRepositoryImp.kt index 90afff2f846..058d231472f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRowDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.datatablerowdialog import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerDataTable diff --git a/mifosng-android/src/main/java/com/mifos/states/DataTableRowDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogUiState.kt similarity index 85% rename from mifosng-android/src/main/java/com/mifos/states/DataTableRowDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogUiState.kt index 955b5f49e45..e6e09f5dcae 100644 --- a/mifosng-android/src/main/java/com/mifos/states/DataTableRowDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.datatablerowdialog import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableRowDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/DataTableRowDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogViewModel.kt index e29063ad9e4..c419aec6bd1 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableRowDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/datatablerowdialog/DataTableRowDialogViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.datatablerowdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse -import com.mifos.repositories.DataTableRowDialogRepository -import com.mifos.states.DataTableRowDialogUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.kt index 4043e400dc3..f75f779d705 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogFragment.kt @@ -24,13 +24,11 @@ import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.DialogFragmentDocumentBinding import com.mifos.objects.noncore.Document -import com.mifos.states.DocumentDialogUiState import com.mifos.utils.AndroidVersionUtil import com.mifos.utils.CheckSelfPermissionAndRequest import com.mifos.utils.Constants import com.mifos.utils.FileUtils import com.mifos.utils.SafeUIBlockingUtility -import com.mifos.viewmodels.DocumentDialogViewModel import dagger.hilt.android.AndroidEntryPoint import java.io.File diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DocumentDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/DocumentDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogRepository.kt index 94c58dabe8d..060e180827c 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DocumentDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.documentdialog import com.mifos.api.GenericResponse import okhttp3.MultipartBody diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DocumentDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/DocumentDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogRepositoryImp.kt index 400cf707f7a..a469ac42973 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DocumentDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.documentdialog import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerDocument diff --git a/mifosng-android/src/main/java/com/mifos/states/DocumentDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/DocumentDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogUiState.kt index cae087397d9..3317c2f65b5 100644 --- a/mifosng-android/src/main/java/com/mifos/states/DocumentDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.documentdialog import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/DocumentDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/DocumentDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogViewModel.kt index d3a7cc87875..67b2a75bc49 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/DocumentDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/documentdialog/DocumentDialogViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.documentdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse -import com.mifos.repositories.DocumentDialogRepository -import com.mifos.states.DocumentDialogUiState import dagger.hilt.android.lifecycle.HiltViewModel import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogFragment.kt index c57e2077ed7..26529ce74a4 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogFragment.kt @@ -17,9 +17,7 @@ import com.mifos.objects.noncore.Identifier import com.mifos.objects.noncore.IdentifierCreationResponse import com.mifos.objects.noncore.IdentifierPayload import com.mifos.objects.noncore.IdentifierTemplate -import com.mifos.states.IdentifierDialogUiState import com.mifos.utils.Constants -import com.mifos.viewmodels.IdentifierDialogViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/IdentifierDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogRepository.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/repositories/IdentifierDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogRepository.kt index a6ca8239fe0..755003abcc1 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/IdentifierDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.identifierdialog import com.mifos.objects.noncore.IdentifierCreationResponse import com.mifos.objects.noncore.IdentifierPayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/IdentifierDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogRepositoryImp.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/IdentifierDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogRepositoryImp.kt index 8a9c31132f0..ba2960837df 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/IdentifierDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.identifierdialog import com.mifos.api.datamanager.DataManagerClient import com.mifos.objects.noncore.IdentifierCreationResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/IdentifierDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/IdentifierDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogUiState.kt index 9bfa5dcd86a..88e4a8101e7 100644 --- a/mifosng-android/src/main/java/com/mifos/states/IdentifierDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.identifierdialog import com.mifos.objects.noncore.IdentifierCreationResponse import com.mifos.objects.noncore.IdentifierTemplate diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/IdentifierDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/IdentifierDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogViewModel.kt index 935193acd12..60df182332b 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/IdentifierDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/identifierdialog/IdentifierDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.identifierdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.objects.noncore.DocumentType import com.mifos.objects.noncore.IdentifierCreationResponse import com.mifos.objects.noncore.IdentifierPayload import com.mifos.objects.noncore.IdentifierTemplate -import com.mifos.repositories.IdentifierDialogRepository -import com.mifos.states.IdentifierDialogUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogFragment.kt index 67fa1044dd6..3bf76eacd44 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogFragment.kt @@ -27,11 +27,9 @@ import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.client.ChargeCreationResponse import com.mifos.objects.client.Charges import com.mifos.services.data.ChargesPayload -import com.mifos.states.LoanChargeDialogUiState import com.mifos.utils.Constants import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.LoanChargeDialogViewModel import dagger.hilt.android.AndroidEntryPoint import okhttp3.ResponseBody import org.json.JSONObject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogRepository.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanChargeDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogRepository.kt index 14b4717e5be..c10c1e09a61 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.loanchargedialog import com.mifos.objects.client.ChargeCreationResponse import com.mifos.services.data.ChargesPayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogRepositoryImp.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanChargeDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogRepositoryImp.kt index 5e101fc0694..8e69e290e39 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.loanchargedialog import com.mifos.api.DataManager import com.mifos.objects.client.ChargeCreationResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanChargeDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/LoanChargeDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogUiState.kt index f109ac5ace6..02212a577e1 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanChargeDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.loanchargedialog import com.mifos.objects.client.ChargeCreationResponse import okhttp3.ResponseBody diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanChargeDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanChargeDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogViewModel.kt index 55b5d332e2f..c5179f245c1 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanChargeDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/loanchargedialog/LoanChargeDialogViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.loanchargedialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.client.ChargeCreationResponse -import com.mifos.repositories.LoanChargeDialogRepository import com.mifos.services.data.ChargesPayload -import com.mifos.states.LoanChargeDialogUiState import dagger.hilt.android.lifecycle.HiltViewModel import okhttp3.ResponseBody import retrofit2.HttpException diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogFragment.kt index a269a334093..6f90cc758c5 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogFragment.kt @@ -12,11 +12,9 @@ import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.DialogFragmentSyncCentersBinding import com.mifos.objects.group.Center -import com.mifos.states.SyncCentersDialogUiState import com.mifos.utils.Constants import com.mifos.utils.Network.isOnline import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncCentersDialogViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncCentersDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogRepository.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncCentersDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogRepository.kt index 51da0a6e727..d03e68020fd 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncCentersDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.synccenterdialog import com.mifos.objects.accounts.CenterAccounts import com.mifos.objects.accounts.ClientAccounts diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncCentersDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogRepositoryImp.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncCentersDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogRepositoryImp.kt index 7af74d6493a..d0349d6ce9b 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncCentersDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.synccenterdialog import com.mifos.api.datamanager.DataManagerCenter import com.mifos.api.datamanager.DataManagerClient diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncCentersDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogUiState.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/states/SyncCentersDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogUiState.kt index 250b2f6acc9..1050336346d 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncCentersDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.synccenterdialog /** * Created by Aditya Gupta on 16/08/23. diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncCentersDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogViewModel.kt similarity index 99% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncCentersDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogViewModel.kt index cfb8d393764..7eb5d567df6 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncCentersDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/synccenterdialog/SyncCentersDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.synccenterdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -15,8 +15,6 @@ import com.mifos.objects.group.Group import com.mifos.objects.group.GroupWithAssociations import com.mifos.objects.zipmodels.LoanAndLoanRepayment import com.mifos.objects.zipmodels.SavingsAccountAndTransactionTemplate -import com.mifos.repositories.SyncCentersDialogRepository -import com.mifos.states.SyncCentersDialogUiState import com.mifos.utils.Constants import com.mifos.utils.NetworkUtilsWrapper import com.mifos.utils.Utils diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogFragment.kt index 6d8054d8f15..9f6d3763192 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogFragment.kt @@ -12,11 +12,9 @@ import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.DialogFragmentSyncClientsBinding import com.mifos.objects.client.Client -import com.mifos.states.SyncClientsDialogUiState import com.mifos.utils.Constants import com.mifos.utils.Network.isOnline import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncClientsDialogViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientsDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogRepository.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncClientsDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogRepository.kt index a6229ffe236..91470f144da 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientsDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.syncclientsdialog import com.mifos.objects.accounts.ClientAccounts import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientsDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogRepositoryImp.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncClientsDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogRepositoryImp.kt index 020d2e40455..116729ae0ea 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientsDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.syncclientsdialog import com.mifos.api.datamanager.DataManagerClient import com.mifos.api.datamanager.DataManagerLoan diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncClientsDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogUiState.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/states/SyncClientsDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogUiState.kt index c6ba5b0bd23..d5e47237296 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncClientsDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.syncclientsdialog /** * Created by Aditya Gupta on 16/08/23. diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncClientsDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogViewModel.kt similarity index 99% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncClientsDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogViewModel.kt index 5e81571634d..c78844a1ba2 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncClientsDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncclientsdialog/SyncClientsDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.syncclientsdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -9,8 +9,6 @@ import com.mifos.objects.accounts.savings.SavingsAccount import com.mifos.objects.client.Client import com.mifos.objects.zipmodels.LoanAndLoanRepayment import com.mifos.objects.zipmodels.SavingsAccountAndTransactionTemplate -import com.mifos.repositories.SyncClientsDialogRepository -import com.mifos.states.SyncClientsDialogUiState import com.mifos.utils.Constants import com.mifos.utils.NetworkUtilsWrapper import com.mifos.utils.Utils diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogFragment.kt index ca679c79dc9..5331166c291 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogFragment.kt @@ -12,11 +12,9 @@ import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.DialogFragmentSyncGroupsBinding import com.mifos.objects.group.Group -import com.mifos.states.SyncGroupsDialogUiState import com.mifos.utils.Constants import com.mifos.utils.Network.isOnline import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncGroupsDialogViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupsDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogRepository.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncGroupsDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogRepository.kt index af9f0981e34..6d535ac2428 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupsDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog import com.mifos.objects.accounts.ClientAccounts import com.mifos.objects.accounts.GroupAccounts diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupsDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogRepositoryImp.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncGroupsDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogRepositoryImp.kt index e30166b4250..3b281d28cfb 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupsDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog import com.mifos.api.datamanager.DataManagerClient import com.mifos.api.datamanager.DataManagerGroups diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncGroupsDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/SyncGroupsDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogUiState.kt index 5bd180f6fd1..cc29992fb3f 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncGroupsDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog /** * Created by Aditya Gupta on 16/08/23. diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncGroupsDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogViewModel.kt similarity index 99% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncGroupsDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogViewModel.kt index d5c4df16e95..9d4531f10e3 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncGroupsDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncgroupsdialog/SyncGroupsDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -12,8 +12,6 @@ import com.mifos.objects.group.Group import com.mifos.objects.group.GroupWithAssociations import com.mifos.objects.zipmodels.LoanAndLoanRepayment import com.mifos.objects.zipmodels.SavingsAccountAndTransactionTemplate -import com.mifos.repositories.SyncGroupsDialogRepository -import com.mifos.states.SyncGroupsDialogUiState import com.mifos.utils.Constants import com.mifos.utils.NetworkUtilsWrapper import com.mifos.utils.Utils diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogFragment.kt index c640108cfa9..cbe09336964 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogFragment.kt @@ -11,11 +11,9 @@ import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.DialogFragmentSyncSurveysBinding import com.mifos.objects.survey.Survey -import com.mifos.states.SyncSurveysDialogUiState import com.mifos.utils.Constants import com.mifos.utils.Network.isOnline import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncSurveysDialogViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncSurveysDialogRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogRepository.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncSurveysDialogRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogRepository.kt index f063e668b7a..7a01b3821d6 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncSurveysDialogRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog import com.mifos.objects.survey.QuestionDatas import com.mifos.objects.survey.ResponseDatas diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncSurveysDialogRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogRepositoryImp.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncSurveysDialogRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogRepositoryImp.kt index 6fbd0b870a9..4d261cd4c02 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncSurveysDialogRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog import com.mifos.api.datamanager.DataManagerSurveys import com.mifos.objects.survey.QuestionDatas @@ -7,7 +7,8 @@ import com.mifos.objects.survey.Survey import rx.Observable import javax.inject.Inject -class SyncSurveysDialogRepositoryImp @Inject constructor(private val dataManagerSurvey: DataManagerSurveys) : SyncSurveysDialogRepository { +class SyncSurveysDialogRepositoryImp @Inject constructor(private val dataManagerSurvey: DataManagerSurveys) : + SyncSurveysDialogRepository { override fun syncSurveyInDatabase(survey: Survey): Observable { return dataManagerSurvey.syncSurveyInDatabase(survey) diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncSurveysDialogUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogUiState.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/states/SyncSurveysDialogUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogUiState.kt index 37041f18190..5c249f9293e 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncSurveysDialogUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog import com.mifos.objects.survey.Survey diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncSurveysDialogViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncSurveysDialogViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogViewModel.kt index 8b0999f714c..33e016ac937 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncSurveysDialogViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/dialogfragments/syncsurveysdialog/SyncSurveysDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.objects.survey.QuestionDatas import com.mifos.objects.survey.ResponseDatas import com.mifos.objects.survey.Survey -import com.mifos.repositories.SyncSurveysDialogRepository -import com.mifos.states.SyncSurveysDialogUiState import com.mifos.utils.NetworkUtilsWrapper import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.adapter.rxjava.HttpException diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/RepositoryModule.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/RepositoryModule.kt index d7ff9b119e8..ba4325a616f 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/RepositoryModule.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/RepositoryModule.kt @@ -17,126 +17,126 @@ import com.mifos.api.datamanager.DataManagerSavings import com.mifos.api.datamanager.DataManagerSearch import com.mifos.api.datamanager.DataManagerStaff import com.mifos.api.datamanager.DataManagerSurveys -import com.mifos.repositories.ActivateRepository -import com.mifos.repositories.ActivateRepositoryImp -import com.mifos.repositories.CenterDetailsRepository -import com.mifos.repositories.CenterDetailsRepositoryImp -import com.mifos.repositories.CenterListRepository -import com.mifos.repositories.CenterListRepositoryImp -import com.mifos.repositories.ChargeDialogRepository -import com.mifos.repositories.ChargeDialogRepositoryImp -import com.mifos.repositories.ClientChargeRepository -import com.mifos.repositories.ClientChargeRepositoryImp -import com.mifos.repositories.ClientDetailsRepository -import com.mifos.repositories.ClientDetailsRepositoryImp -import com.mifos.repositories.ClientIdentifiersRepository -import com.mifos.repositories.ClientIdentifiersRepositoryImp -import com.mifos.repositories.ClientListRepository -import com.mifos.repositories.ClientListRepositoryImp -import com.mifos.repositories.CollectionSheetRepository -import com.mifos.repositories.CollectionSheetRepositoryImp -import com.mifos.repositories.CreateNewCenterRepository -import com.mifos.repositories.CreateNewCenterRepositoryImp -import com.mifos.repositories.CreateNewClientRepository -import com.mifos.repositories.CreateNewClientRepositoryImp -import com.mifos.repositories.CreateNewGroupRepository -import com.mifos.repositories.CreateNewGroupRepositoryImp -import com.mifos.repositories.DataTableDataRepository -import com.mifos.repositories.DataTableDataRepositoryImp -import com.mifos.repositories.DataTableListRepository -import com.mifos.repositories.DataTableListRepositoryImp -import com.mifos.repositories.DataTableRepository -import com.mifos.repositories.DataTableRepositoryImp -import com.mifos.repositories.DataTableRowDialogRepository -import com.mifos.repositories.DataTableRowDialogRepositoryImp -import com.mifos.repositories.DocumentDialogRepository -import com.mifos.repositories.DocumentDialogRepositoryImp -import com.mifos.repositories.DocumentListRepository -import com.mifos.repositories.DocumentListRepositoryImp -import com.mifos.repositories.GenerateCollectionSheetRepository -import com.mifos.repositories.GenerateCollectionSheetRepositoryImp -import com.mifos.repositories.GroupDetailsRepository -import com.mifos.repositories.GroupDetailsRepositoryImp -import com.mifos.repositories.GroupListRepository -import com.mifos.repositories.GroupListRepositoryImp -import com.mifos.repositories.GroupLoanAccountRepository -import com.mifos.repositories.GroupLoanAccountRepositoryImp -import com.mifos.repositories.GroupsListRepository -import com.mifos.repositories.GroupsListRepositoryImp -import com.mifos.repositories.IdentifierDialogRepository -import com.mifos.repositories.IdentifierDialogRepositoryImp -import com.mifos.repositories.IndividualCollectionSheetDetailsRepository -import com.mifos.repositories.IndividualCollectionSheetDetailsRepositoryImp -import com.mifos.repositories.LoanAccountApprovalRepository -import com.mifos.repositories.LoanAccountApprovalRepositoryImp -import com.mifos.repositories.LoanAccountDisbursementRepository -import com.mifos.repositories.LoanAccountDisbursementRepositoryImp -import com.mifos.repositories.LoanAccountRepository -import com.mifos.repositories.LoanAccountRepositoryImp -import com.mifos.repositories.LoanAccountSummaryRepository -import com.mifos.repositories.LoanAccountSummaryRepositoryImp -import com.mifos.repositories.LoanChargeDialogRepository -import com.mifos.repositories.LoanChargeDialogRepositoryImp -import com.mifos.repositories.LoanChargeRepository -import com.mifos.repositories.LoanChargeRepositoryImp -import com.mifos.repositories.LoanRepaymentRepository -import com.mifos.repositories.LoanRepaymentRepositoryImp -import com.mifos.repositories.LoanRepaymentScheduleRepository -import com.mifos.repositories.LoanRepaymentScheduleRepositoryImp -import com.mifos.repositories.LoanTransactionsRepository -import com.mifos.repositories.LoanTransactionsRepositoryImp -import com.mifos.repositories.LoginRepository -import com.mifos.repositories.LoginRepositoryImp -import com.mifos.repositories.NewIndividualCollectionSheetRepository -import com.mifos.repositories.NewIndividualCollectionSheetRepositoryImp -import com.mifos.repositories.NoteRepository -import com.mifos.repositories.NoteRepositoryImp -import com.mifos.repositories.OfflineDashboardRepository -import com.mifos.repositories.OfflineDashboardRepositoryImp -import com.mifos.repositories.PathTrackingRepository -import com.mifos.repositories.PathTrackingRepositoryImp -import com.mifos.repositories.PinPointClientRepository -import com.mifos.repositories.PinPointClientRepositoryImp -import com.mifos.repositories.ReportCategoryRepository -import com.mifos.repositories.ReportCategoryRepositoryImp -import com.mifos.repositories.ReportDetailRepository -import com.mifos.repositories.ReportDetailRepositoryImp -import com.mifos.repositories.SavingsAccountActivateRepository -import com.mifos.repositories.SavingsAccountActivateRepositoryImp -import com.mifos.repositories.SavingsAccountApprovalRepository -import com.mifos.repositories.SavingsAccountApprovalRepositoryImp -import com.mifos.repositories.SavingsAccountRepository -import com.mifos.repositories.SavingsAccountRepositoryImp -import com.mifos.repositories.SavingsAccountSummaryRepository -import com.mifos.repositories.SavingsAccountSummaryRepositoryImp -import com.mifos.repositories.SavingsAccountTransactionRepository -import com.mifos.repositories.SavingsAccountTransactionRepositoryImp -import com.mifos.repositories.SearchRepository -import com.mifos.repositories.SearchRepositoryImp -import com.mifos.repositories.SignatureRepository -import com.mifos.repositories.SignatureRepositoryImp -import com.mifos.repositories.SurveyListRepository -import com.mifos.repositories.SurveyListRepositoryImp -import com.mifos.repositories.SurveySubmitRepository -import com.mifos.repositories.SurveySubmitRepositoryImp -import com.mifos.repositories.SyncCenterPayloadsRepository -import com.mifos.repositories.SyncCenterPayloadsRepositoryImp -import com.mifos.repositories.SyncCentersDialogRepository -import com.mifos.repositories.SyncCentersDialogRepositoryImp -import com.mifos.repositories.SyncClientPayloadsRepository -import com.mifos.repositories.SyncClientPayloadsRepositoryImp -import com.mifos.repositories.SyncClientsDialogRepository -import com.mifos.repositories.SyncClientsDialogRepositoryImp -import com.mifos.repositories.SyncGroupPayloadsRepository -import com.mifos.repositories.SyncGroupPayloadsRepositoryImp -import com.mifos.repositories.SyncGroupsDialogRepository -import com.mifos.repositories.SyncGroupsDialogRepositoryImp -import com.mifos.repositories.SyncLoanRepaymentTransactionRepository -import com.mifos.repositories.SyncLoanRepaymentTransactionRepositoryImp -import com.mifos.repositories.SyncSavingsAccountTransactionRepository -import com.mifos.repositories.SyncSavingsAccountTransactionRepositoryImp -import com.mifos.repositories.SyncSurveysDialogRepository -import com.mifos.repositories.SyncSurveysDialogRepositoryImp +import com.mifos.mifosxdroid.online.activate.ActivateRepository +import com.mifos.mifosxdroid.online.activate.ActivateRepositoryImp +import com.mifos.mifosxdroid.online.centerdetails.CenterDetailsRepository +import com.mifos.mifosxdroid.online.centerdetails.CenterDetailsRepositoryImp +import com.mifos.mifosxdroid.online.centerlist.CenterListRepository +import com.mifos.mifosxdroid.online.centerlist.CenterListRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.chargedialog.ChargeDialogRepository +import com.mifos.mifosxdroid.dialogfragments.chargedialog.ChargeDialogRepositoryImp +import com.mifos.mifosxdroid.online.clientcharge.ClientChargeRepository +import com.mifos.mifosxdroid.online.clientcharge.ClientChargeRepositoryImp +import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsRepository +import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsRepositoryImp +import com.mifos.mifosxdroid.online.clientidentifiers.ClientIdentifiersRepository +import com.mifos.mifosxdroid.online.clientidentifiers.ClientIdentifiersRepositoryImp +import com.mifos.mifosxdroid.online.clientlist.ClientListRepository +import com.mifos.mifosxdroid.online.clientlist.ClientListRepositoryImp +import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetRepository +import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetRepositoryImp +import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterRepository +import com.mifos.mifosxdroid.online.createnewcenter.CreateNewCenterRepositoryImp +import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientRepository +import com.mifos.mifosxdroid.online.createnewclient.CreateNewClientRepositoryImp +import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupRepository +import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupRepositoryImp +import com.mifos.mifosxdroid.online.datatabledata.DataTableDataRepository +import com.mifos.mifosxdroid.online.datatabledata.DataTableDataRepositoryImp +import com.mifos.mifosxdroid.online.datatablelistfragment.DataTableListRepository +import com.mifos.mifosxdroid.online.datatablelistfragment.DataTableListRepositoryImp +import com.mifos.mifosxdroid.online.datatable.DataTableRepository +import com.mifos.mifosxdroid.online.datatable.DataTableRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.datatablerowdialog.DataTableRowDialogRepository +import com.mifos.mifosxdroid.dialogfragments.datatablerowdialog.DataTableRowDialogRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.documentdialog.DocumentDialogRepository +import com.mifos.mifosxdroid.dialogfragments.documentdialog.DocumentDialogRepositoryImp +import com.mifos.mifosxdroid.online.documentlist.DocumentListRepository +import com.mifos.mifosxdroid.online.documentlist.DocumentListRepositoryImp +import com.mifos.mifosxdroid.online.generatecollectionsheet.GenerateCollectionSheetRepository +import com.mifos.mifosxdroid.online.generatecollectionsheet.GenerateCollectionSheetRepositoryImp +import com.mifos.mifosxdroid.online.groupdetails.GroupDetailsRepository +import com.mifos.mifosxdroid.online.groupdetails.GroupDetailsRepositoryImp +import com.mifos.mifosxdroid.online.grouplist.GroupListRepository +import com.mifos.mifosxdroid.online.grouplist.GroupListRepositoryImp +import com.mifos.mifosxdroid.online.grouploanaccount.GroupLoanAccountRepository +import com.mifos.mifosxdroid.online.grouploanaccount.GroupLoanAccountRepositoryImp +import com.mifos.mifosxdroid.online.groupslist.GroupsListRepository +import com.mifos.mifosxdroid.online.groupslist.GroupsListRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.identifierdialog.IdentifierDialogRepository +import com.mifos.mifosxdroid.dialogfragments.identifierdialog.IdentifierDialogRepositoryImp +import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsRepository +import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsRepositoryImp +import com.mifos.mifosxdroid.online.loanaccountapproval.LoanAccountApprovalRepository +import com.mifos.mifosxdroid.online.loanaccountapproval.LoanAccountApprovalRepositoryImp +import com.mifos.mifosxdroid.online.loanaccountdisbursement.LoanAccountDisbursementRepository +import com.mifos.mifosxdroid.online.loanaccountdisbursement.LoanAccountDisbursementRepositoryImp +import com.mifos.mifosxdroid.online.loanaccount.LoanAccountRepository +import com.mifos.mifosxdroid.online.loanaccount.LoanAccountRepositoryImp +import com.mifos.mifosxdroid.online.loanaccountsummary.LoanAccountSummaryRepository +import com.mifos.mifosxdroid.online.loanaccountsummary.LoanAccountSummaryRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.loanchargedialog.LoanChargeDialogRepository +import com.mifos.mifosxdroid.dialogfragments.loanchargedialog.LoanChargeDialogRepositoryImp +import com.mifos.mifosxdroid.online.loancharge.LoanChargeRepository +import com.mifos.mifosxdroid.online.loancharge.LoanChargeRepositoryImp +import com.mifos.mifosxdroid.online.loanrepayment.LoanRepaymentRepository +import com.mifos.mifosxdroid.online.loanrepayment.LoanRepaymentRepositoryImp +import com.mifos.mifosxdroid.online.loanrepaymentschedule.LoanRepaymentScheduleRepository +import com.mifos.mifosxdroid.online.loanrepaymentschedule.LoanRepaymentScheduleRepositoryImp +import com.mifos.mifosxdroid.online.loantransactions.LoanTransactionsRepository +import com.mifos.mifosxdroid.online.loantransactions.LoanTransactionsRepositoryImp +import com.mifos.mifosxdroid.activity.login.LoginRepository +import com.mifos.mifosxdroid.activity.login.LoginRepositoryImp +import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetRepository +import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetRepositoryImp +import com.mifos.mifosxdroid.online.note.NoteRepository +import com.mifos.mifosxdroid.online.note.NoteRepositoryImp +import com.mifos.mifosxdroid.offline.offlinedashbarod.OfflineDashboardRepository +import com.mifos.mifosxdroid.offline.offlinedashbarod.OfflineDashboardRepositoryImp +import com.mifos.mifosxdroid.activity.pathtracking.PathTrackingRepository +import com.mifos.mifosxdroid.activity.pathtracking.PathTrackingRepositoryImp +import com.mifos.mifosxdroid.activity.pinpointclient.PinPointClientRepository +import com.mifos.mifosxdroid.activity.pinpointclient.PinPointClientRepositoryImp +import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryRepository +import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryRepositoryImp +import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailRepository +import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailRepositoryImp +import com.mifos.mifosxdroid.online.savingsaccountactivate.SavingsAccountActivateRepository +import com.mifos.mifosxdroid.online.savingsaccountactivate.SavingsAccountActivateRepositoryImp +import com.mifos.mifosxdroid.online.savingsaccountapproval.SavingsAccountApprovalRepository +import com.mifos.mifosxdroid.online.savingsaccountapproval.SavingsAccountApprovalRepositoryImp +import com.mifos.mifosxdroid.online.savingsaccount.SavingsAccountRepository +import com.mifos.mifosxdroid.online.savingsaccount.SavingsAccountRepositoryImp +import com.mifos.mifosxdroid.online.savingaccountsummary.SavingsAccountSummaryRepository +import com.mifos.mifosxdroid.online.savingaccountsummary.SavingsAccountSummaryRepositoryImp +import com.mifos.mifosxdroid.online.savingaccounttransaction.SavingsAccountTransactionRepository +import com.mifos.mifosxdroid.online.savingaccounttransaction.SavingsAccountTransactionRepositoryImp +import com.mifos.mifosxdroid.online.search.SearchRepository +import com.mifos.mifosxdroid.online.search.SearchRepositoryImp +import com.mifos.mifosxdroid.online.sign.SignatureRepository +import com.mifos.mifosxdroid.online.sign.SignatureRepositoryImp +import com.mifos.mifosxdroid.online.surveylist.SurveyListRepository +import com.mifos.mifosxdroid.online.surveylist.SurveyListRepositoryImp +import com.mifos.mifosxdroid.online.surveysubmit.SurveySubmitRepository +import com.mifos.mifosxdroid.online.surveysubmit.SurveySubmitRepositoryImp +import com.mifos.mifosxdroid.offline.synccenterpayloads.SyncCenterPayloadsRepository +import com.mifos.mifosxdroid.offline.synccenterpayloads.SyncCenterPayloadsRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.synccenterdialog.SyncCentersDialogRepository +import com.mifos.mifosxdroid.dialogfragments.synccenterdialog.SyncCentersDialogRepositoryImp +import com.mifos.mifosxdroid.offline.syncclientpayloads.SyncClientPayloadsRepository +import com.mifos.mifosxdroid.offline.syncclientpayloads.SyncClientPayloadsRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.syncclientsdialog.SyncClientsDialogRepository +import com.mifos.mifosxdroid.dialogfragments.syncclientsdialog.SyncClientsDialogRepositoryImp +import com.mifos.mifosxdroid.offline.syncgrouppayloads.SyncGroupPayloadsRepository +import com.mifos.mifosxdroid.offline.syncgrouppayloads.SyncGroupPayloadsRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog.SyncGroupsDialogRepository +import com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog.SyncGroupsDialogRepositoryImp +import com.mifos.mifosxdroid.offline.syncloanrepaymenttransacition.SyncLoanRepaymentTransactionRepository +import com.mifos.mifosxdroid.offline.syncloanrepaymenttransacition.SyncLoanRepaymentTransactionRepositoryImp +import com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction.SyncSavingsAccountTransactionRepository +import com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction.SyncSavingsAccountTransactionRepositoryImp +import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogRepository +import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogRepositoryImp import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardFragment.kt index 7401392033a..fe1d939bad0 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardFragment.kt @@ -24,9 +24,7 @@ import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.objects.client.ClientPayload import com.mifos.objects.group.GroupPayload import com.mifos.services.data.CenterPayload -import com.mifos.states.OfflineDashboardUiState import com.mifos.utils.ItemOffsetDecoration -import com.mifos.viewmodels.OfflineDashboardViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/OfflineDashboardRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/OfflineDashboardRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardRepository.kt index 63a69f02d5f..4e48c18cb0b 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/OfflineDashboardRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.offlinedashbarod import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/mifosng-android/src/main/java/com/mifos/repositories/OfflineDashboardRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/OfflineDashboardRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardRepositoryImp.kt index dda372dc611..b593b38f2f7 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/OfflineDashboardRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.offlinedashbarod import com.mifos.api.datamanager.DataManagerCenter import com.mifos.api.datamanager.DataManagerClient diff --git a/mifosng-android/src/main/java/com/mifos/states/OfflineDashboardUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardUiState.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/states/OfflineDashboardUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardUiState.kt index 7752300df64..eb6748d7794 100644 --- a/mifosng-android/src/main/java/com/mifos/states/OfflineDashboardUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.offline.offlinedashbarod import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/OfflineDashboardViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/OfflineDashboardViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardViewModel.kt index 6ee074cdc62..df45d1ce8fe 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/OfflineDashboardViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/offlinedashbarod/OfflineDashboardViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.offline.offlinedashbarod import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,9 +7,7 @@ import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.objects.client.ClientPayload import com.mifos.objects.group.GroupPayload -import com.mifos.repositories.OfflineDashboardRepository import com.mifos.services.data.CenterPayload -import com.mifos.states.OfflineDashboardUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt index 5595c733846..2087a9cb11a 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt @@ -18,10 +18,8 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentSyncpayloadBinding import com.mifos.services.data.CenterPayload -import com.mifos.states.SyncCenterPayloadsUiState import com.mifos.utils.Constants import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncCenterPayloadsViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncCenterPayloadsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncCenterPayloadsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsRepository.kt index 4814d001606..451c9bec867 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncCenterPayloadsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.synccenterpayloads import com.mifos.objects.response.SaveResponse import com.mifos.services.data.CenterPayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncCenterPayloadsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncCenterPayloadsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsRepositoryImp.kt index e13aee14aa3..b51b46706cf 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncCenterPayloadsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.synccenterpayloads import com.mifos.api.datamanager.DataManagerCenter import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncCenterPayloadsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/SyncCenterPayloadsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsUiState.kt index 3d9a4f013b0..b9a02d9c683 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncCenterPayloadsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.offline.synccenterpayloads import com.mifos.services.data.CenterPayload diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncCenterPayloadsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncCenterPayloadsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsViewModel.kt index b64faa5c257..b2f7817eef9 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncCenterPayloadsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.offline.synccenterpayloads import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.response.SaveResponse -import com.mifos.repositories.SyncCenterPayloadsRepository import com.mifos.services.data.CenterPayload -import com.mifos.states.SyncCenterPayloadsUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Observer import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt index 3b139b089d4..29d2f9fead8 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt @@ -18,10 +18,8 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentSyncpayloadBinding import com.mifos.objects.client.ClientPayload -import com.mifos.states.SyncClientPayloadsUiState import com.mifos.utils.Constants import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncClientPayloadsViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientPayloadsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsRepository.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncClientPayloadsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsRepository.kt index 783d8635aea..27e2224a870 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientPayloadsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncclientpayloads import com.mifos.objects.client.Client import com.mifos.objects.client.ClientPayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientPayloadsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncClientPayloadsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsRepositoryImp.kt index cf2b48058da..f952cd19b6f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncClientPayloadsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncclientpayloads import com.mifos.api.datamanager.DataManagerClient import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncClientPayloadsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/SyncClientPayloadsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsUiState.kt index 3514bc4fd3a..5bdfd71d830 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncClientPayloadsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.offline.syncclientpayloads import com.mifos.objects.client.ClientPayload diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncClientPayloadsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncClientPayloadsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsViewModel.kt index 2d3ac535f7e..615a17c1ba9 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncClientPayloadsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.offline.syncclientpayloads import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.client.Client import com.mifos.objects.client.ClientPayload -import com.mifos.repositories.SyncClientPayloadsRepository -import com.mifos.states.SyncClientPayloadsUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Observer import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt index a4f2196929f..efed1f71e08 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt @@ -18,10 +18,8 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentSyncpayloadBinding import com.mifos.objects.group.GroupPayload -import com.mifos.states.SyncGroupPayloadsUiState import com.mifos.utils.Constants import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncGroupPayloadsViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupPayloadsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsRepository.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncGroupPayloadsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsRepository.kt index 7309042b531..fa4673e4344 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupPayloadsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncgrouppayloads import com.mifos.objects.group.GroupPayload import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupPayloadsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsRepositoryImp.kt similarity index 86% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncGroupPayloadsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsRepositoryImp.kt index 14f03d25ebd..d18932d37f4 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncGroupPayloadsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncgrouppayloads import com.mifos.api.datamanager.DataManagerGroups import com.mifos.objects.group.GroupPayload @@ -6,7 +6,8 @@ import com.mifos.objects.response.SaveResponse import rx.Observable import javax.inject.Inject -class SyncGroupPayloadsRepositoryImp @Inject constructor(private val dataManagerGroups: DataManagerGroups) : SyncGroupPayloadsRepository { +class SyncGroupPayloadsRepositoryImp @Inject constructor(private val dataManagerGroups: DataManagerGroups) : + SyncGroupPayloadsRepository { override fun allDatabaseGroupPayload(): Observable> { return dataManagerGroups.allDatabaseGroupPayload diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncGroupPayloadsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/SyncGroupPayloadsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsUiState.kt index 0a73eedfee6..5adb737aec8 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncGroupPayloadsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.offline.syncgrouppayloads import com.mifos.objects.group.GroupPayload import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncGroupPayloadsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncGroupPayloadsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsViewModel.kt index 50de6e963fe..74d82a6315e 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncGroupPayloadsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.offline.syncgrouppayloads import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.group.GroupPayload import com.mifos.objects.response.SaveResponse -import com.mifos.repositories.SyncGroupPayloadsRepository -import com.mifos.states.SyncGroupPayloadsUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt index d4fb5230ee5..4cea50f0e76 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt @@ -19,10 +19,8 @@ import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentSyncpayloadBinding import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.states.SyncLoanRepaymentTransactionUiState import com.mifos.utils.Constants import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncLoanRepaymentTransactionViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncLoanRepaymentTransactionRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionRepository.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncLoanRepaymentTransactionRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionRepository.kt index fd6afaefc10..15188715861 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncLoanRepaymentTransactionRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncloanrepaymenttransacition import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.loan.LoanRepaymentRequest diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncLoanRepaymentTransactionRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionRepositoryImp.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncLoanRepaymentTransactionRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionRepositoryImp.kt index 0083284fc7c..35ee1b9ccbc 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncLoanRepaymentTransactionRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncloanrepaymenttransacition import com.mifos.api.datamanager.DataManagerLoan import com.mifos.objects.PaymentTypeOption diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncLoanRepaymentTransactionUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionUiState.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/states/SyncLoanRepaymentTransactionUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionUiState.kt index a43a1fefdf2..88ef7dd52e2 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncLoanRepaymentTransactionUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.offline.syncloanrepaymenttransacition import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.loan.LoanRepaymentRequest diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncLoanRepaymentTransactionViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncLoanRepaymentTransactionViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionViewModel.kt index b4e196e630a..2efcabf3fc4 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncLoanRepaymentTransactionViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.offline.syncloanrepaymenttransacition import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.loan.LoanRepaymentResponse -import com.mifos.repositories.SyncLoanRepaymentTransactionRepository -import com.mifos.states.SyncLoanRepaymentTransactionUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt index 1b248173597..c2662060c98 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt @@ -19,11 +19,9 @@ import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentSyncpayloadBinding import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.states.SyncSavingsAccountTransactionUiState import com.mifos.utils.Constants import com.mifos.utils.Network.isOnline import com.mifos.utils.PrefManager.userStatus -import com.mifos.viewmodels.SyncSavingsAccountTransactionViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncSavingsAccountTransactionRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncSavingsAccountTransactionRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionRepository.kt index 0e344a3a1b4..8bf10a42bdb 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncSavingsAccountTransactionRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SyncSavingsAccountTransactionRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/SyncSavingsAccountTransactionRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionRepositoryImp.kt index 2e333b3ade1..9795a46c760 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SyncSavingsAccountTransactionRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction import com.mifos.api.datamanager.DataManagerLoan import com.mifos.api.datamanager.DataManagerSavings diff --git a/mifosng-android/src/main/java/com/mifos/states/SyncSavingsAccountTransactionUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/SyncSavingsAccountTransactionUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionUiState.kt index 189032de9ec..715c14ed9ee 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SyncSavingsAccountTransactionUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncSavingsAccountTransactionViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SyncSavingsAccountTransactionViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionViewModel.kt index f4ff5539681..d71f4a2677a 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SyncSavingsAccountTransactionViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.offline.syncsavingsaccounttransaction import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.PaymentTypeOption import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.repositories.SyncSavingsAccountTransactionRepository -import com.mifos.states.SyncSavingsAccountTransactionUiState import com.mifos.utils.MFErrorParser import dagger.hilt.android.lifecycle.HiltViewModel import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/ClientActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/ClientActivity.kt index 312a8122ac8..167bce4dbcd 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/ClientActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/ClientActivity.kt @@ -14,6 +14,7 @@ import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.databinding.ActivityToolbarContainerBinding import com.mifos.mifosxdroid.online.surveylist.SurveyListFragment +import com.mifos.mifosxdroid.online.surveyquestion.SurveyQuestionActivity import com.mifos.objects.accounts.savings.DepositType import com.mifos.objects.survey.Survey import com.mifos.utils.Constants diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateFragment.kt index 44cb577c078..24621df22b5 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateFragment.kt @@ -13,18 +13,15 @@ import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentActivateClientBinding import com.mifos.objects.client.ActivatePayload -import com.mifos.states.ActivateUiState import com.mifos.utils.Constants import com.mifos.utils.DatePickerConstrainType import com.mifos.utils.FragmentConstants import com.mifos.utils.getDatePickerDialog import com.mifos.utils.getTodayFormatted -import com.mifos.viewmodels.ActivateViewModel import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat import java.time.Instant import java.util.Locale -import javax.inject.Inject /** * Created by Rajan Maurya on 09/02/17. diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ActivateRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateRepository.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/ActivateRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateRepository.kt index 29c23ad19c3..a84dc37266c 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ActivateRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.activate import com.mifos.api.GenericResponse import com.mifos.objects.client.ActivatePayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ActivateRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/ActivateRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateRepositoryImp.kt index 6beea9aed2b..c05fbd4c533 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ActivateRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.activate import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerCenter diff --git a/mifosng-android/src/main/java/com/mifos/states/ActivateUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateUiState.kt similarity index 86% rename from mifosng-android/src/main/java/com/mifos/states/ActivateUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateUiState.kt index 534844dcc4e..3142a94b5ca 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ActivateUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.activate /** * Created by Aditya Gupta on 06/08/23. diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ActivateViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ActivateViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateViewModel.kt index 8e533c0fc5c..cbb2d92558f 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ActivateViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/activate/ActivateViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.activate import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse import com.mifos.mifosxdroid.R import com.mifos.objects.client.ActivatePayload -import com.mifos.repositories.ActivateRepository -import com.mifos.states.ActivateUiState import dagger.hilt.android.lifecycle.HiltViewModel import org.apache.fineract.client.models.PostCentersCenterIdResponse import org.apache.fineract.client.models.PostClientsClientIdResponse diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsFragment.kt index 87d01781d10..76a59f089e6 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsFragment.kt @@ -15,12 +15,9 @@ import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentCenterDetailsBinding import com.mifos.objects.group.CenterInfo import com.mifos.objects.group.CenterWithAssociations -import com.mifos.states.CenterDetailsUiState import com.mifos.utils.Constants import com.mifos.utils.Utils -import com.mifos.viewmodels.CenterDetailsViewModel import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject /** * Created by Rajan Maurya on 05/02/17. diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CenterDetailsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsRepository.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/repositories/CenterDetailsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsRepository.kt index b43d76fedb0..6578549769b 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CenterDetailsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.centerdetails import com.mifos.objects.group.CenterInfo import com.mifos.objects.group.CenterWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CenterDetailsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/CenterDetailsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsRepositoryImp.kt index 1a9a1990131..07340a4af87 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CenterDetailsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.centerdetails import com.mifos.api.datamanager.DataManagerCenter import com.mifos.api.datamanager.DataManagerRunReport diff --git a/mifosng-android/src/main/java/com/mifos/states/CenterDetailsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/CenterDetailsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsUiState.kt index 86b4b03299b..11c76112702 100644 --- a/mifosng-android/src/main/java/com/mifos/states/CenterDetailsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.centerdetails import com.mifos.objects.group.CenterInfo import com.mifos.objects.group.CenterWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/CenterDetailsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsViewModel.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/viewmodels/CenterDetailsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsViewModel.kt index deb9b5f1cb4..111d00a6e3a 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/CenterDetailsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerdetails/CenterDetailsViewModel.kt @@ -1,15 +1,11 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.centerdetails import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.mifos.api.datamanager.DataManagerCenter -import com.mifos.api.datamanager.DataManagerRunReport import com.mifos.mifosxdroid.R import com.mifos.objects.group.CenterInfo import com.mifos.objects.group.CenterWithAssociations -import com.mifos.repositories.CenterDetailsRepository -import com.mifos.states.CenterDetailsUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt index 23861d01434..2c89ae70734 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.kt @@ -17,7 +17,7 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler -import com.mifos.mifosxdroid.HomeActivity +import com.mifos.mifosxdroid.activity.home.HomeActivity import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.adapters.CentersListAdapter import com.mifos.mifosxdroid.core.EndlessRecyclerViewScrollListener @@ -30,9 +30,7 @@ import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetFragment import com.mifos.mifosxdroid.uihelpers.MFDatePicker import com.mifos.objects.group.Center import com.mifos.objects.group.CenterWithAssociations -import com.mifos.states.CenterListUiState import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.CenterListViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CenterListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/CenterListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListRepository.kt index f00499329bb..5e978b1613d 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CenterListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.centerlist import com.mifos.objects.client.Page import com.mifos.objects.group.Center diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CenterListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/CenterListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListRepositoryImp.kt index ff70db8184e..b64c1a86d22 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CenterListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.centerlist import com.mifos.api.datamanager.DataManagerCenter import com.mifos.objects.client.Page diff --git a/mifosng-android/src/main/java/com/mifos/states/CenterListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListUiState.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/states/CenterListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListUiState.kt index c4d0245a135..c7f1b35d0ed 100644 --- a/mifosng-android/src/main/java/com/mifos/states/CenterListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.centerlist import com.mifos.objects.group.Center import com.mifos.objects.group.CenterWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/CenterListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/CenterListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListViewModel.kt index 6befba6f03d..bb6c314a15d 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/CenterListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.centerlist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.client.Page import com.mifos.objects.group.Center import com.mifos.objects.group.CenterWithAssociations -import com.mifos.repositories.CenterListRepository -import com.mifos.states.CenterListUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeFragment.kt index a530d8b194c..fe5998a77cb 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeFragment.kt @@ -24,9 +24,7 @@ import com.mifos.mifosxdroid.dialogfragments.chargedialog.ChargeDialogFragment import com.mifos.mifosxdroid.dialogfragments.chargedialog.OnChargeCreateListener import com.mifos.objects.client.Charges import com.mifos.objects.client.Page -import com.mifos.states.ClientChargeUiState import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.ClientChargeViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientChargeRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeRepository.kt similarity index 84% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientChargeRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeRepository.kt index 07a2ea815d9..7b534383190 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientChargeRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientcharge import com.mifos.objects.client.Charges import com.mifos.objects.client.Page diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientChargeRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientChargeRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeRepositoryImp.kt index 94af840ca29..a5f23432e0f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientChargeRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientcharge import com.mifos.api.datamanager.DataManagerCharge import com.mifos.objects.client.Charges diff --git a/mifosng-android/src/main/java/com/mifos/states/ClientChargeUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/ClientChargeUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeUiState.kt index ddafd01c7c0..d450754f296 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ClientChargeUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.clientcharge import com.mifos.objects.client.Charges import com.mifos.objects.client.Page diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientChargeViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ClientChargeViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeViewModel.kt index 87d31bbd62f..7f6576e98b1 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientChargeViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.clientcharge import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.client.Charges import com.mifos.objects.client.Page -import com.mifos.repositories.ClientChargeRepository -import com.mifos.states.ClientChargeUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt index 4c19d852f38..7ed1577eb2e 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt @@ -45,16 +45,13 @@ import com.mifos.objects.accounts.ClientAccounts import com.mifos.objects.accounts.savings.DepositType import com.mifos.objects.client.Charges import com.mifos.objects.client.Client -import com.mifos.states.ClientDetailsUiState import com.mifos.utils.Constants import com.mifos.utils.ImageLoaderUtils import com.mifos.utils.Utils -import com.mifos.viewmodels.ClientDetailsViewModel import dagger.hilt.android.AndroidEntryPoint import okhttp3.ResponseBody import java.io.File import java.io.FileOutputStream -import javax.inject.Inject @AndroidEntryPoint class ClientDetailsFragment : MifosBaseFragment() { diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientDetailsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsRepository.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientDetailsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsRepository.kt index 5b1a4e716df..8c93fb48a58 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientDetailsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientdetails import com.mifos.objects.accounts.ClientAccounts import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientDetailsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsRepositoryImp.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientDetailsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsRepositoryImp.kt index d3919e9b206..9541253f914 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientDetailsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientdetails import com.mifos.api.datamanager.DataManagerClient import com.mifos.objects.accounts.ClientAccounts diff --git a/mifosng-android/src/main/java/com/mifos/states/ClientDetailsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsUiState.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/states/ClientDetailsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsUiState.kt index de9463945f7..cb0de47ff3e 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ClientDetailsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.clientdetails import com.mifos.objects.accounts.ClientAccounts import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientDetailsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ClientDetailsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsViewModel.kt index bd4d814169c..4060d93ed2d 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientDetailsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsViewModel.kt @@ -1,15 +1,12 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.clientdetails import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.zipmodels.ClientAndClientAccounts -import com.mifos.repositories.ClientDetailsRepository -import com.mifos.states.ClientDetailsUiState import dagger.hilt.android.lifecycle.HiltViewModel import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody -import okhttp3.RequestBody import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.ResponseBody import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersFragment.kt index e66fa97e3f3..3b3fe8a7881 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersFragment.kt @@ -27,10 +27,8 @@ import com.mifos.mifosxdroid.dialogfragments.identifierdialog.ClientIdentifierCr import com.mifos.mifosxdroid.dialogfragments.identifierdialog.IdentifierDialogFragment import com.mifos.mifosxdroid.online.documentlist.DocumentListFragment import com.mifos.objects.noncore.Identifier -import com.mifos.states.ClientIdentifiersUiState import com.mifos.utils.Constants import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.ClientIdentifiersViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientIdentifiersRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersRepository.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientIdentifiersRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersRepository.kt index e6580e1b52b..b7f4ccf2d47 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientIdentifiersRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientidentifiers import com.mifos.objects.noncore.Identifier import org.apache.fineract.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientIdentifiersRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersRepositoryImp.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientIdentifiersRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersRepositoryImp.kt index 561c71c6ccc..2fa3d0dd932 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientIdentifiersRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientidentifiers import com.mifos.api.datamanager.DataManagerClient import com.mifos.objects.noncore.Identifier diff --git a/mifosng-android/src/main/java/com/mifos/states/ClientIdentifiersUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/ClientIdentifiersUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersUiState.kt index 623184dac4c..801228e1057 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ClientIdentifiersUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.clientidentifiers import com.mifos.objects.noncore.Identifier diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientIdentifiersViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ClientIdentifiersViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersViewModel.kt index ecd412db514..f55cf28a1e5 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientIdentifiersViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientidentifiers/ClientIdentifiersViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.clientidentifiers import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.noncore.Identifier -import com.mifos.repositories.ClientIdentifiersRepository -import com.mifos.states.ClientIdentifiersUiState import dagger.hilt.android.lifecycle.HiltViewModel import org.apache.fineract.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt index e6bf2d5e581..92772253ac3 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListFragment.kt @@ -18,7 +18,7 @@ import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler -import com.mifos.mifosxdroid.HomeActivity +import com.mifos.mifosxdroid.activity.home.HomeActivity import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.adapters.ClientNameListAdapter import com.mifos.mifosxdroid.core.EndlessRecyclerViewScrollListener @@ -29,9 +29,7 @@ import com.mifos.mifosxdroid.databinding.FragmentClientBinding import com.mifos.mifosxdroid.dialogfragments.syncclientsdialog.SyncClientsDialogFragment import com.mifos.objects.client.Client import com.mifos.objects.navigation.ClientArgs -import com.mifos.states.ClientListUiState import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.ClientListViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListRepository.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListRepository.kt index da38887df0e..1b4d01a5dea 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientlist import com.mifos.objects.client.Client import com.mifos.objects.client.Page diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ClientListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListRepositoryImp.kt similarity index 83% rename from mifosng-android/src/main/java/com/mifos/repositories/ClientListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListRepositoryImp.kt index 46d4407aa5f..754456e5a06 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ClientListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.clientlist import com.mifos.api.datamanager.DataManagerClient import com.mifos.objects.client.Client @@ -9,7 +9,8 @@ import javax.inject.Inject /** * Created by Aditya Gupta on 08/08/23. */ -class ClientListRepositoryImp @Inject constructor(private val dataManagerClient: DataManagerClient) : ClientListRepository { +class ClientListRepositoryImp @Inject constructor(private val dataManagerClient: DataManagerClient) : + ClientListRepository { override fun getAllClients(paged: Boolean, offset: Int, limit: Int): Observable> { return dataManagerClient.getAllClients(paged,offset,limit) diff --git a/mifosng-android/src/main/java/com/mifos/states/ClientListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/ClientListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListUiState.kt index ade744572bc..9eddae299cd 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ClientListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.clientlist import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ClientListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListViewModel.kt index 182a9f0e30c..0dd3542be2d 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ClientListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientlist/ClientListViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.clientlist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.client.Client import com.mifos.objects.client.Page -import com.mifos.repositories.ClientListRepository -import com.mifos.states.ClientListUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetFragment.kt index 4d1814eb9e2..60f8ddfa751 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetFragment.kt @@ -20,9 +20,7 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.databinding.FragmentCollectionSheetBinding import com.mifos.objects.db.CollectionSheet import com.mifos.objects.response.SaveResponse -import com.mifos.states.CollectionSheetUiState import com.mifos.utils.Constants -import com.mifos.viewmodels.CollectionSheetViewModel import dagger.hilt.android.AndroidEntryPoint import retrofit2.HttpException import java.util.* diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CollectionSheetRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/CollectionSheetRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetRepository.kt index 46a24900378..3034e937ed6 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CollectionSheetRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.collectionsheet import com.mifos.api.model.CollectionSheetPayload import com.mifos.api.model.Payload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CollectionSheetRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetRepositoryImp.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/CollectionSheetRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetRepositoryImp.kt index 448bdd0f589..a609ea0676f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CollectionSheetRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.collectionsheet import com.mifos.api.DataManager import com.mifos.api.model.CollectionSheetPayload diff --git a/mifosng-android/src/main/java/com/mifos/states/CollectionSheetUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/CollectionSheetUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetUiState.kt index bb01ed2dd4f..6e895ce250d 100644 --- a/mifosng-android/src/main/java/com/mifos/states/CollectionSheetUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.collectionsheet import com.mifos.objects.db.CollectionSheet import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/CollectionSheetViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/CollectionSheetViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetViewModel.kt index 7f2c348256b..94c6a5d8649 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/CollectionSheetViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.collectionsheet import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.api.model.CollectionSheetPayload import com.mifos.api.model.Payload import com.mifos.objects.db.CollectionSheet import com.mifos.objects.response.SaveResponse -import com.mifos.repositories.CollectionSheetRepository -import com.mifos.states.CollectionSheetUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt index fd344d2ec96..299e3dcc996 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetFragment.kt @@ -15,13 +15,11 @@ import com.mifos.mifosxdroid.dialogfragments.collectionsheetdialog.CollectionShe import com.mifos.objects.collectionsheet.IndividualCollectionSheet import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff -import com.mifos.states.NewIndividualCollectionSheetUiState import com.mifos.utils.Constants import com.mifos.utils.DatePickerConstrainType import com.mifos.utils.FragmentConstants import com.mifos.utils.getDatePickerDialog import com.mifos.utils.getTodayFormatted -import com.mifos.viewmodels.NewIndividualCollectionSheetViewModel import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat import java.time.Instant diff --git a/mifosng-android/src/main/java/com/mifos/repositories/NewIndividualCollectionSheetRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/NewIndividualCollectionSheetRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetRepository.kt index 01f8cb7c353..1ac9bca20fd 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/NewIndividualCollectionSheetRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.collectionsheetindividual import com.mifos.api.model.RequestCollectionSheetPayload import com.mifos.objects.collectionsheet.IndividualCollectionSheet diff --git a/mifosng-android/src/main/java/com/mifos/repositories/NewIndividualCollectionSheetRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/NewIndividualCollectionSheetRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetRepositoryImp.kt index 363f06745be..f82efe197db 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/NewIndividualCollectionSheetRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.collectionsheetindividual import com.mifos.api.DataManager import com.mifos.api.datamanager.DataManagerCollectionSheet diff --git a/mifosng-android/src/main/java/com/mifos/states/NewIndividualCollectionSheetUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/NewIndividualCollectionSheetUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetUiState.kt index c3624286a7b..e13b84dcaca 100644 --- a/mifosng-android/src/main/java/com/mifos/states/NewIndividualCollectionSheetUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.collectionsheetindividual import com.mifos.objects.collectionsheet.IndividualCollectionSheet import com.mifos.objects.organisation.Office diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/NewIndividualCollectionSheetViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/NewIndividualCollectionSheetViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetViewModel.kt index 44736473086..b71fed1ac65 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/NewIndividualCollectionSheetViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.collectionsheetindividual import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.api.model.RequestCollectionSheetPayload import com.mifos.objects.collectionsheet.IndividualCollectionSheet import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff -import com.mifos.repositories.NewIndividualCollectionSheetRepository -import com.mifos.states.NewIndividualCollectionSheetUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt index a41470dd1ce..6a6ef9b532c 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsFragment.kt @@ -22,9 +22,7 @@ import com.mifos.mifosxdroid.databinding.IndividualCollectionsSheetDetailsBindin import com.mifos.mifosxdroid.online.GenerateCollectionSheetActivity import com.mifos.objects.collectionsheet.IndividualCollectionSheet import com.mifos.objects.collectionsheet.LoanAndClientName -import com.mifos.states.IndividualCollectionSheetDetailsUiState import com.mifos.utils.Constants -import com.mifos.viewmodels.IndividualCollectionSheetDetailsViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/IndividualCollectionSheetDetailsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsRepository.kt similarity index 83% rename from mifosng-android/src/main/java/com/mifos/repositories/IndividualCollectionSheetDetailsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsRepository.kt index 9bb72d9c6ae..e0afb693ced 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/IndividualCollectionSheetDetailsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.collectionsheetindividualdetails import com.mifos.api.GenericResponse import com.mifos.api.model.IndividualCollectionSheetPayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/IndividualCollectionSheetDetailsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsRepositoryImp.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/IndividualCollectionSheetDetailsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsRepositoryImp.kt index 02b6c13a044..2edbcde9ec0 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/IndividualCollectionSheetDetailsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.collectionsheetindividualdetails import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerCollectionSheet diff --git a/mifosng-android/src/main/java/com/mifos/states/IndividualCollectionSheetDetailsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsUiState.kt similarity index 82% rename from mifosng-android/src/main/java/com/mifos/states/IndividualCollectionSheetDetailsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsUiState.kt index af8ecd546c4..d0561e0bfde 100644 --- a/mifosng-android/src/main/java/com/mifos/states/IndividualCollectionSheetDetailsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.collectionsheetindividualdetails /** * Created by Aditya Gupta on 10/08/23. diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/IndividualCollectionSheetDetailsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/IndividualCollectionSheetDetailsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsViewModel.kt index 92236a5d123..1efdb90054a 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/IndividualCollectionSheetDetailsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.collectionsheetindividualdetails import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -8,8 +8,6 @@ import com.mifos.api.model.IndividualCollectionSheetPayload import com.mifos.objects.accounts.loan.PaymentTypeOptions import com.mifos.objects.collectionsheet.ClientCollectionSheet import com.mifos.objects.collectionsheet.LoanAndClientName -import com.mifos.repositories.IndividualCollectionSheetDetailsRepositoryImp -import com.mifos.states.IndividualCollectionSheetDetailsUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterFragment.kt index 2fe32a2399b..49e019b64a4 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterFragment.kt @@ -20,14 +20,12 @@ import com.mifos.mifosxdroid.databinding.FragmentCreateNewCenterBinding import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse import com.mifos.services.data.CenterPayload -import com.mifos.states.CreateNewCenterUiState import com.mifos.utils.DatePickerConstrainType import com.mifos.utils.FragmentConstants import com.mifos.utils.MifosResponseHandler import com.mifos.utils.ValidationUtil import com.mifos.utils.getDatePickerDialog import com.mifos.utils.getTodayFormatted -import com.mifos.viewmodels.CreateNewCenterViewModel import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat import java.time.Instant diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewCenterRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterRepository.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/repositories/CreateNewCenterRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterRepository.kt index 6162b7042d0..c780a27a299 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewCenterRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.createnewcenter import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewCenterRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterRepositoryImp.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/repositories/CreateNewCenterRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterRepositoryImp.kt index 5e52e0c8b55..0f2bab4db51 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewCenterRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.createnewcenter import com.mifos.api.datamanager.DataManagerCenter import com.mifos.objects.organisation.Office diff --git a/mifosng-android/src/main/java/com/mifos/states/CreateNewCenterUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterUiState.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/states/CreateNewCenterUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterUiState.kt index 196f848b0eb..17f7949a589 100644 --- a/mifosng-android/src/main/java/com/mifos/states/CreateNewCenterUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.createnewcenter import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewCenterViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewCenterViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterViewModel.kt index 58145a1f06b..c0e7d6835d3 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewCenterViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewcenter/CreateNewCenterViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.createnewcenter import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,9 +6,7 @@ import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse -import com.mifos.repositories.CreateNewCenterRepository import com.mifos.services.data.CenterPayload -import com.mifos.states.CreateNewCenterUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientFragment.kt index 5a58c593526..4d08a92deb3 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientFragment.kt @@ -33,14 +33,12 @@ import com.mifos.objects.client.ClientPayload import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff import com.mifos.objects.templates.clients.ClientsTemplate -import com.mifos.states.CreateNewClientUiState import com.mifos.utils.Constants import com.mifos.utils.DatePickerConstrainType import com.mifos.utils.FragmentConstants import com.mifos.utils.ValidationUtil import com.mifos.utils.getDatePickerDialog import com.mifos.utils.getTodayFormatted -import com.mifos.viewmodels.CreateNewClientViewModel import dagger.hilt.android.AndroidEntryPoint import java.io.File import java.text.SimpleDateFormat diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewClientRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/CreateNewClientRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientRepository.kt index 587659a2706..2ab6f56a6f3 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewClientRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.createnewclient import com.mifos.objects.client.Client import com.mifos.objects.client.ClientPayload diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewClientRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/CreateNewClientRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientRepositoryImp.kt index 5832ca6f587..af58a01469e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewClientRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.createnewclient import com.mifos.api.datamanager.DataManagerClient import com.mifos.api.datamanager.DataManagerOffices @@ -10,7 +10,6 @@ import com.mifos.objects.organisation.Staff import com.mifos.objects.templates.clients.ClientsTemplate import okhttp3.MultipartBody import okhttp3.ResponseBody -import org.apache.fineract.client.models.RetrieveOneResponse import rx.Observable import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/states/CreateNewClientUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientUiState.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/states/CreateNewClientUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientUiState.kt index 3f785d6bf7d..84cca3a42e8 100644 --- a/mifosng-android/src/main/java/com/mifos/states/CreateNewClientUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.createnewclient import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewClientViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewClientViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientViewModel.kt index 8c55c3f75c5..96888ed2150 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewClientViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.createnewclient import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -10,8 +10,6 @@ import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff import com.mifos.objects.templates.clients.ClientsTemplate import com.mifos.objects.templates.clients.Options -import com.mifos.repositories.CreateNewClientRepository -import com.mifos.states.CreateNewClientUiState import dagger.hilt.android.lifecycle.HiltViewModel import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupFragment.kt index f5957c84f91..626cc13bdab 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupFragment.kt @@ -23,7 +23,6 @@ import com.mifos.mifosxdroid.online.GroupsActivity import com.mifos.objects.group.GroupPayload import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse -import com.mifos.states.CreateNewGroupUiState import com.mifos.utils.Constants import com.mifos.utils.DatePickerConstrainType import com.mifos.utils.FragmentConstants @@ -33,7 +32,6 @@ import com.mifos.utils.PrefManager import com.mifos.utils.ValidationUtil import com.mifos.utils.getDatePickerDialog import com.mifos.utils.getTodayFormatted -import com.mifos.viewmodels.CreateNewGroupViewModel import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat import java.time.Instant diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewGroupRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupRepository.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/repositories/CreateNewGroupRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupRepository.kt index f33d443891b..a6e53ba6f16 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewGroupRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.createnewgroup import com.mifos.objects.group.GroupPayload import com.mifos.objects.organisation.Office diff --git a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewGroupRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupRepositoryImp.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/CreateNewGroupRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupRepositoryImp.kt index 53a31bfc774..aca5b6eddd3 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/CreateNewGroupRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.createnewgroup import com.mifos.api.datamanager.DataManagerGroups import com.mifos.api.datamanager.DataManagerOffices diff --git a/mifosng-android/src/main/java/com/mifos/states/CreateNewGroupUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/CreateNewGroupUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupUiState.kt index b4cd9eeba5a..df9a67bcc34 100644 --- a/mifosng-android/src/main/java/com/mifos/states/CreateNewGroupUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.createnewgroup import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewGroupViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewGroupViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupViewModel.kt index d9ae59124fe..b37ce623970 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/CreateNewGroupViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/createnewgroup/CreateNewGroupViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.createnewgroup import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.objects.group.GroupPayload import com.mifos.objects.organisation.Office import com.mifos.objects.response.SaveResponse -import com.mifos.repositories.CreateNewGroupRepository -import com.mifos.states.CreateNewGroupUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableFragment.kt index 00265f787c7..8c714d1d149 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableFragment.kt @@ -15,8 +15,6 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentDatatablesBinding import com.mifos.objects.noncore.DataTable -import com.mifos.states.DataTableUiState -import com.mifos.viewmodels.DataTableViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableRepository.kt similarity index 82% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableRepository.kt index 5bb9937b8aa..eb098f52a0c 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.datatable import com.mifos.objects.noncore.DataTable import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableRepositoryImp.kt index 52805ebce53..ea14c7ab04a 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.datatable import com.mifos.api.datamanager.DataManagerDataTable import com.mifos.objects.noncore.DataTable diff --git a/mifosng-android/src/main/java/com/mifos/states/DataTableUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/DataTableUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableUiState.kt index 2b20a5869fb..3c8f5eeb252 100644 --- a/mifosng-android/src/main/java/com/mifos/states/DataTableUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.datatable import com.mifos.objects.noncore.DataTable diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableViewModel.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/viewmodels/DataTableViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableViewModel.kt index 92f591a919d..1b52c615479 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatable/DataTableViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.datatable import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.noncore.DataTable -import com.mifos.repositories.DataTableRepository -import com.mifos.states.DataTableUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataFragment.kt index 0617e391881..50553af607f 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataFragment.kt @@ -7,7 +7,6 @@ package com.mifos.mifosxdroid.online.datatabledata import android.app.Activity import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater @@ -26,12 +25,10 @@ import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentDatatableBinding import com.mifos.mifosxdroid.dialogfragments.datatablerowdialog.DataTableRowDialogFragment import com.mifos.objects.noncore.DataTable -import com.mifos.states.DataTableDataUiState import com.mifos.utils.Constants import com.mifos.utils.DataTableUIBuilder import com.mifos.utils.DataTableUIBuilder.DataTableActionListener import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.DataTableDataViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableDataRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableDataRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataRepository.kt index 359ed8e5e4f..e674205724f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableDataRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.datatabledata import com.google.gson.JsonArray import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableDataRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableDataRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataRepositoryImp.kt index 4af637c5918..a8f79d89309 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableDataRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.datatabledata import com.google.gson.JsonArray import com.mifos.api.datamanager.DataManagerDataTable diff --git a/mifosng-android/src/main/java/com/mifos/states/DataTableDataUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataUiState.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/states/DataTableDataUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataUiState.kt index 295d9608167..ac32ca89de7 100644 --- a/mifosng-android/src/main/java/com/mifos/states/DataTableDataUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.datatabledata import com.google.gson.JsonArray diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableDataViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/DataTableDataViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataViewModel.kt index b0ce620760d..ceed9173e78 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableDataViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatabledata/DataTableDataViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.datatabledata import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.google.gson.JsonArray import com.mifos.mifosxdroid.R -import com.mifos.repositories.DataTableDataRepository -import com.mifos.states.DataTableDataUiState import dagger.hilt.android.lifecycle.HiltViewModel import org.apache.fineract.client.models.DeleteDataTablesDatatableAppTableIdDatatableIdResponse import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListFragment.kt index 46dac5fdb43..c9f90cf22e5 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListFragment.kt @@ -27,12 +27,10 @@ import com.mifos.objects.noncore.DataTable import com.mifos.objects.noncore.DataTablePayload import com.mifos.services.data.GroupLoanPayload import com.mifos.services.data.LoansPayload -import com.mifos.states.DataTableListUiState import com.mifos.utils.Constants import com.mifos.utils.MifosResponseHandler import com.mifos.utils.PrefManager import com.mifos.utils.SafeUIBlockingUtility -import com.mifos.viewmodels.DataTableListViewModel import dagger.hilt.android.AndroidEntryPoint import java.util.* diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListRepository.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListRepository.kt index 19c5de7cc96..539b9d5dc47 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.datatablelistfragment import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DataTableListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListRepositoryImp.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/DataTableListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListRepositoryImp.kt index d776f26bda4..fbaefe55dd0 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DataTableListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.datatablelistfragment import com.mifos.api.DataManager import com.mifos.api.datamanager.DataManagerClient diff --git a/mifosng-android/src/main/java/com/mifos/states/DataTableListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/DataTableListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListUiState.kt index 8aadc38b542..af90f8557b6 100644 --- a/mifosng-android/src/main/java/com/mifos/states/DataTableListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.datatablelistfragment import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/DataTableListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListViewModel.kt index 3dbe09599d1..961b1924c6b 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/DataTableListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/datatablelistfragment/DataTableListViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.datatablelistfragment import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,10 +7,8 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.client.Client import com.mifos.objects.client.ClientPayload -import com.mifos.repositories.DataTableListRepository import com.mifos.services.data.GroupLoanPayload import com.mifos.services.data.LoansPayload -import com.mifos.states.DataTableListUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListFragment.kt index 92b97b9d617..e5ae3f4b952 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListFragment.kt @@ -29,12 +29,10 @@ import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentDocumentListBinding import com.mifos.mifosxdroid.dialogfragments.documentdialog.DocumentDialogFragment import com.mifos.objects.noncore.Document -import com.mifos.states.DocumentListUiState import com.mifos.utils.CheckSelfPermissionAndRequest import com.mifos.utils.Constants import com.mifos.utils.FileUtils import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.DocumentListViewModel import dagger.hilt.android.AndroidEntryPoint import okhttp3.ResponseBody import java.io.File diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DocumentListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListRepository.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/repositories/DocumentListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListRepository.kt index 6f6999c2826..bc6a767684e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DocumentListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.documentlist import com.mifos.api.GenericResponse import com.mifos.objects.noncore.Document diff --git a/mifosng-android/src/main/java/com/mifos/repositories/DocumentListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListRepositoryImp.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/DocumentListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListRepositoryImp.kt index 8f4536bb0cd..64e3004a7fe 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/DocumentListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.documentlist import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerDocument diff --git a/mifosng-android/src/main/java/com/mifos/states/DocumentListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListUiState.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/states/DocumentListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListUiState.kt index df7ea4d57db..e60f20403bd 100644 --- a/mifosng-android/src/main/java/com/mifos/states/DocumentListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.documentlist import com.mifos.objects.noncore.Document import okhttp3.ResponseBody diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/DocumentListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/DocumentListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListViewModel.kt index 5ad9bf41e57..528838232b5 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/DocumentListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.documentlist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse import com.mifos.mifosxdroid.R import com.mifos.objects.noncore.Document -import com.mifos.repositories.DocumentListRepository -import com.mifos.states.DocumentListUiState +import com.mifos.mifosxdroid.online.documentlist.DocumentListRepository +import com.mifos.mifosxdroid.online.documentlist.DocumentListUiState import dagger.hilt.android.lifecycle.HiltViewModel import okhttp3.ResponseBody import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetFragment.kt index ff87af588de..2602a5fce35 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetFragment.kt @@ -35,13 +35,11 @@ import com.mifos.objects.group.CenterWithAssociations import com.mifos.objects.group.Group import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff -import com.mifos.states.GenerateCollectionSheetUiState import com.mifos.utils.Constants import com.mifos.utils.DatePickerConstrainType import com.mifos.utils.FragmentConstants import com.mifos.utils.getDatePickerDialog import com.mifos.utils.getTodayFormatted -import com.mifos.viewmodels.GenerateCollectionSheetViewModel import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat import java.time.Instant diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GenerateCollectionSheetRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetRepository.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/GenerateCollectionSheetRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetRepository.kt index cd71d724bab..8cc97c158f8 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GenerateCollectionSheetRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.generatecollectionsheet import com.mifos.api.GenericResponse import com.mifos.objects.collectionsheet.CenterDetail diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GenerateCollectionSheetRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetRepositoryImp.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/repositories/GenerateCollectionSheetRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetRepositoryImp.kt index 355f2ff9a9d..395750f5160 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GenerateCollectionSheetRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.generatecollectionsheet import com.mifos.api.DataManager import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/GenerateCollectionSheetUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetUiState.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/states/GenerateCollectionSheetUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetUiState.kt index 76a1c12ac6f..a29ed2c8f88 100644 --- a/mifosng-android/src/main/java/com/mifos/states/GenerateCollectionSheetUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.generatecollectionsheet import com.mifos.objects.collectionsheet.CenterDetail import com.mifos.objects.collectionsheet.CollectionSheetResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/GenerateCollectionSheetViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/GenerateCollectionSheetViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetViewModel.kt index a860ab69def..bda4fee49b9 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/GenerateCollectionSheetViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/generatecollectionsheet/GenerateCollectionSheetViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.generatecollectionsheet import android.content.Context import androidx.lifecycle.LiveData @@ -18,9 +18,7 @@ import com.mifos.objects.group.CenterWithAssociations import com.mifos.objects.group.Group import com.mifos.objects.organisation.Office import com.mifos.objects.organisation.Staff -import com.mifos.repositories.GenerateCollectionSheetRepository -import com.mifos.repositories.NewIndividualCollectionSheetRepository -import com.mifos.states.GenerateCollectionSheetUiState +import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetRepository import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt index 2710e9a784f..690b0d5acbe 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt @@ -21,7 +21,6 @@ import com.joanzapata.iconify.widget.IconTextView import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.adapters.LoanAccountsListAdapter import com.mifos.mifosxdroid.adapters.SavingsAccountsListAdapter -import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.databinding.FragmentGroupDetailsBinding import com.mifos.objects.accounts.GroupAccounts @@ -29,12 +28,9 @@ import com.mifos.objects.accounts.savings.DepositType import com.mifos.objects.client.Client import com.mifos.objects.group.Group import com.mifos.objects.navigation.ClientListArgs -import com.mifos.states.GroupDetailsUiState import com.mifos.utils.Constants import com.mifos.utils.Utils -import com.mifos.viewmodels.GroupDetailsViewModel import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject /** * Created by nellyk on 2/27/2016. diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupDetailsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsRepository.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupDetailsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsRepository.kt index b9aff4de234..f99ddf16d2f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupDetailsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.groupdetails import com.mifos.objects.accounts.GroupAccounts import com.mifos.objects.group.Group diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupDetailsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupDetailsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsRepositoryImp.kt index 6b873eeaede..3ddb9b22185 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupDetailsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.groupdetails import com.mifos.api.datamanager.DataManagerGroups import com.mifos.objects.accounts.GroupAccounts diff --git a/mifosng-android/src/main/java/com/mifos/states/GroupDetailsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/GroupDetailsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsUiState.kt index 6e3e0b7e0b2..5775aa6bad0 100644 --- a/mifosng-android/src/main/java/com/mifos/states/GroupDetailsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.groupdetails import com.mifos.objects.accounts.GroupAccounts import com.mifos.objects.client.Client diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupDetailsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/GroupDetailsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsViewModel.kt index 1c107fffba6..b97e9120769 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupDetailsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.groupdetails import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.group.GroupWithAssociations import com.mifos.objects.zipmodels.GroupAndGroupAccounts -import com.mifos.repositories.GroupDetailsRepository -import com.mifos.states.GroupDetailsUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Observable import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListFragment.kt index 60a118c1e50..f1dbb1bbd8c 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListFragment.kt @@ -21,10 +21,7 @@ import com.mifos.objects.client.Client import com.mifos.objects.group.CenterWithAssociations import com.mifos.objects.group.GroupWithAssociations import com.mifos.objects.navigation.ClientListArgs -import com.mifos.states.GroupListUiState -import com.mifos.viewmodels.GroupListViewModel import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject @AndroidEntryPoint class GroupListFragment : ProgressableFragment(), diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListRepository.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListRepository.kt index ebb71c13eaf..4d56f98d220 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.grouplist import com.mifos.objects.group.CenterWithAssociations import com.mifos.objects.group.GroupWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListRepositoryImp.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListRepositoryImp.kt index 54886b3416d..1ef3ac30791 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.grouplist import com.mifos.api.DataManager import com.mifos.objects.group.CenterWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/states/GroupListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/GroupListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListUiState.kt index 05d3e665bf4..163447f0812 100644 --- a/mifosng-android/src/main/java/com/mifos/states/GroupListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.grouplist import com.mifos.objects.group.CenterWithAssociations import com.mifos.objects.group.GroupWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListViewModel.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/viewmodels/GroupListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListViewModel.kt index 8a533ffab55..8847dd09234 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouplist/GroupListViewModel.kt @@ -1,13 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.grouplist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.mifos.mifosxdroid.R import com.mifos.objects.group.CenterWithAssociations import com.mifos.objects.group.GroupWithAssociations -import com.mifos.repositories.GroupListRepository -import com.mifos.states.GroupListUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountFragment.kt index 9de677c70d1..027fce845b6 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountFragment.kt @@ -27,10 +27,8 @@ import com.mifos.objects.templates.loans.GroupLoanTemplate import com.mifos.objects.templates.loans.RepaymentFrequencyDaysOfWeekTypeOptions import com.mifos.objects.templates.loans.RepaymentFrequencyNthDayTypeOptions import com.mifos.services.data.GroupLoanPayload -import com.mifos.states.GroupLoanAccountUiState import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.GroupLoanAccountViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupLoanAccountRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountRepository.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupLoanAccountRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountRepository.kt index 9747ba0e2a7..5550fc95e70 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupLoanAccountRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.grouploanaccount import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.organisation.LoanProducts diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupLoanAccountRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupLoanAccountRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountRepositoryImp.kt index d67750f916f..823ef627f9a 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupLoanAccountRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.grouploanaccount import com.mifos.api.DataManager import com.mifos.objects.accounts.loan.Loans diff --git a/mifosng-android/src/main/java/com/mifos/states/GroupLoanAccountUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/GroupLoanAccountUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountUiState.kt index f70d969d64c..0bbd8e3d70f 100644 --- a/mifosng-android/src/main/java/com/mifos/states/GroupLoanAccountUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.grouploanaccount import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.organisation.LoanProducts diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupLoanAccountViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/GroupLoanAccountViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountViewModel.kt index 28b32f6ddea..3daf4e89962 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupLoanAccountViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/grouploanaccount/GroupLoanAccountViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.grouploanaccount import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -14,9 +14,7 @@ import com.mifos.objects.templates.loans.LoanOfficerOptions import com.mifos.objects.templates.loans.LoanPurposeOptions import com.mifos.objects.templates.loans.TermFrequencyTypeOptions import com.mifos.objects.templates.loans.TransactionProcessingStrategyOptions -import com.mifos.repositories.GroupLoanAccountRepository import com.mifos.services.data.GroupLoanPayload -import com.mifos.states.GroupLoanAccountUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Observable import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt index 92fd62dc670..8b7b9bc2c2d 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListFragment.kt @@ -13,7 +13,7 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler -import com.mifos.mifosxdroid.HomeActivity +import com.mifos.mifosxdroid.activity.home.HomeActivity import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.adapters.GroupNameListAdapter import com.mifos.mifosxdroid.core.EndlessRecyclerViewScrollListener @@ -23,10 +23,8 @@ import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentGroupsBinding import com.mifos.mifosxdroid.dialogfragments.syncgroupsdialog.SyncGroupsDialogFragment import com.mifos.objects.group.Group -import com.mifos.states.GroupsListUiState import com.mifos.utils.Constants import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.GroupsListViewModel import dagger.hilt.android.AndroidEntryPoint import java.util.* diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupsListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListRepository.kt similarity index 86% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupsListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListRepository.kt index 7fa7793941c..c12790337be 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupsListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.groupslist import com.mifos.objects.client.Page import com.mifos.objects.group.Group diff --git a/mifosng-android/src/main/java/com/mifos/repositories/GroupsListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListRepositoryImp.kt similarity index 83% rename from mifosng-android/src/main/java/com/mifos/repositories/GroupsListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListRepositoryImp.kt index 6a28a0e3860..f7e1524c9af 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/GroupsListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.groupslist import com.mifos.api.datamanager.DataManagerGroups import com.mifos.objects.client.Page @@ -9,7 +9,8 @@ import javax.inject.Inject /** * Created by Aditya Gupta on 08/08/23. */ -class GroupsListRepositoryImp @Inject constructor(private val dataManagerGroups: DataManagerGroups) : GroupsListRepository{ +class GroupsListRepositoryImp @Inject constructor(private val dataManagerGroups: DataManagerGroups) : + GroupsListRepository { override fun getGroups(paged: Boolean, offset: Int, limit: Int): Observable> { return dataManagerGroups.getGroups(paged,offset,limit) } diff --git a/mifosng-android/src/main/java/com/mifos/states/GroupsListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/GroupsListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListUiState.kt index 15ec2094e88..6dbfe52cff4 100644 --- a/mifosng-android/src/main/java/com/mifos/states/GroupsListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.groupslist import com.mifos.objects.group.Group diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupsListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/GroupsListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListViewModel.kt index cdaf5af5f30..2578623e0da 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/GroupsListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupslist/GroupsListViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.groupslist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.client.Page import com.mifos.objects.group.Group -import com.mifos.repositories.GroupsListRepository -import com.mifos.states.GroupsListUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountFragment.kt index 98c2bb0ca22..7de9247616c 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountFragment.kt @@ -28,11 +28,9 @@ import com.mifos.objects.templates.loans.LoanTemplate import com.mifos.objects.templates.loans.RepaymentFrequencyDaysOfWeekTypeOptions import com.mifos.objects.templates.loans.RepaymentFrequencyNthDayTypeOptions import com.mifos.services.data.LoansPayload -import com.mifos.states.LoanAccountUiState import com.mifos.utils.Constants import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.LoanAccountViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountRepository.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountRepository.kt index 3bf53b4f489..68814809a31 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccount import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.organisation.LoanProducts diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountRepositoryImp.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountRepositoryImp.kt index 96e70f58871..67a460e545b 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccount import com.mifos.api.datamanager.DataManagerLoan import com.mifos.objects.accounts.loan.Loans diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanAccountUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/LoanAccountUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountUiState.kt index 12de0118fe7..5b0b313cf07 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanAccountUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loanaccount import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.organisation.LoanProducts diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountViewModel.kt index f816317a7db..6160276a150 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loanaccount import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,9 +7,7 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.accounts.loan.Loans import com.mifos.objects.organisation.LoanProducts import com.mifos.objects.templates.loans.LoanTemplate -import com.mifos.repositories.LoanAccountRepository import com.mifos.services.data.LoansPayload -import com.mifos.states.LoanAccountUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApproval.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApproval.kt index 81ebf4dd800..e553116d43f 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApproval.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApproval.kt @@ -21,10 +21,8 @@ import com.mifos.mifosxdroid.uihelpers.MFDatePicker import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.accounts.loan.LoanApproval import com.mifos.objects.accounts.loan.LoanWithAssociations -import com.mifos.states.LoanAccountApprovalUiState import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.LoanAccountApprovalViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountApprovalRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalRepository.kt similarity index 83% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountApprovalRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalRepository.kt index a11e5372d81..f53bc292028 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountApprovalRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccountapproval import com.mifos.api.GenericResponse import com.mifos.objects.accounts.loan.LoanApproval diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountApprovalRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalRepositoryImp.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountApprovalRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalRepositoryImp.kt index 5587e80670e..2ff357146b5 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountApprovalRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccountapproval import com.mifos.api.DataManager import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanAccountApprovalUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/LoanAccountApprovalUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalUiState.kt index c8b55605821..15e6badcbea 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanAccountApprovalUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loanaccountapproval import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountApprovalViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountApprovalViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalViewModel.kt index 22162e4f622..8af1302563b 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountApprovalViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loanaccountapproval import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse import com.mifos.objects.accounts.loan.LoanApproval -import com.mifos.repositories.LoanAccountApprovalRepository -import com.mifos.states.LoanAccountApprovalUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementFragment.kt index deb10b0a5e2..c393c74b387 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementFragment.kt @@ -25,11 +25,9 @@ import com.mifos.mifosxdroid.uihelpers.MFDatePicker import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.accounts.loan.LoanDisbursement import com.mifos.objects.templates.loans.LoanTransactionTemplate -import com.mifos.states.LoanAccountDisbursementUiState import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants import com.mifos.utils.Network -import com.mifos.viewmodels.LoanAccountDisbursementViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountDisbursementRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementRepository.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountDisbursementRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementRepository.kt index 967a2ca95a9..a4b0f3b7598 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountDisbursementRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccountdisbursement import com.mifos.api.GenericResponse import com.mifos.objects.accounts.loan.LoanDisbursement diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountDisbursementRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementRepositoryImp.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountDisbursementRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementRepositoryImp.kt index 6a4fd452563..c6e4dd6009e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountDisbursementRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccountdisbursement import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerLoan diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanAccountDisbursementUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/LoanAccountDisbursementUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementUiState.kt index d479afd5dd0..3900f0c0ba1 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanAccountDisbursementUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loanaccountdisbursement import com.mifos.api.GenericResponse import com.mifos.objects.templates.loans.LoanTransactionTemplate diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountDisbursementViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountDisbursementViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementViewModel.kt index f888ba342c3..a4c5ccbb9af 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountDisbursementViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountdisbursement/LoanAccountDisbursementViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loanaccountdisbursement import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.api.GenericResponse import com.mifos.api.model.APIEndPoint import com.mifos.objects.accounts.loan.LoanDisbursement import com.mifos.objects.templates.loans.LoanTransactionTemplate -import com.mifos.repositories.LoanAccountDisbursementRepository -import com.mifos.states.LoanAccountDisbursementUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryFragment.kt index 5523fedf826..23e6c14c051 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryFragment.kt @@ -21,12 +21,9 @@ import com.mifos.mifosxdroid.core.ProgressableFragment import com.mifos.mifosxdroid.databinding.FragmentLoanAccountSummaryBinding import com.mifos.objects.accounts.loan.LoanWithAssociations import com.mifos.objects.client.Charges -import com.mifos.states.LoanAccountSummaryUiState import com.mifos.utils.Constants import com.mifos.utils.DateHelper -import com.mifos.viewmodels.LoanAccountSummaryViewModel import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject /** * Created by ishankhanna on 09/05/14. diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountSummaryRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryRepository.kt similarity index 81% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountSummaryRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryRepository.kt index 04a15d49108..945b4660f3e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountSummaryRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccountsummary import com.mifos.objects.accounts.loan.LoanWithAssociations import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountSummaryRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryRepositoryImp.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanAccountSummaryRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryRepositoryImp.kt index 990b50c0533..5237bf37dd7 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanAccountSummaryRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanaccountsummary import com.mifos.api.datamanager.DataManagerLoan import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanAccountSummaryUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/LoanAccountSummaryUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryUiState.kt index b7a5ab7effd..c2d8dbf2c02 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanAccountSummaryUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loanaccountsummary import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountSummaryViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountSummaryViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryViewModel.kt index 09df74775b2..bdfb88f89d5 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanAccountSummaryViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanaccountsummary/LoanAccountSummaryViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loanaccountsummary import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.accounts.loan.LoanWithAssociations -import com.mifos.repositories.LoanAccountSummaryRepository -import com.mifos.states.LoanAccountSummaryUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeFragment.kt index f0b26f1a179..3bcd93c6bdc 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeFragment.kt @@ -22,9 +22,7 @@ import com.mifos.mifosxdroid.databinding.FragmentChargeListBinding import com.mifos.mifosxdroid.dialogfragments.chargedialog.OnChargeCreateListener import com.mifos.mifosxdroid.dialogfragments.loanchargedialog.LoanChargeDialogFragment import com.mifos.objects.client.Charges -import com.mifos.states.LoanChargeUiState import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.LoanChargeViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeRepository.kt similarity index 81% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanChargeRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeRepository.kt index 98bd44ed979..f40551294db 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loancharge import com.mifos.objects.client.Charges import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeRepositoryImp.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanChargeRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeRepositoryImp.kt index ed52827de82..f3a836e83c0 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanChargeRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loancharge import com.mifos.api.DataManager import com.mifos.objects.client.Charges diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanChargeUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/LoanChargeUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeUiState.kt index b8347788ba5..febc5f664c3 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanChargeUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loancharge import com.mifos.objects.client.Charges diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanChargeViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanChargeViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeViewModel.kt index 236bf9dffd9..6b77fe6a327 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanChargeViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loancharge import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.client.Charges -import com.mifos.repositories.LoanChargeRepository -import com.mifos.states.LoanChargeUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentFragment.kt index 55a0f52b035..985b2b3a9b7 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentFragment.kt @@ -30,10 +30,8 @@ import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.loan.LoanRepaymentResponse import com.mifos.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.states.LoanRepaymentUiState import com.mifos.utils.FragmentConstants import com.mifos.utils.Utils -import com.mifos.viewmodels.LoanRepaymentViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentRepository.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentRepository.kt index f1ca9a64535..356b16f85ea 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanrepayment import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.loan.LoanRepaymentResponse diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentRepositoryImp.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentRepositoryImp.kt index 0b10431b7ce..4ba902e76c9 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanrepayment import com.mifos.api.datamanager.DataManagerLoan import com.mifos.objects.accounts.loan.LoanRepaymentRequest diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanRepaymentUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/LoanRepaymentUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentUiState.kt index 84521bc400d..9472338b772 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanRepaymentUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loanrepayment import com.mifos.objects.accounts.loan.LoanRepaymentResponse import com.mifos.objects.templates.loans.LoanRepaymentTemplate diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanRepaymentViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanRepaymentViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentViewModel.kt index d17b647d02e..aa6e3f60b68 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanRepaymentViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loanrepayment import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.accounts.loan.LoanRepaymentRequest import com.mifos.objects.accounts.loan.LoanRepaymentResponse import com.mifos.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.repositories.LoanRepaymentRepository -import com.mifos.states.LoanRepaymentUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleFragment.kt index 620bac03014..1ed59d906b4 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleFragment.kt @@ -18,8 +18,6 @@ import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentLoanRepaymentScheduleBinding import com.mifos.objects.accounts.loan.LoanWithAssociations import com.mifos.objects.accounts.loan.RepaymentSchedule -import com.mifos.states.LoanRepaymentScheduleUiState -import com.mifos.viewmodels.LoanRepaymentScheduleViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentScheduleRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleRepository.kt similarity index 81% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentScheduleRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleRepository.kt index 78314aea2c0..e0fd91c72b0 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentScheduleRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanrepaymentschedule import com.mifos.objects.accounts.loan.LoanWithAssociations import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentScheduleRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleRepositoryImp.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentScheduleRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleRepositoryImp.kt index 20718fe3a3e..5434be5ba3d 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanRepaymentScheduleRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loanrepaymentschedule import com.mifos.api.DataManager import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanRepaymentScheduleUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/LoanRepaymentScheduleUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleUiState.kt index d5a3c6acecf..cab1b7ab61d 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanRepaymentScheduleUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loanrepaymentschedule import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanRepaymentScheduleViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanRepaymentScheduleViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleViewModel.kt index f0f265c325f..4b002ba4049 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanRepaymentScheduleViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loanrepaymentschedule import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.accounts.loan.LoanWithAssociations -import com.mifos.repositories.LoanRepaymentScheduleRepository -import com.mifos.states.LoanRepaymentScheduleUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsFragment.kt index aab406529a9..ad5f1d973e7 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsFragment.kt @@ -17,11 +17,7 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentLoanTransactionsBinding import com.mifos.objects.accounts.loan.LoanWithAssociations -import com.mifos.states.LoanTransactionsUiState -import com.mifos.utils.Constants -import com.mifos.viewmodels.LoanTransactionsViewModel import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject @AndroidEntryPoint class LoanTransactionsFragment : MifosBaseFragment() { diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanTransactionsRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsRepository.kt similarity index 82% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanTransactionsRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsRepository.kt index b525c1d5447..7ec4e3fc48f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanTransactionsRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loantransactions import com.mifos.objects.accounts.loan.LoanWithAssociations import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/LoanTransactionsRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsRepositoryImp.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/repositories/LoanTransactionsRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsRepositoryImp.kt index 8f6e148748f..f0a4856d1db 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/LoanTransactionsRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.loantransactions import com.mifos.api.DataManager import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/states/LoanTransactionsUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsUiState.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/states/LoanTransactionsUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsUiState.kt index 3ab1c20754c..cd86afd8b01 100644 --- a/mifosng-android/src/main/java/com/mifos/states/LoanTransactionsUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.loantransactions import com.mifos.objects.accounts.loan.LoanWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanTransactionsViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/LoanTransactionsViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsViewModel.kt index 5650a669473..865243cea93 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoanTransactionsViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loantransactions/LoanTransactionsViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.loantransactions import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.accounts.loan.LoanWithAssociations -import com.mifos.repositories.LoanTransactionsRepository -import com.mifos.states.LoanTransactionsUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteFragment.kt index 6932179a419..02c9655c2a6 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteFragment.kt @@ -14,8 +14,6 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentNotesBinding import com.mifos.objects.noncore.Note -import com.mifos.states.NoteUiState -import com.mifos.viewmodels.NoteViewModel import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/mifosng-android/src/main/java/com/mifos/repositories/NoteRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteRepository.kt similarity index 83% rename from mifosng-android/src/main/java/com/mifos/repositories/NoteRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteRepository.kt index 574221de852..0e68bb968e4 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/NoteRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.note import com.mifos.objects.noncore.Note import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/NoteRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/NoteRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteRepositoryImp.kt index 9a5ebd7e624..eacf064bb7f 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/NoteRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.note import com.mifos.api.datamanager.DataManagerNote import com.mifos.objects.noncore.Note diff --git a/mifosng-android/src/main/java/com/mifos/states/NoteUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/NoteUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteUiState.kt index b779e08883c..e11da3b7930 100644 --- a/mifosng-android/src/main/java/com/mifos/states/NoteUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.note import com.mifos.objects.noncore.Note diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/NoteViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteViewModel.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/viewmodels/NoteViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteViewModel.kt index 5d3d87b7671..d341cb4e08c 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/NoteViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/note/NoteViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.note import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.noncore.Note -import com.mifos.repositories.NoteRepository -import com.mifos.states.NoteUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/RunReportsActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/RunReportsActivity.kt similarity index 99% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/online/RunReportsActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/RunReportsActivity.kt index 068115c6505..93f270e0d38 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/RunReportsActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/RunReportsActivity.kt @@ -1,4 +1,4 @@ -package com.mifos.mifosxdroid.online +package com.mifos.mifosxdroid.online.runreports import android.content.Intent import android.os.Bundle diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryFragment.kt index 59e25d67bf0..26a9ace3295 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryFragment.kt @@ -16,9 +16,7 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentRunreportBinding import com.mifos.objects.runreports.client.ClientReportTypeItem -import com.mifos.states.ReportCategoryUiState import com.mifos.utils.Constants -import com.mifos.viewmodels.ReportCategoryViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ReportCategoryRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryRepository.kt similarity index 84% rename from mifosng-android/src/main/java/com/mifos/repositories/ReportCategoryRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryRepository.kt index cb8d1f42f59..960579e8e70 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ReportCategoryRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.runreports.reportcategory import com.mifos.objects.runreports.client.ClientReportTypeItem import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ReportCategoryRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/ReportCategoryRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryRepositoryImp.kt index fee82054b58..fb1d308dc88 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ReportCategoryRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.runreports.reportcategory import com.mifos.api.datamanager.DataManagerRunReport import com.mifos.objects.runreports.client.ClientReportTypeItem diff --git a/mifosng-android/src/main/java/com/mifos/states/ReportCategoryUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryUiState.kt similarity index 86% rename from mifosng-android/src/main/java/com/mifos/states/ReportCategoryUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryUiState.kt index 581e568ee7a..adc5b0dd916 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ReportCategoryUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.runreports.reportcategory import com.mifos.objects.runreports.client.ClientReportTypeItem diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ReportCategoryViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryViewModel.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ReportCategoryViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryViewModel.kt index 16c7bc39da1..8938c0529d0 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ReportCategoryViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportcategory/ReportCategoryViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.runreports.reportcategory import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.runreports.client.ClientReportTypeItem -import com.mifos.repositories.ReportCategoryRepository -import com.mifos.states.ReportCategoryUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailFragment.kt index 43b75c02b15..b749d9570a6 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailFragment.kt @@ -27,10 +27,8 @@ import com.mifos.mifosxdroid.uihelpers.MFDatePicker import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.runreports.FullParameterListResponse import com.mifos.objects.runreports.client.ClientReportTypeItem -import com.mifos.states.ReportDetailUiState import com.mifos.utils.Constants import com.mifos.utils.FragmentConstants -import com.mifos.viewmodels.ReportDetailViewModel import dagger.hilt.android.AndroidEntryPoint import java.text.ParseException import java.text.SimpleDateFormat diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ReportDetailRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/ReportDetailRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailRepository.kt index 7bc01070dba..c14e6fc3754 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ReportDetailRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.runreports.reportdetail import com.mifos.objects.runreports.FullParameterListResponse import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/ReportDetailRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/ReportDetailRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailRepositoryImp.kt index 95d0d035b7b..2c271befa09 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/ReportDetailRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.runreports.reportdetail import com.mifos.api.datamanager.DataManagerRunReport import com.mifos.objects.runreports.FullParameterListResponse diff --git a/mifosng-android/src/main/java/com/mifos/states/ReportDetailUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/ReportDetailUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailUiState.kt index bf6dec87c41..9fe09350648 100644 --- a/mifosng-android/src/main/java/com/mifos/states/ReportDetailUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.runreports.reportdetail import com.mifos.objects.runreports.FullParameterListResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/ReportDetailViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailViewModel.kt similarity index 98% rename from mifosng-android/src/main/java/com/mifos/viewmodels/ReportDetailViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailViewModel.kt index 1715822f36a..692db79f518 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/ReportDetailViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/runreports/reportdetail/ReportDetailViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.runreports.reportdetail import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.runreports.DataRow import com.mifos.objects.runreports.FullParameterListResponse -import com.mifos.repositories.ReportDetailRepository -import com.mifos.states.ReportDetailUiState import dagger.hilt.android.lifecycle.HiltViewModel import retrofit2.HttpException import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt index 73fe5e9bcc5..ef82f8eb6a1 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryFragment.kt @@ -29,11 +29,8 @@ import com.mifos.objects.accounts.savings.DepositType.ServerTypes import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations import com.mifos.objects.accounts.savings.Status import com.mifos.objects.accounts.savings.Transaction -import com.mifos.states.SavingsAccountSummaryUiState import com.mifos.utils.Constants -import com.mifos.viewmodels.SavingsAccountSummaryViewModel import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject import kotlin.properties.Delegates @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountSummaryRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryRepository.kt similarity index 85% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountSummaryRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryRepository.kt index 93dae152735..0249a9d27b6 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountSummaryRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingaccountsummary import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountSummaryRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountSummaryRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryRepositoryImp.kt index 33c160a8d8d..97661847936 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountSummaryRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingaccountsummary import com.mifos.api.datamanager.DataManagerSavings import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountSummaryUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryUiState.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/states/SavingsAccountSummaryUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryUiState.kt index de408302297..e75e9a2ed21 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountSummaryUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.savingaccountsummary import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountSummaryViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryViewModel.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountSummaryViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryViewModel.kt index 1b0020e0b25..845286259a0 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountSummaryViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.savingaccountsummary import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.mifosxdroid.R import com.mifos.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.repositories.SavingsAccountSummaryRepository -import com.mifos.states.SavingsAccountSummaryUiState import com.mifos.utils.Constants import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionFragment.kt index be725d1c865..0aed0265aef 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionFragment.kt @@ -30,13 +30,11 @@ import com.mifos.objects.accounts.savings.DepositType import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionResponse import com.mifos.objects.templates.savings.SavingsAccountTransactionTemplate -import com.mifos.states.SavingsAccountTransactionUiState import com.mifos.utils.Constants import com.mifos.utils.FragmentConstants import com.mifos.utils.Network import com.mifos.utils.PrefManager import com.mifos.utils.Utils -import com.mifos.viewmodels.SavingsAccountTransactionViewModel import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountTransactionRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountTransactionRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionRepository.kt index 4c3537cf500..a256c9b87d0 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountTransactionRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingaccounttransaction import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionResponse diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountTransactionRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountTransactionRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionRepositoryImp.kt index 725a7ef1daf..cc1593a3d89 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountTransactionRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingaccounttransaction import com.mifos.api.datamanager.DataManagerSavings import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest diff --git a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountTransactionUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionUiState.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/states/SavingsAccountTransactionUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionUiState.kt index 3fa4cc4fd8b..7e1616d9a55 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountTransactionUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.savingaccounttransaction import com.mifos.objects.accounts.savings.SavingsAccountTransactionResponse import com.mifos.objects.templates.savings.SavingsAccountTransactionTemplate diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountTransactionViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionViewModel.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountTransactionViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionViewModel.kt index bb712e35f3c..2fe3247a10f 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountTransactionViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingaccounttransaction/SavingsAccountTransactionViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.savingaccounttransaction import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModel import com.mifos.objects.accounts.savings.SavingsAccountTransactionRequest import com.mifos.objects.accounts.savings.SavingsAccountTransactionResponse import com.mifos.objects.templates.savings.SavingsAccountTransactionTemplate -import com.mifos.repositories.SavingsAccountTransactionRepository -import com.mifos.states.SavingsAccountTransactionUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/states/SavingAccountUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingAccountUiState.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/states/SavingAccountUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingAccountUiState.kt index 1df5c7ae431..60054045ab7 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SavingAccountUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingAccountUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.savingsaccount import com.mifos.objects.client.Savings import com.mifos.objects.organisation.ProductSavings diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingAccountViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingAccountViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SavingAccountViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingAccountViewModel.kt index 899f3258b3c..62641058c3f 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingAccountViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingAccountViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.savingsaccount import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -10,9 +10,7 @@ import com.mifos.objects.common.InterestType import com.mifos.objects.organisation.ProductSavings import com.mifos.objects.templates.savings.SavingProductsTemplate import com.mifos.objects.zipmodels.SavingProductsAndTemplate -import com.mifos.repositories.SavingsAccountRepository import com.mifos.services.data.SavingsPayload -import com.mifos.states.SavingAccountUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Observable import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountFragment.kt index 669a8f68bdd..cfdb2fe9841 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountFragment.kt @@ -25,11 +25,9 @@ import com.mifos.objects.client.Savings import com.mifos.objects.organisation.ProductSavings import com.mifos.objects.templates.savings.SavingProductsTemplate import com.mifos.services.data.SavingsPayload -import com.mifos.states.SavingAccountUiState import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants import com.mifos.utils.Network -import com.mifos.viewmodels.SavingAccountViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountRepository.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountRepository.kt index efbea779850..149eace2c1a 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingsaccount import com.mifos.objects.client.Savings import com.mifos.objects.organisation.ProductSavings diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountRepositoryImp.kt similarity index 96% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountRepositoryImp.kt index 3bdd5bf0488..af175752b2a 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccount/SavingsAccountRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingsaccount import com.mifos.api.datamanager.DataManagerSavings import com.mifos.objects.client.Savings diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateFragment.kt index 0bbe637da66..1348676a327 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateFragment.kt @@ -20,11 +20,9 @@ import com.mifos.mifosxdroid.databinding.DialogFragmentApproveSavingsBinding import com.mifos.mifosxdroid.uihelpers.MFDatePicker import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.accounts.savings.DepositType -import com.mifos.states.SavingsAccountActivateUiState import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants import com.mifos.utils.SafeUIBlockingUtility -import com.mifos.viewmodels.SavingsAccountActivateViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountActivateRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateRepository.kt similarity index 82% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountActivateRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateRepository.kt index b0efe883d7c..ae512ede56e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountActivateRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingsaccountactivate import com.mifos.api.GenericResponse import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountActivateRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateRepositoryImp.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountActivateRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateRepositoryImp.kt index 41aa53b5c2d..5cfaad1f79a 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountActivateRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingsaccountactivate import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerSavings diff --git a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountActivateUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/SavingsAccountActivateUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateUiState.kt index 1e20bd03a39..59b39765508 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountActivateUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.savingsaccountactivate import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountActivateViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountActivateViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateViewModel.kt index c665d63328a..5d410e9c2b4 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountActivateViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountactivate/SavingsAccountActivateViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.savingsaccountactivate import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse -import com.mifos.repositories.SavingsAccountActivateRepository -import com.mifos.states.SavingsAccountActivateUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalFragment.kt index 1d5d2f4dfde..328670e960b 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalFragment.kt @@ -20,12 +20,10 @@ import com.mifos.mifosxdroid.uihelpers.MFDatePicker import com.mifos.mifosxdroid.uihelpers.MFDatePicker.OnDatePickListener import com.mifos.objects.accounts.loan.SavingsApproval import com.mifos.objects.accounts.savings.DepositType -import com.mifos.states.SavingsAccountApprovalUiState import com.mifos.utils.DateHelper import com.mifos.utils.FragmentConstants import com.mifos.utils.Network import com.mifos.utils.SafeUIBlockingUtility -import com.mifos.viewmodels.SavingsAccountApprovalViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountApprovalRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalRepository.kt similarity index 85% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountApprovalRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalRepository.kt index a255906bbf8..692cd7539bd 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountApprovalRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingsaccountapproval import com.mifos.api.GenericResponse import com.mifos.objects.accounts.loan.SavingsApproval diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountApprovalRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountApprovalRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalRepositoryImp.kt index 676269a15a3..ac05e3d00d8 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SavingsAccountApprovalRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.savingsaccountapproval import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerSavings diff --git a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountApprovalUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/SavingsAccountApprovalUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalUiState.kt index 7f0a39344f9..b5624cd1dec 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SavingsAccountApprovalUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.savingsaccountapproval import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountApprovalViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountApprovalViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalViewModel.kt index 89c650d4e71..ffb6e56b56f 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SavingsAccountApprovalViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/savingsaccountapproval/SavingsAccountApprovalViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.savingsaccountapproval import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse import com.mifos.objects.accounts.loan.SavingsApproval -import com.mifos.repositories.SavingsAccountApprovalRepository -import com.mifos.states.SavingsAccountApprovalUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.kt index 9761257aa64..456fc49f273 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.kt @@ -18,7 +18,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.mifos.mifosxdroid.HomeActivity +import com.mifos.mifosxdroid.activity.home.HomeActivity import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.adapters.SearchAdapter import com.mifos.mifosxdroid.core.MifosBaseFragment @@ -26,14 +26,11 @@ import com.mifos.mifosxdroid.core.util.Toaster.show import com.mifos.mifosxdroid.databinding.FragmentClientSearchBinding import com.mifos.objects.SearchedEntity import com.mifos.objects.navigation.ClientArgs -import com.mifos.states.SearchUiState import com.mifos.utils.Constants import com.mifos.utils.Network -import com.mifos.viewmodels.SearchViewModel import dagger.hilt.android.AndroidEntryPoint import uk.co.deanwild.materialshowcaseview.MaterialShowcaseSequence import uk.co.deanwild.materialshowcaseview.ShowcaseConfig -import javax.inject.Inject @AndroidEntryPoint diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SearchRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchRepository.kt similarity index 86% rename from mifosng-android/src/main/java/com/mifos/repositories/SearchRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchRepository.kt index f95d39ad9f1..085acb94c97 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SearchRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.search import com.mifos.objects.SearchedEntity import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SearchRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchRepositoryImp.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/repositories/SearchRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchRepositoryImp.kt index 723ebd4dda1..9e4bf49df1e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SearchRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.search import com.mifos.api.datamanager.DataManagerSearch import com.mifos.objects.SearchedEntity diff --git a/mifosng-android/src/main/java/com/mifos/states/SearchUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchUiState.kt similarity index 90% rename from mifosng-android/src/main/java/com/mifos/states/SearchUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchUiState.kt index a0c0ee5aeb6..d02b0a69154 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SearchUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.search import com.mifos.objects.SearchedEntity diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SearchViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchViewModel.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SearchViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchViewModel.kt index f3f9a239695..e36dc3dd4f1 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SearchViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.search import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.SearchedEntity -import com.mifos.repositories.SearchRepository -import com.mifos.states.SearchUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureFragment.kt index 8fc189d6941..c29f0030a13 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureFragment.kt @@ -23,13 +23,11 @@ import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentSignBinding import com.mifos.mifosxdroid.views.SignatureView.OnSignatureSaveListener -import com.mifos.states.SignatureUiState import com.mifos.utils.AndroidVersionUtil import com.mifos.utils.CheckSelfPermissionAndRequest import com.mifos.utils.Constants import com.mifos.utils.FileUtils import com.mifos.utils.SafeUIBlockingUtility -import com.mifos.viewmodels.SignatureViewModel import dagger.hilt.android.AndroidEntryPoint import java.io.File diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SignatureRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureRepository.kt similarity index 88% rename from mifosng-android/src/main/java/com/mifos/repositories/SignatureRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureRepository.kt index 8a14951a1de..6ce432e8754 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SignatureRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.sign import com.mifos.api.GenericResponse import okhttp3.MultipartBody diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SignatureRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureRepositoryImp.kt similarity index 93% rename from mifosng-android/src/main/java/com/mifos/repositories/SignatureRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureRepositoryImp.kt index e5fac1e2b10..b0c122eabe2 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SignatureRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.sign import com.mifos.api.GenericResponse import com.mifos.api.datamanager.DataManagerDocument diff --git a/mifosng-android/src/main/java/com/mifos/states/SignatureUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureUiState.kt similarity index 89% rename from mifosng-android/src/main/java/com/mifos/states/SignatureUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureUiState.kt index cd829ca9374..4aa28b2ba2c 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SignatureUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.sign import com.mifos.api.GenericResponse diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SignatureViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureViewModel.kt similarity index 94% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SignatureViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureViewModel.kt index 228f5a1cb6f..24cc7683132 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SignatureViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/sign/SignatureViewModel.kt @@ -1,12 +1,10 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.sign import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.api.GenericResponse import com.mifos.mifosxdroid.R -import com.mifos.repositories.SignatureRepository -import com.mifos.states.SignatureUiState import dagger.hilt.android.lifecycle.HiltViewModel import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListFragment.kt index f3b66dae308..5e2202571ae 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListFragment.kt @@ -20,8 +20,6 @@ import com.mifos.mifosxdroid.core.ProgressableFragment import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mifosxdroid.databinding.FragmentSurveyListBinding import com.mifos.objects.survey.Survey -import com.mifos.states.SurveyListUiState -import com.mifos.viewmodels.SurveyListViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SurveyListRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListRepository.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/SurveyListRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListRepository.kt index 93b56d7fe2e..3eb809cc3cb 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SurveyListRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.surveylist import com.mifos.objects.survey.QuestionDatas import com.mifos.objects.survey.ResponseDatas diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SurveyListRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListRepositoryImp.kt similarity index 95% rename from mifosng-android/src/main/java/com/mifos/repositories/SurveyListRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListRepositoryImp.kt index e7b12c34a39..6b9f3bfbfab 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SurveyListRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.surveylist import com.mifos.api.datamanager.DataManagerSurveys import com.mifos.objects.survey.QuestionDatas diff --git a/mifosng-android/src/main/java/com/mifos/states/SurveyListUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/SurveyListUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListUiState.kt index 97c20a986d2..eb721419bd0 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SurveyListUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.surveylist import com.mifos.objects.survey.Survey diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListViewModel.kt similarity index 97% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListViewModel.kt index 2317540930e..d9dab072358 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveylist/SurveyListViewModel.kt @@ -1,4 +1,4 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.surveylist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -7,8 +7,6 @@ import com.mifos.mifosxdroid.R import com.mifos.objects.survey.QuestionDatas import com.mifos.objects.survey.ResponseDatas import com.mifos.objects.survey.Survey -import com.mifos.repositories.SurveyListRepository -import com.mifos.states.SurveyListUiState import com.mifos.utils.PrefManager import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/Communicator.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/Communicator.kt similarity index 86% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/online/Communicator.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/Communicator.kt index 684129481e1..13b678ce165 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/Communicator.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/Communicator.kt @@ -2,7 +2,7 @@ * This project is licensed under the open source MPL V2. * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.mifosxdroid.online +package com.mifos.mifosxdroid.online.surveyquestion import com.mifos.objects.survey.Scorecard diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/SurveyQuestionActivity.kt old mode 100755 new mode 100644 similarity index 97% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/SurveyQuestionActivity.kt index 18067b2db0a..c9ead44e3e1 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/SurveyQuestionActivity.kt @@ -2,7 +2,7 @@ * This project is licensed under the open source MPL V2. * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.mifosxdroid.online +package com.mifos.mifosxdroid.online.surveyquestion import android.os.Bundle import android.util.Log @@ -15,7 +15,7 @@ import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.adapters.SurveyPagerAdapter import com.mifos.mifosxdroid.core.MifosBaseActivity import com.mifos.mifosxdroid.databinding.ActivitySurveyQuestionBinding -import com.mifos.mifosxdroid.online.SurveyQuestionFragment.OnAnswerSelectedListener +import com.mifos.mifosxdroid.online.surveyquestion.SurveyQuestionFragment.OnAnswerSelectedListener import com.mifos.mifosxdroid.online.surveysubmit.SurveySubmitFragment.Companion.newInstance import com.mifos.mifosxdroid.online.surveysubmit.SurveySubmitFragment.DisableSwipe import com.mifos.objects.survey.Scorecard diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/SurveyQuestionFragment.kt old mode 100755 new mode 100644 similarity index 98% rename from mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionFragment.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/SurveyQuestionFragment.kt index e8457039110..cd58f62333c --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveyquestion/SurveyQuestionFragment.kt @@ -2,7 +2,7 @@ * This project is licensed under the open source MPL V2. * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.mifosxdroid.online +package com.mifos.mifosxdroid.online.surveyquestion import android.app.Activity import android.content.Context diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitFragment.kt index dbb07602fa1..d7fd9ae2e8f 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitFragment.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitFragment.kt @@ -15,11 +15,9 @@ import androidx.lifecycle.ViewModelProvider import com.mifos.mifosxdroid.R import com.mifos.mifosxdroid.core.MifosBaseFragment import com.mifos.mifosxdroid.databinding.FragmentSurveyLastBinding -import com.mifos.mifosxdroid.online.Communicator -import com.mifos.mifosxdroid.online.SurveyQuestionActivity +import com.mifos.mifosxdroid.online.surveyquestion.Communicator +import com.mifos.mifosxdroid.online.surveyquestion.SurveyQuestionActivity import com.mifos.objects.survey.Scorecard -import com.mifos.states.SurveySubmitUiState -import com.mifos.viewmodels.SurveySubmitViewModel import dagger.hilt.android.AndroidEntryPoint /** diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SurveySubmitRepository.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitRepository.kt similarity index 82% rename from mifosng-android/src/main/java/com/mifos/repositories/SurveySubmitRepository.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitRepository.kt index d51f846af4b..75b96ad607e 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SurveySubmitRepository.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitRepository.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.surveysubmit import com.mifos.objects.survey.Scorecard import rx.Observable diff --git a/mifosng-android/src/main/java/com/mifos/repositories/SurveySubmitRepositoryImp.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitRepositoryImp.kt similarity index 91% rename from mifosng-android/src/main/java/com/mifos/repositories/SurveySubmitRepositoryImp.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitRepositoryImp.kt index d91b5862f5f..0844671d3be 100644 --- a/mifosng-android/src/main/java/com/mifos/repositories/SurveySubmitRepositoryImp.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitRepositoryImp.kt @@ -1,4 +1,4 @@ -package com.mifos.repositories +package com.mifos.mifosxdroid.online.surveysubmit import com.mifos.api.datamanager.DataManagerSurveys import com.mifos.objects.survey.Scorecard diff --git a/mifosng-android/src/main/java/com/mifos/states/SurveySubmitUiState.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitUiState.kt similarity index 87% rename from mifosng-android/src/main/java/com/mifos/states/SurveySubmitUiState.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitUiState.kt index 17b3fb21df1..e7daf724b33 100644 --- a/mifosng-android/src/main/java/com/mifos/states/SurveySubmitUiState.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitUiState.kt @@ -1,4 +1,4 @@ -package com.mifos.states +package com.mifos.mifosxdroid.online.surveysubmit import com.mifos.objects.survey.Scorecard diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SurveySubmitViewModel.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitViewModel.kt similarity index 92% rename from mifosng-android/src/main/java/com/mifos/viewmodels/SurveySubmitViewModel.kt rename to mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitViewModel.kt index 35c121fea0e..6fe8fdcc934 100644 --- a/mifosng-android/src/main/java/com/mifos/viewmodels/SurveySubmitViewModel.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/surveysubmit/SurveySubmitViewModel.kt @@ -1,11 +1,9 @@ -package com.mifos.viewmodels +package com.mifos.mifosxdroid.online.surveysubmit import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.mifos.objects.survey.Scorecard -import com.mifos.repositories.SurveySubmitRepository -import com.mifos.states.SurveySubmitUiState import dagger.hilt.android.lifecycle.HiltViewModel import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt index f1fe69a9cf3..ab61b81af4a 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt @@ -4,9 +4,9 @@ import android.content.Intent import android.os.Bundle import android.view.View import androidx.core.widget.NestedScrollView -import com.mifos.mifosxdroid.HomeActivity +import com.mifos.mifosxdroid.activity.home.HomeActivity import com.mifos.mifosxdroid.R -import com.mifos.mifosxdroid.SplashScreenActivity +import com.mifos.mifosxdroid.activity.splashscreen.SplashScreenActivity import com.mifos.mifosxdroid.core.util.Toaster import com.mifos.mobile.passcode.MifosPassCodeActivity import com.mifos.mobile.passcode.utils.EncryptionUtil diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/Font.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/Font.kt index c184a6f80ec..1f5d0db0773 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/Font.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/views/Font.kt @@ -5,8 +5,8 @@ package com.mifos.mifosxdroid.views import android.graphics.Typeface -import com.mifos.App -import com.mifos.App.Companion.instance +import com.mifos.application.App +import com.mifos.application.App.Companion.instance import java.io.File /** diff --git a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt index ee90914930a..3e4e38bce6f 100644 --- a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt +++ b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt @@ -2,7 +2,7 @@ package com.mifos.utils import android.content.SharedPreferences import android.preference.PreferenceManager -import com.mifos.App +import com.mifos.application.App import com.mifos.objects.user.User import org.apache.fineract.client.models.PostAuthenticationResponse import org.mifos.core.sharedpreference.Key diff --git a/mifosng-android/src/main/res/layout/activity_home.xml b/mifosng-android/src/main/res/layout/activity_home.xml index 64df2b010a0..107e1e4e610 100644 --- a/mifosng-android/src/main/res/layout/activity_home.xml +++ b/mifosng-android/src/main/res/layout/activity_home.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context=".HomeActivity"> + tools:context=".activity.home.HomeActivity"> diff --git a/mifosng-android/src/main/res/layout/fragment_splash.xml b/mifosng-android/src/main/res/layout/fragment_splash.xml index 8b1d4b3950e..1281b77f6bd 100755 --- a/mifosng-android/src/main/res/layout/fragment_splash.xml +++ b/mifosng-android/src/main/res/layout/fragment_splash.xml @@ -8,6 +8,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#FFFFFF" - tools:context=".SplashScreenActivity$PlaceholderFragment"> + tools:context=".activity.splashscreen.SplashScreenActivity$PlaceholderFragment"> diff --git a/mifosng-android/src/main/res/menu/splash_screen.xml b/mifosng-android/src/main/res/menu/splash_screen.xml index d0a9f97b163..f7106ad9566 100755 --- a/mifosng-android/src/main/res/menu/splash_screen.xml +++ b/mifosng-android/src/main/res/menu/splash_screen.xml @@ -6,7 +6,7 @@ + tools:context=".activity.splashscreen.SplashScreenActivity" > diff --git a/mifosng-android/src/main/res/navigation/nav_graph.xml b/mifosng-android/src/main/res/navigation/nav_graph.xml index 6c6071b1e9d..949ddded3ac 100644 --- a/mifosng-android/src/main/res/navigation/nav_graph.xml +++ b/mifosng-android/src/main/res/navigation/nav_graph.xml @@ -449,7 +449,7 @@